X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=SHUTTLE%2FAliShuttle.h;h=e304d6a71d282373af81a8f34ad34a79a892caf8;hb=f6c857dc02ee14f827ef59ea8cf50625d4f225c5;hp=a0ebbf587fec6c9131befa216b8b784a35a61ca1;hpb=8da81210a72b8a2d4026d0ad29c1af388a2a94e7;p=u%2Fmrichter%2FAliRoot.git

diff --git a/SHUTTLE/AliShuttle.h b/SHUTTLE/AliShuttle.h
index a0ebbf587fe..e304d6a71d2 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();
@@ -64,10 +65,15 @@ public:
 	virtual TList* GetFileSources(Int_t system, const char* detector, const char* id = 0);
 	virtual TList* GetFileIDs(Int_t system, const char* detector, const char* source);
 	virtual const char* GetRunParameter(const char* lbEntry);
+	virtual UInt_t GetStartTimeDCSQuery();
+	virtual UInt_t GetEndTimeDCSQuery();
 	virtual AliCDBEntry* GetFromOCDB(const char* detector, const AliCDBPath& path);
 	virtual const char* GetRunType();
     	virtual Bool_t GetHLTStatus();
-	virtual void Log(const char* detector, const char* message);
+	virtual const char* GetTriggerConfiguration(); 
+	virtual const char* GetCTPTimeParams(); 
+	virtual const char* GetTriggerDetectorMask(); 
+	virtual void Log(const char* detector, const char* message, UInt_t level=3);
 
 	void SetLogbookEntry(AliShuttleLogbookEntry* entry) {fLogbookEntry=entry;}
 	
@@ -89,7 +95,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);
@@ -102,6 +108,7 @@ private:
 	Bool_t RetrieveFile(UInt_t system, const char* daqFileName, const char* localFileName);
 
 	Bool_t UpdateTable();
+	Bool_t UpdateTableSkippedCase(const char* detector="ALL");
 	Bool_t UpdateTableFailCase();
 
 	Bool_t StoreLocally(const TString& localUri, const AliCDBPath& path, TObject* object,
@@ -121,15 +128,17 @@ 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);
+	Int_t GetMem(Int_t pid);
 	
 	TString GetLogFileName(const char* detector) const;
 
 	void SetLastAction(const char* action);
 	
 	void SendAlive();
-	void SendMLInfo();
+	void SendMLDetInfo();
+	void SendMLRunInfo(const char* status);
+	virtual Bool_t TouchFile();
 
 	const AliShuttleConfig* fConfig; 	// pointer to configuration object
 
@@ -145,7 +154,7 @@ private:
 	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
-	Bool_t fFXSError;		// Bool to keep track of any FXS errors
+	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