Coding violation fixies (Jens Viechula)

diff --git a/TPC/AliTPCCalibCE.cxx b/TPC/AliTPCCalibCE.cxx
index 4842f327eb96f7a862ba77a5e762a11944c60b21..b12808b871b33486d326660001253b2ee47f964c 100644 (file)
--- a/TPC/AliTPCCalibCE.cxx
+++ b/TPC/AliTPCCalibCE.cxx
@@ -13,56 +13,15 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-
-
-
-
-
-
 /* $Id$ */
 
-
-
-//Root includes
-#include <TObjArray.h>
-#include <TH1F.h>
-#include <TH2S.h>
-#include <TString.h>
-#include <TVectorF.h>
-#include <TVectorD.h>
-#include <TMatrixD.h>
-#include <TMath.h>
-#include <TGraph.h>
-#include <TString.h>
-
-#include <TDirectory.h>
-#include <TSystem.h>
-#include <TFile.h>
-
-//AliRoot includes
-#include "AliRawReader.h"
-#include "AliRawReaderRoot.h"
-#include "AliRawReaderDate.h"
-#include "AliRawEventHeaderBase.h"
-#include "AliTPCRawStream.h"
-#include "AliTPCcalibDB.h"
-#include "AliTPCCalROC.h"
-#include "AliTPCCalPad.h"
-#include "AliTPCROC.h"
-#include "AliTPCParam.h"
-#include "AliTPCCalibCE.h"
-#include "AliMathBase.h"
-#include "TTreeStream.h"
-
-//date
-#include "event.h"
-ClassImp(AliTPCCalibCE)
-
-//////////////////////////////////////////////////////////////////////////////////////
-//          Implementation of the TPC Central Electrode calibration
-//
-//   Origin: Jens Wiechula, Marian Ivanov   J.Wiechula@gsi.de, Marian.Ivanov@cern.ch
-// 
+////////////////////////////////////////////////////////////////////////////////////////
+//                                                                                    //
+//             Implementation of the TPC Central Electrode calibration                //
+//                                                                                    //
+//   Origin: Jens Wiechula, Marian Ivanov   J.Wiechula@gsi.de, Marian.Ivanov@cern.ch  //
+//                                                                                    //
+////////////////////////////////////////////////////////////////////////////////////////
 //
 //
 // *************************************************************************************
@@ -299,6 +258,42 @@ END_HTML */
 //////////////////////////////////////////////////////////////////////////////////////
 
 
+//Root includes
+#include <TObjArray.h>
+#include <TH1F.h>
+#include <TH2S.h>
+#include <TString.h>
+#include <TVectorF.h>
+#include <TVectorD.h>
+#include <TMatrixD.h>
+#include <TMath.h>
+#include <TGraph.h>
+#include <TString.h>
+
+#include <TDirectory.h>
+#include <TSystem.h>
+#include <TFile.h>
+
+//AliRoot includes
+#include "AliRawReader.h"
+#include "AliRawReaderRoot.h"
+#include "AliRawReaderDate.h"
+#include "AliRawEventHeaderBase.h"
+#include "AliTPCRawStream.h"
+#include "AliTPCcalibDB.h"
+#include "AliTPCCalROC.h"
+#include "AliTPCCalPad.h"
+#include "AliTPCROC.h"
+#include "AliTPCParam.h"
+#include "AliTPCCalibCE.h"
+#include "AliMathBase.h"
+#include "TTreeStream.h"
+
+//date
+#include "event.h"
+ClassImp(AliTPCCalibCE)
+
+
 AliTPCCalibCE::AliTPCCalibCE() :
     TObject(),
     fFirstTimeBin(650),
@@ -355,7 +350,7 @@ AliTPCCalibCE::AliTPCCalibCE() :
     fVTime0OffsetCounter(72),
     fVMeanQ(72),
     fVMeanQCounter(72),
-    fEvent(-1),
+//    fEvent(-1),
     fDebugStreamer(0x0),
     fDebugLevel(0)
 {
@@ -421,7 +416,7 @@ AliTPCCalibCE::AliTPCCalibCE(const AliTPCCalibCE &sig) :
     fVTime0OffsetCounter(72),
     fVMeanQ(72),
     fVMeanQCounter(72),
-    fEvent(-1),
+//    fEvent(-1),
     fDebugStreamer(0x0),
     fDebugLevel(sig.fDebugLevel)
 {
@@ -547,6 +542,7 @@ AliTPCCalibCE::~AliTPCCalibCE()
 
     if ( fDebugStreamer) delete fDebugStreamer;
 //    if ( fHTime0 ) delete fHTime0;
+    delete fROC;
     delete fParam;
 }
 //_____________________________________________________________________
@@ -736,7 +732,7 @@ void AliTPCCalibCE::FindCESignal(TVectorD &param, Float_t &qSum, const TVectorF
     qSum     = ceQsum;
 }
 //_____________________________________________________________________
-Bool_t AliTPCCalibCE::IsPeak(Int_t pos, Int_t tminus, Int_t tplus)
+Bool_t AliTPCCalibCE::IsPeak(Int_t pos, Int_t tminus, Int_t tplus) const
 {
     //
     // Check if 'pos' is a Maximum. Consider 'tminus' timebins before
@@ -788,8 +784,8 @@ void AliTPCCalibCE::ProcessPad()
 
 
     TVectorD param(3);
-    Float_t  Qsum;
-    FindCESignal(param, Qsum, maxima);
+    Float_t  qSum;
+    FindCESignal(param, qSum, maxima);
 
     Double_t meanT  = param[1];
     Double_t sigmaT = param[2];
@@ -798,7 +794,7 @@ void AliTPCCalibCE::ProcessPad()
     (*GetPadTimesEvent(fCurrentSector,kTRUE)).GetMatrixArray()[fCurrentChannel] = meanT;
 
     //Fill Q histogram
-    GetHistoQ(fCurrentSector,kTRUE)->Fill( TMath::Sqrt(Qsum), fCurrentChannel );
+    GetHistoQ(fCurrentSector,kTRUE)->Fill( TMath::Sqrt(qSum), fCurrentChannel );
 
     //Fill RMS histogram
     GetHistoRMS(fCurrentSector,kTRUE)->Fill( sigmaT, fCurrentChannel );
@@ -808,7 +804,7 @@ void AliTPCCalibCE::ProcessPad()
     if ( fDebugLevel>0 ){
        (*GetPadPedestalEvent(fCurrentSector,kTRUE)).GetMatrixArray()[fCurrentChannel]=fPadPedestal;
        (*GetPadRMSEvent(fCurrentSector,kTRUE)).GetMatrixArray()[fCurrentChannel]=sigmaT;
-       (*GetPadQEvent(fCurrentSector,kTRUE)).GetMatrixArray()[fCurrentChannel]=Qsum;
+       (*GetPadQEvent(fCurrentSector,kTRUE)).GetMatrixArray()[fCurrentChannel]=qSum;
     }
 
     ResetPad();
@@ -895,20 +891,20 @@ void AliTPCCalibCE::EndEvent()
        vMeanQ->GetMatrixArray()[fNevents]=meanQ;
 
        for ( UInt_t iChannel=0; iChannel<fROC->GetNChannels(iSec); ++iChannel ){
-           Float_t Time  = (*vTimes).GetMatrixArray()[iChannel];
+           Float_t time  = (*vTimes).GetMatrixArray()[iChannel];
 
            //set values for temporary roc calibration class
            if ( iSec < 36 ) {
-               calIroc->SetValue(iChannel, Time);
-                if ( Time == 0 ) calIrocOutliers.SetValue(iChannel,1);
+               calIroc->SetValue(iChannel, time);
+                if ( time == 0 ) calIrocOutliers.SetValue(iChannel,1);
 
            } else {
-               calOroc->SetValue(iChannel, Time);
-                if ( Time == 0 ) calOrocOutliers.SetValue(iChannel,1);
+               calOroc->SetValue(iChannel, time);
+                if ( time == 0 ) calOrocOutliers.SetValue(iChannel,1);
            }
 
            if ( (fNevents>0) && (fOldRunNumber==fRunNumber) )
-               GetHistoT0(iSec,kTRUE)->Fill( Time-time0Side[(iSec/18)%2],iChannel );
+               GetHistoT0(iSec,kTRUE)->Fill( time-time0Side[(iSec/18)%2],iChannel );
 
 
 
@@ -925,8 +921,8 @@ void AliTPCCalibCE::EndEvent()
                Int_t pad=0;
                Int_t padc=0;
 
-               Float_t Q   = (*GetPadQEvent(iSec))[iChannel];
-                Float_t RMS = (*GetPadRMSEvent(iSec))[iChannel];
+               Float_t q   = (*GetPadQEvent(iSec))[iChannel];
+                Float_t rms = (*GetPadRMSEvent(iSec))[iChannel];
 
                UInt_t channel=iChannel;
                Int_t sector=iSec;
@@ -944,10 +940,10 @@ void AliTPCCalibCE::EndEvent()
 //             for (Int_t i=fFirstTimeBin; i<fLastTimeBin+1; ++i)
 //                 h1->Fill(i,fPadSignal(i));
 
-               Double_t T0Sec = 0;
+               Double_t t0Sec = 0;
                if (fVTime0OffsetCounter.GetMatrixArray()[iSec]>0)
-                   T0Sec = fVTime0Offset.GetMatrixArray()[iSec]/fVTime0OffsetCounter.GetMatrixArray()[iSec];
-               Double_t T0Side = time0Side[(iSec/18)%2];
+                   t0Sec = fVTime0Offset.GetMatrixArray()[iSec]/fVTime0OffsetCounter.GetMatrixArray()[iSec];
+               Double_t t0Side = time0Side[(iSec/18)%2];
                (*fDebugStreamer) << "DataPad" <<
                    "Event=" << fNevents <<
                    "RunNumber=" << fRunNumber <<
@@ -957,11 +953,11 @@ void AliTPCCalibCE::EndEvent()
                    "Pad="   << pad <<
                    "PadC="  << padc <<
                    "PadSec="<< channel <<
-                   "Time0Sec="  << T0Sec <<
-                   "Time0Side=" << T0Side <<
-                   "Time="  << Time <<
-                   "RMS="   << RMS <<
-                   "Sum="   << Q <<
+                   "Time0Sec="  << t0Sec <<
+                   "Time0Side=" << t0Side <<
+                   "Time="  << time <<
+                   "RMS="   << rms <<
+                   "Sum="   << q <<
                     "MeanQ=" << meanQ <<
                    //              "hist.=" << h1 <<
                    "\n";
@@ -1003,7 +999,7 @@ void AliTPCCalibCE::EndEvent()
                if ( backup ) backup->cd();  //we don't want to be cd'd to the debug streamer
            }
            (*fDebugStreamer) << "DataRoc" <<
-               "Event=" << fEvent <<
+//             "Event=" << fEvent <<
                "RunNumber=" << fRunNumber <<
                "TimeStamp="   << fTimeStamp <<
                "Sector="<< iSec <<
@@ -1191,7 +1187,7 @@ TH1S* AliTPCCalibCE::GetHistoTmean(Int_t sector, Bool_t force)
     return GetHisto(sector, arr, "LastTmean", force);
 }
 //_____________________________________________________________________
-TVectorF* AliTPCCalibCE::GetVectSector(Int_t sector, TObjArray *arr, UInt_t size, Bool_t force)
+TVectorF* AliTPCCalibCE::GetVectSector(Int_t sector, TObjArray *arr, UInt_t size, Bool_t force) const
 {
     //
     // return pointer to Pad Info from 'arr' for the current event and sector
@@ -1269,7 +1265,7 @@ TVectorF* AliTPCCalibCE::GetQMeanEvents(Int_t sector, Bool_t force)
     return GetVectSector(sector,arr,100,force);
 }
 //_____________________________________________________________________
-AliTPCCalROC* AliTPCCalibCE::GetCalRoc(Int_t sector, TObjArray* arr, Bool_t force)
+AliTPCCalROC* AliTPCCalibCE::GetCalRoc(Int_t sector, TObjArray* arr, Bool_t force) const
 {
     //
     // return pointer to ROC Calibration
@@ -1326,7 +1322,7 @@ AliTPCCalROC* AliTPCCalibCE::GetCalRocOutliers(Int_t sector, Bool_t force)
     return GetCalRoc(sector, arr, force);
 }
 //_____________________________________________________________________
-TObjArray* AliTPCCalibCE::GetParamArray(Int_t sector, TObjArray* arr, Bool_t force)
+TObjArray* AliTPCCalibCE::GetParamArray(Int_t sector, TObjArray* arr, Bool_t force) const
 {
     //
     // return pointer to TObjArray of fit parameters
@@ -1611,9 +1607,9 @@ void AliTPCCalibCE::Analyse()
        TH2S *hQ   = GetHistoQ(iSec);
        TH2S *hRMS = GetHistoRMS(iSec);
 
-       Short_t *array_hQ   = hQ->GetArray();
-       Short_t *array_hT0  = hT0->GetArray();
-       Short_t *array_hRMS = hRMS->GetArray();
+       Short_t *arrayhQ   = hQ->GetArray();
+       Short_t *arrayhT0  = hT0->GetArray();
+       Short_t *arrayhRMS = hRMS->GetArray();
 
         UInt_t nChannels = fROC->GetNChannels(iSec);
 
@@ -1636,9 +1632,9 @@ void AliTPCCalibCE::Analyse()
            Int_t offsetT0 = (fNbinsT0+2)*(iChannel+1)+1;
            Int_t offsetRMS = (fNbinsRMS+2)*(iChannel+1)+1;
 
-           cogQ     = AliMathBase::GetCOG(array_hQ+offsetQ,fNbinsQ,fXminQ,fXmaxQ);
-           cogTime0 = AliMathBase::GetCOG(array_hT0+offsetT0,fNbinsT0,fXminT0,fXmaxT0);
-            cogRMS   = AliMathBase::GetCOG(array_hRMS+offsetRMS,fNbinsRMS,fXminRMS,fXmaxRMS);
+           cogQ     = AliMathBase::GetCOG(arrayhQ+offsetQ,fNbinsQ,fXminQ,fXmaxQ);
+           cogTime0 = AliMathBase::GetCOG(arrayhT0+offsetT0,fNbinsT0,fXminT0,fXmaxT0);
+            cogRMS   = AliMathBase::GetCOG(arrayhRMS+offsetRMS,fNbinsRMS,fXminRMS,fXmaxRMS);
 
 
 

diff --git a/TPC/AliTPCCalibCE.h b/TPC/AliTPCCalibCE.h
index 44500b2cc25d0524ee8e3d5d2e58d5ed1931a8fa..18635e5091b97c1268ead03286e2687f063138e1 100644 (file)
--- a/TPC/AliTPCCalibCE.h
+++ b/TPC/AliTPCCalibCE.h
@@ -3,6 +3,12 @@
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
+////////////////////////////////////////////////////////////////////////////////////////
+//                                                                                    //
+//             Implementation of the TPC Central Electrode calibration                //
+//                                                                                    //
+////////////////////////////////////////////////////////////////////////////////////////
+
 #include <TVectorT.h>
 class TObjArray;
 class TH1S;
@@ -36,15 +42,15 @@ public:
               const Int_t iTimeBin, const Float_t signal);
     void Analyse();
     //
-    AliTPCCalROC* GetCalRocT0 (Int_t sector, Bool_t force=kFALSE);  // get calibration object - sector
-    AliTPCCalROC* GetCalRocQ  (Int_t sector, Bool_t force=kFALSE);  // get calibration object - sector
+    AliTPCCalROC* GetCalRocT0  (Int_t sector, Bool_t force=kFALSE);  // get calibration object - sector
+    AliTPCCalROC* GetCalRocQ   (Int_t sector, Bool_t force=kFALSE);  // get calibration object - sector
     AliTPCCalROC* GetCalRocRMS(Int_t sector, Bool_t force=kFALSE);  // get calibration object - sector
     AliTPCCalROC* GetCalRocOutliers(Int_t sector, Bool_t force=kFALSE);  // get calibration object - sector
 
-    const TObjArray* GetCalPadT0() { return &fCalRocArrayT0; }      // get calibration object
-    const TObjArray* GetCalPadQ()  { return &fCalRocArrayQ;  }      // get calibration object
-    const TObjArray* GetCalPadRMS(){ return &fCalRocArrayRMS;}      // get calibration object
-    const TObjArray* GetCalPadOutliers(){ return &fCalRocArrayOutliers;}      // get calibration object
+    const TObjArray* GetCalPadT0()  const { return &fCalRocArrayT0; }      // get calibration object
+    const TObjArray* GetCalPadQ()   const { return &fCalRocArrayQ;  }      // get calibration object
+    const TObjArray* GetCalPadRMS() const { return &fCalRocArrayRMS;}      // get calibration object
+    const TObjArray* GetCalPadOutliers() const { return &fCalRocArrayOutliers;}      // get calibration object
 
     TH2S* GetHistoQ  (Int_t sector, Bool_t force=kFALSE);           // get refernce histogram
     TH2S* GetHistoT0 (Int_t sector, Bool_t force=kFALSE);           // get refernce histogram
@@ -86,7 +92,7 @@ public:
     Int_t GetFirstTimeBin()   const { return fFirstTimeBin;  }
     Int_t GetLastTimeBin()    const { return fLastTimeBin;   }
 
-    Int_t GetNeventsProcessed() { return fNevents; }
+    Int_t GetNeventsProcessed() const { return fNevents; }
 
     void Merge(AliTPCCalibCE *ce);
 
@@ -163,16 +169,16 @@ private:
     TVectorD  fVMeanQ;                //!  Mean Q for each sector;
     TVectorD  fVMeanQCounter;         //!  Mean Q counter for each sector;
     //debugging
-    Int_t fEvent;
+//    Int_t fEvent;
     TTreeSRedirector *fDebugStreamer;  //! debug streamer
 
-    Short_t fDebugLevel;
+    Short_t fDebugLevel;              // debug level
     //! debugging
 
     void   FindPedestal(Float_t part=.6);
     void   FindCESignal(TVectorD &param, Float_t &qSum, const TVectorF maxima);
     void   FindLocalMaxima(TVectorF &maxima);
-    Bool_t IsPeak(Int_t pos, Int_t tminus, Int_t tplus);
+    Bool_t IsPeak(Int_t pos, Int_t tminus, Int_t tplus) const;
 
     TH2S* GetHisto(Int_t sector, TObjArray *arr,
                   Int_t nbinsY, Float_t ymin, Float_t ymax,
@@ -180,12 +186,12 @@ private:
     TH1S* GetHisto(Int_t sector, TObjArray *arr,
                   Char_t *type, Bool_t force);
 
-    AliTPCCalROC* GetCalRoc(Int_t sector, TObjArray* arr, Bool_t force);
+    AliTPCCalROC* GetCalRoc(Int_t sector, TObjArray* arr, Bool_t force) const;
 
-    TVectorF* GetVectSector(Int_t sector, TObjArray *arr, UInt_t size, Bool_t force=kFALSE);
+    TVectorF* GetVectSector(Int_t sector, TObjArray *arr, UInt_t size, Bool_t force=kFALSE) const;
     TVectorF* GetPadTimesEvent(Int_t sector, Bool_t force=kFALSE);
 
-    TObjArray* GetParamArray(Int_t sector, TObjArray *arr, Bool_t force=kFALSE);
+    TObjArray* GetParamArray(Int_t sector, TObjArray *arr, Bool_t force=kFALSE) const;
 
     void ResetEvent();
     void ResetPad();
@@ -198,10 +204,6 @@ private:
     TVectorF* GetPadRMSEvent(Int_t sector, Bool_t force=kFALSE);
     TVectorF* GetPadPedestalEvent(Int_t sector, Bool_t force=kFALSE);
 
-
-public:
-
-
     ClassDef(AliTPCCalibCE,2)  //Implementation of the TPC Central Electrode calibration
 
 };

diff --git a/TPC/AliTPCCalibPulser.cxx b/TPC/AliTPCCalibPulser.cxx
index 2faef43afe65fea73c0ae22064450c77f84e13cf..1c88353712bc682cfb5a4e0690b112f87d87955e 100644 (file)
--- a/TPC/AliTPCCalibPulser.cxx
+++ b/TPC/AliTPCCalibPulser.cxx
@@ -15,41 +15,13 @@
 
 /* $Id$ */
 
-//Root includes
-#include <TH1F.h>
-#include <TH2S.h>
-#include <TString.h>
-#include <TVectorF.h>
-#include <TMath.h>
-
-#include <TDirectory.h>
-#include <TSystem.h>
-#include <TFile.h>
-
-//AliRoot includes
-#include "AliRawReader.h"
-#include "AliRawReaderRoot.h"
-#include "AliRawReaderDate.h"
-#include "AliTPCRawStream.h"
-#include "AliTPCCalROC.h"
-#include "AliTPCCalPad.h"
-#include "AliTPCROC.h"
-#include "AliTPCParam.h"
-#include "AliTPCCalibPulser.h"
-#include "AliTPCcalibDB.h"
-#include "AliMathBase.h"
-#include "TTreeStream.h"
-
-//date
-#include "event.h"
-
-
-///////////////////////////////////////////////////////////////////////////////////////
-//          Implementation of the TPC pulser calibration
-//
-//   Origin: Jens Wiechula, Marian Ivanov   J.Wiechula@gsi.de, Marian.Ivanov@cern.ch
-// 
-// 
+/////////////////////////////////////////////////////////////////////////////////////////
+//                                                                                     //
+//                  Implementation of the TPC pulser calibration                       //
+//                                                                                     //
+//   Origin: Jens Wiechula, Marian Ivanov   J.Wiechula@gsi.de, Marian.Ivanov@cern.ch   //
+//                                                                                     //
+/////////////////////////////////////////////////////////////////////////////////////////
 /***************************************************************************
  *                      Class Description                                  *
  ***************************************************************************
@@ -191,9 +163,42 @@
 */
 
 
-ClassImp(AliTPCCalibPulser) /*FOLD00*/
+//Root includes
+#include <TObjArray.h>
+#include <TH1F.h>
+#include <TH2S.h>
+#include <TString.h>
+#include <TVectorF.h>
+#include <TMath.h>
+
+#include <TDirectory.h>
+#include <TSystem.h>
+#include <TROOT.h>
+#include <TFile.h>
+
+//AliRoot includes
+#include "AliRawReader.h"
+#include "AliRawReaderRoot.h"
+#include "AliRawReaderDate.h"
+#include "AliTPCRawStream.h"
+#include "AliTPCCalROC.h"
+#include "AliTPCCalPad.h"
+#include "AliTPCROC.h"
+#include "AliTPCParam.h"
+#include "AliTPCCalibPulser.h"
+#include "AliTPCcalibDB.h"
+#include "AliMathBase.h"
+#include "TTreeStream.h"
 
-AliTPCCalibPulser::AliTPCCalibPulser() : /*FOLD00*/
+//date
+#include "event.h"
+
+
+
+
+ClassImp(AliTPCCalibPulser)
+
+AliTPCCalibPulser::AliTPCCalibPulser() :
     TObject(),
     fFirstTimeBin(60),
     fLastTimeBin(120),
@@ -235,7 +240,7 @@ AliTPCCalibPulser::AliTPCCalibPulser() : /*FOLD00*/
     fPadNoise(0),
     fVTime0Offset(72),
     fVTime0OffsetCounter(72),
-    fEvent(-1),
+//    fEvent(-1),
     fDebugStreamer(0x0),
     fDebugLevel(0)
 {
@@ -287,7 +292,7 @@ AliTPCCalibPulser::AliTPCCalibPulser(const AliTPCCalibPulser &sig) :
     fPadNoise(0),
     fVTime0Offset(72),
     fVTime0OffsetCounter(72),
-    fEvent(-1),
+//    fEvent(-1),
     fDebugStreamer(0x0),
     fDebugLevel(sig.fDebugLevel)
 {
@@ -361,17 +366,18 @@ AliTPCCalibPulser::~AliTPCCalibPulser()
     fPadPedestalArrayEvent.Delete();
 
     if ( fDebugStreamer) delete fDebugStreamer;
+    delete fROC;
     delete fParam;
 }
 //_____________________________________________________________________
-Int_t AliTPCCalibPulser::Update(const Int_t icsector, /*FOLD00*/
+Int_t AliTPCCalibPulser::Update(const Int_t icsector,
                                const Int_t icRow,
                                const Int_t icPad,
                                const Int_t icTimeBin,
                                const Float_t csignal)
 {
     //
-    // Signal filling methode on the fly pedestal and Time offset correction if necessary.
+    // Signal filling methode on the fly pedestal and time offset correction if necessary.
     // no extra analysis necessary. Assumes knowledge of the signal shape!
     // assumes that it is looped over consecutive time bins of one pad
     //
@@ -532,7 +538,7 @@ void AliTPCCalibPulser::FindPulserSignal(TVectorD &param, Float_t &qSum)
     qSum     = ceQsum;
 }
 //_____________________________________________________________________
-void AliTPCCalibPulser::ProcessPad() /*FOLD00*/
+void AliTPCCalibPulser::ProcessPad()
 {
     //
     //  Process data of current pad
@@ -540,8 +546,8 @@ void AliTPCCalibPulser::ProcessPad() /*FOLD00*/
 
     FindPedestal();
     TVectorD param(3);
-    Float_t  Qsum;
-    FindPulserSignal(param, Qsum);
+    Float_t  qSum;
+    FindPulserSignal(param, qSum);
 
     Double_t meanT  = param[1];
     Double_t sigmaT = param[2];
@@ -550,7 +556,7 @@ void AliTPCCalibPulser::ProcessPad() /*FOLD00*/
     (*GetPadTimesEvent(fCurrentSector,kTRUE)).GetMatrixArray()[fCurrentChannel] = meanT;
 
     //Fill Q histogram
-    GetHistoQ(fCurrentSector,kTRUE)->Fill( TMath::Sqrt(Qsum), fCurrentChannel );
+    GetHistoQ(fCurrentSector,kTRUE)->Fill( TMath::Sqrt(qSum), fCurrentChannel );
 
     //Fill RMS histogram
     GetHistoRMS(fCurrentSector,kTRUE)->Fill( sigmaT, fCurrentChannel );
@@ -560,13 +566,12 @@ void AliTPCCalibPulser::ProcessPad() /*FOLD00*/
     if ( fDebugLevel>0 ){
        (*GetPadPedestalEvent(fCurrentSector,kTRUE))[fCurrentChannel]=fPadPedestal;
        (*GetPadRMSEvent(fCurrentSector,kTRUE))[fCurrentChannel]=sigmaT;
-       (*GetPadQEvent(fCurrentSector,kTRUE))[fCurrentChannel]=Qsum;
+       (*GetPadQEvent(fCurrentSector,kTRUE))[fCurrentChannel]=qSum;
     }
-
     ResetPad();
 }
 //_____________________________________________________________________
-void AliTPCCalibPulser::EndEvent() /*FOLD00*/
+void AliTPCCalibPulser::EndEvent()
 {
     //
     //  Process data of current event
@@ -581,10 +586,10 @@ void AliTPCCalibPulser::EndEvent() /*FOLD00*/
         if ( !vTimes ) continue;
 
        for ( UInt_t iChannel=0; iChannel<fROC->GetNChannels(iSec); ++iChannel ){
-           Float_t Time0 = fVTime0Offset[iSec]/fVTime0OffsetCounter[iSec];
-           Float_t Time  = (*vTimes).GetMatrixArray()[iChannel];
+           Float_t time0 = fVTime0Offset[iSec]/fVTime0OffsetCounter[iSec];
+           Float_t time  = (*vTimes).GetMatrixArray()[iChannel];
 
-            GetHistoT0(iSec,kTRUE)->Fill( Time-Time0,iChannel );
+            GetHistoT0(iSec,kTRUE)->Fill( time-time0,iChannel );
 
 
            //Debug start
@@ -600,8 +605,8 @@ void AliTPCCalibPulser::EndEvent() /*FOLD00*/
                Int_t pad=0;
                Int_t padc=0;
 
-               Float_t Q   = (*GetPadQEvent(iSec)).GetMatrixArray()[iChannel];
-                Float_t RMS = (*GetPadRMSEvent(iSec)).GetMatrixArray()[iChannel];
+               Float_t q   = (*GetPadQEvent(iSec)).GetMatrixArray()[iChannel];
+                Float_t rms = (*GetPadRMSEvent(iSec)).GetMatrixArray()[iChannel];
 
                UInt_t channel=iChannel;
                Int_t sector=iSec;
@@ -620,16 +625,16 @@ void AliTPCCalibPulser::EndEvent() /*FOLD00*/
                    h1->Fill(i,fPadSignal(i));
 
                (*fDebugStreamer) << "DataPad" <<
-                   "Event=" << fEvent <<
+//                 "Event=" << fEvent <<
                    "Sector="<< sector <<
                    "Row="   << row<<
                    "Pad="   << pad <<
                    "PadC="  << padc <<
                    "PadSec="<< channel <<
-                   "Time0="  << Time0 <<
-                   "Time="  << Time <<
-                   "RMS="   << RMS <<
-                   "Sum="   << Q <<
+                   "Time0="  << time0 <<
+                   "Time="  << time <<
+                   "RMS="   << rms <<
+                   "Sum="   << q <<
                    "hist.=" << h1 <<
                    "\n";
 
@@ -642,7 +647,7 @@ void AliTPCCalibPulser::EndEvent() /*FOLD00*/
 
 }
 //_____________________________________________________________________
-Bool_t AliTPCCalibPulser::ProcessEvent(AliTPCRawStream *rawStream) /*FOLD00*/
+Bool_t AliTPCCalibPulser::ProcessEvent(AliTPCRawStream *rawStream)
 {
   //
   // Event Processing loop - AliTPCRawStream
@@ -699,7 +704,7 @@ Bool_t AliTPCCalibPulser::ProcessEvent(eventHeaderStruct *event)
 
 }
 //_____________________________________________________________________
-TH2S* AliTPCCalibPulser::GetHisto(Int_t sector, TObjArray *arr, /*FOLD00*/
+TH2S* AliTPCCalibPulser::GetHisto(Int_t sector, TObjArray *arr,
                                  Int_t nbinsY, Float_t ymin, Float_t ymax,
                                  Char_t *type, Bool_t force)
 {
@@ -725,7 +730,7 @@ TH2S* AliTPCCalibPulser::GetHisto(Int_t sector, TObjArray *arr, /*FOLD00*/
     return hist;
 }
 //_____________________________________________________________________
-TH2S* AliTPCCalibPulser::GetHistoT0(Int_t sector, Bool_t force) /*FOLD00*/
+TH2S* AliTPCCalibPulser::GetHistoT0(Int_t sector, Bool_t force)
 {
     //
     // return pointer to T0 histogram
@@ -735,7 +740,7 @@ TH2S* AliTPCCalibPulser::GetHistoT0(Int_t sector, Bool_t force) /*FOLD00*/
     return GetHisto(sector, arr, fNbinsT0, fXminT0, fXmaxT0, "T0", force);
 }
 //_____________________________________________________________________
-TH2S* AliTPCCalibPulser::GetHistoQ(Int_t sector, Bool_t force) /*FOLD00*/
+TH2S* AliTPCCalibPulser::GetHistoQ(Int_t sector, Bool_t force)
 {
     //
     // return pointer to Q histogram
@@ -745,7 +750,7 @@ TH2S* AliTPCCalibPulser::GetHistoQ(Int_t sector, Bool_t force) /*FOLD00*/
     return GetHisto(sector, arr, fNbinsQ, fXminQ, fXmaxQ, "Q", force);
 }
 //_____________________________________________________________________
-TH2S* AliTPCCalibPulser::GetHistoRMS(Int_t sector, Bool_t force) /*FOLD00*/
+TH2S* AliTPCCalibPulser::GetHistoRMS(Int_t sector, Bool_t force)
 {
     //
     // return pointer to Q histogram
@@ -755,7 +760,7 @@ TH2S* AliTPCCalibPulser::GetHistoRMS(Int_t sector, Bool_t force) /*FOLD00*/
     return GetHisto(sector, arr, fNbinsRMS, fXminRMS, fXmaxRMS, "RMS", force);
 }
 //_____________________________________________________________________
-TVectorF* AliTPCCalibPulser::GetPadInfoEvent(Int_t sector, TObjArray *arr, Bool_t force) /*FOLD00*/
+TVectorF* AliTPCCalibPulser::GetPadInfoEvent(Int_t sector, TObjArray *arr, Bool_t force)
 {
     //
     // return pointer to Pad Info from 'arr' for the current event and sector
@@ -769,7 +774,7 @@ TVectorF* AliTPCCalibPulser::GetPadInfoEvent(Int_t sector, TObjArray *arr, Bool_
     return vect;
 }
 //_____________________________________________________________________
-TVectorF* AliTPCCalibPulser::GetPadTimesEvent(Int_t sector, Bool_t force) /*FOLD00*/
+TVectorF* AliTPCCalibPulser::GetPadTimesEvent(Int_t sector, Bool_t force)
 {
     //
     // return pointer to Pad Times Array for the current event and sector
@@ -779,7 +784,7 @@ TVectorF* AliTPCCalibPulser::GetPadTimesEvent(Int_t sector, Bool_t force) /*FOLD
     return GetPadInfoEvent(sector,arr,force);
 }
 //_____________________________________________________________________
-TVectorF* AliTPCCalibPulser::GetPadQEvent(Int_t sector, Bool_t force) /*FOLD00*/
+TVectorF* AliTPCCalibPulser::GetPadQEvent(Int_t sector, Bool_t force)
 {
     //
     // return pointer to Pad Q Array for the current event and sector
@@ -791,7 +796,7 @@ TVectorF* AliTPCCalibPulser::GetPadQEvent(Int_t sector, Bool_t force) /*FOLD00*/
     return GetPadInfoEvent(sector,arr,force);
 }
 //_____________________________________________________________________
-TVectorF* AliTPCCalibPulser::GetPadRMSEvent(Int_t sector, Bool_t force) /*FOLD00*/
+TVectorF* AliTPCCalibPulser::GetPadRMSEvent(Int_t sector, Bool_t force)
 {
     //
     // return pointer to Pad RMS Array for the current event and sector
@@ -802,7 +807,7 @@ TVectorF* AliTPCCalibPulser::GetPadRMSEvent(Int_t sector, Bool_t force) /*FOLD00
     return GetPadInfoEvent(sector,arr,force);
 }
 //_____________________________________________________________________
-TVectorF* AliTPCCalibPulser::GetPadPedestalEvent(Int_t sector, Bool_t force) /*FOLD00*/
+TVectorF* AliTPCCalibPulser::GetPadPedestalEvent(Int_t sector, Bool_t force)
 {
     //
     // return pointer to Pad RMS Array for the current event and sector
@@ -813,7 +818,7 @@ TVectorF* AliTPCCalibPulser::GetPadPedestalEvent(Int_t sector, Bool_t force) /*F
     return GetPadInfoEvent(sector,arr,force);
 }
 //_____________________________________________________________________
-AliTPCCalROC* AliTPCCalibPulser::GetCalRoc(Int_t sector, TObjArray* arr, Bool_t force) /*FOLD00*/
+AliTPCCalROC* AliTPCCalibPulser::GetCalRoc(Int_t sector, TObjArray* arr, Bool_t force) const
 {
     //
     // return pointer to ROC Calibration
@@ -830,7 +835,7 @@ AliTPCCalROC* AliTPCCalibPulser::GetCalRoc(Int_t sector, TObjArray* arr, Bool_t
     return croc;
 }
 //_____________________________________________________________________
-AliTPCCalROC* AliTPCCalibPulser::GetCalRocT0(Int_t sector, Bool_t force) /*FOLD00*/
+AliTPCCalROC* AliTPCCalibPulser::GetCalRocT0(Int_t sector, Bool_t force)
 {
     //
     // return pointer to Carge ROC Calibration
@@ -840,7 +845,7 @@ AliTPCCalROC* AliTPCCalibPulser::GetCalRocT0(Int_t sector, Bool_t force) /*FOLD0
     return GetCalRoc(sector, arr, force);
 }
 //_____________________________________________________________________
-AliTPCCalROC* AliTPCCalibPulser::GetCalRocQ(Int_t sector, Bool_t force) /*FOLD00*/
+AliTPCCalROC* AliTPCCalibPulser::GetCalRocQ(Int_t sector, Bool_t force)
 {
     //
     // return pointer to T0 ROC Calibration
@@ -850,7 +855,7 @@ AliTPCCalROC* AliTPCCalibPulser::GetCalRocQ(Int_t sector, Bool_t force) /*FOLD00
     return GetCalRoc(sector, arr, force);
 }
 //_____________________________________________________________________
-AliTPCCalROC* AliTPCCalibPulser::GetCalRocRMS(Int_t sector, Bool_t force) /*FOLD00*/
+AliTPCCalROC* AliTPCCalibPulser::GetCalRocRMS(Int_t sector, Bool_t force)
 {
     //
     // return pointer to signal width ROC Calibration
@@ -870,7 +875,7 @@ AliTPCCalROC* AliTPCCalibPulser::GetCalRocOutliers(Int_t sector, Bool_t force)
     return GetCalRoc(sector, arr, force);
 }
 //_____________________________________________________________________
-void AliTPCCalibPulser::ResetEvent() /*FOLD00*/
+void AliTPCCalibPulser::ResetEvent()
 {
     //
     //  Reset global counters  -- Should be called before each event is processed
@@ -893,7 +898,7 @@ void AliTPCCalibPulser::ResetEvent() /*FOLD00*/
     }
 }
 //_____________________________________________________________________
-void AliTPCCalibPulser::ResetPad() /*FOLD00*/
+void AliTPCCalibPulser::ResetPad()
 {
     //
     //  Reset pad infos -- Should be called after a pad has been processed
@@ -956,7 +961,7 @@ void AliTPCCalibPulser::Merge(AliTPCCalibPulser *sig)
     }
 }
 //_____________________________________________________________________
-void AliTPCCalibPulser::Analyse() /*FOLD00*/
+void AliTPCCalibPulser::Analyse()
 {
     //
     //  Calculate calibration constants
@@ -979,9 +984,9 @@ void AliTPCCalibPulser::Analyse() /*FOLD00*/
        TH2S *hQ   = GetHistoQ(iSec);
        TH2S *hRMS = GetHistoRMS(iSec);
 
-       Short_t *array_hQ   = hQ->GetArray();
-       Short_t *array_hT0  = hT0->GetArray();
-       Short_t *array_hRMS = hRMS->GetArray();
+       Short_t *arrayhQ   = hQ->GetArray();
+       Short_t *arrayhT0  = hT0->GetArray();
+       Short_t *arrayhRMS = hRMS->GetArray();
 
         UInt_t nChannels = fROC->GetNChannels(iSec);
 
@@ -1005,16 +1010,16 @@ void AliTPCCalibPulser::Analyse() /*FOLD00*/
            Int_t offsetRMS = (fNbinsRMS+2)*(iChannel+1)+1;
 
 /*
-           AliMathBase::FitGaus(array_hQ+offsetQ,fNbinsQ,fXminQ,fXmaxQ,&paramQ,&dummy);
-           AliMathBase::FitGaus(array_hT0+offsetT0,fNbinsT0,fXminT0,fXmaxT0,&paramT0,&dummy);
-            AliMathBase::FitGaus(array_hRMS+offsetRMS,fNbinsRMS,fXminRMS,fXmaxRMS,&paramRMS,&dummy);
+           AliMathBase::FitGaus(arrayhQ+offsetQ,fNbinsQ,fXminQ,fXmaxQ,&paramQ,&dummy);
+           AliMathBase::FitGaus(arrayhT0+offsetT0,fNbinsT0,fXminT0,fXmaxT0,&paramT0,&dummy);
+            AliMathBase::FitGaus(arrayhRMS+offsetRMS,fNbinsRMS,fXminRMS,fXmaxRMS,&paramRMS,&dummy);
            cogQ     = paramQ[1];
            cogTime0 = paramT0[1];
            cogRMS   = paramRMS[1];
 */
-           cogQ     = AliMathBase::GetCOG(array_hQ+offsetQ,fNbinsQ,fXminQ,fXmaxQ);
-           cogTime0 = AliMathBase::GetCOG(array_hT0+offsetT0,fNbinsT0,fXminT0,fXmaxT0);
-            cogRMS   = AliMathBase::GetCOG(array_hRMS+offsetRMS,fNbinsRMS,fXminRMS,fXmaxRMS);
+           cogQ     = AliMathBase::GetCOG(arrayhQ+offsetQ,fNbinsQ,fXminQ,fXmaxQ);
+           cogTime0 = AliMathBase::GetCOG(arrayhT0+offsetT0,fNbinsT0,fXminT0,fXmaxT0);
+            cogRMS   = AliMathBase::GetCOG(arrayhRMS+offsetRMS,fNbinsRMS,fXminRMS,fXmaxRMS);
 
 
 

diff --git a/TPC/AliTPCCalibPulser.h b/TPC/AliTPCCalibPulser.h
index e3e7fa76f4fd13693e0a20ef99e14cd8d4fea05e..3a58df3e50e3a1c5d95864e79c9a75ccfb4d1275 100644 (file)
--- a/TPC/AliTPCCalibPulser.h
+++ b/TPC/AliTPCCalibPulser.h
@@ -3,10 +3,13 @@
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
-#include <TVectorT.h>
-#include <TObject.h>
-#include <TObjArray.h>
+/////////////////////////////////////////////////////////////////////////////////////////
+//                                                                                     //
+//                  Implementation of the TPC pulser calibration                       //
+//                                                                                     //
+/////////////////////////////////////////////////////////////////////////////////////////
 
+#include <TVectorT.h>
 class TObjArray;
 class TH2S;
 class TTreeSRedirector;
@@ -41,10 +44,10 @@ public:
     AliTPCCalROC* GetCalRocRMS(Int_t sector, Bool_t force=kFALSE);  // get calibration object - sector
     AliTPCCalROC* GetCalRocOutliers(Int_t sector, Bool_t force=kFALSE);  // get calibration object - sector
 
-    const TObjArray* GetCalPadT0() { return &fCalRocArrayT0; }      // get calibration object
-    const TObjArray* GetCalPadQ()  { return &fCalRocArrayQ;  }      // get calibration object
-    const TObjArray* GetCalPadRMS(){ return &fCalRocArrayRMS;}      // get calibration object
-    const TObjArray* GetCalPadOutliers(){ return &fCalRocArrayOutliers;}      // get calibration object
+    const TObjArray* GetCalPadT0()  const { return &fCalRocArrayT0; }      // get calibration object
+    const TObjArray* GetCalPadQ()   const { return &fCalRocArrayQ;  }      // get calibration object
+    const TObjArray* GetCalPadRMS() const{ return &fCalRocArrayRMS;}      // get calibration object
+    const TObjArray* GetCalPadOutliers() const { return &fCalRocArrayOutliers;}      // get calibration object
 
     TH2S* GetHistoQ  (Int_t sector, Bool_t force=kFALSE);           // get refernce histogram
     TH2S* GetHistoT0 (Int_t sector, Bool_t force=kFALSE);           // get refernce histogram
@@ -130,10 +133,10 @@ private:
     TVectorF  fVTime0OffsetCounter;   //!  Time0 Offset from preprocessing for each sector;
 
     //debugging
-    Int_t fEvent;
+//    Int_t fEvent;                      //  Number of events processed
     TTreeSRedirector *fDebugStreamer;  //! debug streamer
 
-    Short_t fDebugLevel;
+    Short_t fDebugLevel;               //  debug Level
     //! debugging
 
     void   FindPedestal(Float_t part=.6);
@@ -144,7 +147,7 @@ private:
                   Char_t *type, Bool_t force);
 
 
-    AliTPCCalROC* GetCalRoc(Int_t sector, TObjArray* arr, Bool_t force);
+    AliTPCCalROC* GetCalRoc(Int_t sector, TObjArray* arr, Bool_t force) const;
 
     TVectorF* GetPadTimesEvent(Int_t sector, Bool_t force=kFALSE);
 
@@ -161,9 +164,6 @@ private:
     TVectorF* GetPadPedestalEvent(Int_t sector, Bool_t force=kFALSE);
 
 
-public:
-
-
   ClassDef(AliTPCCalibPulser,1)           //Implementation of the TPC pulser calibration
 };