Changes in modules/TimeSmearing.cc [2b5ff2c:341014c] in git

File:

• modules/TimeSmearing.cc (modified) (4 diffs)

modules/TimeSmearing.cc

@@ -53 +53 @@
 
 TimeSmearing::TimeSmearing() :
-  fFormula(0), fItInputArray(0)
+  fItInputArray(0)
 {
-  fFormula = new DelphesFormula;
 }
 
@@ -62 +61 @@
 TimeSmearing::~TimeSmearing()
 {
-  if(fFormula) delete fFormula;
 }
 
@@ -71 +69 @@
   // read resolution formula
 
-  fFormula->Compile(GetString("TimeResolution", "1.0"));
+  fTimeResolution = GetDouble("TimeResolution", 1.0E-10);
+  // import input array
 
-  // import input array
-  fEtaMax = GetDouble("EtaMax", 6.);
   fInputArray = ImportArray(GetString("InputArray", "MuonMomentumSmearing/muons"));
   fItInputArray = fInputArray->MakeIterator();
@@ -95 +92 @@
 {
   Candidate *candidate, *mother;
-  Double_t ti, tf_smeared, tf, timeResolution;
-  Double_t pt, eta, phi, e, d0, dz, ctgTheta;
-
-
+  Double_t ti, tf_smeared, tf;
   const Double_t c_light = 2.99792458E8;
 
   fItInputArray->Reset();
-  while((candidate = static_cast<Candidate*>(fItInputArray->Next())))
+  while((candidate = static_cast<Candidate *>(fItInputArray->Next())))
   {
-    ti = candidate->InitialPosition.T()*1.0E-3/c_light;
-    tf = candidate->Position.T()*1.0E-3/c_light;
-    
-    // dummy, only need to properly call TFormula
-    const TLorentzVector &candidatePosition = candidate->Position;
-    const TLorentzVector &candidateMomentum = candidate->Momentum;
-    eta = candidatePosition.Eta();
-    phi = candidatePosition.Phi();
-    pt = candidateMomentum.Pt();
-    e = candidateMomentum.E();
-    d0 = candidate->D0;
-    dz = candidate->DZ;
-    ctgTheta = candidate->CtgTheta;
+    const TLorentzVector &candidateInitialPosition = candidate->InitialPosition;
+    const TLorentzVector &candidateFinalPosition = candidate->Position;
+
+    ti = candidateInitialPosition.T() * 1.0E-3 / c_light;
+    tf = candidateFinalPosition.T() * 1.0E-3 / c_light;
 
     // apply smearing formula
-    
-    timeResolution = fFormula->Eval(pt, eta, phi, e, d0, dz, ctgTheta);
-    if(fabs(candidate->Position.Eta())<fEtaMax)
-    { 
-      tf_smeared = tf + timeResolution*gRandom->Gaus(0, 1);
-    }
-    else continue;
-
-    // double beta_particle = candidate->Momentum.P()/candidate->Momentum.E();
-    // ti = tf_smeared - candidate->Ld*1.0E-3/(c_light*beta_particle);
+    tf_smeared = gRandom->Gaus(tf, fTimeResolution);
+    ti = ti + tf_smeared - tf;
+    tf = tf_smeared;
 
     mother = candidate;
-    candidate = static_cast<Candidate*>(candidate->Clone());
+    candidate = static_cast<Candidate *>(candidate->Clone());
+    candidate->InitialPosition.SetT(ti * 1.0E3 * c_light);
+    candidate->Position.SetT(tf * 1.0E3 * c_light);
+
+    candidate->ErrorT = fTimeResolution * 1.0E3 * c_light;
+
     candidate->AddCandidate(mother);
-    candidate->InitialPosition.SetT((100+ti)*1.0E3*c_light);
-    candidate->Position.SetT(tf_smeared*1.0E3*c_light);
-    candidate->ErrorT = timeResolution*1.0E3*c_light;
 
     fOutputArray->Add(candidate);