Skip to content

Commit

Permalink
Initialize FairSink before initializing FairSource
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
fuhlig1 committed Feb 19, 2019
1 parent 97d7bf7 commit f1ec534
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion base/steer/FairRunOnline.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit f1ec534

Please sign in to comment.