Fork me on GitHub

Changeset 8a11cdc in git


Ignore:
Timestamp:
Feb 12, 2019, 2:59:49 PM (6 years ago)
Author:
GitHub <noreply@…>
Branches:
ImprovedOutputFile, Timing, llp, master
Children:
769f65b
Parents:
70bb4cb (diff), dd64cff (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Pavel Demin <pavel-demin@…> (02/12/19 14:59:49)
git-committer:
GitHub <noreply@…> (02/12/19 14:59:49)
Message:

Merge pull request #68 from delphes/llp

new modules and classes for llp

Files:
5 added
4 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    r70bb4cb r8a11cdc  
    404404        modules/ParticlePropagator.h \
    405405        modules/Efficiency.h \
     406        modules/TrackEfficiency.h \
    406407        modules/IdentificationMap.h \
    407408        modules/EnergySmearing.h \
     
    522523        classes/DelphesStream.h \
    523524        external/ExRootAnalysis/ExRootTreeBranch.h
     525tmp/classes/DelphesLongFormula.$(ObjSuf): \
     526        classes/DelphesLongFormula.$(SrcSuf) \
     527        classes/DelphesLongFormula.h
    524528tmp/classes/DelphesModule.$(ObjSuf): \
    525529        classes/DelphesModule.$(SrcSuf) \
     
    984988        external/ExRootAnalysis/ExRootFilter.h \
    985989        external/ExRootAnalysis/ExRootClassifier.h
     990tmp/modules/TrackEfficiency.$(ObjSuf): \
     991        modules/TrackEfficiency.$(SrcSuf) \
     992        modules/TrackEfficiency.h \
     993        classes/DelphesClasses.h \
     994        classes/DelphesFactory.h \
     995        classes/DelphesLongFormula.h \
     996        external/ExRootAnalysis/ExRootResult.h \
     997        external/ExRootAnalysis/ExRootFilter.h \
     998        external/ExRootAnalysis/ExRootClassifier.h
    986999tmp/modules/TrackPileUpSubtractor.$(ObjSuf): \
    9871000        modules/TrackPileUpSubtractor.$(SrcSuf) \
     
    10671080        tmp/classes/DelphesHepMCReader.$(ObjSuf) \
    10681081        tmp/classes/DelphesLHEFReader.$(ObjSuf) \
     1082        tmp/classes/DelphesLongFormula.$(ObjSuf) \
    10691083        tmp/classes/DelphesModule.$(ObjSuf) \
    10701084        tmp/classes/DelphesPileUpReader.$(ObjSuf) \
     
    11481162        tmp/modules/TrackCountingBTagging.$(ObjSuf) \
    11491163        tmp/modules/TrackCountingTauTagging.$(ObjSuf) \
     1164        tmp/modules/TrackEfficiency.$(ObjSuf) \
    11501165        tmp/modules/TrackPileUpSubtractor.$(ObjSuf) \
    11511166        tmp/modules/TrackSmearing.$(ObjSuf) \
     
    17791794        tmp/external/tcl/tclVar.$(ObjSuf)
    17801795
     1796modules/TrackEfficiency.h: \
     1797        classes/DelphesModule.h
     1798        @touch $@
     1799
    17811800modules/DenseTrackFilter.h: \
    17821801        classes/DelphesModule.h
  • classes/DelphesClasses.h

    r70bb4cb r8a11cdc  
    315315  Float_t SumPt; // isolation variable
    316316
     317  Float_t D0; // track transverse impact parameter
     318  Float_t DZ; // track longitudinal impact parameter
     319  Float_t ErrorD0; // track transverse impact parameter error
     320  Float_t ErrorDZ; // track longitudinal impact parameter error
     321
    317322  static CompBase *fgCompare; //!
    318323  const CompBase *GetCompare() const { return fgCompare; }
     
    345350  Float_t SumPtChargedPU; // isolation variable
    346351  Float_t SumPt; // isolation variable
     352
     353  Float_t D0; // track transverse impact parameter
     354  Float_t DZ; // track longitudinal impact parameter
     355  Float_t ErrorD0; // track transverse impact parameter error
     356  Float_t ErrorDZ; // track longitudinal impact parameter error
    347357
    348358  static CompBase *fgCompare; //!
  • modules/ModulesLinkDef.h

    r70bb4cb r8a11cdc  
    3232#include "modules/ParticlePropagator.h"
    3333#include "modules/Efficiency.h"
     34#include "modules/TrackEfficiency.h"
    3435#include "modules/IdentificationMap.h"
    3536#include "modules/EnergySmearing.h"
     
    8586#pragma link C++ class ParticlePropagator+;
    8687#pragma link C++ class Efficiency+;
     88#pragma link C++ class TrackEfficiency+;
    8789#pragma link C++ class IdentificationMap+;
    8890#pragma link C++ class EnergySmearing+;
  • modules/TreeWriter.cc

    r70bb4cb r8a11cdc  
    528528    entry->T = position.T()*1.0E-3/c_light;
    529529
     530    // displacement
     531    entry->D0            = candidate->D0;
     532    entry->ErrorD0       = candidate->ErrorD0;
     533    entry->DZ            = candidate->DZ;
     534    entry->ErrorDZ       = candidate->ErrorDZ;
     535
    530536    // Isolation variables
    531 
    532537    entry->IsolationVar = candidate->IsolationVar;
    533538    entry->IsolationVarRhoCorr = candidate->IsolationVarRhoCorr ;
     
    582587
    583588    entry->T = position.T()*1.0E-3/c_light;
     589
     590
     591    // displacement
     592    entry->D0            = candidate->D0;
     593    entry->ErrorD0       = candidate->ErrorD0;
     594    entry->DZ            = candidate->DZ;
     595    entry->ErrorDZ       = candidate->ErrorDZ;
    584596
    585597    // Isolation variables
Note: See TracChangeset for help on using the changeset viewer.