New reader for the pedestal run and vdrift (Julian) and some bug fixing (Raphaelle)

[u/mrichter/AliRoot.git] / TRD / AliTRDCalibraFillHisto.h

diff --git a/TRD/AliTRDCalibraFillHisto.h b/TRD/AliTRDCalibraFillHisto.h
index 6560b361d7a02bc186a5742d73823c1cc39a1ea7..04354e65f7ba0b39a88fa1538470c2f201cdc905 100644 (file)
--- a/TRD/AliTRDCalibraFillHisto.h
+++ b/TRD/AliTRDCalibraFillHisto.h
@@ -1,5 +1,5 @@
 #ifndef ALITRDCALIBRAFILLHISTO_H
-#define ALITRDCALIBRAFILLHISTOs_H
+#define ALITRDCALIBRAFILLHISTO_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
@@ -14,15 +14,10 @@
 #ifndef ROOT_TObject
 #  include <TObject.h>
 #endif
-#ifndef ROOT_TLinearFitter
-#  include <TLinearFitter.h> 
-#endif
 #ifndef ROOT_TProfile2D
 #  include <TProfile2D.h> 
 #endif
-#ifndef ROOT_TH2I
-#  include <TH2I.h> 
-#endif
+
 
 class TProfile2D;
 class TObjArray;
@@ -48,6 +43,9 @@ class AliTRDgeometry;
 class AliTRDCalDet;
 class AliTRDCalROC;
 
+class AliTRDrawFastStream;
+class AliTRDdigitsManager;
+class AliTRDSignalIndex;
 
 struct eventHeaderStruct;
 
@@ -66,14 +64,15 @@ class AliTRDCalibraFillHisto : public TObject {
   AliTRDCalibraFillHisto &operator=(const AliTRDCalibraFillHisto &) { return *this; }
 
   // Functions for initialising and filling with AliTRDtrackV1
-          Bool_t  Init2Dhistos();
-         Bool_t  UpdateHistograms(AliTRDtrack *t);
-         Bool_t  UpdateHistogramsV1(AliTRDtrackV1 *t);
+          Bool_t  Init2Dhistos(Int_t nboftimebin = -1);
+         Bool_t  UpdateHistograms(const AliTRDtrack *t);
+         Bool_t  UpdateHistogramsV1(const AliTRDtrackV1 *t);
  
   // Process events DAQ
          Int_t   ProcessEventDAQ(AliTRDrawStreamBase *rawStream, Bool_t nocheck = kFALSE);
          Int_t   ProcessEventDAQ(AliRawReader *rawReader, Bool_t nocheck = kFALSE);
-         Int_t   ProcessEventDAQ(eventHeaderStruct *event, Bool_t nocheck = kFALSE);
+         Int_t   ProcessEventDAQ(const eventHeaderStruct *event, Bool_t nocheck = kFALSE);
+         Int_t   ProcessEventDAQ2(AliRawReader *rawReader);
 
   // Is Pad on
           Bool_t   IsPadOn(Int_t detector, Int_t row, Int_t col) const;
@@ -140,7 +139,11 @@ class AliTRDCalibraFillHisto : public TObject {
           void     SetDifference(Short_t difference)                         { fDifference           = difference;           }
           void     SetNumberClusters(Short_t numberClusters)                 { if(numberClusters >= 0) fNumberClusters       = numberClusters;       }
          void     SetNumberClustersf(Short_t numberClustersf)               { fNumberClustersf      = numberClustersf;      }
-          void     SetNumberBinCharge(Short_t numberBinCharge)               { fNumberBinCharge      = numberBinCharge;      }
+         void     SetNumberClustersProcent(Float_t numberClustersProcent)   { fNumberClustersProcent = numberClustersProcent;                       }
+         void     SetThresholdClustersDAQ(Float_t thresholdClustersDAQ)     { fThresholdClustersDAQ = thresholdClustersDAQ;                         }
+         void     SetNumberRowDAQ(Short_t numberRowDAQ)                     { fNumberRowDAQ         = numberRowDAQ;         }
+         void     SetNumberColDAQ(Short_t numberColDAQ)                     { fNumberColDAQ         = numberColDAQ;         }
+         void     SetNumberBinCharge(Short_t numberBinCharge)               { fNumberBinCharge      = numberBinCharge;      }
           void     SetNumberBinPRF(Short_t numberBinPRF)                     { fNumberBinPRF         = numberBinPRF;         }
          void     SetNumberGroupsPRF(Short_t numberGroupsPRF);
   
@@ -207,6 +210,10 @@ AliTRDCalibraVector *GetCalibraVector() const                                { r
          Int_t    fROBPrevious;            // Change of ROB
          Short_t  fNumberClusters;         // Minimum number of clusters in the tracklets
          Short_t  fNumberClustersf;        // Maximum number of clusters in the tracklets
+         Float_t  fNumberClustersProcent;  // Procent of number of time bins for fNumberClusters
+         Float_t  fThresholdClustersDAQ;   // Threshold clusters for DAQ algorithm
+         Short_t  fNumberRowDAQ;           // Size of the spot for DAQ algorithm
+         Short_t  fNumberColDAQ;           // Size of the spot for DAQ algorithm
           Float_t  fProcent;                // Limit to take the info of the most important calibration group if the track goes through 2 groups (CH)
           Short_t  fDifference;             // Limit to take the info of the most important calibration group if the track goes through 2 groups (CH)
           Int_t    fNumberTrack;            // How many tracks could be used (Debug for the moment)
@@ -258,12 +265,12 @@ AliTRDCalibraVector *GetCalibraVector() const                                { r
   // Calibration with AliTRDtrackV1
           void     FillTheInfoOfTheTrackPH();
           void     FillTheInfoOfTheTrackCH(Int_t nbclusters);
-         Bool_t   FindP1TrackPHtracklet(AliTRDtrack *t, Int_t index0, Int_t index1);
+         Bool_t   FindP1TrackPHtracklet(const AliTRDtrack *t, Int_t index0, Int_t index1);
          Bool_t   FindP1TrackPHtrackletV1(const AliTRDseedV1 *tracklet, Int_t nbclusters);
-         Bool_t   HandlePRFtracklet(AliTRDtrack *t, Int_t index0, Int_t index1);
+         Bool_t   HandlePRFtracklet(const AliTRDtrack *t, Int_t index0, Int_t index1);
          Bool_t   HandlePRFtrackletV1(const AliTRDseedV1 *tracklet, Int_t nbclusters);
          void     ResetfVariablestracklet();
-         void     StoreInfoCHPHtrack(AliTRDcluster *cl, Double_t dqdl, Int_t *group, Int_t row, Int_t col);
+         void     StoreInfoCHPHtrack(const AliTRDcluster *cl,const Double_t dqdl,const Int_t *group,const Int_t row,const Int_t col,const AliTRDcluster *cls=0x0);
          void     FillCH2d(Int_t x, Float_t y);
 
   // Calibration on DAQ
@@ -274,8 +281,8 @@ AliTRDCalibraVector *GetCalibraVector() const                                { r
  // row col calibration groups stuff
           Bool_t   LocalisationDetectorXbins(Int_t detector);
          Int_t    CalculateTotalNumberOfBins(Int_t i);
-         void     CheckGoodTrackletV0(Int_t detector, Int_t row, Int_t col);
-         void     CheckGoodTrackletV1(AliTRDcluster *cl);
+         void     CheckGoodTrackletV0(const Int_t detector,const Int_t row,const Int_t col);
+         void     CheckGoodTrackletV1(const AliTRDcluster *cl);
          Int_t    CalculateCalibrationGroup(Int_t i, Int_t row, Int_t col) const;
          
   // Clear
@@ -303,4 +310,3 @@ AliTRDCalibraVector *GetCalibraVector() const                                { r
   
 #endif
 
-