Changeset 8a11cdc in git

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:

• Makefile (modified) (6 diffs)
• cards/delphes_card_llptest.tcl (added)
• classes/DelphesClasses.h (modified) (2 diffs)
• classes/DelphesLongFormula.cc (added)
• classes/DelphesLongFormula.h (added)
• modules/ModulesLinkDef.h (modified) (2 diffs)
• modules/TrackEfficiency.cc (added)
• modules/TrackEfficiency.h (added)
• modules/TreeWriter.cc (modified) (2 diffs)

Makefile

@@ -404 +404 @@
         modules/ParticlePropagator.h \
         modules/Efficiency.h \
+        modules/TrackEfficiency.h \
         modules/IdentificationMap.h \
         modules/EnergySmearing.h \
@@ -522 +523 @@
         classes/DelphesStream.h \
         external/ExRootAnalysis/ExRootTreeBranch.h
+tmp/classes/DelphesLongFormula.$(ObjSuf): \
+        classes/DelphesLongFormula.$(SrcSuf) \
+        classes/DelphesLongFormula.h
 tmp/classes/DelphesModule.$(ObjSuf): \
         classes/DelphesModule.$(SrcSuf) \
@@ -984 +988 @@
         external/ExRootAnalysis/ExRootFilter.h \
         external/ExRootAnalysis/ExRootClassifier.h
+tmp/modules/TrackEfficiency.$(ObjSuf): \
+        modules/TrackEfficiency.$(SrcSuf) \
+        modules/TrackEfficiency.h \
+        classes/DelphesClasses.h \
+        classes/DelphesFactory.h \
+        classes/DelphesLongFormula.h \
+        external/ExRootAnalysis/ExRootResult.h \
+        external/ExRootAnalysis/ExRootFilter.h \
+        external/ExRootAnalysis/ExRootClassifier.h
 tmp/modules/TrackPileUpSubtractor.$(ObjSuf): \
         modules/TrackPileUpSubtractor.$(SrcSuf) \
@@ -1067 +1080 @@
         tmp/classes/DelphesHepMCReader.$(ObjSuf) \
         tmp/classes/DelphesLHEFReader.$(ObjSuf) \
+        tmp/classes/DelphesLongFormula.$(ObjSuf) \
         tmp/classes/DelphesModule.$(ObjSuf) \
         tmp/classes/DelphesPileUpReader.$(ObjSuf) \
@@ -1148 +1162 @@
         tmp/modules/TrackCountingBTagging.$(ObjSuf) \
         tmp/modules/TrackCountingTauTagging.$(ObjSuf) \
+        tmp/modules/TrackEfficiency.$(ObjSuf) \
         tmp/modules/TrackPileUpSubtractor.$(ObjSuf) \
         tmp/modules/TrackSmearing.$(ObjSuf) \
@@ -1779 +1794 @@
         tmp/external/tcl/tclVar.$(ObjSuf)
 
+modules/TrackEfficiency.h: \
+        classes/DelphesModule.h
+        @touch $@
+
 modules/DenseTrackFilter.h: \
         classes/DelphesModule.h

classes/DelphesClasses.h

@@ -315 +315 @@
   Float_t SumPt; // isolation variable
 
+  Float_t D0; // track transverse impact parameter
+  Float_t DZ; // track longitudinal impact parameter
+  Float_t ErrorD0; // track transverse impact parameter error
+  Float_t ErrorDZ; // track longitudinal impact parameter error
+
   static CompBase *fgCompare; //!
   const CompBase *GetCompare() const { return fgCompare; }
@@ -345 +350 @@
   Float_t SumPtChargedPU; // isolation variable
   Float_t SumPt; // isolation variable
+
+  Float_t D0; // track transverse impact parameter
+  Float_t DZ; // track longitudinal impact parameter
+  Float_t ErrorD0; // track transverse impact parameter error
+  Float_t ErrorDZ; // track longitudinal impact parameter error
 
   static CompBase *fgCompare; //!

modules/ModulesLinkDef.h

@@ -32 +32 @@
 #include "modules/ParticlePropagator.h"
 #include "modules/Efficiency.h"
+#include "modules/TrackEfficiency.h"
 #include "modules/IdentificationMap.h"
 #include "modules/EnergySmearing.h"
@@ -85 +86 @@
 #pragma link C++ class ParticlePropagator+;
 #pragma link C++ class Efficiency+;
+#pragma link C++ class TrackEfficiency+;
 #pragma link C++ class IdentificationMap+;
 #pragma link C++ class EnergySmearing+;

modules/TreeWriter.cc

@@ -528 +528 @@
     entry->T = position.T()*1.0E-3/c_light;
 
+    // displacement
+    entry->D0            = candidate->D0;
+    entry->ErrorD0       = candidate->ErrorD0;
+    entry->DZ            = candidate->DZ;
+    entry->ErrorDZ       = candidate->ErrorDZ;
+
     // Isolation variables
-
     entry->IsolationVar = candidate->IsolationVar;
     entry->IsolationVarRhoCorr = candidate->IsolationVarRhoCorr ;
@@ -582 +587 @@
 
     entry->T = position.T()*1.0E-3/c_light;
+
+
+    // displacement
+    entry->D0            = candidate->D0;
+    entry->ErrorD0       = candidate->ErrorD0;
+    entry->DZ            = candidate->DZ;
+    entry->ErrorDZ       = candidate->ErrorDZ;
 
     // Isolation variables