Skip to content

Fix following elimination of FairGenericRootManager #747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sawenzel merged 1 commit into from
Dec 22, 2017
Merged

Fix following elimination of FairGenericRootManager #747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DataFormats/TPC/include/DataFormatsTPC/ClusterHardware.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include <cstdint>

namespace o2 { namespace DataFormat { namespace TPC{
namespace o2 { namespace DataFormat { namespace TPC{

struct ClusterHardware { //Temporary draft of hardware clusters. The ...Pre members are yet to be defined, and will most likely either be floats or fixed point integers.
float padPre; //< Quantity needed to compute the pad
Expand Down
6 changes: 3 additions & 3 deletions Detectors/FIT/simulation/src/Detector.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "TSystem.h"
#include "TVirtualMC.h"

#include "FairGenericRootManager.h" // for FairGenericRootManager
#include "FairRootManager.h" // for FairRootManager
#include "FairLogger.h"
#include "FairVolume.h"

Expand Down Expand Up @@ -302,8 +302,8 @@ void Detector::Register()
// parameter to kFALSE means that this collection will not be written to the file,
// it will exist only during the simulation

if (FairGenericRootManager::Instance()) {
FairGenericRootManager::Instance()->GetFairRootManager()->RegisterAny(addNameTo("Hit").data(), mHits, kTRUE);
if (FairRootManager::Instance()) {
FairRootManager::Instance()->RegisterAny(addNameTo("Hit").data(), mHits, kTRUE);
}
}

Expand Down
6 changes: 3 additions & 3 deletions Detectors/ITSMFT/ITS/simulation/src/Detector.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
//FairRoot includes
#include "FairDetector.h" // for FairDetector
#include "FairLogger.h" // for LOG, LOG_IF
#include "FairGenericRootManager.h" // for FairGenericRootManager
#include "FairRootManager.h" // for FairRootManager
#include "FairRun.h" // for FairRun
#include "FairRuntimeDb.h" // for FairRuntimeDb
#include "FairVolume.h" // for FairVolume
Expand Down Expand Up @@ -593,8 +593,8 @@ void Detector::Register()
// it will exist only during the simulation

// FIXME: fix MT interface
if (FairGenericRootManager::Instance()) {
FairGenericRootManager::Instance()->GetFairRootManager()->RegisterAny(addNameTo("Hit").data(), mHits, kTRUE);
if (FairRootManager::Instance()) {
FairRootManager::Instance()->RegisterAny(addNameTo("Hit").data(), mHits, kTRUE);
}
}

Expand Down
6 changes: 3 additions & 3 deletions Detectors/ITSMFT/MFT/simulation/src/Detector.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include "TGeoManager.h"

#include "FairLogger.h"
#include "FairGenericRootManager.h"
#include "FairRootManager.h"
#include "FairVolume.h"

using o2::ITSMFT::Hit;
Expand Down Expand Up @@ -471,8 +471,8 @@ void Detector::Register()
// parameter to kFALSE means that this collection will not be written to the file,
// it will exist only during the simulation

if (FairGenericRootManager::Instance()) {
FairGenericRootManager::Instance()->GetFairRootManager()->RegisterAny(addNameTo("Hit").data(), mHits, kTRUE);
if (FairRootManager::Instance()) {
FairRootManager::Instance()->RegisterAny(addNameTo("Hit").data(), mHits, kTRUE);
}

}
Expand Down
1 change: 0 additions & 1 deletion Detectors/TPC/simulation/src/Detector.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

#include <cstddef> // for NULL

#include "FairGenericRootManager.h"
#include "FairGeoVolume.h"
#include "FairGeoNode.h"
#include "FairGeoLoader.h"
Expand Down