Coding conventions (F.Carminati)

diff --git a/EMCAL/AliEMCALClusterizer.cxx b/EMCAL/AliEMCALClusterizer.cxx
index 7a6a4b3fa74d65e526f3f7d8888f7e2f1f32f674..dc015462e452d01a4165284114748ed03a781b14 100644 (file)
--- 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 28fb44c27ee57ba04cac9ee0fa6bee9161df5816..bd61d21661d1905d11788baacbf7d79ca864f66e 100644 (file)
--- 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 e50b874c743b08d0e86436030600e6c15157038e..ee8d369b023fe7e1ee700d9a5f1bef2278a5c328 100644 (file)
--- 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 d7eddedb47af72a0dd0afde33bd06b51b99e595d..d122dc607b7f2be3691ce0492e10188f16d94490 100644 (file)
--- 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 f9ce91c062c83ff8414c3d5b9390188226c7fed9..b49919c3f9cb78c310be194578d539c033a6206b 100644 (file)
--- 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 b785bcd3a85acb50d97e993e923ae461304c25ba..b0a896265cf6dbf987e3fa7ecabbc65b2f496d03 100644 (file)
--- 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 8144826e221ff5f6aa621e5bcb6dbae8cc0b44af..9f63691101923ccdfd173e23aca97c92ea523a74 100644 (file)
--- 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 b95f3914f432d5a0bd9301bdb4dc102227ed696b..f897dc4a86579aaf9833412af5fd45923d147e80 100644 (file)
--- 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<AliEMCALDigitizer*>(Digitizer()) ;}
 
   AliEMCALClusterizer* Clusterizer ()  {return dynamic_cast<AliEMCALClusterizer*>(Reconstructioner()) ;}

diff --git a/EMCAL/AliEMCALPID.cxx b/EMCAL/AliEMCALPID.cxx
index b864e8c1f7b74ec3c97330bd78cc425b7b2475bd..a28c38a3a2d4e1fb38549e1ceb3b479f706b410a 100644 (file)
--- 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 eb47285280b32cb0c27fee7bfa62fc9ac7272933..e4fd3858a8665b4dd677a9b9845a20b1a0284a34 100644 (file)
--- 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 bffc60d968180cd43d2141fc7eea37d8a965501b..68a7f98bf282749589d241c2936d2fa09a9a66fe 100644 (file)
--- 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 674d654bd1907ba634fd172774a4bd80caa8e17f..56dd5118cd7fbec7c30c3c4eb34e2d1e25697681 100644 (file)
--- 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 6245983f16747153b6699b833ebceabcabb4bb0b..4429ce5c5b17b22ff7393ccdd393bacc3319d530 100644 (file)
--- 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 415bc78756bab0949d6b2e078e50c23965683b09..27523395a8373f6937ed11bf74f8b2581cd36e9e 100644 (file)
--- 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 af19f53f94951c6e6e8f24af021d8a66ce078ab4..f47342b38efbdb7a7aff6b3dee8d0de9cbeaf86d 100644 (file)
--- 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 6b8710fa123975164e3adaec6e3a0b8816e8f3bc..a3d53dcff44ad855310230f23ce6bdf33fb95bca 100644 (file)
--- 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 2018438327760f51ceed98b7c25de9ef7494e487..4f57aad04e18d8cfea1e54a4fb1d8b5c24a2d5c1 100644 (file)
--- 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 cc17bc1f97cf747e2b7a9f8f222f882f3aa9c8fa..b3e33a0834b285e0f7ddf0e9b84b7290a419dd5e 100644 (file)
--- 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 b0014441e5002a9894c106fa82bd943236fb4f1e..d6a4a2e350f7e54237be1c34d5de6ab1c998ac8b 100644 (file)
--- 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 abba3d5408366b0a9b0f2e1348782eb5a7fbeb83..129400b24bdfc2fe86ad4fd37e30c7feb1a98148 100644 (file)
--- 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 8dae4f706454075660717193be3f644f2c2504a1..f0fd6c47b446f77e8823c933a57bcf9c7b34062b 100755 (executable)
--- 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 2577290383de31b97e48b2cb2d3cc07a59eac3e8..941ffa3d08de8ea727877afb84c30a65113c02d3 100644 (file)
--- 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<TTask *>(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<AliPHOSTrackSegmentMaker *> (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<TTask *>(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 a83a458e60c4f0538001df9885a6b68ab05a6b98..5a8398a1282e7b8a04414ad4c882e03b33a483d3 100644 (file)
--- 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 b768ee0f39e04032ee9f2048aa40abbe6b3e1ca2..8b135209cff56493bc773a7fd75b90fdf6c90336 100644 (file)
--- 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 48281f2ffac5d26a887809c3b17669be6af696c2..d7ac6ca4fbc8b5acba608aa3919dc74ac73b6766 100644 (file)
--- 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 3a9e9377e8c7c85c1a90f6a5747d3ecb2780c366..25382737b250c271edf8c36bc33c752f0143362c 100644 (file)
--- 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 42ffe6d6b9d184ae99442afb89f1962a84aa1fff..080d4ad2fa6676f39ea755cd760c90673d849314 100644 (file)
--- 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 5bfa2068faaefafdab88cb8851986fedac99ad40..0868f9601812eea5988d6484d9770ff8d4777e82 100644 (file)
--- 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 59311ddc03c44f6edcfc60c47caa851452afeb94..0984cbd415b236b7e35d9d6797a0b05e6fb5c31a 100644 (file)
--- 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 4b55e07a15b7f3d6886289ea007c6695d83cd7aa..63ec849b7002156ee4c87768cb8f45a0ed39e7bf 100644 (file)
--- 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 b083d7488c12331ef0f149ecd75612fb99aae5e1..e647553ee7e5cdf083664b5cf7f6b8bb13cfd85d 100644 (file)
--- 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 676f1a7d145f9e77057202bd52078641fc2b337f..6da175dc4d1c5453e10cc347a1cbf67348bfb5bf 100644 (file)
--- 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<AliPHOSDigitizer*>(Digitizer()) ;}
 
   AliPHOSClusterizer* Clusterizer () const {return dynamic_cast<AliPHOSClusterizer*>(Reconstructioner()) ;}

diff --git a/PHOS/AliPHOSPID.cxx b/PHOS/AliPHOSPID.cxx
index 3101f1a13510a895023606a211073262a7c862f8..1504ec659bbcba98ce8810d6ef8ea4571cfe7107 100644 (file)
--- 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 22069283e455bdcf4508a320632957b4bc0fca83..23ce334477afa7cee8406efc1e8ed44f46139041 100644 (file)
--- 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 3ee659f7538b7d3898ebad4c1ae0414d928444d8..90fed9f3a210a2fb628439e0f78f2d69eda324b9 100644 (file)
--- 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 6a64e8d8ea52523d4f7020a8ceeb1dab9abb85f9..23ea4a26971b40872be4b4097fa64921dd9a1280 100644 (file)
--- 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 964324150b4b9051dfbc12c11864e9600addfc2d..f45046fe6a1c3b54a44b1e113469b3796be30051 100644 (file)
--- 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 02a9deaa890b8f76e078d779054d1cf47f3344f8..6d9a4aa088a72b2b08abde8adf5ec776e572374a 100644 (file)
--- 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 d2edbe8598dab69eb741ea02dbe4044c77f41161..f4d06c1d28dc0153d24e068a73bfaa7e8870ae4f 100644 (file)
--- 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 53417fac45f825e7013690b22eaee9dba9ca318c..5ca4ed33f2af62affe907d18d74f08e4e0802f59 100644 (file)
--- 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 588ea90b7af600b006d7b79112121f746bc5e54b..f7064b1020a26702174ba259fb330ddd68831ff4 100644 (file)
--- 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 7e3cd77b5ad11deb9a457f88ba4ff15e20048936..20effa2f42fdeca2c3f1e3ee9990bc79d4ae4550 100644 (file)
--- 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 e726d0074cdb6b36e3141527e4ed46cae871be7d..840764ca1d4c1097412795a9d68e5fb62f895089 100644 (file)
--- 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 709f4276430eb16629299374013bc9b7b55a27c2..cca69a9bf395d9af50dd5f0a93b6aa1e5d8cdcea 100644 (file)
--- 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 <TNamed.h>
 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 8c718fc98083fbb4da2a95c70a6ba720492d0e43..b48d7d991afd1b244e3e54814fc0680d79093f2d 100644 (file)
--- 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<TFolder*>(GetEventFolder()->FindObject(AliConfig::fgkDataFolderName));
+   fDataFolder =  dynamic_cast<TFolder*>(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<TFolder*>(GetTopFolder()->FindObject(AliConfig::fgkTasksFolderName));
+   fTasksFolder =  dynamic_cast<TFolder*>(GetTopFolder()->FindObject(AliConfig::GetTasksFolderName()));
    
    if (!fTasksFolder)
     {

diff --git a/STEER/AliRun.h b/STEER/AliRun.h
index 4e0831558cc00de26f936bd16f5a74db5263bcfd..5997bb3eb43b818b170230cd44a775e185fb48d6 100644 (file)
--- a/STEER/AliRun.h
+++ b/STEER/AliRun.h
@@ -5,6 +5,10 @@
 
 /* $Id$ */
 
+//
+// General configuration class for folders
+//
+
 #include <TMCProcess.h>
 #include <TStopwatch.h>
 #include <TError.h>

diff --git a/STEER/AliRunLoader.cxx b/STEER/AliRunLoader.cxx
index 3e2dce5bf2caf1ed97c04ccddb4d67e3f31bf985..373e815bfdb09c1078011d35c9dd0ef16630b432 100644 (file)
--- 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 af3f804a2a7cf4a9c89a224c411e70ac32730906..2989830104c2b987553126b63456ad0bda721570 100644 (file)
--- 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 c78336526f810220f665d3b0ba6e2613f1b53459..002fadce34c4b7b69bc57d7858bbd33b0e79248c 100644 (file)
--- 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 fa7001effff0da1ae9e18d6a02be91b798f358d2..03bfdf84e4d5497446de648222bae9c2f082007f 100644 (file)
--- 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 4bb4b1aec945908ab6acc7f1720952f7cca256f0..961af6ded84f064747c5b695fc675f437de53e8d 100644 (file)
--- 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 3f585e363b017a4a420430f7eb4fdbf60b6e3d72..35ac4de48cd4de4ee62ae5a0e6772f195fbec1ae 100644 (file)
--- 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 c781370510b86b42fd36cde93d45412907c5a8a3..d0f3689fd6ac5007f5e67b833eb8ff03022b80d8 100644 (file)
--- 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 ec4e516d70e3f85aee91d2641ea62c267fa1290a..598ed2a21acadd572934e00da2531fbce91aa8e5 100644 (file)
--- 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 171a1368488c07a2993df5728b4de1ac7801e878..d04fb07aede739ffa45a70e8d22f9dc5a3707b1e 100644 (file)
--- 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 2dd51c048fb4d725b391da4899fc25eac0aa8121..418935e9460044c5a4cddf29e3fc675573f1057d 100644 (file)
--- 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 7acb828b13121931d960b8c0d605320661aa05bf..5eaf9a80b23c4d6c42fc9a0d09704695c4a83765 100644 (file)
--- 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 7f9415a0896ffa7f0ab1fc99465e4e99db4b90b7..8966f4744da6c8ec6343311a97841138547e4073 100644 (file)
--- a/macros/Config.C
+++ b/macros/Config.C
@@ -74,7 +74,7 @@ void Config()
 
     cout<<"Config.C: Creating Run Loader ..."<<endl;
     rl = AliRunLoader::Open("galice.root",
-                           AliConfig::fgkDefaultEventFolderName,
+                           AliConfig::GetDefaultEventFolderName(),
                            "recreate");
     if (rl == 0x0)
       {