Generator protocol to updateHeader and notifyEmbedding needs to use o2::dataformat::MCEventHeader

preghenella · sawenzel · commit fe228d8fcaf8 · 2021-01-11T09:46:00.000+01:00
diff --git a/Generators/include/Generators/Generator.h b/Generators/include/Generators/Generator.h
@@ -18,7 +18,13 @@
 #include "Generators/Trigger.h"
 #include <vector>
 
-class FairMCEventHeader;
+namespace o2
+{
+namespace dataformats
+{
+class MCEventHeader;
+}
+} // namespace o2
 
 namespace o2
 {
@@ -82,7 +88,7 @@ class Generator : public FairGenerator
   void clearParticles() { mParticles.clear(); };
 
   /** notification methods **/
-  virtual void notifyEmbedding(const FairMCEventHeader* mcHeader){};
+  virtual void notifyEmbedding(const o2::dataformats::MCEventHeader* eventHeader){};
 
  protected:
   /** copy constructor **/
@@ -91,7 +97,7 @@ class Generator : public FairGenerator
   Generator& operator=(const Generator&);
 
   /** methods that can be overridded **/
-  virtual void updateHeader(FairMCEventHeader* eventHeader){};
+  virtual void updateHeader(o2::dataformats::MCEventHeader* eventHeader){};
 
   /** internal methods **/
   Bool_t addTracks(FairPrimaryGenerator* primGen);
diff --git a/Generators/include/Generators/GeneratorPythia8.h b/Generators/include/Generators/GeneratorPythia8.h
@@ -84,7 +84,7 @@ class GeneratorPythia8 : public Generator
   GeneratorPythia8& operator=(const GeneratorPythia8&);
 
   /** methods that can be overridded **/
-  void updateHeader(FairMCEventHeader* eventHeader) override;
+  void updateHeader(o2::dataformats::MCEventHeader* eventHeader) override;
 
   /** internal methods **/
   Bool_t importParticles(Pythia8::Event& event);
diff --git a/Generators/src/Generator.cxx b/Generators/src/Generator.cxx
@@ -13,6 +13,7 @@
 #include "Generators/Generator.h"
 #include "Generators/Trigger.h"
 #include "Generators/PrimaryGenerator.h"
+#include "SimulationDataFormat/MCEventHeader.h"
 #include "FairPrimaryGenerator.h"
 #include "FairLogger.h"
 #include <cmath>
@@ -89,7 +90,13 @@ Bool_t
   }
 
   /** update header **/
-  updateHeader(primGen->GetEvent());
+  auto header = primGen->GetEvent();
+  auto o2header = dynamic_cast<o2::dataformats::MCEventHeader*>(header);
+  if (!header) {
+    LOG(FATAL) << "MC event header is not a 'o2::dataformats::MCEventHeader' object";
+    return kFALSE;
+  }
+  updateHeader(o2header);
 
   /** success **/
   return kTRUE;
diff --git a/Generators/src/GeneratorPythia8.cxx b/Generators/src/GeneratorPythia8.cxx
@@ -15,7 +15,7 @@
 #include "CommonUtils/ConfigurationMacroHelper.h"
 #include "FairLogger.h"
 #include "TParticle.h"
-#include "FairMCEventHeader.h"
+#include "SimulationDataFormat/MCEventHeader.h"
 #include "Pythia8/HIUserHooks.h"
 #include "TSystem.h"
 
@@ -192,7 +192,7 @@ Bool_t
 
 /*****************************************************************/
 
-void GeneratorPythia8::updateHeader(FairMCEventHeader* eventHeader)
+void GeneratorPythia8::updateHeader(o2::dataformats::MCEventHeader* eventHeader)
 {
   /** update header **/
 
diff --git a/run/SimExamples/Adaptive_Pythia8/adaptive_pythia8.macro b/run/SimExamples/Adaptive_Pythia8/adaptive_pythia8.macro
@@ -16,7 +16,7 @@ public:
 
   // update the number of events to be generated
   // according to background primaries and formula
-  void notifyEmbedding(const FairMCEventHeader *bkgHeader) override {
+  void notifyEmbedding(const o2::dataformats::MCEventHeader *bkgHeader) override {
     auto nPrimaries = bkgHeader->GetNPrim();
     mEvents = mFormula.Eval(nPrimaries);
   };
diff --git a/run/SimExamples/AliRoot_AMPT/aliroot_ampt.macro b/run/SimExamples/AliRoot_AMPT/aliroot_ampt.macro
@@ -76,7 +76,7 @@ public:
     return o2::eventgen::GeneratorTGenerator::generateEvent();
   }
 
-  void updateHeader(FairMCEventHeader* eventHeader) {
+  void updateHeader(o2::dataformats::MCEventHeader* eventHeader) {
     auto theAMPT = (TAmpt *)mGenAMPT->GetMC();
     auto impactB = theAMPT->GetHINT1(19);
     auto evPlane = theAMPT->GetReactionPlaneAngle();    
diff --git a/run/SimExamples/HF_Embedding_Pythia8/GeneratorHF.macro b/run/SimExamples/HF_Embedding_Pythia8/GeneratorHF.macro
@@ -28,7 +28,7 @@ public:
   // for each event in case we are in embedding mode.
   // We use it to setup the number of signal events
   // to be generated and to be embedded on the background.
-  void notifyEmbedding(const FairMCEventHeader *bkgHeader) override {
+  void notifyEmbedding(const o2::dataformats::MCEventHeader *bkgHeader) override {
     mEvents = mFormula.Eval(bkgHeader->GetB());
     std::cout << " --- notify embedding: impact parameter is " << bkgHeader->GetB() << ", generating " << mEvents << " signal events " << std::endl;
   };
diff --git a/run/SimExamples/Signal_ImpactB/signal_impactb.macro b/run/SimExamples/Signal_ImpactB/signal_impactb.macro
@@ -28,7 +28,7 @@ public:
   
   // update the number of particles to be generated
   // according to impact parameter and formula
-  void notifyEmbedding(const FairMCEventHeader *bkgHeader) override {
+  void notifyEmbedding(const o2::dataformats::MCEventHeader *bkgHeader) override {
     auto b = bkgHeader->GetB();
     mNSignals = mFormula.Eval(b);
     std::cout << " --- notify embedding: b = " << b << ", nparticles = " << mNSignals << std::endl;

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public:`
`76`	`76`	`return o2::eventgen::GeneratorTGenerator::generateEvent();`
`77`	`77`	`}`
`78`	`78`
`79`		`- void updateHeader(FairMCEventHeader* eventHeader) {`
	`79`	`+ void updateHeader(o2::dataformats::MCEventHeader* eventHeader) {`
`80`	`80`	`auto theAMPT = (TAmpt *)mGenAMPT->GetMC();`
`81`	`81`	`auto impactB = theAMPT->GetHINT1(19);`
`82`	`82`	`auto evPlane = theAMPT->GetReactionPlaneAngle();`