X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=SHUTTLE%2FAliShuttleTrigger.h;h=1e37ac267347e5320b1feb1927961b0f19914a72;hb=ad2b76cb610a0a3bcd7a62f9de35d2aa334f6373;hp=bd453c836424175c27cb37c47670e620b36f9ec6;hpb=58bc3020aee893f8a693c4efecbcb660281e58e8;p=u%2Fmrichter%2FAliRoot.git

diff --git a/SHUTTLE/AliShuttleTrigger.h b/SHUTTLE/AliShuttleTrigger.h
index bd453c83642..1e37ac26734 100644
--- a/SHUTTLE/AliShuttleTrigger.h
+++ b/SHUTTLE/AliShuttleTrigger.h
@@ -18,7 +18,6 @@
 #include <TCondition.h>
 
 
-class AliCDBStorage;
 class AliShuttle;
 class AliShuttleConfig;
 
@@ -30,64 +29,40 @@ class TerminateSignalHandler: public TSignalHandler {
 public:
 	TerminateSignalHandler(): TSignalHandler((ESignals) 0,0), fTrigger(0) { }
 	TerminateSignalHandler(AliShuttleTrigger* trigger, ESignals signal):
-		TSignalHandler(signal, kFALSE), fTrigger(trigger) {}
+	TSignalHandler(signal, kFALSE), fTrigger(trigger) {}
 
 	virtual ~TerminateSignalHandler() { }
 	virtual Bool_t Notify();
 
 private:
-
-	TerminateSignalHandler(const TerminateSignalHandler& other); 	
-	TerminateSignalHandler& operator= (const TerminateSignalHandler& other); 	
-
+	TerminateSignalHandler(const TerminateSignalHandler& other);
+	TerminateSignalHandler& operator= (const TerminateSignalHandler& other);
+  
 	AliShuttleTrigger* fTrigger;  // pointer to the current AliShuttleTrigger
 
 	ClassDef(TerminateSignalHandler, 0)
 };
 
 class AliShuttleTrigger: public TObject {
+
 public:
 	AliShuttleTrigger(const AliShuttleConfig* config, UInt_t timeout = 5000, Int_t retries = 5);
 	~AliShuttleTrigger();
 
 	AliShuttle* GetShuttle() {return fShuttle;}
 
-	Bool_t Collect(Int_t run);
-	Bool_t CollectNew();
-	Bool_t CollectAll();
-	
+	Bool_t Collect(Int_t run = -1);
+
 	virtual Bool_t Notify();
 	void Terminate();
 
 	void Run();
 
 private:
-
 	AliShuttleTrigger(const AliShuttleTrigger& other);
 	AliShuttleTrigger& operator= (const AliShuttleTrigger& other);
 
-	class AliShuttleTriggerDATEEntry: public TObject {
-	public:
-		AliShuttleTriggerDATEEntry(Int_t run, UInt_t startTime, UInt_t endTime):
-			fRun(run), fStartTime(startTime), fEndTime(endTime) {}
-
-		Int_t GetRun() const {return fRun;}
-		UInt_t GetStartTime() const  {return fStartTime;}
-		UInt_t GetEndTime() const {return fEndTime;}
-
-	private:
-		Int_t fRun;   		// Run number
-		UInt_t fStartTime; 	// Run start time
-		UInt_t fEndTime; 	// Run end time
-		ClassDef(AliShuttleTriggerDATEEntry, 0)
-	};
-
-	Bool_t RetrieveDATEEntries(const char* whereClause, TObjArray& entries,
-			Int_t& lastRun);
-	Bool_t RetrieveConditionsData(const TObjArray& dateEntries);
-
 	const AliShuttleConfig* fConfig;
-	//AliCDBStorage* fLocalStorage;
 
 	AliShuttle* fShuttle; 		// Pointer to the actual Shuttle instance
 
@@ -97,8 +72,8 @@ private:
 	TMutex fMutex;  		// Mutex
 	TCondition fCondition;  	// Condition 
 
-	TerminateSignalHandler fQuitSignalHandler; 		// Quit signal 
-	TerminateSignalHandler fInterruptSignalHandler;  	// Interrupt signal
+	TerminateSignalHandler* fQuitSignalHandler; 		// Quit signal
+	TerminateSignalHandler* fInterruptSignalHandler;  	// Interrupt signal
 
 
 	ClassDef(AliShuttleTrigger, 0)