X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=VZERO%2FAliVZEROQADataMakerRec.h;h=579986f1beecb8867dfef372853b6e4b48c2aa6e;hb=4b813e964172008454a27ec9297a2ba66f926357;hp=42a274517b9f63ef33e70e96123695c9cab60bad;hpb=a8e2345601f3ede91425706dd266202716e5f927;p=u%2Fmrichter%2FAliRoot.git

diff --git a/VZERO/AliVZEROQADataMakerRec.h b/VZERO/AliVZEROQADataMakerRec.h
index 42a274517b9..579986f1bee 100644
--- a/VZERO/AliVZEROQADataMakerRec.h
+++ b/VZERO/AliVZEROQADataMakerRec.h
@@ -22,13 +22,14 @@ class TObjArray;
 class AliCDBManager;
 class AliCDBStorage;
 class AliVZEROCalibData;
+class AliVZEROTriggerData;
 
 class AliVZEROQADataMakerRec: public AliQADataMakerRec {
 
 public:
   // Histograms for Raw data control
-  enum HRawType_t {kPedestalInt0,kPedestalInt1,kPedestalCycleInt0,kPedestalCycleInt1,kPedestalTimeInt0,kPedestalTimeInt1
-  		  ,kChargeEoIInt0,kChargeEoIInt1,kChargeEoITimeInt0,kChargeEoITimeInt1,kChargeEoICycleInt0,kChargeEoICycleInt1
+  enum HRawType_t {kPedestalInt0,kPedestalInt1
+  		  ,kChargeEoI,kChargeEoIInt0,kChargeEoIInt1
 		  ,kChargeEoIBBInt0,kChargeEoIBBInt1,kChargeEoIBGInt0,kChargeEoIBGInt1,kChargeVsClockInt0,kChargeVsClockInt1
 		  ,kChargeMBBB0BG0Int0,kChargeMBBB0BG1Int0,kChargeMBBB1BG0Int0,kChargeMBBB1BG1Int0
 		  ,kChargeMBBB0BG0Int1,kChargeMBBB0BG1Int1,kChargeMBBB1BG0Int1,kChargeMBBB1BG1Int1
@@ -36,7 +37,8 @@ public:
 		  ,kMultiV0A,kMultiV0C,kChargeV0A,kChargeV0C,kChargeV0 
 		  ,kV0ATime,kV0CTime,kDiffTime
 		  ,kRawMIPV0A,kRawMIPV0C,kRawMIPV0,kRawMIPChannel
-		  ,kRawMeanChargePerRing,kRawMeanFlagPerRing} ;
+		  ,kBBFlagsPerChannel, kTriggers,kTriggers2,kTimeV0AV0C
+		  ,kCentrChargeV0AV0C};
 	
  enum HESDType_t {kCellMultiV0A,kCellMultiV0C,kMIPMultiV0A,kMIPMultiV0C,kMIPMultiChannel
 		  ,kBBFlag,kBGFlag,kChargeChannel,kTimeChannel
@@ -49,13 +51,13 @@ public:
   virtual ~AliVZEROQADataMakerRec() {;} // destructor
   AliVZEROCalibData *GetCalibData() const;
   virtual void   InitRaws() ; 
-  void SetTrendingUpdateTime(size_t time) {fTrendingUpdateTime = time;};
   
 protected: 
   AliVZEROCalibData *fCalibData;        //! calibration data
+  AliVZEROTriggerData *fTriggerData;    //! trigger config data
    
 private:
-  virtual void   EndOfDetectorCycle(AliQAv1::TASKINDEX_t, TObjArray ** list) ;
+  virtual void   EndOfDetectorCycle(AliQAv1::TASKINDEX_t task, TObjArray ** list) ;
   virtual void   InitESDs() ; 
   virtual void   InitDigits();  
   virtual void   MakeESDs(AliESDEvent * esd) ;
@@ -63,23 +65,24 @@ private:
   virtual void   MakeDigits() ; 
   virtual void   MakeDigits(TTree* digitTree) ; 
   virtual void   StartOfDetectorCycle() ; 
-  void AddTrendingEntry();
-
-  Int_t   fEvent;
-  Int_t   fEven[64];
-  Int_t   fOdd[64];
-  Float_t fADCmean[128];
-  size_t fNTotEvents;
-  size_t fNSubEvents;
-  size_t fTrendingUpdateEvent;
-  size_t fTrendingUpdateTime;
-  UInt_t fCycleStartTime;
-  UInt_t fCycleStopTime;
-  Double_t fMonitorRate;
-  Double_t fChargePerRing[8];
-  Double_t fFlagPerRing[8];
+  Float_t CorrectLeadingTime(Int_t i, Float_t time, Float_t adc) const;
+  
+ 
+  //  Int_t   fEvent;                     // event index
+  Int_t   fEven[64];                  // even charge integrators
+  Int_t   fOdd[64];                   // odd charge intergators
+  Float_t fADCmean[128];              // mean adc per integrator
+  //  size_t fNTotEvents;                 // total number of events
+  //  size_t fNSubEvents;                 // number of events used in trending histos
+  //  size_t fTrendingUpdateEvent;        // event index of last update of the trending histos
+  //  size_t fNTrendingUpdates;           // number of updates in trending histos
+  size_t fTrendingUpdateTime;         // trending histos update time
+  UInt_t fCycleStartTime;             // timestamp of QA start-of-cycle
+  UInt_t fCycleStopTime;              // timestamp of QA end-of-cycle
+  Float_t            fTimeOffset[64]; //! HPTDC time offsets channel by channel
+  TF1*               fTimeSlewing;    //! Function for time slewing correction
 
-  ClassDef(AliVZEROQADataMakerRec,1)  // description 
+  ClassDef(AliVZEROQADataMakerRec,4)  // description 
 
 };