Changeset 95aa610 in git for modules

Timestamp:

May 11, 2015, 1:41:01 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

3241a0e

Parents:

4a93785

Message:

fixed phi, energy dependence in efficiency, smearing, identification, btagging, angular smearing modules

Location:

modules

Files:

• AngularSmearing.cc (modified) (2 diffs)
• BTagging.cc (modified) (3 diffs)
• Efficiency.cc (modified) (2 diffs)
• EnergyScale.cc (modified) (1 diff)
• EnergySmearing.cc (modified) (3 diffs)
• IdentificationMap.cc (modified) (3 diffs)
• ImpactParameterSmearing.cc (modified) (4 diffs)
• MomentumSmearing.cc (modified) (2 diffs)

modules/AngularSmearing.cc

@@ -100 +100 @@
 {
   Candidate *candidate, *mother;
-  Double_t pt, eta, phi;
+  Double_t pt, eta, phi, e;
 
   fItInputArray->Reset();
@@ -110 +110 @@
     phi = candidatePosition.Phi();
     pt = candidateMomentum.Pt();
+    e = candidateMomentum.E();
 
     // apply smearing formula for eta,phi
 
-    eta = gRandom->Gaus(eta, fFormulaEta->Eval(pt, eta));
-    phi = gRandom->Gaus(phi, fFormulaPhi->Eval(pt, eta));
+    eta = gRandom->Gaus(eta, fFormulaEta->Eval(pt, eta, phi, e));
+    phi = gRandom->Gaus(phi, fFormulaPhi->Eval(pt, eta, phi, e));
     
     if(pt <= 0.0) continue;

modules/BTagging.cc

@@ -171 +171 @@
 {
   Candidate *jet, *parton;
-  Double_t pt, eta, phi;
+  Double_t pt, eta, phi, e;
   TObjArray *partonArray;
   map< Int_t, DelphesFormula * >::iterator itEfficiencyMap;
@@ -194 +194 @@
     phi = jetMomentum.Phi();
     pt = jetMomentum.Pt();
-
+    e = jetMomentum.E();
+    
     // loop over all input partons
     itPartonArray.Reset();
@@ -218 +219 @@
 
     // apply an efficency formula
-    jet->BTag |= (gRandom->Uniform() <= formula->Eval(pt, eta)) << fBitNumber;
-  }
-}
-
-//------------------------------------------------------------------------------
+    jet->BTag |= (gRandom->Uniform() <= formula->Eval(pt, eta, phi, e)) << fBitNumber;
+  }
+}
+
+//------------------------------------------------------------------------------

modules/Efficiency.cc

@@ -96 +96 @@
 { 
   Candidate *candidate;
-  Double_t pt, eta, phi;
+  Double_t pt, eta, phi, e;
 
   fItInputArray->Reset();
@@ -106 +106 @@
     phi = candidatePosition.Phi();
     pt = candidateMomentum.Pt();
+    e = candidateMomentum.E();
 
     // apply an efficency formula
-    if(gRandom->Uniform() > fFormula->Eval(pt, eta)) continue;
+    if(gRandom->Uniform() > fFormula->Eval(pt, eta, phi, e)) continue;
     
     fOutputArray->Add(candidate);

modules/EnergyScale.cc

@@ -104 +104 @@
     momentum = candidate->Momentum;
 
-    scale = fFormula->Eval(momentum.Pt(), momentum.Eta());
+    scale = fFormula->Eval(momentum.Pt(), momentum.Eta(), momentum.Phi(), momentum.E());
 
     if(scale > 0.0) momentum *= scale;

modules/EnergySmearing.cc

@@ -96 +96 @@
 {
   Candidate *candidate, *mother;
-  Double_t energy, eta, phi;
+  Double_t pt, energy, eta, phi;
 
   fItInputArray->Reset();
@@ -103 +103 @@
     const TLorentzVector &candidatePosition = candidate->Position;
     const TLorentzVector &candidateMomentum = candidate->Momentum;
+    
+    pt = candidatePosition.Pt();
     eta = candidatePosition.Eta();
     phi = candidatePosition.Phi();
@@ -108 +110 @@
  
     // apply smearing formula
-    energy = gRandom->Gaus(energy, fFormula->Eval(0.0, eta, 0.0, energy));
+    energy = gRandom->Gaus(energy, fFormula->Eval(pt, eta, phi, energy));
      
     if(energy <= 0.0) continue;

modules/IdentificationMap.cc

@@ -127 +127 @@
 {
   Candidate *candidate;
-  Double_t pt, eta, phi;
+  Double_t pt, eta, phi, e;
   TMisIDMap::iterator itEfficiencyMap;
   pair <TMisIDMap::iterator, TMisIDMap::iterator> range;
@@ -143 +143 @@
     phi = candidatePosition.Phi();
     pt = candidateMomentum.Pt();
+    e = candidateMomentum.E();
+   
     pdgCodeIn = candidate->PID;
     charge = candidate->Charge;
@@ -164 +166 @@
       pdgCodeOut = (it->second).first;
 
-      p = formula->Eval(pt, eta);
+      p = formula->Eval(pt, eta, phi, e);
 
       if(total <= r && r < total + p)

modules/ImpactParameterSmearing.cc

@@ -97 +97 @@
   Candidate *candidate, *particle, *mother;
   Double_t xd, yd, zd, dxy, sx, sy, sz, ddxy;
-  Double_t pt, eta, px, py;
+  Double_t pt, eta, px, py, phi, e;
 
   fItInputArray->Reset();
@@ -110 +110 @@
     eta = candidateMomentum.Eta();
     pt = candidateMomentum.Pt();
+    phi = candidateMomentum.Phi();
+    e = candidateMomentum.E();
+    
     px = candidateMomentum.Px();
     py = candidateMomentum.Py();
@@ -119 +122 @@
 
     // calculate smeared values
-    sx = gRandom->Gaus(0.0, fFormula->Eval(pt, eta));
-    sy = gRandom->Gaus(0.0, fFormula->Eval(pt, eta));
-    sz = gRandom->Gaus(0.0, fFormula->Eval(pt, eta));
+    sx = gRandom->Gaus(0.0, fFormula->Eval(pt, eta, phi, e));
+    sy = gRandom->Gaus(0.0, fFormula->Eval(pt, eta, phi, e));
+    sz = gRandom->Gaus(0.0, fFormula->Eval(pt, eta, phi, e));
 
     xd += sx;
@@ -130 +133 @@
     dxy = (xd*py - yd*px)/pt;
 
-    ddxy = gRandom->Gaus(0.0, fFormula->Eval(pt, eta));
+    ddxy = gRandom->Gaus(0.0, fFormula->Eval(pt, eta, phi, e));
 
     // fill smeared values in candidate

modules/MomentumSmearing.cc

@@ -96 +96 @@
 {
   Candidate *candidate, *mother;
-  Double_t pt, eta, phi;
+  Double_t pt, eta, phi, e;
 
   fItInputArray->Reset();
@@ -106 +106 @@
     phi = candidatePosition.Phi();
     pt = candidateMomentum.Pt();
+    e = candidateMomentum.E();
 
     // apply smearing formula
-    pt = gRandom->Gaus(pt, fFormula->Eval(pt, eta) * pt);
+    pt = gRandom->Gaus(pt, fFormula->Eval(pt, eta, phi, e) * pt);
     
     if(pt <= 0.0) continue;