Changeset b1fd38d in git for modules

Timestamp:

Jan 23, 2017, 12:21:21 PM (8 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

4b4207e

Parents:

273735d

Message:

put formula instead of constant value for z vertex res.

Location:

modules

Files:

• TrackPileUpSubtractor.cc (modified) (6 diffs)
• TrackPileUpSubtractor.h (modified) (2 diffs)

modules/TrackPileUpSubtractor.cc

@@ -53 +53 @@
 //------------------------------------------------------------------------------
 
-TrackPileUpSubtractor::TrackPileUpSubtractor()
+TrackPileUpSubtractor::TrackPileUpSubtractor() :
+fFormula(0) 
 {
+  fFormula = new DelphesFormula;
 }
 
@@ -61 +63 @@
 TrackPileUpSubtractor::~TrackPileUpSubtractor()
 {
+  if(fFormula) delete fFormula;
 }
 
@@ -72 +75 @@
   fItVertexInputArray = fVertexInputArray->MakeIterator();
 
-  fZVertexResolution  = GetDouble("ZVertexResolution", 0.005)*1.0E3;
+  // read resolution formula in m
+  fFormula->Compile(GetString("ZVertexResolution", "0.001"));
 
   fPTMin = GetDouble("PTMin", 0.);
@@ -119 +123 @@
   TObjArray *array;
   Double_t z, zvtx=0;
+  Double_t pt, eta, phi, e;
 
 
@@ -144 +149 @@
     {
       particle = static_cast<Candidate*>(candidate->GetCandidates()->At(0));
+      const TLorentzVector &candidateMomentum = particle->Momentum;
+
+      eta = candidateMomentum.Eta();
+      pt = candidateMomentum.Pt();
+      phi = candidateMomentum.Phi();
+      e = candidateMomentum.E();
+      
       z = particle->Position.Z();
 
@@ -149 +161 @@
       // assume perfect pile-up subtraction for tracks outside fZVertexResolution
 
-      if(candidate->IsPU && TMath::Abs(z-zvtx) > fZVertexResolution)
+      if(candidate->IsPU && TMath::Abs(z-zvtx) > fFormula->Eval(pt, eta, phi, e)* 1.0e3)
       {
         candidate->IsRecoPU = 1;

modules/TrackPileUpSubtractor.h

@@ -34 +34 @@
 class TIterator;
 class TObjArray;
+class DelphesFormula;
 
 class TrackPileUpSubtractor: public DelphesModule
@@ -48 +49 @@
 private:
 
-  Double_t fZVertexResolution;
+  DelphesFormula *fFormula; //!
 
   Double_t fPTMin;