From e191bb57c96a66bf4f60381b9a3f8c511bc6188e Mon Sep 17 00:00:00 2001 From: hristov Date: Mon, 22 Mar 2004 10:08:06 +0000 Subject: [PATCH] Coding conventions (F.Carminati) --- EMCAL/AliEMCALClusterizer.cxx | 6 ++++-- EMCAL/AliEMCALClusterizer.h | 2 +- EMCAL/AliEMCALClusterizerv1.h | 2 +- EMCAL/AliEMCALDigitizer.cxx | 8 ++++---- EMCAL/AliEMCALDigitizer.h | 4 ++-- EMCAL/AliEMCALGetter.cxx | 6 +++--- EMCAL/AliEMCALGetter.h | 4 ++-- EMCAL/AliEMCALLoader.h | 2 +- EMCAL/AliEMCALPID.cxx | 5 +++-- EMCAL/AliEMCALPID.h | 2 +- EMCAL/AliEMCALPIDv1.h | 2 +- EMCAL/AliEMCALSDigitizer.cxx | 5 +++-- EMCAL/AliEMCALSDigitizer.h | 2 +- EMCAL/AliEMCALTrackSegmentMaker.cxx | 6 ++++-- EMCAL/AliEMCALTrackSegmentMaker.h | 2 +- EMCAL/AliEMCALTrackSegmentMakerv1.h | 2 +- HBTAN/AliHBTReaderITSv2.cxx | 2 +- HBTAN/AliHBTReaderTPC.cxx | 2 +- MUON/AliMUON.cxx | 2 +- MUON/AliMUONEventReconstructor.cxx | 4 ++-- MUON/mapping/AliMpSectorPainter.cxx | 8 ++++---- PHOS/AliPHOS.cxx | 6 +++--- PHOS/AliPHOSClusterizer.cxx | 6 ++++-- PHOS/AliPHOSClusterizer.h | 2 +- PHOS/AliPHOSClusterizerv1.h | 2 +- PHOS/AliPHOSDigitizer.cxx | 12 +++++++----- PHOS/AliPHOSDigitizer.h | 4 ++-- PHOS/AliPHOSEmcRecPoint.cxx | 2 +- PHOS/AliPHOSEvalRecPoint.cxx | 4 ++-- PHOS/AliPHOSGetter.cxx | 6 +++--- PHOS/AliPHOSGetter.h | 4 ++-- PHOS/AliPHOSLoader.h | 2 +- PHOS/AliPHOSPID.cxx | 5 +++-- PHOS/AliPHOSPID.h | 2 +- PHOS/AliPHOSPIDv1.h | 2 +- PHOS/AliPHOSSDigitizer.cxx | 5 +++-- PHOS/AliPHOSSDigitizer.h | 2 +- PHOS/AliPHOSTrackSegmentMaker.cxx | 6 ++++-- PHOS/AliPHOSTrackSegmentMaker.h | 2 +- PHOS/AliPHOSTrackSegmentMakerv1.h | 2 +- PMD/AliPMDClusterFinder.cxx | 2 +- PMD/AliPMDDigitizer.cxx | 4 ++-- START/AliSTARTvertex.cxx | 2 +- STEER/AliConfig.h | 13 +++++++++++-- STEER/AliLoader.cxx | 4 ++-- STEER/AliRun.h | 4 ++++ STEER/AliRunLoader.cxx | 2 +- STEER/AliRunLoader.h | 4 ++-- STEER/AliSimulation.cxx | 2 +- STEER/AliStack.cxx | 2 +- STEER/AliStack.h | 2 +- TOF/AliTOFSDigitizer.cxx | 2 +- TPC/AliTPCtrackerMI.cxx | 4 ++-- TPC/AliTPCtrackerParam.h | 2 +- TRD/AliTRDclusterizer.cxx | 2 +- TRD/AliTRDdigitizer.cxx | 4 ++-- VZERO/AliVZERODigitizer.cxx | 2 +- macros/Config.C | 2 +- 58 files changed, 120 insertions(+), 93 deletions(-) diff --git a/EMCAL/AliEMCALClusterizer.cxx b/EMCAL/AliEMCALClusterizer.cxx index 7a6a4b3fa74..dc015462e45 100644 --- a/EMCAL/AliEMCALClusterizer.cxx +++ b/EMCAL/AliEMCALClusterizer.cxx @@ -45,8 +45,10 @@ ClassImp(AliEMCALClusterizer) } //____________________________________________________________________________ -AliEMCALClusterizer::AliEMCALClusterizer(const TString alirunFileName, const TString eventFolderName): - TTask("EMCAL"+AliConfig::fgkReconstructionerTaskName, alirunFileName), fEventFolderName(eventFolderName) +AliEMCALClusterizer::AliEMCALClusterizer(const TString alirunFileName, + const TString eventFolderName): + TTask("EMCAL"+AliConfig::Instance()->GetReconstructionerTaskName(), alirunFileName), + fEventFolderName(eventFolderName) { // ctor fFirstEvent = 0 ; diff --git a/EMCAL/AliEMCALClusterizer.h b/EMCAL/AliEMCALClusterizer.h index 28fb44c27ee..bd61d21661d 100644 --- a/EMCAL/AliEMCALClusterizer.h +++ b/EMCAL/AliEMCALClusterizer.h @@ -25,7 +25,7 @@ class AliEMCALClusterizer : public TTask { public: AliEMCALClusterizer() ; // default ctor - AliEMCALClusterizer(const TString alirunFileName, const TString eventFolderName = AliConfig::fgkDefaultEventFolderName) ; + AliEMCALClusterizer(const TString alirunFileName, const TString eventFolderName = AliConfig::GetDefaultEventFolderName()) ; virtual ~AliEMCALClusterizer() ; // dtorEM virtual Float_t GetTowerClusteringThreshold()const {Warning("GetTowerClusteringThreshold", "Not Defined") ; return 0. ; } diff --git a/EMCAL/AliEMCALClusterizerv1.h b/EMCAL/AliEMCALClusterizerv1.h index e50b874c743..ee8d369b023 100644 --- a/EMCAL/AliEMCALClusterizerv1.h +++ b/EMCAL/AliEMCALClusterizerv1.h @@ -35,7 +35,7 @@ class AliEMCALClusterizerv1 : public AliEMCALClusterizer { public: AliEMCALClusterizerv1() ; - AliEMCALClusterizerv1(const TString alirunFileNameFile, const TString eventFolderName = AliConfig::fgkDefaultEventFolderName); + AliEMCALClusterizerv1(const TString alirunFileNameFile, const TString eventFolderName = AliConfig::GetDefaultEventFolderName()); virtual ~AliEMCALClusterizerv1() ; virtual Int_t AreNeighbours(AliEMCALDigit * d1, AliEMCALDigit * d2)const ; diff --git a/EMCAL/AliEMCALDigitizer.cxx b/EMCAL/AliEMCALDigitizer.cxx index d7eddedb47a..d122dc607b7 100644 --- a/EMCAL/AliEMCALDigitizer.cxx +++ b/EMCAL/AliEMCALDigitizer.cxx @@ -92,7 +92,7 @@ ClassImp(AliEMCALDigitizer) //____________________________________________________________________________ AliEMCALDigitizer::AliEMCALDigitizer(TString alirunFileName, TString eventFolderName): - AliDigitizer("EMCAL"+AliConfig::fgkDigitizerTaskName, alirunFileName), + AliDigitizer("EMCAL"+AliConfig::Instance()->GetDigitizerTaskName(), alirunFileName), fInputFileNames(0), fEventNames(0), fEventFolderName(eventFolderName) { // ctor @@ -126,7 +126,7 @@ AliEMCALDigitizer::AliEMCALDigitizer(const AliEMCALDigitizer & d) : AliDigitizer //____________________________________________________________________________ AliEMCALDigitizer::AliEMCALDigitizer(AliRunDigitizer * rd): - AliDigitizer(rd,"EMCAL"+AliConfig::fgkDigitizerTaskName), + AliDigitizer(rd,"EMCAL"+AliConfig::Instance()->GetDigitizerTaskName()), fEventFolderName(0) { // ctor Init() is called by RunDigitizer @@ -503,7 +503,7 @@ void AliEMCALDigitizer::MixWith(TString alirunFileName, TString eventFolderName) // looking for the file which contains SDigits AliEMCALGetter * gime = AliEMCALGetter::Instance() ; TString fileName( gime->GetSDigitsFileName() ) ; - if ( eventFolderName != AliConfig::fgkDefaultEventFolderName) // only if not the default folder name + if ( eventFolderName != AliConfig::GetDefaultEventFolderName()) // only if not the default folder name fileName = fileName.ReplaceAll(".root", "") + "_" + eventFolderName + ".root" ; if ( (gSystem->AccessPathName(fileName)) ) { Error("MixWith", "The file %s does not exist!", fileName.Data()) ; @@ -545,7 +545,7 @@ void AliEMCALDigitizer::Print()const tempo += index ; AliEMCALGetter * gime = AliEMCALGetter::Instance(fInputFileNames[index], tempo) ; TString fileName( gime->GetSDigitsFileName() ) ; - if ( fEventNames[index] != AliConfig::fgkDefaultEventFolderName) // only if not the default folder name + if ( fEventNames[index] != AliConfig::GetDefaultEventFolderName()) // only if not the default folder name fileName = fileName.ReplaceAll(".root", "") + "_" + fEventNames[index] + ".root" ; printf ("Adding SDigits from %s %s\n", fInputFileNames[index].Data(), fileName.Data()) ; } diff --git a/EMCAL/AliEMCALDigitizer.h b/EMCAL/AliEMCALDigitizer.h index f9ce91c062c..b49919c3f9c 100644 --- a/EMCAL/AliEMCALDigitizer.h +++ b/EMCAL/AliEMCALDigitizer.h @@ -31,7 +31,7 @@ class AliEMCALDigitizer: public AliDigitizer { public: AliEMCALDigitizer() ; // ctor - AliEMCALDigitizer(TString alirunFileNameFile, TString eventFolderName = AliConfig::fgkDefaultEventFolderName) ; + AliEMCALDigitizer(TString alirunFileNameFile, TString eventFolderName = AliConfig::GetDefaultEventFolderName()) ; AliEMCALDigitizer(const AliEMCALDigitizer & dtizer) ; AliEMCALDigitizer(AliRunDigitizer * manager) ; virtual ~AliEMCALDigitizer() ; @@ -53,7 +53,7 @@ public: //General Int_t GetDigitsInRun() const { return fDigitsInRun; } void MixWith(TString alirunFileName, - TString eventFolderName = AliConfig::fgkDefaultEventFolderName) ; // Add another one file to mix + TString eventFolderName = AliConfig::GetDefaultEventFolderName()) ; // Add another one file to mix void Print()const ; AliEMCALDigitizer & operator = (const AliEMCALDigitizer & /*rvalue*/) { diff --git a/EMCAL/AliEMCALGetter.cxx b/EMCAL/AliEMCALGetter.cxx index b785bcd3a85..b0a896265cf 100644 --- a/EMCAL/AliEMCALGetter.cxx +++ b/EMCAL/AliEMCALGetter.cxx @@ -329,7 +329,7 @@ AliEMCALGetter * AliEMCALGetter::Instance(const char* alirunFileName, const char } else { AliRunLoader * rl = AliRunLoader::GetRunLoader(fgEmcalLoader->GetTitle()); - if ( strstr(version, AliConfig::fgkDefaultEventFolderName) ) // false in case of merging + if ( strstr(version, AliConfig::GetDefaultEventFolderName()) ) // false in case of merging delete rl ; fgObjGetter = new AliEMCALGetter(alirunFileName, version, openingOption) ; } @@ -710,7 +710,7 @@ Bool_t AliEMCALGetter::VersionExists(TString & opt) const if ( opt == "sdigits") { // add the version name to the root file name TString fileName( EmcalLoader()->GetSDigitsFileName() ) ; - if (version != AliConfig::fgkDefaultEventFolderName) // only if not the default folder name + if (version != AliConfig::GetDefaultEventFolderName()) // only if not the default folder name fileName = fileName.ReplaceAll(".root", "") + "_" + version + ".root" ; if ( !(gSystem->AccessPathName(fileName)) ) { Warning("VersionExists", "The file %s already exists", fileName.Data()) ; @@ -722,7 +722,7 @@ Bool_t AliEMCALGetter::VersionExists(TString & opt) const if ( opt == "digits") { // add the version name to the root file name TString fileName( EmcalLoader()->GetDigitsFileName() ) ; - if (version != AliConfig::fgkDefaultEventFolderName) // only if not the default folder name + if (version != AliConfig::GetDefaultEventFolderName()) // only if not the default folder name fileName = fileName.ReplaceAll(".root", "") + "_" + version + ".root" ; if ( !(gSystem->AccessPathName(fileName)) ) { Warning("VersionExists", "The file %s already exists", fileName.Data()) ; diff --git a/EMCAL/AliEMCALGetter.h b/EMCAL/AliEMCALGetter.h index 8144826e221..9f636911019 100644 --- a/EMCAL/AliEMCALGetter.h +++ b/EMCAL/AliEMCALGetter.h @@ -63,7 +63,7 @@ class AliEMCALGetter : public TObject { //=========== Instantiators ================ static AliEMCALGetter * Instance(const char* headerFile, - const char* version = AliConfig::fgkDefaultEventFolderName, + const char* version = AliConfig::GetDefaultEventFolderName(), Option_t * openingOption = "READ" ) ; static AliEMCALGetter * Instance() ; @@ -189,7 +189,7 @@ class AliEMCALGetter : public TObject { private: AliEMCALGetter(const char* headerFile, - const char* version = AliConfig::fgkDefaultEventFolderName, + const char* version = AliConfig::GetDefaultEventFolderName(), Option_t * openingOption = "READ") ; Int_t ReadTreeD(void) ; diff --git a/EMCAL/AliEMCALLoader.h b/EMCAL/AliEMCALLoader.h index b95f3914f43..f897dc4a865 100644 --- a/EMCAL/AliEMCALLoader.h +++ b/EMCAL/AliEMCALLoader.h @@ -152,7 +152,7 @@ class AliEMCALLoader : public AliLoader { /************ T A S K S **************/ /*********************************************/ // - // AliEMCALSDigitizer* EMCALSDigitizer(TString name = AliConfig::fgkDefaultEventFolderName); + // AliEMCALSDigitizer* EMCALSDigitizer(TString name = AliConfig::GetDefaultEventFolderName()); //AliEMCALDigitizer* EMCALDigitizer() { return dynamic_cast(Digitizer()) ;} AliEMCALClusterizer* Clusterizer () {return dynamic_cast(Reconstructioner()) ;} diff --git a/EMCAL/AliEMCALPID.cxx b/EMCAL/AliEMCALPID.cxx index b864e8c1f7b..a28c38a3a2d 100644 --- a/EMCAL/AliEMCALPID.cxx +++ b/EMCAL/AliEMCALPID.cxx @@ -46,8 +46,9 @@ ClassImp(AliEMCALPID) //____________________________________________________________________________ -AliEMCALPID::AliEMCALPID(const TString alirunFileName, const TString eventFolderName) -:TTask("EMCAL"+AliConfig::fgkPIDTaskName, alirunFileName), fEventFolderName(eventFolderName) +AliEMCALPID::AliEMCALPID(const TString alirunFileName, const TString eventFolderName): + TTask("EMCAL"+AliConfig::Instance()->GetPIDTaskName(), alirunFileName), + fEventFolderName(eventFolderName) { // ctor fFirstEvent = 0 ; diff --git a/EMCAL/AliEMCALPID.h b/EMCAL/AliEMCALPID.h index eb47285280b..e4fd3858a86 100644 --- a/EMCAL/AliEMCALPID.h +++ b/EMCAL/AliEMCALPID.h @@ -31,7 +31,7 @@ class AliEMCALPID : public TTask { public: AliEMCALPID() ; // ctor - AliEMCALPID(const TString alirunFileName, const TString eventFolderName = AliConfig::fgkDefaultEventFolderName) ; + AliEMCALPID(const TString alirunFileName, const TString eventFolderName = AliConfig::GetDefaultEventFolderName()) ; AliEMCALPID(const AliEMCALPID & pid):TTask(pid) {;} virtual ~AliEMCALPID() ; // dtor diff --git a/EMCAL/AliEMCALPIDv1.h b/EMCAL/AliEMCALPIDv1.h index bffc60d9681..68a7f98bf28 100644 --- a/EMCAL/AliEMCALPIDv1.h +++ b/EMCAL/AliEMCALPIDv1.h @@ -30,7 +30,7 @@ class AliEMCALPIDv1 : public AliEMCALPID { public: AliEMCALPIDv1() ; // ctor - AliEMCALPIDv1(const TString alirunFileNameFile, const TString eventFolderName = AliConfig::fgkDefaultEventFolderName) ; + AliEMCALPIDv1(const TString alirunFileNameFile, const TString eventFolderName = AliConfig::GetDefaultEventFolderName()) ; AliEMCALPIDv1(const AliEMCALPIDv1 & pid) ; // cpy ctor virtual ~AliEMCALPIDv1() ; // dtor diff --git a/EMCAL/AliEMCALSDigitizer.cxx b/EMCAL/AliEMCALSDigitizer.cxx index 674d654bd19..56dd5118cd7 100644 --- a/EMCAL/AliEMCALSDigitizer.cxx +++ b/EMCAL/AliEMCALSDigitizer.cxx @@ -72,8 +72,9 @@ ClassImp(AliEMCALSDigitizer) } //____________________________________________________________________________ -AliEMCALSDigitizer::AliEMCALSDigitizer(const char * alirunFileName, const char * eventFolderName): - TTask("EMCAL"+AliConfig::fgkSDigitizerTaskName, alirunFileName), +AliEMCALSDigitizer::AliEMCALSDigitizer(const char * alirunFileName, + const char * eventFolderName): + TTask("EMCAL"+AliConfig::Instance()->GetSDigitizerTaskName(), alirunFileName), fEventFolderName(eventFolderName) { // ctor diff --git a/EMCAL/AliEMCALSDigitizer.h b/EMCAL/AliEMCALSDigitizer.h index 6245983f167..4429ce5c5b1 100644 --- a/EMCAL/AliEMCALSDigitizer.h +++ b/EMCAL/AliEMCALSDigitizer.h @@ -27,7 +27,7 @@ class AliEMCALSDigitizer: public TTask { public: AliEMCALSDigitizer() ; // ctor - AliEMCALSDigitizer(const char * alirunFileName, const char * eventFolderName = AliConfig::fgkDefaultEventFolderName) ; + AliEMCALSDigitizer(const char * alirunFileName, const char * eventFolderName = AliConfig::GetDefaultEventFolderName()) ; AliEMCALSDigitizer(const AliEMCALSDigitizer & sd) ; virtual ~AliEMCALSDigitizer(); // dtor diff --git a/EMCAL/AliEMCALTrackSegmentMaker.cxx b/EMCAL/AliEMCALTrackSegmentMaker.cxx index 415bc78756b..27523395a83 100644 --- a/EMCAL/AliEMCALTrackSegmentMaker.cxx +++ b/EMCAL/AliEMCALTrackSegmentMaker.cxx @@ -41,8 +41,10 @@ ClassImp( AliEMCALTrackSegmentMaker) } //____________________________________________________________________________ -AliEMCALTrackSegmentMaker::AliEMCALTrackSegmentMaker(const TString alirunFileName, const TString eventFolderName): - TTask("EMCAL"+AliConfig::fgkTrackerTaskName, alirunFileName), fEventFolderName(eventFolderName) +AliEMCALTrackSegmentMaker::AliEMCALTrackSegmentMaker(const TString alirunFileName, + const TString eventFolderName): + TTask("EMCAL"+AliConfig::Instance()->GetTrackerTaskName(), alirunFileName), + fEventFolderName(eventFolderName) { // ctor diff --git a/EMCAL/AliEMCALTrackSegmentMaker.h b/EMCAL/AliEMCALTrackSegmentMaker.h index af19f53f949..f47342b38ef 100644 --- a/EMCAL/AliEMCALTrackSegmentMaker.h +++ b/EMCAL/AliEMCALTrackSegmentMaker.h @@ -29,7 +29,7 @@ class AliEMCALTrackSegmentMaker : public TTask { public: AliEMCALTrackSegmentMaker() ; - AliEMCALTrackSegmentMaker(const TString alirunFileName, const TString eventFolderName = AliConfig::fgkDefaultEventFolderName) ; + AliEMCALTrackSegmentMaker(const TString alirunFileName, const TString eventFolderName = AliConfig::GetDefaultEventFolderName()) ; AliEMCALTrackSegmentMaker(const AliEMCALTrackSegmentMaker & tsmaker):TTask(tsmaker) { ; } virtual ~ AliEMCALTrackSegmentMaker() ; diff --git a/EMCAL/AliEMCALTrackSegmentMakerv1.h b/EMCAL/AliEMCALTrackSegmentMakerv1.h index 6b8710fa123..a3d53dcff44 100644 --- a/EMCAL/AliEMCALTrackSegmentMakerv1.h +++ b/EMCAL/AliEMCALTrackSegmentMakerv1.h @@ -26,7 +26,7 @@ class AliEMCALTrackSegmentMakerv1 : public AliEMCALTrackSegmentMaker { public: AliEMCALTrackSegmentMakerv1() ; - AliEMCALTrackSegmentMakerv1(const TString alirunFileNameFile, const TString eventFolderName = AliConfig::fgkDefaultEventFolderName); + AliEMCALTrackSegmentMakerv1(const TString alirunFileNameFile, const TString eventFolderName = AliConfig::GetDefaultEventFolderName()); AliEMCALTrackSegmentMakerv1(const AliEMCALTrackSegmentMakerv1 & tsm):AliEMCALTrackSegmentMaker(tsm) { // cpy ctor: no implementation yet // requested by the Coding Convention diff --git a/HBTAN/AliHBTReaderITSv2.cxx b/HBTAN/AliHBTReaderITSv2.cxx index 20184383277..4f57aad04e1 100644 --- a/HBTAN/AliHBTReaderITSv2.cxx +++ b/HBTAN/AliHBTReaderITSv2.cxx @@ -225,7 +225,7 @@ Int_t AliHBTReaderITSv2::OpenNextFile() return 1; } filename = filename +"/"+ fFileName; - fRunLoader = AliRunLoader::Open(filename,AliConfig::fgkDefaultEventFolderName); + fRunLoader = AliRunLoader::Open(filename,AliConfig::GetDefaultEventFolderName()); if( fRunLoader == 0x0) { DoOpenError("Can not open session."); diff --git a/HBTAN/AliHBTReaderTPC.cxx b/HBTAN/AliHBTReaderTPC.cxx index cc17bc1f97c..b3e33a0834b 100644 --- a/HBTAN/AliHBTReaderTPC.cxx +++ b/HBTAN/AliHBTReaderTPC.cxx @@ -376,7 +376,7 @@ Int_t AliHBTReaderTPC::OpenNextSession() return 1; } filename = filename +"/"+ fFileName; - fRunLoader = AliRunLoader::Open(filename,AliConfig::fgkDefaultEventFolderName); + fRunLoader = AliRunLoader::Open(filename,AliConfig::GetDefaultEventFolderName()); if( fRunLoader == 0x0) { DoOpenError("Can not open session."); diff --git a/MUON/AliMUON.cxx b/MUON/AliMUON.cxx index b0014441e50..d6a4a2e350f 100644 --- a/MUON/AliMUON.cxx +++ b/MUON/AliMUON.cxx @@ -448,7 +448,7 @@ void AliMUON::Hits2SDigits() // Adaption of AliMUONSDigitizerv1 to be excuted by the AliSimulation framework AliRunLoader* runLoader = fLoader->GetRunLoader(); AliRunDigitizer * manager = new AliRunDigitizer(1,1); - manager->SetInputStream(0,runLoader->GetFileName(),AliConfig::fgkDefaultEventFolderName); + manager->SetInputStream(0,runLoader->GetFileName(),AliConfig::GetDefaultEventFolderName()); AliMUONDigitizer * dMUON = new AliMUONSDigitizerv1(manager); fLoader->LoadHits("READ"); for (Int_t iEvent = 0; iEvent < runLoader->GetNumberOfEvents(); iEvent++) { diff --git a/MUON/AliMUONEventReconstructor.cxx b/MUON/AliMUONEventReconstructor.cxx index abba3d54083..129400b24bd 100644 --- a/MUON/AliMUONEventReconstructor.cxx +++ b/MUON/AliMUONEventReconstructor.cxx @@ -454,7 +454,7 @@ void AliMUONEventReconstructor::MakeEventToBeReconstructed(void) // To make the list of hits to be reconstructed, // either from the GEANT hits or from the raw clusters // according to the parameter set for the reconstructor -// TString evfoldname = AliConfig::fgkDefaultEventFolderName;//to be interfaced properly +// TString evfoldname = AliConfig::GetDefaultEventFolderName();//to be interfaced properly // AliRunLoader* rl = AliRunLoader::GetRunLoader(evfoldname); // if (rl == 0x0) @@ -748,7 +748,7 @@ void AliMUONEventReconstructor::AddHitsForRecFromRawClusters(TTree* TR) TClonesArray *rawclusters; if (fPrintLevel >= 1) cout << "enter AddHitsForRecFromRawClusters" << endl; -// TString evfoldname = AliConfig::fgkDefaultEventFolderName;//to be interfaced properly +// TString evfoldname = AliConfig::GetDefaultEventFolderName();//to be interfaced properly // AliRunLoader* rl = AliRunLoader::GetRunLoader(evfoldname); // if (rl == 0x0) // { diff --git a/MUON/mapping/AliMpSectorPainter.cxx b/MUON/mapping/AliMpSectorPainter.cxx index 8dae4f70645..f0fd6c47b44 100755 --- a/MUON/mapping/AliMpSectorPainter.cxx +++ b/MUON/mapping/AliMpSectorPainter.cxx @@ -224,8 +224,8 @@ void AliMpSectorPainter::Paint(Option_t* /*option*/) pos.X()+dim.X(),pos.Y()+dim.Y()); if (iRow>0){ - gPad->DrawLine(pos.X()-dim.X(),pos.Y()-dim.Y(),lx1,pos.Y()-dim.Y()); - gPad->DrawLine(pos.X()+dim.X(),pos.Y()-dim.Y(),lx2,pos.Y()-dim.Y()); + gPad->PaintLine(pos.X()-dim.X(),pos.Y()-dim.Y(),lx1,pos.Y()-dim.Y()); + gPad->PaintLine(pos.X()+dim.X(),pos.Y()-dim.Y(),lx2,pos.Y()-dim.Y()); } lx1=pos.X()-dim.X(); lx2=pos.X()+dim.X(); @@ -236,12 +236,12 @@ void AliMpSectorPainter::Paint(Option_t* /*option*/) AliMpRow *row = fSector->GetRow(0); TVector2 pos,dim; gr->RealToPad(row->Position(),row->Dimensions(),pos,dim); - gPad->DrawLine(pos.X()-dim.X(),pos.Y()-dim.Y(), + gPad->PaintLine(pos.X()-dim.X(),pos.Y()-dim.Y(), pos.X()+dim.X(),pos.Y()-dim.Y()); row = fSector->GetRow(fSector->GetNofRows()-1); gr->RealToPad(row->Position(),row->Dimensions(),pos,dim); - gPad->DrawLine(pos.X()-dim.X(),pos.Y()+dim.Y(), + gPad->PaintLine(pos.X()-dim.X(),pos.Y()+dim.Y(), pos.X()+dim.X(),pos.Y()+dim.Y()); gr->Pop(); diff --git a/PHOS/AliPHOS.cxx b/PHOS/AliPHOS.cxx index 2577290383d..941ffa3d08d 100644 --- a/PHOS/AliPHOS.cxx +++ b/PHOS/AliPHOS.cxx @@ -389,9 +389,9 @@ void AliPHOS::FillESD(AliESD* esd) const for (index = 0; index < taskslist->GetSize(); index++) { task = dynamic_cast(taskslist->At(index)) ; name = task->GetName() ; - if ( name.Contains(AliConfig::fgkReconstructionerTaskName)) + if ( name.Contains(AliConfig::Instance()->GetReconstructionerTaskName())) task->SetActive(kFALSE) ; - if ( name.Contains(AliConfig::fgkTrackerTaskName)) + if ( name.Contains(AliConfig::Instance()->GetTrackerTaskName())) (dynamic_cast (task))->SetESD(esd) ; } rec->SetEventRange(0, -1) ; // do all the events @@ -477,7 +477,7 @@ void AliPHOS::Reconstruct() const for (index = 0; index < taskslist->GetSize(); index++) { task = dynamic_cast(taskslist->At(index)) ; name = task->GetName() ; - if ( !name.Contains(AliConfig::fgkReconstructionerTaskName)) + if ( !name.Contains(AliConfig::Instance()->GetReconstructionerTaskName())) task->SetActive(kFALSE) ; } rec->SetEventRange(0, -1) ; // do all the events diff --git a/PHOS/AliPHOSClusterizer.cxx b/PHOS/AliPHOSClusterizer.cxx index a83a458e60c..5a8398a1282 100644 --- a/PHOS/AliPHOSClusterizer.cxx +++ b/PHOS/AliPHOSClusterizer.cxx @@ -41,8 +41,10 @@ ClassImp(AliPHOSClusterizer) } //____________________________________________________________________________ -AliPHOSClusterizer::AliPHOSClusterizer(const TString alirunFileName, const TString eventFolderName): - TTask("PHOS"+AliConfig::fgkReconstructionerTaskName, alirunFileName), fEventFolderName(eventFolderName) +AliPHOSClusterizer::AliPHOSClusterizer(const TString alirunFileName, + const TString eventFolderName): + TTask("PHOS"+AliConfig::Instance()->GetReconstructionerTaskName(), + alirunFileName), fEventFolderName(eventFolderName) { // ctor diff --git a/PHOS/AliPHOSClusterizer.h b/PHOS/AliPHOSClusterizer.h index b768ee0f39e..8b135209cff 100644 --- a/PHOS/AliPHOSClusterizer.h +++ b/PHOS/AliPHOSClusterizer.h @@ -24,7 +24,7 @@ class AliPHOSClusterizer : public TTask { public: AliPHOSClusterizer() ; // default ctor - AliPHOSClusterizer(const TString alirunFileName, const TString eventFolderName = AliConfig::fgkDefaultEventFolderName) ; + AliPHOSClusterizer(const TString alirunFileName, const TString eventFolderName = AliConfig::GetDefaultEventFolderName()) ; AliPHOSClusterizer(const AliPHOSClusterizer & clusterizer) : TTask(clusterizer) { ; } virtual ~AliPHOSClusterizer() ; // dtor virtual Float_t GetEmcClusteringThreshold()const {Warning("GetEmcClusteringThreshold", "Not Defined" ) ; return 0. ; } diff --git a/PHOS/AliPHOSClusterizerv1.h b/PHOS/AliPHOSClusterizerv1.h index 48281f2ffac..d7ac6ca4fbc 100644 --- a/PHOS/AliPHOSClusterizerv1.h +++ b/PHOS/AliPHOSClusterizerv1.h @@ -32,7 +32,7 @@ class AliPHOSClusterizerv1 : public AliPHOSClusterizer { public: AliPHOSClusterizerv1() ; - AliPHOSClusterizerv1(const TString alirunFileNameFile, const TString eventFolderName = AliConfig::fgkDefaultEventFolderName); + AliPHOSClusterizerv1(const TString alirunFileNameFile, const TString eventFolderName = AliConfig::GetDefaultEventFolderName()); AliPHOSClusterizerv1(const AliPHOSClusterizerv1 & clu) : AliPHOSClusterizer(clu) { // cpy ctor: no implementation yet // requested by the Coding Convention diff --git a/PHOS/AliPHOSDigitizer.cxx b/PHOS/AliPHOSDigitizer.cxx index 3a9e9377e8c..25382737b25 100644 --- a/PHOS/AliPHOSDigitizer.cxx +++ b/PHOS/AliPHOSDigitizer.cxx @@ -90,8 +90,10 @@ ClassImp(AliPHOSDigitizer) } //____________________________________________________________________________ -AliPHOSDigitizer::AliPHOSDigitizer(TString alirunFileName, TString eventFolderName): - AliDigitizer("PHOS"+AliConfig::fgkDigitizerTaskName, alirunFileName), +AliPHOSDigitizer::AliPHOSDigitizer(TString alirunFileName, + TString eventFolderName): + AliDigitizer("PHOS"+AliConfig::Instance()->GetDigitizerTaskName(), + alirunFileName), fInputFileNames(0), fEventNames(0), fEventFolderName(eventFolderName) { // ctor @@ -127,7 +129,7 @@ AliPHOSDigitizer::AliPHOSDigitizer(const AliPHOSDigitizer & d) //____________________________________________________________________________ AliPHOSDigitizer::AliPHOSDigitizer(AliRunDigitizer * rd): - AliDigitizer(rd,"PHOS"+AliConfig::fgkDigitizerTaskName), + AliDigitizer(rd,"PHOS"+AliConfig::Instance()->GetDigitizerTaskName()), fEventFolderName(0) { // ctor Init() is called by RunDigitizer @@ -569,7 +571,7 @@ void AliPHOSDigitizer::MixWith(TString alirunFileName, TString eventFolderName) // looking for the file which contains SDigits AliPHOSGetter * gime = AliPHOSGetter::Instance() ; TString fileName( gime->GetSDigitsFileName() ) ; - if ( eventFolderName != AliConfig::fgkDefaultEventFolderName) // only if not the default folder name + if ( eventFolderName != AliConfig::GetDefaultEventFolderName()) // only if not the default folder name fileName = fileName.ReplaceAll(".root", "") + "_" + eventFolderName + ".root" ; if ( (gSystem->AccessPathName(fileName)) ) { Error("MixWith", "The file %s does not exist!", fileName.Data()) ; @@ -611,7 +613,7 @@ void AliPHOSDigitizer::Print()const tempo += index ; AliPHOSGetter * gime = AliPHOSGetter::Instance(fInputFileNames[index], tempo) ; TString fileName( gime->GetSDigitsFileName() ) ; - if ( fEventNames[index] != AliConfig::fgkDefaultEventFolderName) // only if not the default folder name + if ( fEventNames[index] != AliConfig::GetDefaultEventFolderName()) // only if not the default folder name fileName = fileName.ReplaceAll(".root", "") + "_" + fEventNames[index] + ".root" ; printf ("Adding SDigits from %s %s\n", fInputFileNames[index].Data(), fileName.Data()) ; } diff --git a/PHOS/AliPHOSDigitizer.h b/PHOS/AliPHOSDigitizer.h index 42ffe6d6b9d..080d4ad2fa6 100644 --- a/PHOS/AliPHOSDigitizer.h +++ b/PHOS/AliPHOSDigitizer.h @@ -30,7 +30,7 @@ class AliPHOSDigitizer: public AliDigitizer { public: AliPHOSDigitizer() ; // ctor - AliPHOSDigitizer(TString alirunFileNameFile, TString eventFolderName = AliConfig::fgkDefaultEventFolderName) ; + AliPHOSDigitizer(TString alirunFileNameFile, TString eventFolderName = AliConfig::GetDefaultEventFolderName()) ; AliPHOSDigitizer(const AliPHOSDigitizer & dtizer) ; AliPHOSDigitizer(AliRunDigitizer * manager) ; virtual ~AliPHOSDigitizer() ; @@ -70,7 +70,7 @@ public: //General Int_t GetDigitsInRun() const { return fDigitsInRun ;} void MixWith(TString alirunFileName, - TString eventFolderName = AliConfig::fgkDefaultEventFolderName) ; // Add another one file to mix + TString eventFolderName = AliConfig::GetDefaultEventFolderName()) ; // Add another one file to mix void Print()const ; AliPHOSDigitizer & operator = (const AliPHOSDigitizer & /*rvalue*/) { diff --git a/PHOS/AliPHOSEmcRecPoint.cxx b/PHOS/AliPHOSEmcRecPoint.cxx index 5bfa2068faa..0868f960181 100644 --- a/PHOS/AliPHOSEmcRecPoint.cxx +++ b/PHOS/AliPHOSEmcRecPoint.cxx @@ -227,7 +227,7 @@ void AliPHOSEmcRecPoint::ExecuteEvent(Int_t event, Int_t, Int_t) const //try to get run loader from default event folder - AliRunLoader* rn = AliRunLoader::GetRunLoader(AliConfig::fgkDefaultEventFolderName); + AliRunLoader* rn = AliRunLoader::GetRunLoader(AliConfig::GetDefaultEventFolderName()); if (rn == 0x0) { Error("ExecuteEvent","Can not find Run Loader in Default Event Folder"); diff --git a/PHOS/AliPHOSEvalRecPoint.cxx b/PHOS/AliPHOSEvalRecPoint.cxx index 59311ddc03c..0984cbd415b 100644 --- a/PHOS/AliPHOSEvalRecPoint.cxx +++ b/PHOS/AliPHOSEvalRecPoint.cxx @@ -46,7 +46,7 @@ ClassImp(AliPHOSEvalRecPoint) - AliPHOSEvalRecPoint::AliPHOSEvalRecPoint(): fEventFolderName(AliConfig::fgkDefaultEventFolderName) + AliPHOSEvalRecPoint::AliPHOSEvalRecPoint(): fEventFolderName(AliConfig::GetDefaultEventFolderName()) { // default ctor fParent=-333; @@ -84,7 +84,7 @@ AliPHOSEvalRecPoint::AliPHOSEvalRecPoint(Bool_t cpv, AliPHOSEvalRecPoint* parent } -AliPHOSEvalRecPoint::AliPHOSEvalRecPoint(Int_t i, Bool_t cpv) : fEventFolderName(AliConfig::fgkDefaultEventFolderName) +AliPHOSEvalRecPoint::AliPHOSEvalRecPoint(Int_t i, Bool_t cpv) : fEventFolderName(AliConfig::GetDefaultEventFolderName()) { // ctor fChi2Dof=-111; diff --git a/PHOS/AliPHOSGetter.cxx b/PHOS/AliPHOSGetter.cxx index 4b55e07a15b..63ec849b700 100644 --- a/PHOS/AliPHOSGetter.cxx +++ b/PHOS/AliPHOSGetter.cxx @@ -355,7 +355,7 @@ AliPHOSGetter * AliPHOSGetter::Instance(const char* alirunFileName, const char* } else { AliRunLoader * rl = AliRunLoader::GetRunLoader(fgPhosLoader->GetTitle()) ; - if ( strstr(version, AliConfig::fgkDefaultEventFolderName) ) // false in case of merging + if ( strstr(version, AliConfig::GetDefaultEventFolderName()) ) // false in case of merging delete rl ; fgObjGetter = new AliPHOSGetter(alirunFileName, version, openingOption) ; } @@ -772,7 +772,7 @@ Bool_t AliPHOSGetter::VersionExists(TString & opt) const if ( opt == "sdigits") { // add the version name to the root file name TString fileName( PhosLoader()->GetSDigitsFileName() ) ; - if (version != AliConfig::fgkDefaultEventFolderName) // only if not the default folder name + if (version != AliConfig::GetDefaultEventFolderName()) // only if not the default folder name fileName = fileName.ReplaceAll(".root", "") + "_" + version + ".root" ; if ( !(gSystem->AccessPathName(fileName)) ) { Warning("VersionExists", "The file %s already exists", fileName.Data()) ; @@ -784,7 +784,7 @@ Bool_t AliPHOSGetter::VersionExists(TString & opt) const if ( opt == "digits") { // add the version name to the root file name TString fileName( PhosLoader()->GetDigitsFileName() ) ; - if (version != AliConfig::fgkDefaultEventFolderName) // only if not the default folder name + if (version != AliConfig::GetDefaultEventFolderName()) // only if not the default folder name fileName = fileName.ReplaceAll(".root", "") + "_" + version + ".root" ; if ( !(gSystem->AccessPathName(fileName)) ) { Warning("VersionExists", "The file %s already exists", fileName.Data()) ; diff --git a/PHOS/AliPHOSGetter.h b/PHOS/AliPHOSGetter.h index b083d7488c1..e647553ee7e 100644 --- a/PHOS/AliPHOSGetter.h +++ b/PHOS/AliPHOSGetter.h @@ -62,7 +62,7 @@ public: //=========== Instantiators ================ static AliPHOSGetter * Instance(const char* headerFile, - const char* version = AliConfig::fgkDefaultEventFolderName, + const char* version = AliConfig::GetDefaultEventFolderName(), Option_t * openingOption = "READ" ) ; static AliPHOSGetter * Instance() ; @@ -190,7 +190,7 @@ public: private: AliPHOSGetter(const char* headerFile, - const char* version = AliConfig::fgkDefaultEventFolderName, + const char* version = AliConfig::GetDefaultEventFolderName(), Option_t * openingOption = "READ") ; Int_t ReadTreeD(void) ; diff --git a/PHOS/AliPHOSLoader.h b/PHOS/AliPHOSLoader.h index 676f1a7d145..6da175dc4d1 100644 --- a/PHOS/AliPHOSLoader.h +++ b/PHOS/AliPHOSLoader.h @@ -156,7 +156,7 @@ public: /************ T A S K S **************/ /*********************************************/ // - // AliPHOSSDigitizer* PHOSSDigitizer(TString name = AliConfig::fgkDefaultEventFolderName); + // AliPHOSSDigitizer* PHOSSDigitizer(TString name = AliConfig::GetDefaultEventFolderName()); //AliPHOSDigitizer* PHOSDigitizer() { return dynamic_cast(Digitizer()) ;} AliPHOSClusterizer* Clusterizer () const {return dynamic_cast(Reconstructioner()) ;} diff --git a/PHOS/AliPHOSPID.cxx b/PHOS/AliPHOSPID.cxx index 3101f1a1351..1504ec659bb 100644 --- a/PHOS/AliPHOSPID.cxx +++ b/PHOS/AliPHOSPID.cxx @@ -47,8 +47,9 @@ ClassImp(AliPHOSPID) //____________________________________________________________________________ -AliPHOSPID::AliPHOSPID(const TString alirunFileName, const TString eventFolderName) -:TTask("PHOS"+AliConfig::fgkPIDTaskName, alirunFileName), fEventFolderName(eventFolderName) +AliPHOSPID::AliPHOSPID(const TString alirunFileName, const TString eventFolderName): + TTask("PHOS"+AliConfig::Instance()->GetPIDTaskName(), alirunFileName), + fEventFolderName(eventFolderName) { // ctor fFirstEvent = 0 ; diff --git a/PHOS/AliPHOSPID.h b/PHOS/AliPHOSPID.h index 22069283e45..23ce334477a 100644 --- a/PHOS/AliPHOSPID.h +++ b/PHOS/AliPHOSPID.h @@ -32,7 +32,7 @@ class AliPHOSPID : public TTask { public: AliPHOSPID() ; // ctor - AliPHOSPID (const TString alirunFileName, const TString eventFolderName = AliConfig::fgkDefaultEventFolderName) ; + AliPHOSPID (const TString alirunFileName, const TString eventFolderName = AliConfig::GetDefaultEventFolderName()) ; AliPHOSPID(const AliPHOSPID & pid) : TTask(pid) {;} virtual ~AliPHOSPID() ; // dtor diff --git a/PHOS/AliPHOSPIDv1.h b/PHOS/AliPHOSPIDv1.h index 3ee659f7538..90fed9f3a21 100644 --- a/PHOS/AliPHOSPIDv1.h +++ b/PHOS/AliPHOSPIDv1.h @@ -30,7 +30,7 @@ class AliPHOSPIDv1 : public AliPHOSPID { public: AliPHOSPIDv1() ; // ctor - AliPHOSPIDv1(const TString alirunFileNameFile, const TString eventFolderName = AliConfig::fgkDefaultEventFolderName) ; + AliPHOSPIDv1(const TString alirunFileNameFile, const TString eventFolderName = AliConfig::GetDefaultEventFolderName()) ; AliPHOSPIDv1(const AliPHOSPIDv1 & pid) ; // cpy ctor virtual ~AliPHOSPIDv1() ; // dtor diff --git a/PHOS/AliPHOSSDigitizer.cxx b/PHOS/AliPHOSSDigitizer.cxx index 6a64e8d8ea5..23ea4a26971 100644 --- a/PHOS/AliPHOSSDigitizer.cxx +++ b/PHOS/AliPHOSSDigitizer.cxx @@ -75,8 +75,9 @@ ClassImp(AliPHOSSDigitizer) } //____________________________________________________________________________ -AliPHOSSDigitizer::AliPHOSSDigitizer(const char * alirunFileName, const char * eventFolderName): - TTask("PHOS"+AliConfig::fgkSDigitizerTaskName, alirunFileName), +AliPHOSSDigitizer::AliPHOSSDigitizer(const char * alirunFileName, + const char * eventFolderName): + TTask("PHOS"+AliConfig::Instance()->GetSDigitizerTaskName(), alirunFileName), fEventFolderName(eventFolderName) { diff --git a/PHOS/AliPHOSSDigitizer.h b/PHOS/AliPHOSSDigitizer.h index 964324150b4..f45046fe6a1 100644 --- a/PHOS/AliPHOSSDigitizer.h +++ b/PHOS/AliPHOSSDigitizer.h @@ -26,7 +26,7 @@ class AliPHOSSDigitizer: public TTask { public: AliPHOSSDigitizer() ; // ctor - AliPHOSSDigitizer(const char * alirunFileName, const char * eventFolderName = AliConfig::fgkDefaultEventFolderName) ; + AliPHOSSDigitizer(const char * alirunFileName, const char * eventFolderName = AliConfig::GetDefaultEventFolderName()) ; AliPHOSSDigitizer(const AliPHOSSDigitizer & sd) ; // cpy ctor virtual ~AliPHOSSDigitizer(); // dtor diff --git a/PHOS/AliPHOSTrackSegmentMaker.cxx b/PHOS/AliPHOSTrackSegmentMaker.cxx index 02a9deaa890..6d9a4aa088a 100644 --- a/PHOS/AliPHOSTrackSegmentMaker.cxx +++ b/PHOS/AliPHOSTrackSegmentMaker.cxx @@ -45,8 +45,10 @@ ClassImp( AliPHOSTrackSegmentMaker) } //____________________________________________________________________________ -AliPHOSTrackSegmentMaker::AliPHOSTrackSegmentMaker(const TString alirunFileName, const TString eventFolderName): - TTask("PHOS"+AliConfig::fgkTrackerTaskName, alirunFileName), fEventFolderName(eventFolderName) +AliPHOSTrackSegmentMaker::AliPHOSTrackSegmentMaker(const TString alirunFileName, + const TString eventFolderName): + TTask("PHOS"+AliConfig::Instance()->GetTrackerTaskName(), alirunFileName), + fEventFolderName(eventFolderName) { // ctor fFirstEvent = 0 ; diff --git a/PHOS/AliPHOSTrackSegmentMaker.h b/PHOS/AliPHOSTrackSegmentMaker.h index d2edbe8598d..f4d06c1d28d 100644 --- a/PHOS/AliPHOSTrackSegmentMaker.h +++ b/PHOS/AliPHOSTrackSegmentMaker.h @@ -32,7 +32,7 @@ class AliPHOSTrackSegmentMaker : public TTask { public: AliPHOSTrackSegmentMaker(); - AliPHOSTrackSegmentMaker(const TString alirunFileName, const TString eventFolderName = AliConfig::fgkDefaultEventFolderName) ; + AliPHOSTrackSegmentMaker(const TString alirunFileName, const TString eventFolderName = AliConfig::GetDefaultEventFolderName()) ; AliPHOSTrackSegmentMaker(const AliPHOSTrackSegmentMaker & tsmaker) : TTask(tsmaker) { ; } virtual ~ AliPHOSTrackSegmentMaker() ; diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.h b/PHOS/AliPHOSTrackSegmentMakerv1.h index 53417fac45f..5ca4ed33f2a 100644 --- a/PHOS/AliPHOSTrackSegmentMakerv1.h +++ b/PHOS/AliPHOSTrackSegmentMakerv1.h @@ -27,7 +27,7 @@ class AliPHOSTrackSegmentMakerv1 : public AliPHOSTrackSegmentMaker { public: AliPHOSTrackSegmentMakerv1() ; - AliPHOSTrackSegmentMakerv1(const TString alirunFileNameFile, const TString eventFolderName = AliConfig::fgkDefaultEventFolderName); + AliPHOSTrackSegmentMakerv1(const TString alirunFileNameFile, const TString eventFolderName = AliConfig::GetDefaultEventFolderName()); AliPHOSTrackSegmentMakerv1(const AliPHOSTrackSegmentMakerv1 & tsm) : AliPHOSTrackSegmentMaker(tsm) { // cpy ctor: no implementation yet // requested by the Coding Convention diff --git a/PMD/AliPMDClusterFinder.cxx b/PMD/AliPMDClusterFinder.cxx index 588ea90b7af..f7064b1020a 100644 --- a/PMD/AliPMDClusterFinder.cxx +++ b/PMD/AliPMDClusterFinder.cxx @@ -73,7 +73,7 @@ void AliPMDClusterFinder::OpengAliceFile(Char_t *file, Option_t *option) // Loads galice.root file and corresponding header, kinematics // hits and sdigits or digits depending on the option // - fRunLoader = AliRunLoader::Open(file,AliConfig::fgkDefaultEventFolderName, + fRunLoader = AliRunLoader::Open(file,AliConfig::GetDefaultEventFolderName(), "UPDATE"); if (!fRunLoader) diff --git a/PMD/AliPMDDigitizer.cxx b/PMD/AliPMDDigitizer.cxx index 7e3cd77b5ad..20effa2f42f 100644 --- a/PMD/AliPMDDigitizer.cxx +++ b/PMD/AliPMDDigitizer.cxx @@ -131,10 +131,10 @@ void AliPMDDigitizer::OpengAliceFile(const char *file, Option_t *option) // hits and sdigits or digits depending on the option // - TString evfoldname = AliConfig::fgkDefaultEventFolderName; + TString evfoldname = AliConfig::GetDefaultEventFolderName(); fRunLoader = AliRunLoader::GetRunLoader(evfoldname); if (!fRunLoader) - fRunLoader = AliRunLoader::Open(file,AliConfig::fgkDefaultEventFolderName, + fRunLoader = AliRunLoader::Open(file,AliConfig::GetDefaultEventFolderName(), "UPDATE"); if (!fRunLoader) diff --git a/START/AliSTARTvertex.cxx b/START/AliSTARTvertex.cxx index e726d0074cd..840764ca1d4 100644 --- a/START/AliSTARTvertex.cxx +++ b/START/AliSTARTvertex.cxx @@ -52,7 +52,7 @@ void AliSTARTvertex::Reconstruct() char nameTD[8],nameTR[8]; char filename[100]; sprintf(filename,"galice.root"); - AliRunLoader* rl = AliRunLoader::Open("galice.root",AliConfig::fgkDefaultEventFolderName,"read"); + AliRunLoader* rl = AliRunLoader::Open("galice.root",AliConfig::GetDefaultEventFolderName(),"read"); if (rl == 0x0) { cerr<<"Can not open session for file galice.root\n"; diff --git a/STEER/AliConfig.h b/STEER/AliConfig.h index 709f4276430..cca69a9bf39 100644 --- a/STEER/AliConfig.h +++ b/STEER/AliConfig.h @@ -5,6 +5,12 @@ /* $Id$ */ +// +// Class to name the folders +// This class contains +// the names of the top level folders +// + #include class TDatabasePDG; class TFolder; @@ -49,6 +55,9 @@ public: TFolder* GetConstFolder(){return fConstFolder;} static const TString& GetModulesFolderName(){return fgkModuleFolderName;} + static const TString& GetDefaultEventFolderName() + {return fgkDefaultEventFolderName;} + static const TString& GetTasksFolderName() {return fgkTasksFolderName;} TString GetQATaskName() const; //returns path to QA tasks TString GetDigitizerTaskName () const; @@ -61,7 +70,8 @@ public: const TString& GetQAFolderName() const; //returns path to folder with QA output const TString& GetDataFolderName() const;//returns name of data folder - + +private: static const TString fgkTopFolderName; //name of top AliRoot folder static const TString fgkDefaultEventFolderName; //name of event folder @@ -89,7 +99,6 @@ public: static const TString fgkGeneratorsFolderName; //name of generator folder static const TString fgkVirtualMCFolderName; //name of virtual MC folder -private: AliConfig(const char * name, const char * title ); AliConfig(const AliConfig&); AliConfig& operator=(const AliConfig&); diff --git a/STEER/AliLoader.cxx b/STEER/AliLoader.cxx index 8c718fc9808..b48d7d991af 100644 --- a/STEER/AliLoader.cxx +++ b/STEER/AliLoader.cxx @@ -282,7 +282,7 @@ TFolder* AliLoader::GetDataFolder() //returns the folder speciofic to given detector e.g. /Folders/Event/Data/ if (!fDataFolder) { - fDataFolder = dynamic_cast(GetEventFolder()->FindObject(AliConfig::fgkDataFolderName)); + fDataFolder = dynamic_cast(GetEventFolder()->FindObject(AliConfig::Instance()->GetDataFolderName())); if (!fDataFolder) { @@ -300,7 +300,7 @@ TFolder* AliLoader::GetTasksFolder() //Returns pointer to Folder with Alice Tasks if (!fTasksFolder) { - fTasksFolder = dynamic_cast(GetTopFolder()->FindObject(AliConfig::fgkTasksFolderName)); + fTasksFolder = dynamic_cast(GetTopFolder()->FindObject(AliConfig::GetTasksFolderName())); if (!fTasksFolder) { diff --git a/STEER/AliRun.h b/STEER/AliRun.h index 4e0831558cc..5997bb3eb43 100644 --- a/STEER/AliRun.h +++ b/STEER/AliRun.h @@ -5,6 +5,10 @@ /* $Id$ */ +// +// General configuration class for folders +// + #include #include #include diff --git a/STEER/AliRunLoader.cxx b/STEER/AliRunLoader.cxx index 3e2dce5bf2c..373e815bfdb 100644 --- a/STEER/AliRunLoader.cxx +++ b/STEER/AliRunLoader.cxx @@ -23,7 +23,7 @@ // When RunLoader is read from the file it does not connect to // // the folder structure automatically. It must be connected // // (mounted) manualy. Default event folder is defined by // -// AliConfig::fgkDefaultEventFolderName // +// AliConfig::GetDefaultEventFolderName() // // but can be mounted elsewhere. Usefull specially in merging case, // // when more than pone session needs to be loaded // // // diff --git a/STEER/AliRunLoader.h b/STEER/AliRunLoader.h index af3f804a2a7..2989830104c 100644 --- a/STEER/AliRunLoader.h +++ b/STEER/AliRunLoader.h @@ -54,7 +54,7 @@ class AliRunLoader: public TNamed virtual ~AliRunLoader(); static AliRunLoader* Open(const char* filename = "galice.root", - const char* eventfoldername = AliConfig::fgkDefaultEventFolderName, + const char* eventfoldername = AliConfig::GetDefaultEventFolderName(), Option_t* option = "READ"); Int_t GetEventNumber() const {return fCurrentEvent;} @@ -125,7 +125,7 @@ class AliRunLoader: public TNamed void AddLoader(AliDetector* det); AliLoader* GetLoader(const char* detname) const; AliLoader* GetLoader(AliDetector* det) const; - Int_t SetEventFolderName(const TString& name = AliConfig::fgkDefaultEventFolderName);//sets top folder name for this run; of alread + Int_t SetEventFolderName(const TString& name = AliConfig::GetDefaultEventFolderName());//sets top folder name for this run; of alread void CleanFolders();//removes all abjects from folder structure void CleanDetectors(); void CleanKinematics(){Clean(fgkKineContainerName);} diff --git a/STEER/AliSimulation.cxx b/STEER/AliSimulation.cxx index c78336526f8..002fadce34c 100644 --- a/STEER/AliSimulation.cxx +++ b/STEER/AliSimulation.cxx @@ -449,7 +449,7 @@ AliRunLoader* AliSimulation::LoadRun() const while (AliRunLoader::GetRunLoader()) delete AliRunLoader::GetRunLoader(); AliRunLoader* runLoader = AliRunLoader::Open(fGAliceFileName.Data(), - AliConfig::fgkDefaultEventFolderName, "UPDATE"); + AliConfig::GetDefaultEventFolderName(), "UPDATE"); if (!runLoader) { Error("LoadRun", "no run loader found in file %s", fGAliceFileName.Data()); diff --git a/STEER/AliStack.cxx b/STEER/AliStack.cxx index fa7001effff..03bfdf84e4d 100644 --- a/STEER/AliStack.cxx +++ b/STEER/AliStack.cxx @@ -51,7 +51,7 @@ AliStack::AliStack(): fCurrentPrimary(-1), fHgwmk(0), fLoadPoint(0), - fEventFolderName(AliConfig::fgkDefaultEventFolderName) + fEventFolderName(AliConfig::GetDefaultEventFolderName()) { // // Default constructor diff --git a/STEER/AliStack.h b/STEER/AliStack.h index 4bb4b1aec94..961af6ded84 100644 --- a/STEER/AliStack.h +++ b/STEER/AliStack.h @@ -22,7 +22,7 @@ class AliStack : public TVirtualMCStack { public: // creators, destructors - AliStack(Int_t size, const char* evfoldname = AliConfig::fgkDefaultEventFolderName); + AliStack(Int_t size, const char* evfoldname = AliConfig::GetDefaultEventFolderName()); AliStack(); AliStack(const AliStack& st); virtual ~AliStack(); diff --git a/TOF/AliTOFSDigitizer.cxx b/TOF/AliTOFSDigitizer.cxx index 3f585e363b0..35ac4de48cd 100644 --- a/TOF/AliTOFSDigitizer.cxx +++ b/TOF/AliTOFSDigitizer.cxx @@ -90,7 +90,7 @@ AliTOFSDigitizer::AliTOFSDigitizer(const char* HeaderFile, Int_t evNumber1, Int_ } // add Task to //root/Tasks folder - TString evfoldname = AliConfig::fgkDefaultEventFolderName; + TString evfoldname = AliConfig::GetDefaultEventFolderName(); fRunLoader = AliRunLoader::GetRunLoader(evfoldname); if (!fRunLoader) fRunLoader = AliRunLoader::Open(HeaderFile);//open session and mount on default event folder diff --git a/TPC/AliTPCtrackerMI.cxx b/TPC/AliTPCtrackerMI.cxx index c781370510b..d0f3689fd6a 100644 --- a/TPC/AliTPCtrackerMI.cxx +++ b/TPC/AliTPCtrackerMI.cxx @@ -276,9 +276,9 @@ void AliTPCtrackerMI::SetIO() { // fNewIO = kTRUE; - fInput = AliRunLoader::GetTreeR("TPC", kFALSE,AliConfig::fgkDefaultEventFolderName); + fInput = AliRunLoader::GetTreeR("TPC", kFALSE,AliConfig::GetDefaultEventFolderName()); - fOutput = AliRunLoader::GetTreeT("TPC", kTRUE,AliConfig::fgkDefaultEventFolderName); + fOutput = AliRunLoader::GetTreeT("TPC", kTRUE,AliConfig::GetDefaultEventFolderName()); if (fOutput){ AliTPCtrack *iotrack= new AliTPCtrack; fOutput->Branch("tracks","AliTPCtrack",&iotrack,32000,100); diff --git a/TPC/AliTPCtrackerParam.h b/TPC/AliTPCtrackerParam.h index ec4e516d70e..598ed2a21ac 100644 --- a/TPC/AliTPCtrackerParam.h +++ b/TPC/AliTPCtrackerParam.h @@ -48,7 +48,7 @@ class AliTPCtrackerParam: ///////////////////////////////////////////////////////////////////////// public: AliTPCtrackerParam(Int_t coll=0, Double_t Bz=0.4, Int_t n=1, - const char* evfoldname = AliConfig::fgkDefaultEventFolderName); + const char* evfoldname = AliConfig::GetDefaultEventFolderName()); virtual ~AliTPCtrackerParam(); // this function performs the parameterized tracking diff --git a/TRD/AliTRDclusterizer.cxx b/TRD/AliTRDclusterizer.cxx index 171a1368488..d04fb07aede 100644 --- a/TRD/AliTRDclusterizer.cxx +++ b/TRD/AliTRDclusterizer.cxx @@ -120,7 +120,7 @@ Bool_t AliTRDclusterizer::Open(const Char_t *name, Int_t nEvent) // // Opens the AliROOT file. Output and input are in the same file // - TString evfoldname = AliConfig::fgkDefaultEventFolderName; + TString evfoldname = AliConfig::GetDefaultEventFolderName(); fRunLoader = AliRunLoader::GetRunLoader(evfoldname); if (!fRunLoader) fRunLoader = AliRunLoader::Open(name); diff --git a/TRD/AliTRDdigitizer.cxx b/TRD/AliTRDdigitizer.cxx index 2dd51c048fb..418935e9460 100644 --- a/TRD/AliTRDdigitizer.cxx +++ b/TRD/AliTRDdigitizer.cxx @@ -425,10 +425,10 @@ Bool_t AliTRDdigitizer::Open(const Char_t *file, Int_t nEvent) // Connect the AliRoot file containing Geometry, Kine, and Hits - TString evfoldname = AliConfig::fgkDefaultEventFolderName; + TString evfoldname = AliConfig::GetDefaultEventFolderName(); fRunLoader = AliRunLoader::GetRunLoader(evfoldname); if (!fRunLoader) - fRunLoader = AliRunLoader::Open(file,AliConfig::fgkDefaultEventFolderName, + fRunLoader = AliRunLoader::Open(file,AliConfig::GetDefaultEventFolderName(), "UPDATE"); if (!fRunLoader) diff --git a/VZERO/AliVZERODigitizer.cxx b/VZERO/AliVZERODigitizer.cxx index 7acb828b131..5eaf9a80b23 100644 --- a/VZERO/AliVZERODigitizer.cxx +++ b/VZERO/AliVZERODigitizer.cxx @@ -100,7 +100,7 @@ void AliVZERODigitizer::OpengAliceFile(const char *file) // Loads galice.root file and corresponding header, kinematics // hits and digits - fRunLoader = AliRunLoader::Open(file,AliConfig::fgkDefaultEventFolderName, + fRunLoader = AliRunLoader::Open(file,AliConfig::GetDefaultEventFolderName(), "UPDATE"); if (!fRunLoader) diff --git a/macros/Config.C b/macros/Config.C index 7f9415a0896..8966f4744da 100644 --- a/macros/Config.C +++ b/macros/Config.C @@ -74,7 +74,7 @@ void Config() cout<<"Config.C: Creating Run Loader ..."<