Changeset af6ce6a in git

Timestamp:

Jan 20, 2020, 2:29:19 PM (5 years ago)

Author:

GitHub <noreply@…>

Branches:

Timing

Children:

9867b49

Parents:

83ee320 (diff), 9c1d14a (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.

git-author:

Michele Selvaggi <michele.selvaggi@…> (01/20/20 14:29:19)

git-committer:

GitHub <noreply@…> (01/20/20 14:29:19)

Message:

Merge pull request #7 from selvaggi/revert-6-llp

Revert "Llp"

Files:

• classes/DelphesFormula.cc (modified) (2 diffs)
• classes/DelphesFormula.h (modified) (1 diff)
• modules/Efficiency.cc (modified) (3 diffs)

classes/DelphesFormula.cc

@@ -56 +56 @@
     buffer.Append(*it);
   }
-  buffer.ReplaceAll("pt", "[0]");
-  buffer.ReplaceAll("eta", "[1]");
-  buffer.ReplaceAll("phi", "[2]");
-  buffer.ReplaceAll("energy", "[3]");
-  buffer.ReplaceAll("r", "[4]");
-  buffer.ReplaceAll("d0", "[5]");
-  buffer.ReplaceAll("dz", "[6]");
-  buffer.ReplaceAll("ctgTheta", "[7]");
+  buffer.ReplaceAll("pt", "x");
+  buffer.ReplaceAll("eta", "y");
+  buffer.ReplaceAll("phi", "z");
+  buffer.ReplaceAll("energy", "t");
+  buffer.ReplaceAll("d0", "[0]");
+  buffer.ReplaceAll("dz", "[1]");
+  buffer.ReplaceAll("ctgTheta", "[2]");
 
 #if ROOT_VERSION_CODE < ROOT_VERSION(6, 3, 0)
@@ -79 +78 @@
 
 Double_t DelphesFormula::Eval(Double_t pt, Double_t eta, Double_t phi,
-  Double_t energy, Double_t r, Double_t z,
-  Double_t d0, Double_t dz, Double_t ctgTheta)
+  Double_t energy, Double_t d0, Double_t dz,
+  Double_t ctgTheta)
 {
-  Double_t x[4] = {0.0, 0.0, z, 0.0};
-  Double_t params[8] = {pt, eta, phi, energy, r, d0, dz, ctgTheta};
+  Double_t x[4] = {pt, eta, phi, energy};
+  Double_t params[3] = {d0, dz, ctgTheta};
   return EvalPar(x, params);
 }

classes/DelphesFormula.h

@@ -34 +34 @@
 
   Double_t Eval(Double_t pt, Double_t eta = 0, Double_t phi = 0,
-    Double_t energy = 0, Double_t r = 0, Double_t z = 0,
-    Double_t d0 = 0, Double_t dz = 0, Double_t ctgTheta = 0);
+    Double_t energy = 0, Double_t d0 = 0, Double_t dz = 0,
+    Double_t ctgTheta = 0);
 };
 

modules/Efficiency.cc

@@ -95 +95 @@
 {
   Candidate *candidate;
-  Double_t pt, eta, phi, e, r, z, d0, dz, ctgTheta;
+  Double_t pt, eta, phi, e, d0, dz, ctgTheta;
 
   fItInputArray->Reset();
@@ -102 +102 @@
     const TLorentzVector &candidatePosition = candidate->Position;
     const TLorentzVector &candidateMomentum = candidate->Momentum;
-    r = candidatePosition.Perp();
-    z = candidatePosition.Z();
     eta = candidatePosition.Eta();
     phi = candidatePosition.Phi();
@@ -113 +111 @@
 
     // apply an efficency formula
-    if(gRandom->Uniform() > fFormula->Eval(pt, eta, phi, e, r, z, d0, dz, ctgTheta)) continue;
+    if(gRandom->Uniform() > fFormula->Eval(pt, eta, phi, e, d0, dz, ctgTheta)) continue;
 
     fOutputArray->Add(candidate);