Changeset 70b9632 in git for modules/PhotonConversions.cc

Timestamp:

Aug 25, 2016, 2:04:58 PM (8 years ago)

Author:

Alexandre Mertens <alexandre.mertens@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

629e819

Parents:

7bb13cd (diff), 1408174 (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.

Message:

dev_01

File:

• modules/PhotonConversions.cc (modified) (2 diffs)

modules/PhotonConversions.cc

@@ -59 +59 @@
   fItInputArray(0), fConversionMap(0), fDecayXsec(0)
 {
-  fDecayXsec = new TF1;
+  fDecayXsec = new TF1("decayXsec","1.0 - 4.0/3.0 * x * (1.0 - x)", 0.0, 1.0);
   fConversionMap = new DelphesCylindricalFormula;
 }
@@ -84 +84 @@
 
   fConversionMap->Compile(GetString("ConversionMap", "0.0"));
-
-#if  ROOT_VERSION_CODE < ROOT_VERSION(6,04,00)
-  fDecayXsec->Compile("1.0 - 4.0/3.0 * x * (1.0 - x)");
-#else
-  fDecayXsec->GetFormula()->Compile("1.0 - 4.0/3.0 * x * (1.0 - x)");
-#endif
-  fDecayXsec->SetRange(0.0, 1.0);
 
   // import array with output from filter/classifier module