Changes in / [771843a:b5e2583] in git

Files:

• modules/PdgCodeFilter.cc (modified) (2 diffs)
• modules/PdgCodeFilter.h (modified) (1 diff)
• modules/StatusPidFilter.cc (modified) (2 diffs)
• modules/StatusPidFilter.h (modified) (1 diff)
• readers/DelphesProMC.cpp (modified) (2 diffs)

modules/PdgCodeFilter.cc

@@ -76 +76 @@
   fInvert = GetBool("Invert", false);
 
-  // no pileup 
-  fRequireNotPileup = GetBool("RequireNotPileup", false);
-
   fRequireStatus = GetBool("RequireStatus", false);
   fStatus = GetInt("Status", 1);
@@ -130 +127 @@
     if(fRequireStatus && (candidate->Status != fStatus)) continue;
     if(fRequireCharge && (candidate->Charge != fCharge)) continue;
-    if(fRequireNotPileup && (candidate->IsPU   >0     )) continue;
 
     pass = kTRUE;

modules/PdgCodeFilter.h

@@ -55 +55 @@
   Bool_t fRequireCharge; //!
   Int_t fCharge; //!
-  Bool_t fRequireNotPileup; //!
+
 
   std::vector<Int_t> fPdgCodes;

modules/StatusPidFilter.cc

@@ -153 +153 @@
 {
   // PT threshold
+
   fPTMin = GetDouble("PTMin", 0.5);
-
-  // keep or remove pileup particles
-  fRequireNotPileup = GetBool("RequireNotPileup", false);
 
   // import input array
@@ -229 +227 @@
     if(!pass || (candidate->Momentum.Pt() < fPTMin && !(is_b_hadron || is_b_quark || is_tau_daughter || is_W_daughter)) ) continue;
 
-    // not pileup particles
-    if(fRequireNotPileup && (candidate->IsPU >0)) continue;
-
     fOutputArray->Add(candidate);
   }

modules/StatusPidFilter.h

@@ -51 +51 @@
   Double_t fPTMin; //!
 
-  Bool_t fRequireNotPileup; //!
-
   TIterator *fItInputArray; //!
 

readers/DelphesProMC.cpp

@@ -125 +125 @@
     candidate->Status = status;
 
-    candidate->IsPU=0;
-    if (mutableParticles->barcode(i)>0) candidate->IsPU=1; // pileup particle
-
     candidate->M1 = mutableParticles->mother1(i);
     candidate->M2 = mutableParticles->mother2(i);
@@ -234 +231 @@
       cout << "** Reading " << argv[i] << endl;
 
-      // use 64 bit 
-      //inputFile = new ProMCBook(argv[i], "r", true);
-
-      //use 32 bit zip (faster but limitted to 64k events)
       inputFile = new ProMCBook(argv[i], "r");