Changes in modules/TimeSmearing.cc [04e2040:341014c] in git

File:

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

modules/TimeSmearing.cc

@@ -19 +19 @@
 /** \class TimeSmearing
  *
- *  Performs time smearing.
+ *  Performs transverse momentum resolution smearing.
  *
- *  \author M. Selvaggi - CERN
+ *  \author P. Demin - UCL, Louvain-la-Neuve
  *
  */
@@ -49 +49 @@
 
 using namespace std;
+
 //------------------------------------------------------------------------------
 
 TimeSmearing::TimeSmearing() :
-  fItTrackInputArray(0), fResolutionFormula(0)
+  fItInputArray(0)
 {
-        fResolutionFormula = new DelphesFormula;
 }
 
@@ -61 +61 @@
 TimeSmearing::~TimeSmearing()
 {
-        if(fResolutionFormula) delete fResolutionFormula;
 }
 
@@ -70 +69 @@
   // read resolution formula
 
-  // read time resolution formula in seconds
-  fResolutionFormula->Compile(GetString("TimeResolution", "30e-12"));
+  fTimeResolution = GetDouble("TimeResolution", 1.0E-10);
+  // import input array
 
-  // import track input array
-  fTrackInputArray = ImportArray(GetString("TrackInputArray", "MuonMomentumSmearing/muons"));
-  fItTrackInputArray = fTrackInputArray->MakeIterator();
-
+  fInputArray = ImportArray(GetString("InputArray", "MuonMomentumSmearing/muons"));
+  fItInputArray = fInputArray->MakeIterator();
 
   // create output array
-  fOutputArray = ExportArray(GetString("OutputArray", "tracks"));
+
+  fOutputArray = ExportArray(GetString("OutputArray", "muons"));
 }
 
@@ -86 +84 @@
 void TimeSmearing::Finish()
 {
-  if(fItTrackInputArray) delete fItTrackInputArray;
+  if(fItInputArray) delete fItInputArray;
 }
 
@@ -94 +92 @@
 {
   Candidate *candidate, *mother;
-  Double_t tf_smeared, tf;
-  Double_t eta, energy;
-  Double_t timeResolution;
-
+  Double_t ti, tf_smeared, tf;
   const Double_t c_light = 2.99792458E8;
 
-  fItTrackInputArray->Reset();
-  while((candidate = static_cast<Candidate *>(fItTrackInputArray->Next())))
+  fItInputArray->Reset();
+  while((candidate = static_cast<Candidate *>(fItInputArray->Next())))
   {
-    // converting to meters
+    const TLorentzVector &candidateInitialPosition = candidate->InitialPosition;
     const TLorentzVector &candidateFinalPosition = candidate->Position;
-    const TLorentzVector &candidateMomentum = candidate->Momentum;
 
+    ti = candidateInitialPosition.T() * 1.0E-3 / c_light;
     tf = candidateFinalPosition.T() * 1.0E-3 / c_light;
 
-    eta = candidateMomentum.Eta();
-    energy = candidateMomentum.E();
-
     // apply smearing formula
-    timeResolution = fResolutionFormula->Eval(0.0, eta, 0.0, energy);
-    tf_smeared = gRandom->Gaus(tf, timeResolution);
+    tf_smeared = gRandom->Gaus(tf, fTimeResolution);
+    ti = ti + tf_smeared - tf;
+    tf = tf_smeared;
 
     mother = candidate;
     candidate = static_cast<Candidate *>(candidate->Clone());
+    candidate->InitialPosition.SetT(ti * 1.0E3 * c_light);
+    candidate->Position.SetT(tf * 1.0E3 * c_light);
 
-    candidate->Position.SetT(tf_smeared * 1.0E3 * c_light);
-    candidate->ErrorT = timeResolution * 1.0E3 * c_light;
+    candidate->ErrorT = fTimeResolution * 1.0E3 * c_light;
 
     candidate->AddCandidate(mother);
+
     fOutputArray->Add(candidate);
   }
 }
+
+//------------------------------------------------------------------------------