X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TRD%2FAliTRDCalibPadStatus.h;h=748681749af3e5706a66ee5131b51a38f865e35d;hb=2f9129dda03eb6e7a74b1b81360d965de5bf1613;hp=cd22f486b4e083f262f50e4144925883dfc6f6e4;hpb=289cc63762b21bbf75987ea9f506511e2e428730;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TRD/AliTRDCalibPadStatus.h b/TRD/AliTRDCalibPadStatus.h
index cd22f486b4e..748681749af 100644
--- a/TRD/AliTRDCalibPadStatus.h
+++ b/TRD/AliTRDCalibPadStatus.h
@@ -13,7 +13,6 @@
 
 class TObjArray;
 class TH2F;
-class TTreeSRedirector;
 
 class AliRawReader;
 
@@ -21,10 +20,13 @@ class AliTRDCalDet;
 class AliTRDCalPad;
 class AliTRDCalROC;
 class AliTRDCalPadStatus;
-class AliTRDRawStreamV2;
-class AliTRDarrayF;
+class AliTRDrawStreamBase;
 class AliTRDgeometry;
 
+class AliTRDrawFastStream;
+class AliTRDdigitsManager;
+class AliTRDSignalIndex;
+
 struct eventHeaderStruct;
 
 class AliTRDCalibPadStatus : public TObject {
@@ -37,34 +39,39 @@ public:
 
   AliTRDCalibPadStatus& operator = (const  AliTRDCalibPadStatus &source);
 
-  Int_t ProcessEvent(AliTRDRawStreamV2 *rawStream, Bool_t nocheck = kFALSE);
+  Int_t ProcessEvent(AliTRDrawStreamBase *rawStream, Bool_t nocheck = kFALSE);
   Int_t ProcessEvent(AliRawReader    *rawReader, Bool_t nocheck = kFALSE);
-  Int_t ProcessEvent(eventHeaderStruct   *event, Bool_t nocheck = kFALSE);
-
-  Int_t Update(const Int_t idet, const Int_t iRow, const Int_t iCol,
-	       const Int_t signal, const Int_t rowMax);
+  Int_t ProcessEvent(const eventHeaderStruct   *event, Bool_t nocheck = kFALSE);
+  Int_t ProcessEvent2(AliRawReader    *rawReader);
+ 
+  void  Destroy();
   Int_t UpdateHisto(const Int_t idet, const Int_t iRow, const Int_t iCol,
-		    const Int_t signal, const Int_t crowMax);
+		    const Int_t signal, const Int_t crowMax, const Int_t ccold, const Int_t icMcm);
+
+  Int_t UpdateHisto2(const Int_t idet, const Int_t iRow, const Int_t iCol,
+		     const Int_t signal, const Int_t crowMax, const Int_t ccold, const Int_t icMcm, const Int_t icRob);
 
-  void Analyse();
   void AnalyseHisto();
   AliTRDCalPadStatus *CreateCalPadStatus();
   AliTRDCalPad *CreateCalPad();
-  AliTRDCalDet *CreateCalDet();
+  AliTRDCalDet *CreateCalDet() const;
 
   void SetCalRocMean(AliTRDCalROC *mean, Int_t det);
   void SetCalRocRMS(AliTRDCalROC *rms, Int_t det);  
 
+  void SetCalRocMeand(AliTRDCalROC *mean, Int_t det);
+  void SetCalRocRMSd(AliTRDCalROC *rms, Int_t det);  
+
   //
-  AliTRDarrayF* GetCalEntries(Int_t det, Bool_t force=kFALSE);    // get calibration object
-  AliTRDarrayF* GetCalMean(Int_t det, Bool_t force=kFALSE);       // get calibration object
-  AliTRDarrayF* GetCalSquares(Int_t det, Bool_t force=kFALSE);    // get calibration object
   AliTRDCalROC* GetCalRocMean(Int_t det, Bool_t force=kFALSE);    // get calibration object
   AliTRDCalROC* GetCalRocRMS(Int_t det, Bool_t force=kFALSE);     // get calibration object
 
+  AliTRDCalROC* GetCalRocMeand(Int_t det, Bool_t force=kFALSE);   // get calibration object
+  AliTRDCalROC* GetCalRocRMSd(Int_t det, Bool_t force=kFALSE);    // get calibration object
+
   TH2F* GetHisto  (Int_t det, Bool_t force=kFALSE);              // get refernce histogram
   
-  void  DumpToFile(const Char_t *filename, const Char_t *dir="", const Bool_t append=kFALSE);
+  void  DumpToFile(const Char_t *filename, const Char_t *dir="", Bool_t append=kFALSE);
   //
   Int_t   GetAdcMin()       const { return fAdcMin;       }
   Int_t   GetAdcMax()       const { return fAdcMax;       }
@@ -72,10 +79,9 @@ public:
   void    SetRangeAdc (Int_t aMin, Int_t aMax){ fAdcMin=aMin; fAdcMax=aMax; }  // Set adc range 
 
 
-  Bool_t TestEvent(Int_t nevent, Int_t sm);  //test the fast approach to fill array  - used for test purposes
-  Bool_t TestEventHisto(Int_t nevent, Int_t sm);  //test the fast approach to fill histograms  
+  Bool_t TestEventHisto(Int_t nevent, Int_t sm, Int_t ch);  //test the fast approach to fill histograms  
 
-private:
+ private:
 
   // Geometry
   AliTRDgeometry  *fGeo;            //! The TRD geometry
@@ -85,32 +91,26 @@ private:
   Int_t fDetector;                  //  Current detector
   Int_t fNumberOfTimeBins;          //  Current number of time bins
      
-  TObjArray fCalArrayEntries;       //  Array of AliTRDarrayF class calibration
-  TObjArray fCalArrayMean;          //  Array of AliTRDarrayF class calibration
-  TObjArray fCalArraySquares;       //  Array of AliTRDarrayF class calibration
   TObjArray fCalRocArrayMean;       //  Array of AliTRDCalROC class for signal width calibration
   TObjArray fCalRocArrayRMS;        //  Array of AliTRDCalROC class for mean width calibration
 
+  TObjArray fCalRocArrayMeand;      //  Array of AliTRDCalROC class for signal width calibration doubled
+  TObjArray fCalRocArrayRMSd;       //  Array of AliTRDCalROC class for mean width calibration doubled
+
   TObjArray fHistoArray;            //  Array of histos for mean width calibration
   
-  AliTRDarrayF *fCalEntries;        //  Current AliTRDArrayF entries
-  AliTRDarrayF *fCalMean;           //  Current AliTRDArrayF Mean
-  AliTRDarrayF *fCalSquares;        //  Current AliTRDArrayF Squares
-
-  AliTRDarrayF* GetCal(Int_t det, TObjArray* arr, Bool_t force);
+ 
   AliTRDCalROC* GetCalRoc(Int_t det, TObjArray* arr, Bool_t force);
  
   TH2F* GetHisto(Int_t det, TObjArray *arr,
 		 Int_t nbinsY, Float_t ymin, Float_t ymax,
-		 Char_t *type, Bool_t force);
+		 const Char_t *type, Bool_t force);
 
   // Some basic geometry function
-  virtual Int_t    GetPlane(Int_t d) const;
-  virtual Int_t    GetChamber(Int_t d) const;
+  virtual Int_t    GetLayer(Int_t d) const;
+  virtual Int_t    GetStack(Int_t d) const;
   virtual Int_t    GetSector(Int_t d) const;
 
-public:
-
   ClassDef(AliTRDCalibPadStatus,1)
 
 };