X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FAliTOFDataDCS.h;h=d18fb8f8102398ce084a8473a687478b2cf5ebca;hb=adf00ba689f8326e35cafc7041c5a197099400c0;hp=cf0d17fd4b83d5d24072eb0833efb70264d079c8;hpb=7fffa85b3d69d7993e3bfb8aff0730087a62e984;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TOF/AliTOFDataDCS.h b/TOF/AliTOFDataDCS.h
index cf0d17fd4b8..d18fb8f8102 100644
--- a/TOF/AliTOFDataDCS.h
+++ b/TOF/AliTOFDataDCS.h
@@ -1,35 +1,28 @@
-#ifndef AliTOFDataDCS_H
-#define AliTOFDataDCS_H
+#ifndef ALITOFDATADCS_H
+#define ALITOFDATADCS_H
 
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
 /* $Id$ */
 
+// AliTOFDataDCS class
+// main aim is to process DCS data
+// in order to obtain the data to be stored in the OCDB
+
 #include "TObject.h" 
-#include "TString.h"
 
 class TMap;
 class TClonesArray;
-class TH2F;
-class TGraph;
-class TF1;
-//class TString;
+class TString;
 class AliTOFFormatDCS;
 
-// AliTOFDataDCS class
-// main aim is to process DCS data
-// in order to obtain the data to be stored in the OCDB
-
 class AliTOFDataDCS : public TObject {
 public:
-  enum {kNAliases=10944, kNHV=90, kNLV=792, 
-	kNLV33=72, kNLV50=72, kNLV48=72, 
-	kNFEEthr=1152, kNFEEtfeac=576, kNFEEttrm=6840, 
-	kNFunctions=0};
+  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();
@@ -37,9 +30,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);
   
@@ -56,28 +53,6 @@ public:
     {return pos<kNHV ? fHVip[pos] : 0;}
   AliTOFFormatDCS* GetHVin(Int_t pos) const 
     {return pos<kNHV ? fHVin[pos] : 0;}
-  AliTOFFormatDCS* GetLVv(Int_t pos) const 
-    {return pos<kNLV ? fLVv[pos] : 0;}
-  AliTOFFormatDCS* GetLVi(Int_t pos) const 
-    {return pos<kNLV ? fLVi[pos] : 0;}
-  AliTOFFormatDCS* GetLVv33(Int_t pos) const 
-    {return pos<kNLV ? fLVv33[pos] : 0;}
-  AliTOFFormatDCS* GetLVi33(Int_t pos) const 
-    {return pos<kNLV ? fLVi33[pos] : 0;}
-  AliTOFFormatDCS* GetLVv50(Int_t pos) const 
-    {return pos<kNLV ? fLVv50[pos] : 0;}
-  AliTOFFormatDCS* GetLVi50(Int_t pos) const 
-    {return pos<kNLV ? fLVi50[pos] : 0;}
-  AliTOFFormatDCS* GetLVv48(Int_t pos) const 
-    {return pos<kNLV ? fLVv48[pos] : 0;}
-  AliTOFFormatDCS* GetLVi48(Int_t pos) const 
-    {return pos<kNLV ? fLVi48[pos] : 0;}
-  AliTOFFormatDCS* GetFEEthr(Int_t pos) const
-    {return pos<kNFEEthr ? fFEEthr[pos] : 0;}
-  AliTOFFormatDCS* GetFEEtfeac(Int_t pos) const
-    {return pos<kNFEEtfeac ? fFEEtfeac[pos] : 0;}
-  AliTOFFormatDCS* GetFEEttrm(Int_t pos) const
-    {return pos<kNFEEttrm ? fFEEttrm[pos] : 0;}
 
   void SetFDRFlag(Bool_t flag) {fFDR = flag;}
   Bool_t GetFDRFlag() const {return fFDR;}
@@ -90,28 +65,19 @@ 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
   AliTOFFormatDCS *fHVvn[kNHV];          // HV voltages, negative ch
   AliTOFFormatDCS *fHVip[kNHV];          // HV currents, positive ch
   AliTOFFormatDCS *fHVin[kNHV];          // HV currents, negative ch
-  AliTOFFormatDCS *fLVv[kNLV];           // LV fea voltages
-  AliTOFFormatDCS *fLVi[kNLV];           // LV fea currents
-  AliTOFFormatDCS *fLVv33[kNLV33];       // LV 3.3 V voltages
-  AliTOFFormatDCS *fLVi33[kNLV33];       // LV 3.3 V currents
-  AliTOFFormatDCS *fLVv50[kNLV50];       // LV 5.0 V voltages
-  AliTOFFormatDCS *fLVi50[kNLV50];       // LV 5.0 V currents
-  AliTOFFormatDCS *fLVv48[kNLV48];       // LV 48 V voltages
-  AliTOFFormatDCS *fLVi48[kNLV48];       // LV 48 V currents
-  AliTOFFormatDCS *fFEEthr[kNFEEthr];    // FEE thresholds
-  AliTOFFormatDCS *fFEEtfeac[kNFEEtfeac];// FEE feac temperatures
-  AliTOFFormatDCS *fFEEttrm[kNFEEttrm];  // FEE trm temperatures
   
   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