chore(FairRun*): Refactor RunId Changes

Introduce a CheckRunIdChanged in FairRunAna and FairRunOnline
that handles RunId changes.

Fix FairRunAna::RunEventReco: It always used runid 0 for
the "new current runid".  Now it just uses
CheckRunIdChanged as well.

Author: ChristianTackeGSI

fairroot/base/steer/FairRunAna.cxx

@@ -324,8 +324,6 @@ void FairRunAna::Run(Int_t Ev_start, Int_t Ev_end)
             fRunInfo.Reset();
         }
 
-        Int_t readEventReturn = 0;
-
         for (int i = Ev_start; i < Ev_end || MaxAllowed == -1; i++) {
 
             gSystem->IgnoreInterrupt();
@@ -337,7 +335,7 @@ void FairRunAna::Run(Int_t Ev_start, Int_t Ev_end)
                 break;
             }
 
-            readEventReturn = fRootManager->ReadEvent(i);
+            auto readEventReturn = fRootManager->ReadEvent(i);
 
             if (readEventReturn != 0) {
                 LOG(warn) << "FairRunAna::Run() fRootManager->ReadEvent(" << i << ") returned " << readEventReturn
@@ -346,15 +344,8 @@ void FairRunAna::Run(Int_t Ev_start, Int_t Ev_end)
             }
 
             FillEventHeader();
+            CheckRunIdChanged();
 
-            auto const tmpId = GetEvtHeaderRunId();
-            if (tmpId != fRunId) {
-                fRunId = tmpId;
-                if (!fStatic) {
-                    Reinit(fRunId);
-                    fTask->ReInitTask();
-                }
-            }
             // std::cout << "WriteoutBufferData with time: " << fRootManager->GetEventTime();
             fRootManager->StoreWriteoutBufferData(fRootManager->GetEventTime());
             fTask->ExecuteTask("");
@@ -384,8 +375,6 @@ void FairRunAna::Run(Int_t Ev_start, Int_t Ev_end)
 //_____________________________________________________________________________
 void FairRunAna::RunEventReco(Int_t Ev_start, Int_t Ev_end)
 {
-    UInt_t tmpId = 0;
-
     Int_t MaxAllowed = fRootManager->CheckMaxEventNo(Ev_end);
     if (MaxAllowed != -1) {
         if (Ev_end == 0) {
@@ -425,13 +414,9 @@ void FairRunAna::RunEventReco(Int_t Ev_start, Int_t Ev_end)
          * if we have simulation files then they have MC Event Header and the Run Id is in it, any way it
          * would be better to make FairMCEventHeader a subclass of FairEvtHeader.
          */
-        if (tmpId != fRunId) {
-            fRunId = tmpId;
-            if (!fStatic) {
-                Reinit(fRunId);
-                fTask->ReInitTask();
-            }
-        }
+
+        CheckRunIdChanged();
+
         // FairMCEventHeader* header = dynamic_cast<FairMCEventHeader*>(fRootManager->GetObject("MCEventHeader.");
         //    std::cout << "WriteoutBufferData with time: " << fRootManager->GetEventTime();
         fRootManager->StoreWriteoutBufferData(fRootManager->GetEventTime());
@@ -487,14 +472,7 @@ void FairRunAna::RunMQ(Long64_t entry)
    it read a certain event and call the task exec, but no output is written
    */
     fRootManager->ReadEvent(entry);
-    auto const tmpId = GetEvtHeaderRunId();
-    if (tmpId != fRunId) {
-        fRunId = tmpId;
-        if (!fStatic) {
-            Reinit(fRunId);
-            fTask->ReInitTask();
-        }
-    }
+    CheckRunIdChanged();
     fTask->ExecuteTask("");
     FillEventHeader();
     fTask->FinishTask();
@@ -505,14 +483,7 @@ void FairRunAna::RunMQ(Long64_t entry)
 void FairRunAna::Run(Long64_t entry)
 {
     fRootManager->ReadEvent(entry);
-    auto const tmpId = GetEvtHeaderRunId();
-    if (tmpId != fRunId) {
-        fRunId = tmpId;
-        if (!fStatic) {
-            Reinit(fRunId);
-            fTask->ReInitTask();
-        }
-    }
+    CheckRunIdChanged();
     fTask->ExecuteTask("");
     FillEventHeader();
     fTask->FinishTask();
@@ -616,6 +587,27 @@ void FairRunAna::TerminateRun()
 }
 //_____________________________________________________________________________
 
+/**
+ * \sa FairRunOnline::CheckRunIdChanged
+ */
+void FairRunAna::CheckRunIdChanged()
+{
+    auto newrunid = GetEvtHeaderRunId();
+    if (newrunid == fRunId) {
+        return;
+    }
+
+    LOG(debug) << "FairRunAna::CheckRunIdChanged() Detected changed RunID from " << fRunId << " to " << newrunid;
+    fRunId = newrunid;
+    if (fStatic) {
+        LOG(debug) << "FairRunAna::CheckRunIdChanged: ReInit not called because initialisation is static.";
+        return;
+    }
+    LOG(debug) << "FairRunAna::CheckRunIdChanged: Call Reinit.";
+    Reinit(fRunId);
+    fTask->ReInitTask();
+}
+
 void FairRunAna::Reinit(UInt_t runId)
 {
     // reinit procedure

fairroot/base/steer/FairRunAna.h

@@ -130,6 +130,11 @@ class FairRunAna : public FairRun
     /** Flag for Event Header Persistency */
     Bool_t fStoreEventHeader;   //!
 
+    /**
+     * \brief Internal facade: Handle RunID changes
+     */
+    void CheckRunIdChanged();
+
     ClassDefOverride(FairRunAna, 6);
 };
 

fairroot/base/steer/FairRunAnaProof.cxx

@@ -284,15 +284,8 @@ void FairRunAnaProof::RunOneEvent(Long64_t entry)
         fRootManager->ReadEvent(entry);
 
         FillEventHeader();
+        CheckRunIdChanged();
 
-        auto const tmpId = GetEvtHeaderRunId();
-        if (tmpId != fRunId) {
-            fRunId = tmpId;
-            if (!fStatic) {
-                Reinit(fRunId);
-                fTask->ReInitTask();
-            }
-        }
         fRootManager->StoreWriteoutBufferData(fRootManager->GetEventTime());
 
         fTask->ExecuteTask("");

fairroot/online/steer/FairRunOnline.cxx

@@ -216,21 +216,8 @@ Int_t FairRunOnline::EventLoop()
     signal(SIGINT, handler_ctrlc);
 
     FillEventHeader();
-    auto const tmpId = GetEvtHeaderRunId();
-    if (tmpId != fRunId) {
-        LOG(info) << "FairRunOnline::EventLoop() Detected changed RunID from " << fRunId << " to " << tmpId;
-        fRunId = tmpId;
-        if (!fStatic) {
-            LOG(info) << "FairRunOnline::EventLoop() Call Reinit.";
-            Reinit(fRunId);
-            if (!GetSource()->ReInitUnpackers()) {
-                LOG(fatal) << "FairRunOnline->EventLoop() ReInitUnpackers() failed!";
-                return 1;
-            }
-            fTask->ReInitTask();
-        } else {
-            LOG(info) << "FairRunOnline::EventLoop() ReInit not called because initialisation is static.";
-        }
+    if (!CheckRunIdChanged()) {
+        return 1;
     }
 
     fRootManager->StoreWriteoutBufferData(fRootManager->GetEventTime());
@@ -348,6 +335,32 @@ void FairRunOnline::RegisterHttpCommand(TString name, TString command)
     }
 }
 
+/**
+ * \sa FairRunAna::CheckRunIdChanged
+ */
+bool FairRunOnline::CheckRunIdChanged()
+{
+    auto const tmpId = GetEvtHeaderRunId();
+    if (tmpId == fRunId) {
+        return true;
+    }
+
+    LOG(info) << "FairRunOnline::CheckRunIdChanged: Detected changed RunID from " << fRunId << " to " << tmpId;
+    fRunId = tmpId;
+    if (fStatic) {
+        LOG(info) << "FairRunOnline::CheckRunIdChanged: ReInit not called because initialisation is static.";
+        return true;
+    }
+    LOG(info) << "FairRunOnline::CheckRunIdChanged: Call Reinit.";
+    Reinit(fRunId);
+    if (!GetSource()->ReInitUnpackers()) {
+        LOG(fatal) << "FairRunOnline::CheckRunIdChanged: ReInitUnpackers() failed!";
+        return false;
+    }
+    fTask->ReInitTask();
+    return true;
+}
+
 void FairRunOnline::Reinit(UInt_t runId)
 {
     // reinit procedure

fairroot/online/steer/FairRunOnline.h

@@ -88,6 +88,12 @@ class FairRunOnline : public FairRun
     /** Main Event loop **/
     Int_t EventLoop();
 
+    /**
+     * \brief Internal facade: Handle RunID changes
+     * \return false on error
+     */
+    bool CheckRunIdChanged();
+
   protected:
     /** This variable became true after Init is called*/
     Bool_t fIsInitialized;