Merge pull request #4132 from silas-gross/PHHerwig

Added feature to get "n_good" and "n_evts" by external systems

Author: pinkenburg

generators/Herwig/HepMCTrigger/HepMCJetTrigger.cc

@@ -31,14 +31,14 @@ HepMCJetTrigger::HepMCJetTrigger(float trigger_thresh, int n_incom, bool up_lim,
 int HepMCJetTrigger::process_event(PHCompositeNode* topNode)
 {
   // std::cout << "HepMCJetTrigger::process_event(PHCompositeNode *topNode) Processing Event" << std::endl;
-  n_evts++;
   if (this->set_event_limit == true)
   {  // needed to keep all HepMC output at the same number of events
     if (n_good >= this->goal_event_number)
     {
       return Fun4AllReturnCodes::ABORTEVENT;
     }
   }
+  n_evts++;
   PHHepMCGenEventMap* phg = findNode::getClass<PHHepMCGenEventMap>(topNode, "PHHepMCGenEventMap");
   if (!phg)
   {

generators/Herwig/HepMCTrigger/HepMCJetTrigger.h

@@ -47,16 +47,18 @@ class HepMCJetTrigger : public SubsysReco
   /// Called at the end of all processing.
 
   /// Reset
+  int getNevts(){return this->n_evts;}
+  int getNgood(){return this->n_good;}
 
  private:
   bool isGoodEvent(HepMC::GenEvent* e1);
   std::vector<fastjet::PseudoJet> findAllJets(HepMC::GenEvent* e1);
   int jetsAboveThreshold(const std::vector<fastjet::PseudoJet>& jets) const;
   float threshold{0.};
   int goal_event_number{1000};
+  bool set_event_limit{false};
   int n_evts{0};
   int n_good{0};
-  bool set_event_limit{false};
 };
 
 #endif  // HEPMCJETTRIGGER_H

generators/Herwig/HepMCTrigger/HepMCParticleTrigger.cc

@@ -68,14 +68,14 @@ HepMCParticleTrigger::HepMCParticleTrigger(float trigger_thresh, int n_incom, bo
 int HepMCParticleTrigger::process_event(PHCompositeNode* topNode)
 {
   // std::cout << "HepMCParticleTrigger::process_event(PHCompositeNode *topNode) Processing Event" << std::endl;
-  n_evts++;
   if (this->set_event_limit == true)
   {  // needed to keep all HepMC output at the same number of events
     if (n_good >= this->goal_event_number)
     {
       return Fun4AllReturnCodes::ABORTEVENT;
     }
   }
+  n_evts++;
   bool good_event{false};
   PHHepMCGenEventMap* phg = findNode::getClass<PHHepMCGenEventMap>(topNode, "PHHepMCGenEventMap");
   if (!phg)

generators/Herwig/HepMCTrigger/HepMCParticleTrigger.h

@@ -66,6 +66,8 @@ class HepMCParticleTrigger : public SubsysReco
   void SetPzHighLow(double, double);
 
   void SetStableParticleOnly(bool b) { m_doStableParticleOnly = b; }
+  int getNevts(){return this->n_evts;}
+  int getNgood(){return this->n_good;}
 
  private:
   bool isGoodEvent(HepMC::GenEvent* e1);
@@ -76,9 +78,9 @@ class HepMCParticleTrigger : public SubsysReco
   bool m_doStableParticleOnly{true};
   float threshold{0.};
   int goal_event_number{1000};
+  bool set_event_limit{false};
   int n_evts{0};
   int n_good{0};
-  bool set_event_limit{false};
 
   float _theEtaHigh{1.1};
   float _theEtaLow{-1.1};