Changes in / [0976f6a:584e2e9] in git

Files:

• .DS_Store (added)
• Makefile (modified) (9 diffs)
• cards/.DS_Store (added)
• cards/FCC/.DS_Store (added)
• cards/FCC/FCChh_PileUpVtx.tcl (modified) (1 diff)
• modules/.DS_Store (added)
• modules/TimeSmearing.cc (modified) (4 diffs)
• modules/TimeSmearing.h (modified) (2 diffs)
• modules/TrackTimingPileUpSubtractor.cc (modified) (2 diffs)
• readers/DelphesPythia8.cpp (modified) (1 diff)

Makefile

@@ -428 +428 @@
         modules/JetPileUpSubtractor.h \
         modules/TrackPileUpSubtractor.h \
+        modules/TrackTimingPileUpSubtractor.h \
         modules/TaggingParticlesSkimmer.h \
         modules/PileUpJetID.h \
@@ -444 +445 @@
         modules/VertexFinder.h \
         modules/VertexFinderDA4D.h \
+        modules/HighMassVertexRecover.h \
         modules/DecayFilter.h \
         modules/ExampleModule.h
@@ -782 +784 @@
         external/Hector/H_BeamParticle.h \
         external/Hector/H_RecRPObject.h
+tmp/modules/HighMassVertexRecover.$(ObjSuf): \
+        modules/HighMassVertexRecover.$(SrcSuf) \
+        modules/HighMassVertexRecover.h \
+        classes/DelphesClasses.h \
+        classes/DelphesFactory.h \
+        classes/DelphesFormula.h \
+        external/ExRootAnalysis/ExRootResult.h \
+        external/ExRootAnalysis/ExRootFilter.h \
+        external/ExRootAnalysis/ExRootClassifier.h
 tmp/modules/IdentificationMap.$(ObjSuf): \
         modules/IdentificationMap.$(SrcSuf) \
@@ -1016 +1027 @@
         modules/TrackSmearing.$(SrcSuf) \
         modules/TrackSmearing.h \
+        classes/DelphesClasses.h \
+        classes/DelphesFactory.h \
+        classes/DelphesFormula.h \
+        external/ExRootAnalysis/ExRootClassifier.h \
+        external/ExRootAnalysis/ExRootFilter.h \
+        external/ExRootAnalysis/ExRootResult.h
+tmp/modules/TrackTimingPileUpSubtractor.$(ObjSuf): \
+        modules/TrackTimingPileUpSubtractor.$(SrcSuf) \
+        modules/TrackTimingPileUpSubtractor.h \
         classes/DelphesClasses.h \
         classes/DelphesFactory.h \
@@ -1058 +1078 @@
         classes/DelphesFormula.h \
         classes/DelphesPileUpReader.h \
-        external/ExRootAnalysis/ExRootClassifier.h \
-        external/ExRootAnalysis/ExRootFilter.h \
-        external/ExRootAnalysis/ExRootResult.h
+        external/ExRootAnalysis/ExRootResult.h \
+        external/ExRootAnalysis/ExRootFilter.h \
+        external/ExRootAnalysis/ExRootClassifier.h
 tmp/modules/VertexSorter.$(ObjSuf): \
         modules/VertexSorter.$(SrcSuf) \
@@ -1146 +1166 @@
         tmp/modules/ExampleModule.$(ObjSuf) \
         tmp/modules/Hector.$(ObjSuf) \
+        tmp/modules/HighMassVertexRecover.$(ObjSuf) \
         tmp/modules/IdentificationMap.$(ObjSuf) \
         tmp/modules/ImpactParameterSmearing.$(ObjSuf) \
@@ -1172 +1193 @@
         tmp/modules/TrackPileUpSubtractor.$(ObjSuf) \
         tmp/modules/TrackSmearing.$(ObjSuf) \
+        tmp/modules/TrackTimingPileUpSubtractor.$(ObjSuf) \
         tmp/modules/TreeWriter.$(ObjSuf) \
         tmp/modules/UniqueObjectFinder.$(ObjSuf) \
@@ -2093 +2115 @@
         @touch $@
 
+modules/TrackTimingPileUpSubtractor.h: \
+        classes/DelphesModule.h
+        @touch $@
+
 modules/Delphes.h: \
         classes/DelphesModule.h
@@ -2267 +2293 @@
 external/fastjet/config.h: \
         external/fastjet/config_win.h
+        @touch $@
+
+modules/HighMassVertexRecover.h: \
+        classes/DelphesModule.h \
+        classes/DelphesClasses.h
         @touch $@
 

cards/FCC/FCChh_PileUpVtx.tcl

@@ -130 +130 @@
 }
 
-#####################################
-# Track propagation to calorimeters
-#####################################
+#################################
+# Propagate particles in cylinder
+#################################
 
 module ParticlePropagator ParticlePropagator {

modules/TimeSmearing.cc

@@ -53 +53 @@
 
 TimeSmearing::TimeSmearing() :
-  fItInputArray(0)
+  fFormula(0), fItInputArray(0)
 {
+  fFormula = new DelphesFormula;
 }
 
@@ -61 +62 @@
 TimeSmearing::~TimeSmearing()
 {
+  if(fFormula) delete fFormula;
 }
 
@@ -69 +71 @@
   // read resolution formula
 
-  fTimeResolution = GetDouble("TimeResolution", 1.0E-10);
+  fFormula->Compile(GetString("TimeResolution", "1.0"));
+
   // import input array
-
+  fEtaMax = GetDouble("EtaMax", 6.);
   fInputArray = ImportArray(GetString("InputArray", "MuonMomentumSmearing/muons"));
   fItInputArray = fInputArray->MakeIterator();
@@ -92 +95 @@
 {
   Candidate *candidate, *mother;
-  Double_t ti, tf_smeared, tf;
+  Double_t ti, tf_smeared, tf, timeResolution;
+  Double_t pt, eta, phi, e, d0, dz, ctgTheta;
+
+
   const Double_t c_light = 2.99792458E8;
 
   fItInputArray->Reset();
-  while((candidate = static_cast<Candidate *>(fItInputArray->Next())))
+  while((candidate = static_cast<Candidate*>(fItInputArray->Next())))
   {
-    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;
+    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;
 
     // apply smearing formula
-    tf_smeared = gRandom->Gaus(tf, fTimeResolution);
-    ti = ti + tf_smeared - tf;
-    tf = tf_smeared;
+    
+    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);
 
     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->ErrorT = fTimeResolution * 1.0E3 * c_light;
-
+    candidate = static_cast<Candidate*>(candidate->Clone());
     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);

modules/TimeSmearing.h

@@ -32 +32 @@
 class TIterator;
 class TObjArray;
+class DelphesFormula;
 
 class TimeSmearing: public DelphesModule
@@ -44 +45 @@
 
 private:
-  Double_t fTimeResolution;
+  DelphesFormula *fFormula; //!
+  Double_t fEtaMax;
 
   TIterator *fItInputArray; //!

modules/TrackTimingPileUpSubtractor.cc

@@ -143 +143 @@
       tvtx = candidate->Position.T();
       tvtx_err = candidate->PositionError.T();
+      cout << " initial : " << candidate->InitialPosition.T() << " final : " << candidate->Position.T() << endl;
     } 
   }
@@ -171 +172 @@
       // apply pile-up subtraction
       distance = pow((zvtx - z),2)/pow((zvtx_err - z_err),2) + pow((tvtx - t),2)/pow((tvtx_err - t_err),2);
+      //cout << " t : " << tvtx << "  t(particle)" << t << endl;
       // here I calculated distance using Z and T of selected vertex (highest sum Pt square) and particles
       // however z_err of vertices is gives 0 because of using CMS trackResolutionCMS.tcl (in that formula, there is limitation on |eta| < 2.5)

readers/DelphesPythia8.cpp

@@ -151 +151 @@
 
     candidate->Position.SetXYZT(x, y, z, t);
-
     allParticleOutputArray->Add(candidate);
 
-    if(!pdgParticle) continue;
+    if(!pdgParticle && (abs(pid) > 1006333 || abs(pid) < 1000612) ) 
+      continue;
 
     if(status == 1)