Implement Finish function for generator

karabowi · dennisklein · commit d59e2aadf2bf · 2022-11-11T15:01:37.000+01:00
Solves the issue #1184.
diff --git a/base/sim/FairGenerator.h b/base/sim/FairGenerator.h
@@ -52,6 +52,9 @@ class FairGenerator : public TNamed
     /**Initialize the generator if needed */
     virtual Bool_t Init() { return kTRUE; }
 
+    /**Finalize the generator if needed */
+    virtual void Finish() { return; }
+
     /** Clone this object (used in MT mode only) */
     virtual FairGenerator* CloneGenerator() const;
 
diff --git a/base/sim/FairMCApplication.cxx b/base/sim/FairMCApplication.cxx
@@ -411,6 +411,10 @@ void FairMCApplication::FinishRun()
         fRootManager->CloseSink();
     }
 
+    if (fEvGen) {
+        fEvGen->Finish();
+    }
+
     if (!fMC->IsMT()) {
         UndoGeometryModifications();
     }
diff --git a/base/sim/FairPrimaryGenerator.cxx b/base/sim/FairPrimaryGenerator.cxx
@@ -144,15 +144,24 @@ FairPrimaryGenerator::FairPrimaryGenerator(const FairPrimaryGenerator &rhs)
 Bool_t FairPrimaryGenerator::Init()
 {
     /** Initialize list of generators*/
-    for (Int_t i = 0; i < fGenList->GetEntries(); i++) {
-        FairGenerator *gen = static_cast<FairGenerator *>(fGenList->At(i));
-        if (gen) {
-            gen->Init();
-        }
+    for (auto gen : TRangeDynCast<FairGenerator>(fGenList)) {
+        if (!gen)
+            continue;
+        gen->Init();
     }
     return kTRUE;
 }
 
+void FairPrimaryGenerator::Finish()
+{
+    /** Finalize list of generators*/
+    for (auto gen : TRangeDynCast<FairGenerator>(fGenList)) {
+        if (!gen)
+            continue;
+        gen->Finish();
+    }
+}
+
 FairPrimaryGenerator::~FairPrimaryGenerator()
 {
 
diff --git a/base/sim/FairPrimaryGenerator.h b/base/sim/FairPrimaryGenerator.h
@@ -52,6 +52,9 @@ class FairPrimaryGenerator : public TNamed
     /** Initialize the generater (if needed!)*/
     virtual Bool_t Init();
 
+    /** Finalize the generater (if needed!)*/
+    virtual void Finish();
+
     /** Register a generator derived from FairGenerator.  **/
     void AddGenerator(FairGenerator *generator)
     {

Original file line number	Diff line number	Diff line change
`@@ -411,6 +411,10 @@ void FairMCApplication::FinishRun()`
`411`	`411`	`fRootManager->CloseSink();`
`412`	`412`	`}`
`413`	`413`
	`414`	`+ if (fEvGen) {`
	`415`	`+ fEvGen->Finish();`
	`416`	`+ }`
	`417`	`+`
`414`	`418`	`if (!fMC->IsMT()) {`
`415`	`419`	`UndoGeometryModifications();`
`416`	`420`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,9 @@ class FairPrimaryGenerator : public TNamed`
`52`	`52`	`/** Initialize the generater (if needed!)*/`
`53`	`53`	`virtual Bool_t Init();`
`54`	`54`
	`55`	`+ /** Finalize the generater (if needed!)*/`
	`56`	`+ virtual void Finish();`
	`57`	`+`
`55`	`58`	`/ Register a generator derived from FairGenerator. /`
`56`	`59`	`void AddGenerator(FairGenerator *generator)`
`57`	`60`	`{`