add enum

perrozzi · Sep 13, 2015 · a4863f0 · a4863f0
1 parent 96d00fa
commit a4863f0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/GeneratorInterface/GenFilters/interface/LHEGenericFilter.h b/GeneratorInterface/GenFilters/interface/LHEGenericFilter.h
@@ -56,5 +56,7 @@ class LHEGenericFilter : public edm::EDFilter {
   std::vector<int> particleID_;    // vector of particle IDs to look for
   int totalEvents_;                // counters
   int passedEvents_;
+  enum logic_ { LT, GT, EQ, NE};
+  logic_ whichlogic;
 };
 #endif
diff --git a/GeneratorInterface/GenFilters/src/LHEGenericFilter.cc b/GeneratorInterface/GenFilters/src/LHEGenericFilter.cc
@@ -11,10 +11,17 @@ totalEvents_(0), passedEvents_(0)
 {
   //here do whatever other initialization is needed
   src_ = consumes<LHEEventProduct>(iConfig.getParameter<edm::InputTag>("src"));
+
+  if(acceptLogic_.compare("LT")==0) whichlogic = LT;
+  else if(acceptLogic_.compare("GT")==0) whichlogic = GT;
+  else if(acceptLogic_.compare("EQ")==0) whichlogic = EQ;
+  else if(acceptLogic_.compare("NE")==0) whichlogic = NE;
+
 }
 
 LHEGenericFilter::~LHEGenericFilter()
 {
+
   // do anything here that needs to be done at destruction time
   // (e.g. close files, deallocate resources etc.)
 
@@ -45,10 +52,10 @@ bool LHEGenericFilter::filter(edm::Event& iEvent, const edm::EventSetup& iSetup)
 
   // event accept/reject logic
   if (
-         (acceptLogic_.compare("LT")==0 && nFound < numRequired_)
-      || (acceptLogic_.compare("GT")==0 && nFound > numRequired_)
-      || (acceptLogic_.compare("EQ")==0 && nFound == numRequired_)
-      || (acceptLogic_.compare("NE")==0 && nFound != numRequired_)
+         (whichlogic==LT && nFound < numRequired_)
+      || (whichlogic==GT && nFound > numRequired_)
+      || (whichlogic==EQ && nFound == numRequired_)
+      || (whichlogic==NE && nFound != numRequired_)
       ) {
     passedEvents_++;
     return true;