Allow external (public) use of generator routines

preghenella · sawenzel · commit d821aa32c615 · 2021-01-06T18:07:03.000+01:00
diff --git a/Generators/include/Generators/Generator.h b/Generators/include/Generators/Generator.h
@@ -61,6 +61,10 @@ class Generator : public FairGenerator
 	**/
   Bool_t ReadEvent(FairPrimaryGenerator* primGen) final;
 
+  /** methods to override **/
+  virtual Bool_t generateEvent() = 0;
+  virtual Bool_t importParticles() = 0;
+
   /** setters **/
   void setMomentumUnit(double val) { mMomentumUnit = val; };
   void setEnergyUnit(double val) { mEnergyUnit = val; };
@@ -71,6 +75,12 @@ class Generator : public FairGenerator
   void addTrigger(Trigger trigger) { mTriggers.push_back(trigger); };
   void addDeepTrigger(DeepTrigger trigger) { mDeepTriggers.push_back(trigger); };
 
+  /** getters **/
+  const std::vector<TParticle>& getParticles() const { return mParticles; }; //!
+
+  /** other **/
+  void clearParticles() { mParticles.clear(); };
+
   /** notification methods **/
   virtual void notifyEmbedding(const FairMCEventHeader* mcHeader){};
 
@@ -80,10 +90,6 @@ class Generator : public FairGenerator
   /** operator= **/
   Generator& operator=(const Generator&);
 
-  /** methods to override **/
-  virtual Bool_t generateEvent() = 0;
-  virtual Bool_t importParticles() = 0;
-
   /** methods that can be overridded **/
   virtual void updateHeader(FairMCEventHeader* eventHeader){};
 
diff --git a/Generators/include/Generators/GeneratorHepMC.h b/Generators/include/Generators/GeneratorHepMC.h
@@ -54,6 +54,10 @@ class GeneratorHepMC : public Generator
   /** Initialize the generator if needed **/
   Bool_t Init() override;
 
+  /** methods to override **/
+  Bool_t generateEvent() override;
+  Bool_t importParticles() override;
+
   /** setters **/
   void setVersion(Int_t val) { mVersion = val; };
   void setFileName(std::string val) { mFileName = val; };
@@ -64,10 +68,6 @@ class GeneratorHepMC : public Generator
   /** operator= **/
   GeneratorHepMC& operator=(const GeneratorHepMC&);
 
-  /** methods to override **/
-  Bool_t generateEvent() override;
-  Bool_t importParticles() override;
-
   /** methods **/
 #ifdef GENERATORS_WITH_HEPMC3_DEPRECATED
   const HepMC::FourVector getBoostedVector(const HepMC::FourVector& vector, Double_t boost);
diff --git a/Generators/include/Generators/GeneratorPythia8.h b/Generators/include/Generators/GeneratorPythia8.h
@@ -38,6 +38,10 @@ class GeneratorPythia8 : public Generator
   /** Initialize the generator if needed **/
   Bool_t Init() override;
 
+  /** methods to override **/
+  Bool_t generateEvent() override;
+  Bool_t importParticles() override { return importParticles(mPythia.event); };
+
   /** setters **/
   void setConfig(std::string val) { mConfig = val; };
   void setHooksFileName(std::string val) { mHooksFileName = val; };
@@ -61,10 +65,6 @@ class GeneratorPythia8 : public Generator
   /** operator= **/
   GeneratorPythia8& operator=(const GeneratorPythia8&);
 
-  /** methods to override **/
-  Bool_t generateEvent() override;
-  Bool_t importParticles() override { return importParticles(mPythia.event); };
-
   /** methods that can be overridded **/
   void updateHeader(FairMCEventHeader* eventHeader) override;
 
diff --git a/Generators/include/Generators/GeneratorTGenerator.h b/Generators/include/Generators/GeneratorTGenerator.h
@@ -37,6 +37,10 @@ class GeneratorTGenerator : public Generator
   /** destructor **/
   ~GeneratorTGenerator() override;
 
+  /** methods to override **/
+  Bool_t generateEvent() override;
+  Bool_t importParticles() override;
+
   /** setters **/
   void setTGenerator(TGenerator* val) { mTGenerator = val; };
   const TGenerator* getTGenerator() const { return mTGenerator; }
@@ -49,10 +53,6 @@ class GeneratorTGenerator : public Generator
   /** operator= **/
   GeneratorTGenerator& operator=(const GeneratorTGenerator&);
 
-  /** methods to override **/
-  Bool_t generateEvent() override;
-  Bool_t importParticles() override;
-
   /** TGenerator interface **/
   TGenerator* mTGenerator;
   TClonesArray* mCloneParticles;
