Changeset 5d2481f in git

Timestamp:

Jun 29, 2015, 5:45:49 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

839deb7

Parents:

1fd8862

Message:

added PhotonConversions modules, and DelphesCylindrical formulae

Files:

• Makefile (modified) (6 diffs)
• classes/DelphesClasses.cc (modified) (3 diffs)
• classes/DelphesClasses.h (modified) (1 diff)
• classes/DelphesCylindricalFormula.cc (added)
• classes/DelphesCylindricalFormula.h (added)
• modules/ModulesLinkDef.h (modified) (2 diffs)
• modules/PhotonConversions.cc (added)
• modules/PhotonConversions.h (added)

Makefile

@@ -309 +309 @@
         modules/Delphes.h \
         modules/AngularSmearing.h \
+        modules/PhotonConversions.h \
         modules/ParticlePropagator.h \
         modules/Efficiency.h \
@@ -390 +391 @@
         classes/DelphesFactory.h \
         classes/SortableObject.h
+tmp/classes/DelphesCylindricalFormula.$(ObjSuf): \
+        classes/DelphesCylindricalFormula.$(SrcSuf) \
+        classes/DelphesCylindricalFormula.h
 tmp/classes/DelphesFactory.$(ObjSuf): \
         classes/DelphesFactory.$(SrcSuf) \
@@ -721 +725 @@
         external/ExRootAnalysis/ExRootFilter.h \
         external/ExRootAnalysis/ExRootClassifier.h
+tmp/modules/PhotonConversions.$(ObjSuf): \
+        modules/PhotonConversions.$(SrcSuf) \
+        modules/PhotonConversions.h \
+        classes/DelphesClasses.h \
+        classes/DelphesFactory.h \
+        classes/DelphesCylindricalFormula.h \
+        external/ExRootAnalysis/ExRootResult.h \
+        external/ExRootAnalysis/ExRootFilter.h \
+        external/ExRootAnalysis/ExRootClassifier.h
 tmp/modules/PileUpJetID.$(ObjSuf): \
         modules/PileUpJetID.$(SrcSuf) \
@@ -848 +861 @@
 DELPHES_OBJ +=  \
         tmp/classes/DelphesClasses.$(ObjSuf) \
+        tmp/classes/DelphesCylindricalFormula.$(ObjSuf) \
         tmp/classes/DelphesFactory.$(ObjSuf) \
         tmp/classes/DelphesFormula.$(ObjSuf) \
@@ -916 +930 @@
         tmp/modules/ParticlePropagator.$(ObjSuf) \
         tmp/modules/PdgCodeFilter.$(ObjSuf) \
+        tmp/modules/PhotonConversions.$(ObjSuf) \
         tmp/modules/PileUpJetID.$(ObjSuf) \
         tmp/modules/PileUpMerger.$(ObjSuf) \
@@ -1805 +1820 @@
         @touch $@
 
+modules/PhotonConversions.h: \
+        classes/DelphesModule.h
+        @touch $@
+
 external/fastjet/ClusterSequenceVoronoiArea.hh: \
         external/fastjet/PseudoJet.hh \

classes/DelphesClasses.cc

@@ -120 +120 @@
   PID(0), Status(0), M1(-1), M2(-1), D1(-1), D2(-1),
   Charge(0), Mass(0.0),
-  IsPU(0), IsRecoPU(0), IsConstituent(0),
+  IsPU(0), IsRecoPU(0), IsConstituent(0), IsFromConversion(0),
   Flavor(0), FlavorAlgo(0), FlavorPhys(0),
   BTag(0), BTagAlgo(0), BTagPhys(0),
@@ -243 +243 @@
   object.IsPU = IsPU;
   object.IsConstituent = IsConstituent;
+  object.IsFromConversion = IsFromConversion;
   object.Flavor = Flavor;
   object.FlavorAlgo = FlavorAlgo;
@@ -343 +344 @@
   IsPU = 0;
   IsConstituent = 0;
+  IsFromConversion = 0;
   Flavor = 0;
   FlavorAlgo = 0;

classes/DelphesClasses.h

@@ -506 +506 @@
 
   Int_t IsConstituent;
-
+  
+  Int_t IsFromConversion;
+  
   UInt_t Flavor;
   UInt_t FlavorAlgo;

modules/ModulesLinkDef.h

@@ -29 +29 @@
 
 #include "modules/AngularSmearing.h"
+#include "modules/PhotonConversions.h"
 #include "modules/ParticlePropagator.h"
 #include "modules/Efficiency.h"
@@ -71 +72 @@
 
 #pragma link C++ class AngularSmearing+;
+#pragma link C++ class PhotonConversions+;
 #pragma link C++ class ParticlePropagator+;
 #pragma link C++ class Efficiency+;