Changeset 205ff13 in git

Timestamp:

Feb 14, 2019, 4:20:05 PM (6 years ago)

Author:

Pavel Demin <pavel-demin@…>

Branches:

ImprovedOutputFile, Timing, llp, master

Children:

19ed91a

Parents:

1f2a49a

Message:

remove TVarNameMap and TVarValMap from DelphesLongFormula

Location:

classes

Files:

• DelphesLongFormula.cc (modified) (2 diffs)
• DelphesLongFormula.h (modified) (2 diffs)

classes/DelphesLongFormula.cc

@@ -57 +57 @@
   }
 
-  buffer.ReplaceAll("pt", "[pt]");
-  buffer.ReplaceAll("eta", "[eta]");
-  buffer.ReplaceAll("phi", "[phi]");
-  buffer.ReplaceAll("energy", "[energy]");
-  buffer.ReplaceAll("d0", "[d0]");
-  buffer.ReplaceAll("dz", "[dz]");
-  buffer.ReplaceAll("ctgTheta", "[ctgTheta]");
-
 #if ROOT_VERSION_CODE < ROOT_VERSION(6, 0, 0)
   TFormula::SetMaxima(100000, 1000, 1000000);
+#else
+  TFormula::AddVariable("pt");
+  TFormula::AddVariable("eta");
+  TFormula::AddVariable("phi");
+  TFormula::AddVariable("energy");
+  TFormula::AddVariable("d0");
+  TFormula::AddVariable("dz");
+  TFormula::AddVariable("ctgTheta");
 #endif
 
@@ -82 +82 @@
   Double_t energy, Double_t d0, Double_t dz, Double_t ctgTheta)
 {
+  Double_t x[7];
 
-  TVarNameMap fVarNameMap;
-  TVarValMap fVarValMap;
+  x[0] = pt;
+  x[1] = eta;
+  x[2] = phi;
+  x[3] = energy;
+  x[4] = d0;
+  x[5] = dz;
+  x[6] = ctgTheta;
 
-  fVarNameMap[this->GetParNumber("pt")] = "pt";
-  fVarNameMap[this->GetParNumber("eta")] = "eta";
-  fVarNameMap[this->GetParNumber("phi")] = "phi";
-  fVarNameMap[this->GetParNumber("energy")] = "energy";
-  fVarNameMap[this->GetParNumber("d0")] = "d0";
-  fVarNameMap[this->GetParNumber("dz")] = "dz";
-  fVarNameMap[this->GetParNumber("ctgTheta")] = "ctgTheta";
-
-  fVarValMap["pt"] = pt;
-  fVarValMap["eta"] = eta;
-  fVarValMap["phi"] = phi;
-  fVarValMap["energy"] = energy;
-  fVarValMap["d0"] = d0;
-  fVarValMap["dz"] = dz;
-  fVarValMap["ctgTheta"] = ctgTheta;
-
-  Double_t vals[7];
-
-  Int_t j = 0;
-  for(Int_t i = 0; i != 7; i++)
-  {
-    if(fVarNameMap.find(i) != fVarNameMap.end())
-    {
-      TString var_name = fVarNameMap[i];
-      vals[i] = fVarValMap[var_name];
-    }
-    else
-      vals[i] = 0.;
-  }
-  return EvalPar(nullptr, vals);
+  return EvalPar(x);
 }
 

classes/DelphesLongFormula.h

@@ -21 +21 @@
 
 #include "TFormula.h"
-#include <map>
 
 class DelphesLongFormula: public TFormula
@@ -35 +34 @@
   Double_t Eval(Double_t pt, Double_t eta = 0, Double_t phi = 0,
     Double_t energy = 0, Double_t d0 = 0, Double_t dz = 0, Double_t ctgTheta = 0);
-
-  typedef std::map<Int_t, TString> TVarNameMap; //!
-  typedef std::map<TString, Double_t> TVarValMap; //!
 };