Changes to adapt to new DCS Query time interval.

diff --git a/TOF/AliTOFDataDCS.cxx b/TOF/AliTOFDataDCS.cxx
index 2313453ef13f14a3854581bd809418badb637619..64648fa790f8a3f531d133ee1d11679c673cc5d2 100644 (file)
--- a/TOF/AliTOFDataDCS.cxx
+++ b/TOF/AliTOFDataDCS.cxx
@@ -75,6 +75,8 @@ AliTOFDataDCS::AliTOFDataDCS():
        fRun(0),
        fStartTime(0),
        fEndTime(0),
+       fStartTimeDCSQuery(0),
+       fEndTimeDCSQuery(0),
        fIsProcessed(kFALSE),
        fFDR(kFALSE)
 {
@@ -92,20 +94,24 @@ AliTOFDataDCS::AliTOFDataDCS():
 }
 
 //---------------------------------------------------------------
-AliTOFDataDCS::AliTOFDataDCS(Int_t nRun, UInt_t startTime, UInt_t endTime):
+AliTOFDataDCS::AliTOFDataDCS(Int_t nRun, UInt_t startTime, UInt_t endTime, UInt_t startTimeDCSQuery, UInt_t endTimeDCSQuery):
        TObject(),
        fRun(nRun),
        fStartTime(startTime),
        fEndTime(endTime),
+       fStartTimeDCSQuery(startTimeDCSQuery),
+       fEndTimeDCSQuery(endTimeDCSQuery),
        fIsProcessed(kFALSE),
        fFDR(kFALSE)
 {
 
   // constructor with arguments
 
-       AliInfo(Form("\n\tRun %d \n\tStartTime %s \n\tEndTime %s", nRun,
+       AliInfo(Form("\n\tRun %d \n\tStartTime %s \n\tEndTime %s \n\tStartTime DCS Query %s \n\tEndTime DCS Query %s", nRun,
        TTimeStamp(startTime).AsString(),
-       TTimeStamp(endTime).AsString()));
+       TTimeStamp(endTime).AsString(), 
+       TTimeStamp(startTimeDCSQuery).AsString(), 
+        TTimeStamp(endTimeDCSQuery).AsString()));
 
        Init();
 
@@ -118,6 +124,8 @@ AliTOFDataDCS::AliTOFDataDCS(const AliTOFDataDCS & data):
   fRun(0),
   fStartTime(0),
   fEndTime(0),
+  fStartTimeDCSQuery(0),
+  fEndTimeDCSQuery(0),
   fIsProcessed(kFALSE),
   fFDR(kFALSE)
 
@@ -128,6 +136,8 @@ AliTOFDataDCS::AliTOFDataDCS(const AliTOFDataDCS & data):
   fRun=data.fRun;
   fStartTime=data.fStartTime;
   fEndTime=data.fEndTime;
+  fStartTimeDCSQuery=data.fStartTimeDCSQuery;
+  fEndTimeDCSQuery=data.fEndTimeDCSQuery;
   fIsProcessed=data.fIsProcessed;
   fFDR=data.fFDR;
 
@@ -153,6 +163,8 @@ AliTOFDataDCS& AliTOFDataDCS:: operator=(const AliTOFDataDCS & data) {
   this->fRun=data.GetRun();
   this->fStartTime=data.GetStartTime();
   this->fEndTime=data.GetEndTime();
+  this->fStartTimeDCSQuery=data.GetStartTimeDCSQuery();
+  this->fEndTimeDCSQuery=data.GetEndTimeDCSQuery();
 
   for(int i=0;i<kNAliases;i++) {
     this->fAliasNames[i]=data.GetAliasName(i);
@@ -201,6 +213,8 @@ Bool_t AliTOFDataDCS::ProcessData(TMap& aliasMap){
 
   AliInfo(Form(" Start Time = %i",fStartTime));
   AliInfo(Form(" End Time = %i",fEndTime));
+  AliInfo(Form(" Start Time DCS Query= %i",fStartTimeDCSQuery));
+  AliInfo(Form(" End Time DCS Query= %i",fEndTimeDCSQuery));
 
   if (fEndTime==fStartTime){
     AliError(Form(" Run with null time length: start time = %i = end time = %i",fStartTime,fEndTime));
@@ -279,7 +293,8 @@ Bool_t AliTOFDataDCS::ProcessData(TMap& aliasMap){
   
     //computing the most significant variations
 
-    Float_t timeDiff = (Float_t)(fEndTime-fStartTime);
+    //Float_t timeDiff = (Float_t)(fEndTime-fStartTime);
+    Float_t timeDiff = (Float_t)(fEndTimeDCSQuery-fStartTimeDCSQuery);
     Int_t deltamin = (Int_t)(60/timeDiff*nentries); //sampling every minute
     Int_t klast = nentries-deltamin;
       

diff --git a/TOF/AliTOFDataDCS.h b/TOF/AliTOFDataDCS.h
index 2b5e57af532cd55805604c6f088875e01d86c7e5..1c5d17477c16054259d089acb3c12cfb0d474066 100644 (file)
--- a/TOF/AliTOFDataDCS.h
+++ b/TOF/AliTOFDataDCS.h
@@ -26,7 +26,7 @@ public:
   enum {kNAliases=360, kNHV=90};
   
   AliTOFDataDCS();
-  AliTOFDataDCS(Int_t nRun, UInt_t startTime, UInt_t endTime);
+  AliTOFDataDCS(Int_t nRun, UInt_t startTime, UInt_t endTime, UInt_t startTimeDCSQuery, UInt_t endTimeDCSQuery );
   AliTOFDataDCS(const AliTOFDataDCS & data);
   AliTOFDataDCS& operator=(const AliTOFDataDCS & data);
   ~AliTOFDataDCS();
@@ -34,9 +34,13 @@ public:
   void SetRun(Int_t run) {fRun = run;}
   void SetStartTime(Int_t startTime) {fStartTime = startTime;}
   void SetEndTime(Int_t endTime) {fEndTime = endTime;}
+  void SetStartTimeDCSQuery(Int_t startTimeDCSQuery) {fStartTimeDCSQuery = startTimeDCSQuery;}
+  void SetEndTimeDCSQuery(Int_t endTimeDCSQuery) {fEndTimeDCSQuery = endTimeDCSQuery;}
   Int_t GetRun() const {return fRun;}
   Int_t GetStartTime() const {return fStartTime;}
   Int_t GetEndTime() const {return fEndTime;}
+  Int_t GetStartTimeDCSQuery() const {return fStartTimeDCSQuery;}
+  Int_t GetEndTimeDCSQuery() const {return fEndTimeDCSQuery;}
   
   Bool_t ProcessData(TMap& aliasMap);
   
@@ -65,6 +69,8 @@ private:
   Int_t fRun;       // Run number
   Int_t fStartTime; // start time
   Int_t fEndTime;   // end time  
+  Int_t fStartTimeDCSQuery; // start time DCSQuery
+  Int_t fEndTimeDCSQuery;   // end time DCSQuery
   
   TString fAliasNames[kNAliases];        // aliases for DCS data
   AliTOFFormatDCS *fHVvp[kNHV];          // HV voltages, positive ch
@@ -75,7 +81,7 @@ private:
   Bool_t fIsProcessed;                   // bool to know processing status
   Bool_t fFDR;                   // bool to know whether we are in a FDR run
   
-  ClassDef(AliTOFDataDCS, 4);
+  ClassDef(AliTOFDataDCS, 5);
 };
 
 #endif

diff --git a/TOF/AliTOFPreprocessor.cxx b/TOF/AliTOFPreprocessor.cxx
index 1bc38792d841d02820df5e289961f3ff81264795..29504880c89dfb3faee19a12f769d87ad068a991 100644 (file)
--- a/TOF/AliTOFPreprocessor.cxx
+++ b/TOF/AliTOFPreprocessor.cxx
@@ -105,11 +105,11 @@ void AliTOFPreprocessor::Initialize(Int_t run, UInt_t startTime,
 
   AliPreprocessor::Initialize(run, startTime, endTime);
 
-       AliInfo(Form("\n\tRun %d \n\tStartTime %s \n\tEndTime %s", run,
+       AliInfo(Form("\n\tRun %d \n\tStartTime %s \n\tEndTime %s \n\tStartTime DCS Query %s \n\tEndTime DCS Query %s", run,
                TTimeStamp(startTime).AsString(),
-               TTimeStamp(endTime).AsString()));
+               TTimeStamp(endTime).AsString(), ((TTimeStamp)GetStartTimeDCSQuery()).AsString(), ((TTimeStamp)GetEndTimeDCSQuery()).AsString()));
 
-       fData = new AliTOFDataDCS(fRun, fStartTime, fEndTime);
+       fData = new AliTOFDataDCS(fRun, fStartTime, fEndTime, GetStartTimeDCSQuery(), GetEndTimeDCSQuery());
        fNChannels = AliTOFGeometry::NSectors()*(2*(AliTOFGeometry::NStripC()+AliTOFGeometry::NStripB())+AliTOFGeometry::NStripA())*AliTOFGeometry::NpadZ()*AliTOFGeometry::NpadX();
 }
 //_____________________________________________________________________________

diff --git a/TOF/TOFPreprocessor.C b/TOF/TOFPreprocessor.C
index 5ca4e1e4cbeb7f889574409556f70a4647bb7802..e39c2467d6103aadbf2d71593f727c309c7e643f 100644 (file)
--- a/TOF/TOFPreprocessor.C
+++ b/TOF/TOFPreprocessor.C
@@ -22,9 +22,11 @@ void TOFPreprocessor(Char_t * RunType="PHYSICS")
 
   // create AliTestShuttle instance
   Int_t nrun = 6;
-  AliTestShuttle* shuttle = new AliTestShuttle(nrun, 0, 1000);
+  AliTestShuttle* shuttle = new AliTestShuttle(nrun, 30, 980);
   //setting run type to physiscs
   shuttle->SetInputRunType(RunType);
+  shuttle->SetTimeCreated(20);
+  shuttle->SetDCSQueryOffset(20);
 
   // Generation of "fake" input DCS data
   TMap* dcsAliasMap = CreateDCSAliasMap();