]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TRD/AliTRDCalibraFillHisto.h
- use mass/z for Light Nuclei in all TPC response functions
[u/mrichter/AliRoot.git] / TRD / AliTRDCalibraFillHisto.h
index 7eaf974ab491dd376d56d8062991e2cdd2d74928..3d130433568e843fa877d5ac57be328eb4e9a891 100644 (file)
 #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;
@@ -36,17 +31,22 @@ class TTreeSRedirector;
 class AliLog;
 class AliRawReader;
 
+class AliESDtrack;
+
 class AliTRDCalibraMode;
 class AliTRDCalibraVector;
 class AliTRDCalibraVdriftLinearFit;
-class AliTRDrawStreamTB;
+class AliTRDCalibraExbAltFit;
 class AliTRDcluster;
-class AliTRDtrack;
-class AliTRDmcmTracklet;
+class AliTRDtrackV1;
+class AliTRDseedV1;
 class AliTRDgeometry;
 class AliTRDCalDet;
 class AliTRDCalROC;
+class AliTRDcalibDB;
 
+class AliTRDdigitsManager;
+class AliTRDSignalIndex;
 
 struct eventHeaderStruct;
 
@@ -58,29 +58,22 @@ class AliTRDCalibraFillHisto : public TObject {
   static AliTRDCalibraFillHisto *Instance();
   static void Terminate();
   static void Destroy();
+  void DestroyDebugStreamer();
+
 
   AliTRDCalibraFillHisto(const AliTRDCalibraFillHisto &c);
   AliTRDCalibraFillHisto &operator=(const AliTRDCalibraFillHisto &) { return *this; }
 
-  // Functions for initialising the AliTRDCalibraFillHisto in the code
-          Bool_t   Init2Dhistos();
-         Bool_t   Init2Dhistostrack();
-
-  // Functions for filling the histos in the code
-          Bool_t   ResetTrack();
-         Bool_t   UpdateHistograms(AliTRDtrack *t);
-          Bool_t   UpdateHistograms(AliTRDcluster *cl, AliTRDtrack *t);
-          Bool_t   UpdateHistogramcm(AliTRDmcmTracklet *trk);
+  // Functions for initialising and filling with AliTRDtrackV1
+          Bool_t  Init2Dhistos(Int_t nboftimebin = -1);
+         Bool_t  InitCalDet();
+         Bool_t  UpdateHistogramsV1(const AliTRDtrackV1 *t,const AliESDtrack *esdtrack = NULL);
  
   // Process events DAQ
-         Int_t   ProcessEventDAQ(AliTRDrawStreamTB *rawStream, Bool_t nocheck = kFALSE);
-         Int_t   ProcessEventDAQ(AliRawReader *rawReader, Bool_t nocheck = kFALSE);
-         Int_t   ProcessEventDAQ(eventHeaderStruct *event, Bool_t nocheck = kFALSE);
-
-         Bool_t   UpdateDAQ(Int_t det, Int_t /*row*/, Int_t /*col*/, Int_t timebin, Int_t signal, Int_t nbtimebins);
+         Int_t   ProcessEventDAQ(AliRawReader *rawReader);
 
   // Is Pad on
-          Bool_t   IsPadOn(Int_t detector, Int_t col, Int_t row) const;
+          Bool_t   IsPadOn(Int_t detector, Int_t row, Int_t col) const;
 
   // Functions for write
          void     Write2d(const Char_t *filename = "TRD.calibration.root", Bool_t append = kFALSE);
@@ -89,61 +82,104 @@ class AliTRDCalibraFillHisto : public TObject {
          Double_t *StatH(TH2 *ch, Int_t i);
          Double_t *GetMeanMedianRMSNumberCH();
          Double_t *GetMeanMedianRMSNumberLinearFitter() const;
+ // LinearFitter
+         void     AnalyseLinearFitter();
        
         
   //
   // Set of Get the variables
   //
 
+         void     SetIsHLT(Bool_t isHLT = kTRUE)                            { fIsHLT = isHLT;                       }  
+         Bool_t   IsHLT() const                                             { return fIsHLT;                        }  
+
   // Choice to fill or not the 2D
-          void     SetMITracking(Bool_t mitracking = kTRUE)                  { fMITracking      = mitracking;        }
-          void     SetMcmTracking(Bool_t mcmtracking = kTRUE)                { fMcmTracking     = mcmtracking;       }
-          void     SetMcmCorrectAngle(Bool_t mcmcorrectangle = kTRUE)        { fMcmCorrectAngle = mcmcorrectangle;   }
-          void     SetPH2dOn(Bool_t ph2don = kTRUE)                          { fPH2dOn          = ph2don;            }
+         void     SetPH2dOn(Bool_t ph2don = kTRUE)                          { fPH2dOn          = ph2don;            }
           void     SetCH2dOn(Bool_t ch2don = kTRUE)                          { fCH2dOn          = ch2don;            }
           void     SetPRF2dOn(Bool_t prf2don = kTRUE)                        { fPRF2dOn         = prf2don;           }
           void     SetHisto2d(Bool_t histo2d = kTRUE)                        { fHisto2d         = histo2d;           }
           void     SetVector2d(Bool_t vector2d = kTRUE)                      { fVector2d        = vector2d;          }
          void     SetLinearFitterOn(Bool_t linearfitteron = kTRUE)          { fLinearFitterOn      = linearfitteron;}
          void     SetLinearFitterDebugOn(Bool_t debug = kTRUE)              { fLinearFitterDebugOn = debug;         }
-                 
+          void     SetExbAltFitOn(Bool_t fiton = kTRUE)                      { fExbAltFitOn      = fiton;}
+         void     SetScaleWithTPCSignal(Bool_t scaleWithTPCSignal = kTRUE)  { fScaleWithTPCSignal = scaleWithTPCSignal;}
+         void     SetFirstRunGain(Int_t firstRunGain)                       { fFirstRunGain = firstRunGain;   }
+         void     SetVersionGainUsed(Int_t versionGainUsed)                 { fVersionGainUsed = versionGainUsed;   }
+         void     SetSubVersionGainUsed(Int_t subVersionGainUsed)           { fSubVersionGainUsed = subVersionGainUsed;   }
+         void     SetFirstRunGainLocal(Int_t firstRunGainLocal)             { fFirstRunGainLocal = firstRunGainLocal;   }
+         void     SetVersionGainLocalUsed(Int_t versionGainLocalUsed)       { fVersionGainLocalUsed = versionGainLocalUsed;   }
+         void     SetSubVersionGainLocalUsed(Int_t subVersionGainLocalUsed) { fSubVersionGainLocalUsed = subVersionGainLocalUsed;   }
+         void     SetFirstRunVdrift(Int_t firstRunVdrift)                   { fFirstRunVdrift = firstRunVdrift;   }
+         void     SetVersionVdriftUsed(Int_t versionVdriftUsed)             { fVersionVdriftUsed = versionVdriftUsed;   }
+         void     SetSubVersionVdriftUsed(Int_t subVersionVdriftUsed)       { fSubVersionVdriftUsed = subVersionVdriftUsed;   }
+         void     SetFirstRunExB(Int_t firstRunExB)                         { fFirstRunExB = firstRunExB;   }
+         void     SetVersionExBUsed(Int_t versionExBUsed)                   { fVersionExBUsed = versionExBUsed;   }
+         void     SetSubVersionExBUsed(Int_t subVersionExBUsed)             { fSubVersionExBUsed = subVersionExBUsed;   }
+         
   
-          Bool_t   GetMITracking() const                                     { return fMITracking;             }
-          Bool_t   GetMcmTracking() const                                    { return fMcmTracking;            }
-          Bool_t   GetMcmCorrectAngle() const                                { return fMcmCorrectAngle;        }
-          Bool_t   GetPH2dOn() const                                         { return fPH2dOn;                 }
+         Bool_t   GetPH2dOn() const                                         { return fPH2dOn;                 }
           Bool_t   GetCH2dOn() const                                         { return fCH2dOn;                 }
           Bool_t   GetPRF2dOn() const                                        { return fPRF2dOn;                }
           Bool_t   GetHisto2d() const                                        { return fHisto2d;                }
           Bool_t   GetVector2d() const                                       { return fVector2d;               }
           Bool_t   GetLinearFitterOn() const                                 { return fLinearFitterOn;         }
          Bool_t   GetLinearFitterDebugOn() const                            { return fLinearFitterDebugOn;    }
-  
-  TH2I            *GetCH2d() const                                           { return fCH2d;                   }
+         Int_t    GetVersionGainUsed() const                                { return fVersionGainUsed;        }
+         Int_t    GetSubVersionGainUsed() const                             { return fSubVersionGainUsed;     }
+         Int_t    GetVersionVdriftUsed() const                              { return fVersionVdriftUsed;      }
+         Int_t    GetSubVersionVdriftUsed() const                           { return fSubVersionVdriftUsed;   }
+
+
+  // Get stuff that are filled
+  TH2I            *GetCH2d();
   TProfile2D      *GetPH2d(Int_t nbtimebin=24, Float_t samplefrequency= 10.0);
   TProfile2D      *GetPRF2d() const                                          { return fPRF2d;                  } 
   TObjArray        GetLinearFitterArray() const                              { return fLinearFitterArray;      }
   TLinearFitter   *GetLinearFitter(Int_t detector, Bool_t force=kFALSE);
-  AliTRDCalibraVdriftLinearFit *GetVdriftLinearFit() const                   { return fLinearVdriftFit;        }
+  AliTRDCalibraVdriftLinearFit *GetVdriftLinearFit() const                   { return fLinearVdriftFit; }
+  AliTRDCalibraExbAltFit *GetExbAltFit() const                               { return fExbAltFit; }
   
  
   // How to fill the 2D
           void     SetRelativeScale(Float_t relativeScale);                      
           void     SetThresholdClusterPRF2(Float_t thresholdClusterPRF2)     { fThresholdClusterPRF2 = thresholdClusterPRF2; }
+         void     SetLimitChargeIntegration(Bool_t limitChargeIntegration)  { fLimitChargeIntegration = limitChargeIntegration; }
+         void     SetFillWithZero(Bool_t fillWithZero)                      { fFillWithZero = fillWithZero;   }
+         void     SetNormalizeNbOfCluster(Bool_t normalizeNbOfCluster)      { fNormalizeNbOfCluster = normalizeNbOfCluster; }
+         void     SetMaxCluster(Float_t maxCluster)                         { fMaxCluster = maxCluster; }
+         void     SetNbMaxCluster(Short_t nbMaxCluster)                     { fNbMaxCluster = nbMaxCluster; }
+         void     SetCutWithVdriftCalib(Bool_t cutWithVdriftCalib)          { fCutWithVdriftCalib = cutWithVdriftCalib; }
+         void     SetMinNbTRDtracklets(Int_t minNbTRDtracklets)             { fMinNbTRDtracklets = minNbTRDtracklets; }
+         void     SetMinTRDMomentum(Float_t minTRDMomentum)                 { fMinTRDMomentum = minTRDMomentum; }
          void     SetNz(Int_t i, Short_t nz);
           void     SetNrphi(Int_t i, Short_t nrphi);
-          void     SetProcent(Float_t procent)                               { fProcent              = procent;              }
+          void     SetAllTogether(Int_t i);
+         void     SetPerSuperModule(Int_t i);
+         void     SetProcent(Float_t procent)                               { fProcent              = procent;              }
           void     SetDifference(Short_t difference)                         { fDifference           = difference;           }
-          void     SetNumberClusters(Short_t numberClusters)                 { fNumberClusters       = numberClusters;       }
-          void     SetNumberBinCharge(Short_t numberBinCharge)               { fNumberBinCharge      = numberBinCharge;      }
+          void     SetNumberClusters(Short_t numberClusters)                 { if(numberClusters >= 0) fNumberClusters       = numberClusters;       }
+         void     SetNumberClustersf(Short_t numberClustersf)               { fNumberClustersf      = numberClustersf;      }
+         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     SetRangeHistoCharge(Float_t rangeHistoCharge)             { fRangeHistoCharge     = rangeHistoCharge;     }
+         void     SetNumberBinCharge(Short_t numberBinCharge)               { fNumberBinCharge      = numberBinCharge;      }
           void     SetNumberBinPRF(Short_t numberBinPRF)                     { fNumberBinPRF         = numberBinPRF;         }
          void     SetNumberGroupsPRF(Short_t numberGroupsPRF);
   
           Float_t  GetRelativeScale() const                                  { return fRelativeScale;          }
           Float_t  GetThresholdClusterPRF2() const                           { return fThresholdClusterPRF2;   }
+         Bool_t   GetLimitChargeIntegration() const                         { return fLimitChargeIntegration; }
+         Bool_t   GetFillWithZero() const                                   { return fFillWithZero;           }
+         Bool_t   GetNormalizeNbOfCluster() const                           { return fNormalizeNbOfCluster;   }
+         Float_t  GetMaxCluster() const                                     { return fMaxCluster;             }
+         Short_t  GetNbMaxCluster() const                                   { return fNbMaxCluster;           }
+         Bool_t   GetCutWithVdriftCalib() const                             { return fCutWithVdriftCalib;     }
          Float_t  GetProcent() const                                        { return fProcent;                }
           Short_t  GetDifference() const                                     { return fDifference;             }
           Short_t  GetNumberClusters() const                                 { return fNumberClusters;         }
+         Short_t  GetNumberClustersf() const                                { return fNumberClustersf;        }
           Short_t  GetNumberBinCharge() const                                { return fNumberBinCharge;        }
           Short_t  GetNumberBinPRF() const                                   { return fNumberBinPRF;           }
          Short_t  GetNumberGroupsPRF() const                                { return fNgroupprf;              }
@@ -159,22 +195,47 @@ AliTRDCalibraVector *GetCalibraVector() const                                { r
 
   // Geometry
   AliTRDgeometry  *fGeo;                    //! The TRD geometry
+  // calibration DB
+  AliTRDcalibDB   *fCalibDB;                //! The pointer to the TRDcalibDB instance
+
+  // Is HLT
+          Bool_t   fIsHLT;                  // Now if HLT, the per detector
 
   // Choice to fill or not the 2D
-          Bool_t   fMITracking;             // Chose to fill the 2D histos or vectors during the offline MI tracking
-          Bool_t   fMcmTracking;            // Chose to fill the 2D histos or vectors during the tracking with tracklets
-          Bool_t   fMcmCorrectAngle;        // Apply correction due to the mcmtrackletangle in the z direction (only) assuming  from vertex
-          Bool_t   fCH2dOn;                 // Chose to fill the 2D histos or vectors for the relative gain calibration 
+         Bool_t   fCH2dOn;                 // Chose to fill the 2D histos or vectors for the relative gain calibration 
           Bool_t   fPH2dOn;                 // Chose to fill the 2D histos or vectors for the drift velocity and T0
           Bool_t   fPRF2dOn;                // Chose to fill the 2D histos or vectors for the pad response function calibration
           Bool_t   fHisto2d;                // Chose to fill the 2D histos
           Bool_t   fVector2d;               // Chose to fill vectors
          Bool_t   fLinearFitterOn;         // Method with linear fit for drift velocity
          Bool_t   fLinearFitterDebugOn;    // Method with linear fit for drift velocity
+          Bool_t   fExbAltFitOn;            // Enable parabolic fit for exb
+         Bool_t   fScaleWithTPCSignal;     // Scale the gain with TPC signal (If use then ask at least 70 TPC clusters)
 
   // How to fill the 2D
           Float_t  fRelativeScale;          // Scale of the deposited charge
           Float_t  fThresholdClusterPRF2;   // Threshold on cluster pad signals
+          Bool_t   fLimitChargeIntegration; // Integration range for the gain calibration
+         Bool_t   fFillWithZero;           // Fill with zero or not the average pulse height
+         Bool_t   fNormalizeNbOfCluster;   // Normalize with the number of cluster for the gain
+         Float_t  fMaxCluster;             // Max amplitude of one cluster
+         Short_t  fNbMaxCluster;           // Number of tb at the end
+         Bool_t   fCutWithVdriftCalib;     // CutWithVdriftCalib for the gain and PH
+         Int_t    fMinNbTRDtracklets;      // Min number of TRD tracklets
+         Float_t  fMinTRDMomentum;         // Min TRD momentum
+  // Back correction
+         Int_t    fFirstRunGain;           // FirstRunGain 
+         Int_t    fVersionGainUsed;        // VersionGainUsed 
+         Int_t    fSubVersionGainUsed;     // SubVersionGainUsed
+         Int_t    fFirstRunGainLocal;      // FirstRunGainLocal 
+         Int_t    fVersionGainLocalUsed;   // VersionGainUsed 
+         Int_t    fSubVersionGainLocalUsed;// SubVersionGainUsed
+         Int_t    fFirstRunVdrift;         // FirstRunVdrift 
+         Int_t    fVersionVdriftUsed;      // VersionVdriftUsed 
+         Int_t    fSubVersionVdriftUsed;   // SubVersionVdriftUsed
+         Int_t    fFirstRunExB;            // FirstRunExB 
+         Int_t    fVersionExBUsed;         // VersionExBUsed 
+         Int_t    fSubVersionExBUsed;      // SubVersionExBUsed
   // Calibration mode
          AliTRDCalibraMode *fCalibraMode;  // Calibration mode
 
@@ -186,11 +247,15 @@ AliTRDCalibraVector *GetCalibraVector() const                                { r
   //
 
   // Fill the 2D histos in the offline tracking
-          Bool_t   fDetectorAliTRDtrack;    // Change of track
          Int_t    fDetectorPreviousTrack;  // Change of detector
          Int_t    fMCMPrevious;            // Change of MCM
          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)
@@ -198,25 +263,18 @@ AliTRDCalibraVector *GetCalibraVector() const                                { r
           Int_t    fNumberUsedPh[2];        // How many tracks have been really used for the drift velocity (0, strict; 1 with fDifference)
          Int_t    fTimeMax;                // Number of time bins
           Float_t  fSf;                     // Sampling frequence
+         Float_t  fRangeHistoCharge;       // Range of the histo for the charge
          Short_t  fNumberBinCharge;        // Number of bins for the gain factor
          Short_t  fNumberBinPRF;           // Number of bin for the PRF
          Short_t  fNgroupprf;              // Number of groups in tnp bins for PRF /2.0
 
   // Variables per tracklet
-         TObjArray     *fListClusters;              // List of clusters
-         Double_t      *fPar0;                      // List of track parameter fP[0]
-         Double_t      *fPar1;                      // List of track parameter fP[1]
-         Double_t      *fPar2;                      // List of track parameter fP[2]
-         Double_t      *fPar3;                      // List of track parameter fP[3]
-         Double_t      *fPar4;                      // List of track paarmeter fP[4]
          Float_t       *fAmpTotal;                  // Energy deposited in the calibration group by the track
           Short_t       *fPHPlace;                   // Calibration group of PH
           Float_t       *fPHValue;                   // PH
          Bool_t         fGoodTracklet;              // Good tracklet
- // Variables per track
-         Bool_t         fGoodTrack;                 // no return
-
- //Statistics
+         TLinearFitter *fLinearFitterTracklet;      // linear fitter tracklet  
+  //Statistics
          Int_t         *fEntriesCH;                 // Number of entries CH
          Int_t         *fEntriesLinearFitter;       // Number of entries LinearFitter
 
@@ -234,54 +292,52 @@ AliTRDCalibraVector *GetCalibraVector() const                                { r
          TH2I            *fCH2d;                         // 2D deposited charge
          TObjArray       fLinearFitterArray;             // TObjArray of Linear Fitters for the detectors 
          AliTRDCalibraVdriftLinearFit *fLinearVdriftFit; // Info Linear Fit
+          AliTRDCalibraExbAltFit *fExbAltFit; // ExB parabolic fit (alternative to vdrift linear fit)
          
  // Current calib object: to correct for the database used
          AliTRDCalDet *fCalDetGain;                      // Current calib object gain
          AliTRDCalROC *fCalROCGain;                      // Current calib object gain
-         AliTRDCalDet *fCalDetT0;                        // Current calib object T0
-         AliTRDCalROC *fCalROCT0;                        // Current calib object T0
-
+          
   //
   // A lot of internal functions......
+  // Init
+         Bool_t   InitCalPad(Int_t detector);
   //
   // Create the 2D histo to be filled Online
           void     CreateCH2d(Int_t nn);
           void     CreatePH2d(Int_t nn);
           void     CreatePRF2d(Int_t nn);
   
-  // Fill the 2D
+  // Calibration with AliTRDtrackV1
           void     FillTheInfoOfTheTrackPH();
-          void     FillTheInfoOfTheTrackCH();
+          void     FillTheInfoOfTheTrackCH(Int_t nbclusters);
+         Bool_t   FindP1TrackPHtrackletV1(const AliTRDseedV1 *tracklet, Int_t nbclusters);
+         Bool_t   HandlePRFtrackletV1(const AliTRDseedV1 *tracklet, Int_t nbclusters);
+         void     ResetfVariablestracklet();
+         Float_t  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);
-         Bool_t   FindP1TrackPH();
-         Bool_t   FindP1TrackPHtrack(AliTRDtrack *t, Int_t index0, Int_t index1);
-          void     ResetfVariables();
-         void     ResetfVariablestrack();
+
+  // Calibration on DAQ
+
+         Int_t    FillDAQ(Double_t phvalue[16][144][36]);
+         Bool_t   UpdateDAQ(Int_t det, Int_t /*row*/, Int_t /*col*/, Int_t timebin, Float_t signal, Int_t nbtimebins);
+         
+ // row col calibration groups stuff
           Bool_t   LocalisationDetectorXbins(Int_t detector);
-         Int_t   *CalculateRowCol(AliTRDcluster *cl) const;
-         void     CheckGoodTracklet(Int_t detector, Int_t *rowcol);
-         Int_t    CalculateCalibrationGroup(Int_t i, Int_t *rowcol) const;
          Int_t    CalculateTotalNumberOfBins(Int_t i);
-         void     StoreInfoCHPH(AliTRDcluster *cl, AliTRDtrack *t, Int_t *group, Int_t *rowcol);
-         void     StoreInfoCHPHtrack(AliTRDcluster *cl, AliTRDtrack *t, Int_t index, Int_t *group, Int_t *rowcol);
-         Bool_t   HandlePRF();
-         Bool_t   HandlePRFtrack(AliTRDtrack *t, Int_t index0, Int_t index1);
-  // LinearFitter
-         void     AnalyseLinearFitter();
+         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
           void     ClearHistos();
       
   // 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;
          
-          Int_t    Arrondi(Double_t x)const;
-
+          
   // Instance of this class and so on
   static  AliTRDCalibraFillHisto *fgInstance;                // Instance
   static  Bool_t   fgTerminated;                             // If terminated
@@ -292,7 +348,7 @@ AliTRDCalibraVector *GetCalibraVector() const                                { r
   AliTRDCalibraFillHisto();
   virtual ~AliTRDCalibraFillHisto(); 
     
-  ClassDef(AliTRDCalibraFillHisto,4)                         // TRD Calibration class
+  ClassDef(AliTRDCalibraFillHisto,7)                         // TRD Calibration class
 
 };