- Timestamp:
- Aug 23, 2016, 3:28:48 PM (8 years ago)
- Branches:
- ImprovedOutputFile, Timing, dual_readout, llp, master
- Children:
- 19389b8, 7993cad
- Parents:
- e55f5b0 (diff), 98ce52a (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. - Location:
- modules
- Files:
-
- 4 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
modules/ModulesLinkDef.h
re55f5b0 r91acc76 40 40 #include "modules/SimpleCalorimeter.h" 41 41 #include "modules/Calorimeter.h" 42 #include "modules/OldCalorimeter.h" 42 43 #include "modules/Isolation.h" 43 44 #include "modules/EnergyScale.h" … … 59 60 #include "modules/PdgCodeFilter.h" 60 61 #include "modules/BeamSpotFilter.h" 62 #include "modules/RecoPuFilter.h" 61 63 #include "modules/Cloner.h" 62 64 #include "modules/Weighter.h" … … 89 91 #pragma link C++ class SimpleCalorimeter+; 90 92 #pragma link C++ class Calorimeter+; 93 #pragma link C++ class OldCalorimeter+; 91 94 #pragma link C++ class Isolation+; 92 95 #pragma link C++ class EnergyScale+; … … 108 111 #pragma link C++ class PdgCodeFilter+; 109 112 #pragma link C++ class BeamSpotFilter+; 113 #pragma link C++ class RecoPuFilter+; 110 114 #pragma link C++ class Cloner+; 111 115 #pragma link C++ class Weighter+; -
modules/PhotonConversions.cc
re55f5b0 r91acc76 59 59 fItInputArray(0), fConversionMap(0), fDecayXsec(0) 60 60 { 61 fDecayXsec = new TF1 ;61 fDecayXsec = new TF1("decayXsec","1.0 - 4.0/3.0 * x * (1.0 - x)", 0.0, 1.0); 62 62 fConversionMap = new DelphesCylindricalFormula; 63 63 } … … 84 84 85 85 fConversionMap->Compile(GetString("ConversionMap", "0.0")); 86 87 #if ROOT_VERSION_CODE < ROOT_VERSION(6,04,00)88 fDecayXsec->Compile("1.0 - 4.0/3.0 * x * (1.0 - x)");89 #else90 fDecayXsec->GetFormula()->Compile("1.0 - 4.0/3.0 * x * (1.0 - x)");91 #endif92 fDecayXsec->SetRange(0.0, 1.0);93 86 94 87 // import array with output from filter/classifier module
Note:
See TracChangeset
for help on using the changeset viewer.