X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=SHUTTLE%2FAliShuttleConfig.h;h=0d4e39400f0c130bca96a5db81222446ff1b6609;hb=8662f0a8949a303f00c76acd6f0eaf28dc57289e;hp=e77746c20c7b6b99496333969e539d1aa707099f;hpb=339adafa9fa0136985b2e34fdbe339f490b9ab16;p=u%2Fmrichter%2FAliRoot.git

diff --git a/SHUTTLE/AliShuttleConfig.h b/SHUTTLE/AliShuttleConfig.h
index e77746c20c7..0d4e39400f0 100644
--- a/SHUTTLE/AliShuttleConfig.h
+++ b/SHUTTLE/AliShuttleConfig.h
@@ -27,13 +27,13 @@ public:
 			const char* binddn = 0, const char* password = 0,
 			const char* basedn = "o=alice,dc=cern,dc=ch");
 	virtual ~AliShuttleConfig();
-	AliShuttleConfig(const AliShuttleConfig & other);
-	AliShuttleConfig& operator= (const AliShuttleConfig& other);
 
 	Bool_t IsValid() const {return fIsValid;};
 
 	const char* GetConfigHost() const {return fConfigHost.Data();}
 
+	const char* GetAlienPath() const {return fAlienPath.Data();}
+
 	const char* GetDAQlbHost() const {return fDAQlbHost.Data();}
 	UInt_t 	    GetDAQlbPort() const {return fDAQlbPort;}
 	const char* GetDAQlbUser() const {return fDAQlbUser.Data();}
@@ -65,6 +65,8 @@ public:
 	Int_t GetPPTimeOut() const { return fPPTimeOut; }
 	Int_t GetDCSTimeOut() const { return fDCSTimeOut; }
 	Int_t GetDCSRetries() const { return fDCSRetries; }
+	UInt_t GetDCSQueryOffset() const { return fDCSQueryOffset; }
+	UInt_t GetDCSDelay() const { return fDCSDelay; }
 	Int_t GetPPMaxMem() const { return fPPMaxMem; }
 
 	Bool_t KeepDCSMap() const { return fKeepDCSMap; }
@@ -75,6 +77,9 @@ public:
 	const char* GetMonitorTable() const {return fMonitorTable.Data();}
 
 	Int_t GetTriggerWait() const {return fTriggerWait;}
+	const char* GetShuttleFileSystem() const {return fShuttleFileSystem.Data();}
+	Int_t GetFreeDiskWarningThreshold() const {return fFreeDiskWarningThreshold;}
+	Int_t GetFreeDiskFatalThreshold() const {return fFreeDiskFatalThreshold;}
 	
 	RunMode GetRunMode() const {return fRunMode;}
 	
@@ -179,13 +184,18 @@ private:
 	};
 
 
+	AliShuttleConfig(const AliShuttleConfig& other);
+	AliShuttleConfig& operator= (const AliShuttleConfig& other);
 	UInt_t SetGlobalConfig(TList* globalList);
 	UInt_t SetSysConfig(TList* sysList);
+	UInt_t SetPasswords();
 	UInt_t SetDetConfig(TList* detList, TList* dcsList);
 	UInt_t SetHostConfig(TList* hostList);
 	
 	TString fConfigHost;  		// Host of the Shuttle configuration LDAP server
 
+	TString fAlienPath;		// Alien Path for CDB/Reference objs in the Alien catalogue
+
 	TString fDAQlbHost;		// Host of the DAQ logbook MySQL Server
 	UInt_t  fDAQlbPort;		// port of the DAQ logbook MySQL Server
 	TString fDAQlbUser;  		// username of the DAQ logbook MySQL Server
@@ -194,6 +204,7 @@ private:
 	TString fDAQlbTable; 		// Table name of the DAQ logbook 
 	TString fShuttlelbTable; 	// Table name of the Shuttle logbook
 	TString fRunTypelbTable; 	// Table name of the Run typr logbook
+	TString fPasswdFilePath; 	// Path for the local file where the passwords are stored
 
 	TString fFXSHost[3]; 		// Host of the [DAQ, DCS, HLT] File eXchange Server
 	UInt_t  fFXSPort[3]; 		// Port of the [DAQ, DCS, HLT] File eXchange Server
@@ -213,12 +224,18 @@ private:
 	Int_t fPPTimeOut;         	// timeout until a preprocessor is killed
 	Int_t fDCSTimeOut;         	// timeout until the query to DCS is terminated
 	Int_t fDCSRetries;         	// number of retries until the query to DCS connection is terminated
+	UInt_t fDCSQueryOffset;         // offset for the DCS DPs query, to be subracted from the StartTime and
+	                                // added to the EndTime
+	UInt_t fDCSDelay;         	// delay to make the query to DCS
 	Int_t fPPMaxMem;          	// maximum allowed memory until a preprocessor is killed
 	
 	TString fMonitorHost;           // host of the MonaLisa monitoring server
 	TString fMonitorTable;          // Monalisa's SHUTTLE table name
 	
 	Int_t fTriggerWait;           	// time to wait for DIM trigger before starting new collection 
+	TString fShuttleFileSystem;     // path of the Shuttle file system
+	Int_t fFreeDiskWarningThreshold;   // threshold for free space in the Shuttle file system to send a mail to the responsibles
+	Int_t fFreeDiskFatalThreshold;     // threshold for free space in the Shuttle file system to send a mail to the responsibles and terminate the Shuttle
 	RunMode  fRunMode;          	// Working mode (0=test; 1=prod)
 
 	TMap fDetectorMap; 		// Map of the detector-by-detector configuration