X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=SHUTTLE%2FAliShuttle.h;h=3b94944cac748000827529501c60424cd0e8bdf2;hb=171c6702917ceb6c7e688f078876c1b3db3b33e6;hp=b3ead58944ade549279ceb8e94b93985afe114f0;hpb=4a33bdd9e61f94345997f3a1c011de115d18f197;p=u%2Fmrichter%2FAliRoot.git

diff --git a/SHUTTLE/AliShuttle.h b/SHUTTLE/AliShuttle.h
index b3ead58944a..3b94944cac7 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();
@@ -50,18 +51,27 @@ public:
 	Int_t GetCurrentRun() const;
 	UInt_t GetCurrentStartTime() const;
 	UInt_t GetCurrentEndTime() const;
+	UInt_t GetCurrentTimeCreated() const;
+	UInt_t GetCurrentYear() const;
+	
+	const char* GetLHCPeriod() const;
 
 	virtual Bool_t Store(const AliCDBPath& path, TObject* object, AliCDBMetaData* metaData,
 			Int_t validityStart = 0, Bool_t validityInfinite = kFALSE);
 	virtual Bool_t StoreReferenceData(const AliCDBPath& path, TObject* object, AliCDBMetaData* metaData);
 	virtual Bool_t StoreReferenceFile(const char* detector, const char* localFile, const char* gridFileName);
+	virtual Bool_t StoreRunMetadataFile(const char* localFile, const char* gridFileName);
 	virtual const char* GetFile(Int_t system, const char* detector,
 		const char* id, const char* source);
 	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 const char* GetTriggerConfiguration(); 
 	virtual void Log(const char* detector, const char* message);
 
 	void SetLogbookEntry(AliShuttleLogbookEntry* entry) {fLogbookEntry=entry;}
@@ -84,26 +94,29 @@ 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);
+	void CountOpenRuns();
 	Bool_t RetrieveConditionsData(const TObjArray& shuttleLogbookEntries);
 
-	Bool_t GetValueSet(const char* host, Int_t port, const char* alias,
-				TObjArray* result, DCSType type);
+	TMap* GetValueSet(const char* host, Int_t port, const TSeqCollection* entries,
+			      DCSType type, Int_t valueSet);
 
 	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,
 				AliCDBMetaData* metaData, Int_t validityStart = 0, Bool_t validityInfinite = kFALSE);
 
 	Bool_t StoreOCDB();
-	Bool_t StoreOCDB(const TString& uri);
-	Bool_t StoreRefFilesToGrid();
+	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);
 	Bool_t CleanReferenceStorage(const char* detector);
 	void RemoveFile(const char* filename);
@@ -114,13 +127,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 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 SendMLInfo();
+	void SendAlive();
+	void SendMLDetInfo();
+	void SendMLRunInfo(const char* status);
+	virtual Bool_t TouchFile();
 
 	const AliShuttleConfig* fConfig; 	// pointer to configuration object
 
@@ -131,10 +148,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