Reverting...I was too fast

[u/mrichter/AliRoot.git] / ZDC / AliZDCDataDCS.h

diff --git a/ZDC/AliZDCDataDCS.h b/ZDC/AliZDCDataDCS.h
index 2d6cebd50e6785a1a2dc11f0cd5dff952070c3f5..08c2237c4ee2549eaff9654b4d3295f9472e1d59 100644 (file)
--- a/ZDC/AliZDCDataDCS.h
+++ b/ZDC/AliZDCDataDCS.h
@@ -7,61 +7,56 @@
 
 
 #include <TMap.h>
-#include <TClonesArray.h>
-#include <TGraph.h>
 
 class AliZDCDataDCS : public TObject {
 public:
-       enum {kNAliases=28, kNGraphs=24};
-
-       AliZDCDataDCS();
-       AliZDCDataDCS(Int_t nRun, UInt_t startTime, UInt_t endTime);
-       ~AliZDCDataDCS();
-
-       void SetRun(Int_t run) {fRun = run;}
-       void SetStartTime(Int_t startTime) {fStartTime = startTime;}
-       void SetEndTime(Int_t endTime) {fEndTime = endTime;}
-       void SetCalibData(Float_t *val) 
-            {for(Int_t i=0; i<kNGraphs; i++) fCalibData[i] = val[i];}
-       void SetCalibData(Int_t i, Float_t val) {fCalibData[i] = val;} 
-       //
-       Int_t GetRun() {return fRun;}
-       Int_t GetStartTime() {return fStartTime;}
-       Int_t GetEndTime() {return fEndTime;}
-       Float_t GetCalibData() {return *fCalibData;}
-       Float_t GetCalibData(Int_t i) {return fCalibData[i];}
-
-       void ProcessData(TMap& aliasMap);
-
-       const char* GetAliasName(UInt_t pos)
-                       {return pos<kNAliases ? fAliasNames[pos].Data() : 0;}
-
-       const TGraph* GetGraph(UInt_t pos)
-                       {return pos<kNGraphs ? ((TGraph*) fGraphs.UncheckedAt(pos)) : 0;}
-
-       Double_t Eval(int pos, Double_t time)
-                       {return pos<kNGraphs ? ((TGraph*) fGraphs.UncheckedAt(pos))->Eval(time) : -1;}
-
-       void Draw(const Option_t* option);
-
+    enum {kNAliases=28, kNAlignDet=4, kNHVChannels=24};
+
+    AliZDCDataDCS();
+    AliZDCDataDCS(Int_t nRun, UInt_t startTime, UInt_t endTime, 
+                  UInt_t startTimeDCSQuery, UInt_t endTimeDCSQuery);
+    AliZDCDataDCS(const AliZDCDataDCS & data);
+    AliZDCDataDCS& operator=(const AliZDCDataDCS & data);
+    ~AliZDCDataDCS();
+
+    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;}
+    Float_t GetAlignData(Int_t i) const {return fAlignData[i];}
+//    Float_t* GetTimeStamp() const {return (float*)fTimeStamp;}
+//    Float_t* GetHVData() const {return (float*)fHVData;}
+
+    Bool_t ProcessData(TMap& aliasMap);
+
+    const char* GetAliasName(UInt_t pos) const
+               {return pos<kNAliases ? fAliasNames[pos].Data() : 0;}
 
 private:
-       void Init();
-       void Introduce(UInt_t numAlias, const TObjArray* aliasArr);
-       void CreateGraph(int i, int dim, const Double_t *x, const Double_t *y);
+    void Init();
+    void Introduce(UInt_t numAlias, const TObjArray* aliasArr);
 
-       Int_t fRun;             // Run number
-       UInt_t fStartTime;      // Start of run time
-       UInt_t fEndTime;        // End of run time
+    Int_t  fRun;           // Run number
+    UInt_t fStartTime;      // Start of run time
+    UInt_t fEndTime;       // End of run time
+    Int_t  fStartTimeDCSQuery; // start time DCSQuery
+    Int_t  fEndTimeDCSQuery;   // end time DCSQuery
 
-       TString fAliasNames[kNAliases]; // Name of the aliases provided by the DCS
-       TClonesArray fGraphs;           // Array containing PTM HV graphics
-       
-       Float_t fCalibData[kNGraphs];   // Array containing calibration data
+    TString fAliasNames[kNAliases]; // Name of the aliases provided by the DCS
+    Float_t fAlignData[kNAlignDet]; // Array containing alignment data
+//    Float_t *fTimeStamp;         // Array containing time stamps
+//    Float_t *fHVData;            // Array containing HV values
 
-       Bool_t fIsProcessed;            // Flag set when data are processed
+    Bool_t fIsProcessed;           // Flag set when data are processed
 
-       ClassDef(AliZDCDataDCS, 2);
+    ClassDef(AliZDCDataDCS, 6);
 };
 
 #endif