fixed bug in storerefstorage

[u/mrichter/AliRoot.git] / SHUTTLE / AliShuttleTrigger.h

diff --git a/SHUTTLE/AliShuttleTrigger.h b/SHUTTLE/AliShuttleTrigger.h
index 8335066a2f9fcab231f7c9ce12659eddf8c97e29..1e37ac267347e5320b1feb1927961b0f19914a72 100644 (file)
--- a/SHUTTLE/AliShuttleTrigger.h
+++ b/SHUTTLE/AliShuttleTrigger.h
@@ -18,7 +18,6 @@
 #include <TCondition.h>
 
 
-class AliCDBStorage;
 class AliShuttle;
 class AliShuttleConfig;
 
@@ -30,33 +29,29 @@ 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 SetNewLastRun(Int_t run);
+       Bool_t Collect(Int_t run = -1);
 
        virtual Bool_t Notify();
        void Terminate();
@@ -64,47 +59,21 @@ public:
        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);
-       Bool_t RetrieveConditionsData(const TObjArray& dateEntries, Bool_t updateLastRun);
-
-  Bool_t ReadLastRun();
-  Bool_t WriteLastRun();
-
        const AliShuttleConfig* fConfig;
-       //AliCDBStorage* fLocalStorage;
 
        AliShuttle* fShuttle;           // Pointer to the actual Shuttle instance
 
        Bool_t fNotified;               // Notified flag
        Bool_t fTerminate;              // Terminate flag
 
-       Int_t fLastRun; // last sucessfully processed run
-
        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)