Merge pull request #40373 from AWildridge/extension-lhe-generic-mass-…

…filter-cmssw-10-6-30-patch1 Backport of changes to LHEGenericMassFilter
cms-sw · Dec 21, 2022 · 91b0685 · 91b0685
2 parents 7326ee4 + d318641
commit 91b0685
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/GeneratorInterface/GenFilters/plugins/LHEGenericMassFilter.cc b/GeneratorInterface/GenFilters/plugins/LHEGenericMassFilter.cc
@@ -24,6 +24,7 @@ class LHEGenericMassFilter : public edm::global::EDFilter<> {
 public:
   explicit LHEGenericMassFilter(const edm::ParameterSet&);
   ~LHEGenericMassFilter() override = default;
+  static void fillDescriptions(edm::ConfigurationDescriptions&);
 
 private:
   bool filter(edm::StreamID, edm::Event&, edm::EventSetup const&) const override;
@@ -35,14 +36,16 @@ class LHEGenericMassFilter : public edm::global::EDFilter<> {
   const std::vector<int> particleID_;  // vector of particle IDs to look for
   const double minMass_;
   const double maxMass_;
+  const bool requiredOutgoingStatus_;  // Whether particles required to pass filter must have outgoing status
 };
 
 LHEGenericMassFilter::LHEGenericMassFilter(const edm::ParameterSet& iConfig)
     : src_(consumes<LHEEventProduct>(iConfig.getParameter<edm::InputTag>("src"))),
       numRequired_(iConfig.getParameter<int>("NumRequired")),
-      particleID_(iConfig.getParameter<std::vector<int> >("ParticleID")),
+      particleID_(iConfig.getParameter<std::vector<int>>("ParticleID")),
       minMass_(iConfig.getParameter<double>("MinMass")),
-      maxMass_(iConfig.getParameter<double>("MaxMass")) {}
+      maxMass_(iConfig.getParameter<double>("MaxMass")),
+      requiredOutgoingStatus_(iConfig.getParameter<bool>("RequiredOutgoingStatus")) {}
 
 // ------------ method called to skim the data  ------------
 bool LHEGenericMassFilter::filter(edm::StreamID iID, edm::Event& iEvent, edm::EventSetup const& iSetup) const {
@@ -57,7 +60,8 @@ bool LHEGenericMassFilter::filter(edm::StreamID iID, edm::Event& iEvent, edm::Ev
   double E = 0.;
 
   for (int i = 0; i < EvtHandle->hepeup().NUP; ++i) {
-    if (EvtHandle->hepeup().ISTUP[i] != 1) {  // keep only outgoing particles
+    // if requiredOutgoingStatus_ keep only outgoing particles, otherwise keep them all
+    if (requiredOutgoingStatus_ && EvtHandle->hepeup().ISTUP[i] != 1) {
       continue;
     }
     for (unsigned int j = 0; j < particleID_.size(); ++j) {
@@ -84,5 +88,16 @@ bool LHEGenericMassFilter::filter(edm::StreamID iID, edm::Event& iEvent, edm::Ev
   return false;
 }
 
+// ------------ method fills 'descriptions' with the allowed parameters for the module  ------------
+void LHEGenericMassFilter::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  edm::ParameterSetDescription desc;
+  desc.add<int>("NumRequired", 1);
+  desc.add<vector<int>>("ParticleID", std::vector<int>{1});
+  desc.add<double>("MinMass", 0.0);
+  desc.add<double>("MaxMass", 1.0);
+  desc.add<bool>("RequiredOutgoingStatus", true);
+  descriptions.addDefault(desc);
+}
+
 //define this as a plug-in
 DEFINE_FWK_MODULE(LHEGenericMassFilter);