From f1ec5344507cc4472b82edc742623dd6a43b665c Mon Sep 17 00:00:00 2001 From: Florian Uhlig Date: Tue, 19 Feb 2019 10:03:14 +0100 Subject: [PATCH] Initialize FairSink before initializing FairSource The order of the initialization is important since FairSource may register objects to the output. To do this the output has already to exist which is the case if FairSink was already initialized. Bump the version info. --- CMakeLists.txt | 2 +- base/steer/FairRunOnline.cxx | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ccb623090..a699b27e09 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ endforeach() # Set project version SET(FAIRROOT_MAJOR_VERSION 18) SET(FAIRROOT_MINOR_VERSION 0) -SET(FAIRROOT_PATCH_VERSION 4) +SET(FAIRROOT_PATCH_VERSION 5) # Set name of our project to "FAIRROOT". # Has to be done after check of cmake version diff --git a/base/steer/FairRunOnline.cxx b/base/steer/FairRunOnline.cxx index b912d10215..ce6e80bc1b 100644 --- a/base/steer/FairRunOnline.cxx +++ b/base/steer/FairRunOnline.cxx @@ -136,8 +136,12 @@ void FairRunOnline::Init() fIsInitialized = kTRUE; } - fRootManager->InitSource(); + // we have to initialize the sink before initializing the source + // This is needed in case the source registers some objects to + // the output + // In this case the output must exist fRootManager->InitSink(); + fRootManager->InitSource(); // FairGeoLoader* loader = new FairGeoLoader("TGeo", "Geo Loader"); // FairGeoInterface* GeoInterFace = loader->getGeoInterface();