Changeset f3c4047 in git for modules

Timestamp:

Jun 26, 2015, 3:22:13 PM (9 years ago)

Author:

Pavel Demin <pavel-demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

9458a020

Parents:

28027d5 (diff), fa42514 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge pull request #12 from cshimmin/feature/pdgcode-options

Add Invert and Status options to PdgCodeFilter

Location:

modules

Files:

• PdgCodeFilter.cc (modified) (3 diffs)
• PdgCodeFilter.h (modified) (1 diff)

modules/PdgCodeFilter.cc

@@ -74 +74 @@
   fPTMin = GetDouble("PTMin", 0.0);
 
+  fInvertPdg = GetBool("InvertPdg", false);
+
+  fRequireStatus = GetBool("RequireStatus", false);
+  fStatus = GetInt("Status", 1);
+
   // import input array
   fInputArray = ImportArray(GetString("InputArray", "Delphes/allParticles"));
@@ -109 +114 @@
   Double_t pt;
 
+  const Bool_t requireStatus = fRequireStatus;
+  const Bool_t invertPdg = fInvertPdg;
+  const int reqStatus = fStatus;
+
   fItInputArray->Reset();
   while((candidate = static_cast<Candidate*>(fItInputArray->Next())))
@@ -116 +125 @@
     pt = candidateMomentum.Pt();
 
+    if(pt < fPTMin) continue;
+    if(requireStatus && (candidate->Status != reqStatus)) continue;
+
     pass = kTRUE;
-
-    if(pt < fPTMin) pass = kFALSE;
     if(find(fPdgCodes.begin(), fPdgCodes.end(), pdgCode) != fPdgCodes.end()) pass = kFALSE;
 
+    if (invertPdg) pass = !pass;
     if(pass) fOutputArray->Add(candidate);
   }

modules/PdgCodeFilter.h

@@ -50 +50 @@
 
   Double_t fPTMin; //!
+  Bool_t fInvertPdg; //!
+  Bool_t fRequireStatus; //!
+  Int_t fStatus; //!
 
   std::vector<Int_t> fPdgCodes;