From 89bcf3b40e4d3361f7b59793957ffcd9c1089d85 Mon Sep 17 00:00:00 2001 From: jgrosseo Date: Fri, 4 Apr 2008 13:36:25 +0000 Subject: [PATCH] adapting to new DAQ logbook schema --- SHUTTLE/AliShuttle.cxx | 26 +++++++++++++++++--------- SHUTTLE/AliShuttleLogbookEntry.h | 5 +++-- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/SHUTTLE/AliShuttle.cxx b/SHUTTLE/AliShuttle.cxx index 7a89793bf0e..b117367b9c7 100644 --- a/SHUTTLE/AliShuttle.cxx +++ b/SHUTTLE/AliShuttle.cxx @@ -1901,20 +1901,28 @@ AliShuttleLogbookEntry* AliShuttle::QueryRunParameters(Int_t run) UInt_t startTime = entry->GetStartTime(); UInt_t endTime = entry->GetEndTime(); + Bool_t ecsSuccess = entry->GetECSSuccess(); TString totEventsStr = entry->GetRunParameter("totalEvents"); Int_t totEvents = totEventsStr.Atoi(); - if (startTime != 0 && endTime != 0 && endTime > startTime && totEvents > 0) - return entry; - - Log("SHUTTLE", - Form("QueryRunParameters - Invalid parameters for Run %d: " - "startTime = %d, endTime = %d. Skipping (Shuttle won't be marked as DONE)!", - run, startTime, endTime)); - - if (totEvents < 1) + if (startTime != 0 && endTime != 0 && endTime > startTime && totEvents > 0 && ecsSuccess) + return entry; + + if (ecsSuccess == kFALSE) + { + Log("SHUTTLE", Form("Skipped run %d due to ECS failure, Reason: %s", run, entry->GetRunParameter("eor_reason"))); + } + else if (totEvents < 1) + { Log("SHUTTLE", Form("QueryRunParameters - Run %d has 0 events - Skipping!", run)); + } + else + { + Log("SHUTTLE", Form("QueryRunParameters - Invalid parameters for Run %d: " + "startTime = %d, endTime = %d. Skipping (Shuttle won't be marked as DONE)!", + run, startTime, endTime)); + } //Log("SHUTTLE", Form("Marking SHUTTLE done for run %d", run)); //fLogbookEntry = entry; diff --git a/SHUTTLE/AliShuttleLogbookEntry.h b/SHUTTLE/AliShuttleLogbookEntry.h index 737291dfb70..fcedb17f1e3 100644 --- a/SHUTTLE/AliShuttleLogbookEntry.h +++ b/SHUTTLE/AliShuttleLogbookEntry.h @@ -36,8 +36,9 @@ public: virtual void Copy(TObject& c) const; Int_t GetRun() const {return fRun;} - UInt_t GetStartTime() const {TString tmp(GetRunParameter("time_start")); return tmp.Atoi();} - UInt_t GetEndTime() const {TString tmp(GetRunParameter("time_end")); return tmp.Atoi();} + UInt_t GetStartTime() const {TString tmp(GetRunParameter("DAQ_time_start")); return tmp.Atoi();} + UInt_t GetEndTime() const {TString tmp(GetRunParameter("DAQ_time_end")); return tmp.Atoi();} + Bool_t GetECSSuccess() const {TString tmp(GetRunParameter("ecs_success")); return (Bool_t) tmp.Atoi();} // void SetRun(Int_t run) {fRun=run;} -- 2.39.3