Changes in modules/PhotonConversions.cc [bdfe7f2:c1ce3fe] in git

File:

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

modules/PhotonConversions.cc

@@ -59 +59 @@
   fItInputArray(0), fConversionMap(0), fDecayXsec(0)
 {
-  fDecayXsec = new TF1("decayXsec","1.0 - 4.0/3.0 * x * (1.0 - x)", 0.0, 1.0);
+  fDecayXsec = new TF1;
   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