Changeset 84733ae in git

Timestamp:

Jan 25, 2017, 1:10:58 PM (8 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

d6ce231

Parents:

5e728c7

Message:

fix IsRecoPU variable

Files:

• classes/DelphesClasses.cc (modified) (1 diff)
• modules/TrackPileUpSubtractor.cc (modified) (6 diffs)

classes/DelphesClasses.cc

@@ -254 +254 @@
   object.Mass = Mass;
   object.IsPU = IsPU;
+  object.IsRecoPU = IsRecoPU;
   object.IsConstituent = IsConstituent;
   object.IsFromConversion = IsFromConversion;

modules/TrackPileUpSubtractor.cc

@@ -53 +53 @@
 //------------------------------------------------------------------------------
 
-TrackPileUpSubtractor::TrackPileUpSubtractor() :
-fFormula(0) 
+TrackPileUpSubtractor::TrackPileUpSubtractor()
 {
-  fFormula = new DelphesFormula;
 }
 
@@ -63 +61 @@
 TrackPileUpSubtractor::~TrackPileUpSubtractor()
 {
-  if(fFormula) delete fFormula;
 }
 
@@ -75 +72 @@
   fItVertexInputArray = fVertexInputArray->MakeIterator();
 
-  // read resolution formula in m
-  fFormula->Compile(GetString("ZVertexResolution", "0.001"));
+  fZVertexResolution  = GetDouble("ZVertexResolution", 0.005)*1.0E3;
 
   fPTMin = GetDouble("PTMin", 0.);
@@ -123 +119 @@
   TObjArray *array;
   Double_t z, zvtx=0;
-  Double_t pt, eta, phi, e;
 
 
@@ -149 +144 @@
     {
       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();
 
@@ -161 +149 @@
       // assume perfect pile-up subtraction for tracks outside fZVertexResolution
 
-      if(candidate->IsPU && TMath::Abs(z-zvtx) > fFormula->Eval(pt, eta, phi, e)* 1.0e3)
+      if(candidate->Charge !=0 && TMath::Abs(z-zvtx) > fZVertexResolution)
       {
         candidate->IsRecoPU = 1;