Moved getters and setters of Shuttle's main OCDB/Reference, local
authoracolla <acolla@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 13 Feb 2007 11:23:21 +0000 (11:23 +0000)
committeracolla <acolla@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 13 Feb 2007 11:23:21 +0000 (11:23 +0000)
OCDB/Reference, temp and log folders to AliShuttleInterface

SHUTTLE/AliShuttle.cxx
SHUTTLE/AliShuttle.h

index 3b8f726ca78145093f1f09241ad35bf095eaaea6..bb3f99097061a0bb70b5bd5e27208fb70717c552 100644 (file)
@@ -182,15 +182,7 @@ some docs added
 
 ClassImp(AliShuttle)
 
-TString AliShuttle::fgkMainCDB("alien://folder=ShuttleCDB");
-TString AliShuttle::fgkLocalCDB("local://LocalShuttleCDB");
-TString AliShuttle::fgkMainRefStorage("alien://folder=ShuttleReference");
-TString AliShuttle::fgkLocalRefStorage("local://LocalReferenceStorage");
-
-Bool_t AliShuttle::fgkProcessDCS(kTRUE); 
-
-TString AliShuttle::fgkShuttleTempDir = gSystem->ExpandPathName("$ALICE_ROOT/SHUTTLE/temp");
-TString AliShuttle::fgkShuttleLogDir = gSystem->ExpandPathName("$ALICE_ROOT/SHUTTLE/log");
+Bool_t AliShuttle::fgkProcessDCS(kTRUE);
 
 //______________________________________________________________________________________________
 AliShuttle::AliShuttle(const AliShuttleConfig* config,
@@ -384,7 +376,7 @@ AliShuttleStatus* AliShuttle::ReadShuttleStatus()
                fStatusEntry = 0;
        }
 
-       fStatusEntry = AliCDBManager::Instance()->GetStorage(AliShuttle::GetLocalCDB())
+       fStatusEntry = AliCDBManager::Instance()->GetStorage(GetLocalCDB())
                ->Get(Form("/SHUTTLE/STATUS/%s", fCurrentDetector.Data()), GetCurrentRun());
 
        if (!fStatusEntry) return 0;
@@ -2021,19 +2013,3 @@ Bool_t AliShuttle::SendMail()
 
        return result == 0;
 }
-
-//______________________________________________________________________________________________
-void AliShuttle::SetShuttleTempDir(const char* tmpDir)
-{
-// sets Shuttle temp directory
-
-       fgkShuttleTempDir = gSystem->ExpandPathName(tmpDir);
-}
-
-//______________________________________________________________________________________________
-void AliShuttle::SetShuttleLogDir(const char* logDir)
-{
-// sets Shuttle log directory
-
-       fgkShuttleLogDir = gSystem->ExpandPathName(logDir);
-}
index 9731ae14297e0e012a29a62c5ad725c611c42e3b..4188233bd4b7b70937720883b2e4e39a350fae93 100644 (file)
@@ -62,25 +62,10 @@ public:
        virtual const char* GetRunParameter(const char* lbEntry);
        virtual void Log(const char* detector, const char* message);
 
-       static TString GetMainCDB () {return fgkMainCDB;}
-       static void SetMainCDB (TString mainCDB) {fgkMainCDB = mainCDB;}
-       static TString GetLocalCDB () {return fgkLocalCDB;}
-       static void SetLocalCDB (TString localCDB) {fgkLocalCDB = localCDB;}
-
-       static TString GetMainRefStorage() {return fgkMainRefStorage;}
-       static void SetMainRefStorage (TString mainRefStorage) {fgkMainRefStorage = mainRefStorage;}
-       static TString GetLocalRefStorage() {return fgkLocalRefStorage;}
-       static void SetLocalRefStorage (TString localRefStorage) {fgkLocalRefStorage = localRefStorage;}
-
        //TODO Test only, remove later !
        void SetProcessDCS(Bool_t process) {fgkProcessDCS = process;}
        void SetLogbookEntry(AliShuttleLogbookEntry* entry) {fLogbookEntry=entry;}
 
-       static void SetShuttleTempDir (const char* tmpDir);
-       static const char* GetShuttleTempDir() {return fgkShuttleTempDir.Data();}
-       static void SetShuttleLogDir (const char* logDir);
-       static const char* GetShuttleLogDir() {return fgkShuttleLogDir.Data();}
-
        Bool_t Connect(Int_t system);
 
 private:
@@ -120,13 +105,6 @@ private:
 
        const AliShuttleConfig* fConfig;        // pointer to configuration object
 
-       static TString      fgkMainCDB;         // URI of the main (Grid) CDB storage
-       static TString      fgkLocalCDB;                //! URI of the local backup CDB storage
-       static TString      fgkMainRefStorage;  // URI of the main (Grid) REFERENCE storage
-       static TString      fgkLocalRefStorage; // URI of the local REFERENCE storage
-       static TString      fgkShuttleTempDir;  // base path of SHUTTLE temp folder
-       static TString      fgkShuttleLogDir;   // path of SHUTTLE log folder
-
        UInt_t fTimeout;        // DCS server connection timeout parameter
        Int_t fRetries;         // Number of DCS server connection retries