Changes in / [285752e:fae7563] in git

Files:

• cards/delphes_card_ATLAS_PileUp.tcl (modified) (2 diffs)
• modules/StatusPidFilter.cc (modified) (2 diffs)
• modules/TreeWriter.cc (modified) (1 diff)

cards/delphes_card_ATLAS_PileUp.tcl

@@ -360 +360 @@
 }
 
+
 ####################
 # Energy flow merger
@@ -377 +378 @@
 
 module PdgCodeFilter EFlowFilter {
-  set InputArray EFlowMerger/eflow
+  set InputArray EFlowMergerAllTracks/eflow
   set OutputArray eflow
   

modules/StatusPidFilter.cc

@@ -104 +104 @@
       return false;
   }
-
-  bool isTauDaughter(int pdgCode, int M1, const TObjArray *fInputArray){
-    //not needed, just to speed up the code - can be further refined but gives only negligible improvement:
-    if ( pdgCode==15 || pdgCode<11 || (pdgCode > 22 && pdgCode < 100) || pdgCode>1000 )
-      return false;
-
-    if ( M1 < 0 ) 
-      return false;
-
-    Candidate *mother;
-    mother = static_cast<Candidate*>(fInputArray->At( M1 ));
-    if ( TMath::Abs(mother->PID) == 15 )
-      return true;
-
-    return false;
-  }
-
 }
 
@@ -194 +177 @@
     bool is_b_quark  = (pdgCode == 5);
 
-    bool is_tau_daughter = isTauDaughter(pdgCode, candidate->M1, fInputArray);
-
     if (is_b_hadron)
       pass = kTRUE;
 
-    if (is_tau_daughter)
-      pass = kTRUE;
-
     // fPTMin not applied to b_hadrons / b_quarks to allow for b-enriched sample stitching
-    // fPTMin not applied to tau decay products to allow visible-tau four momentum determination
-    if(!pass || (candidate->Momentum.Pt() < fPTMin && !(is_b_hadron || is_b_quark || is_tau_daughter)) ) continue;
+    if(!pass || (candidate->Momentum.Pt() < fPTMin && !(is_b_hadron || is_b_quark)) ) continue;
 
     fOutputArray->Add(candidate);

modules/TreeWriter.cc

@@ -376 +376 @@
     rapidity = (cosTheta == 1.0 ? signz*999.9 : momentum.Rapidity());
 
-    entry->P = p;
     entry->PT  = pt;
     entry->Eta = eta;