X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=SHUTTLE%2FAliShuttle.h;h=786973bace620155553bf7c0fafd0c0644454ebb;hb=e3ae8d3344f146f28438746cb9033d8de5df00fd;hp=a258e2df8c602eb65e8869ced5f7ccac3e5aedd4;hpb=fbc112e3df129a1fe0800852b099e02d5c93e5cb;p=u%2Fmrichter%2FAliRoot.git

diff --git a/SHUTTLE/AliShuttle.h b/SHUTTLE/AliShuttle.h
index a258e2df8c6..786973bace6 100644
--- a/SHUTTLE/AliShuttle.h
+++ b/SHUTTLE/AliShuttle.h
@@ -33,6 +33,7 @@ class AliShuttle: public AliShuttleInterface {
 public:
 	enum DCSType {kAlias=0, kDP};
 	enum TestMode { kNone = 0, kSkipDCS = 1, kErrorDCS = 2, kErrorFXSSources = 4, kErrorFXSFiles = 8, kErrorOCDB = 16, kErrorStorage = 32, kErrorGrid = 64 };
+	enum EMailTarget { kDCSEMail = 0, kFXSEMail, kPPEMail };
 
 	AliShuttle(const AliShuttleConfig* config, UInt_t timeout = 5000, Int_t retries = 5);
 	virtual ~AliShuttle();
@@ -67,6 +68,7 @@ public:
 	virtual AliCDBEntry* GetFromOCDB(const char* detector, const AliCDBPath& path);
 	virtual const char* GetRunType();
     	virtual Bool_t GetHLTStatus();
+	virtual const char* GetTriggerConfiguration(); 
 	virtual void Log(const char* detector, const char* message);
 
 	void SetLogbookEntry(AliShuttleLogbookEntry* entry) {fLogbookEntry=entry;}
@@ -89,7 +91,7 @@ private:
 	AliShuttle(const AliShuttle& other);
 	AliShuttle& operator= (const AliShuttle& other);
 
-	Bool_t ProcessCurrentDetector();
+	Int_t ProcessCurrentDetector();
 
 	AliShuttleLogbookEntry* QueryRunParameters(Int_t run);
 	Bool_t QueryShuttleLogbook(const char* whereClause, TObjArray& entries);
@@ -108,7 +110,7 @@ private:
 				AliCDBMetaData* metaData, Int_t validityStart = 0, Bool_t validityInfinite = kFALSE);
 
 	Bool_t StoreOCDB();
-	Bool_t StoreOCDB(const TString& uri);
+	Int_t StoreOCDB(const TString& uri);
 	Bool_t CopyFileLocally(const char* localFile, const TString& target);
 	Bool_t CopyFilesToGrid(const char* type);
 	void CleanLocalStorage(const TString& uri);
@@ -121,8 +123,7 @@ private:
 	Bool_t ContinueProcessing();
 	void UpdateShuttleStatus(AliShuttleStatus::Status newStatus, Bool_t increaseCount = kFALSE);
 	Bool_t UpdateShuttleLogbook(const char* detector, const char* status=0);
-	Bool_t SendMail();
-	Bool_t SendMailToDCS();
+	Bool_t SendMail(EMailTarget target, Int_t system = -1);
 	
 	TString GetLogFileName(const char* detector) const;
 
@@ -130,6 +131,7 @@ private:
 	
 	void SendAlive();
 	void SendMLInfo();
+	virtual Bool_t TouchFile();
 
 	const AliShuttleConfig* fConfig; 	// pointer to configuration object
 
@@ -140,10 +142,12 @@ private:
 
 	AliShuttleLogbookEntry* fLogbookEntry;   //! current Shuttle logbook entry
 	TString fCurrentDetector; // current detector
+	Bool_t fFirstProcessing;  // processing this detector the first time in this run
 
 	TSQLServer *fServer[4]; 	// pointer to the three FXS + Run & Shuttle logbook servers
 	Bool_t fFXSCalled[3];		// FXS call status
 	TList  fFXSlist[3];		// List of files retrieved from each FXS
+	Int_t  fFXSError;		// Variable to keep track of any FXS errors; contains -1 for no error, kDAQ, kDCS, kHLT otherwise
 
 	AliCDBEntry* fStatusEntry; // last CDB entry containing a AliShuttleStatus retrieved