coding conventions

diff --git a/TOF/AliTOFCTPLatency.cxx b/TOF/AliTOFCTPLatency.cxx
index d5abc4c496a8392b18de5b405783e0d7b039bc22..8c4f2a8b49b9af7e0350dce293a9e807acc3ad55 100644 (file)
--- a/TOF/AliTOFCTPLatency.cxx
+++ b/TOF/AliTOFCTPLatency.cxx
@@ -13,15 +13,15 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
- *
- *
- * this class defines the CTPLatency object to be stored
- * in OCDB in order to apply CTPLatency correction during 
- * reconstruction. 
- *
- *
- */
+// *
+// *
+// *
+// * this class defines the CTPLatency object to be stored
+// * in OCDB in order to apply CTPLatency correction during 
+// * reconstruction. 
+// *
+// *
+// *
 
 #include "AliTOFCTPLatency.h"
 

diff --git a/TOF/AliTOFCTPLatency.h b/TOF/AliTOFCTPLatency.h
index 5f3d1225fe6a1a0194f28a993dba1138184b5e3f..f14e2eb9b6293c5774e492f30501aea89a430653 100644 (file)
--- a/TOF/AliTOFCTPLatency.h
+++ b/TOF/AliTOFCTPLatency.h
@@ -5,15 +5,15 @@
  * See cxx source for full Copyright notice                               */
 /* $Id$ */
 
-/*
- *
- *
- * this class defines the CTPLatency object to be stored
- * in OCDB in order to apply CTPLatency correction during 
- * reconstruction. 
- *
- *
- */
+// *
+// *
+// *
+// * this class defines the CTPLatency object to be stored
+// * in OCDB in order to apply CTPLatency correction during 
+// * reconstruction. 
+// *
+// *
+// *
 
 #include "TObject.h"
 

diff --git a/TOF/AliTOFDRMStatusHeader3.h b/TOF/AliTOFDRMStatusHeader3.h
index 3b2e2ada0b6de328dbbe82b20314fdecdd6149e2..7e737b3c8fb0b16d3322f2185977a0c5a993c716 100644 (file)
--- a/TOF/AliTOFDRMStatusHeader3.h
+++ b/TOF/AliTOFDRMStatusHeader3.h
@@ -17,15 +17,15 @@
 class AliTOFDRMStatusHeader3
 {
  public:
-  UInt_t GetSlot() {return fSlotID;};
-  UInt_t GetL0BCID() {return fL0BCID;};
-  UInt_t GetRunTimeInfo() {return fRunTimeInfo;};
-  UInt_t GetWordType() {return fWordType;};
+  UInt_t GetSlot() const {return fSlotID;};
+  UInt_t GetL0BCID() const {return fL0BCID;};
+  UInt_t GetRunTimeInfo() const {return fRunTimeInfo;};
+  UInt_t GetWordType() const {return fWordType;};
  private:
-  UInt_t fSlotID: 4;
-  UInt_t fL0BCID: 12;
-  UInt_t fRunTimeInfo: 12;
-  UInt_t fWordType: 4;
+  UInt_t fSlotID: 4; // slodID
+  UInt_t fL0BCID: 12; // L0BCID
+  UInt_t fRunTimeInfo: 12; // runtime info
+  UInt_t fWordType: 4; // word type
 };
 
 #endif

diff --git a/TOF/AliTOFDeltaBCOffset.cxx b/TOF/AliTOFDeltaBCOffset.cxx
index 25aec195859c513e2828e91889bfad956a0ec0de..b1a150c620d09516a2d5932b64f905ed87c94990 100644 (file)
--- a/TOF/AliTOFDeltaBCOffset.cxx
+++ b/TOF/AliTOFDeltaBCOffset.cxx
@@ -13,15 +13,15 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
- *
- *
- * this class defines the DeltaBCOffset object to be stored
- * in OCDB in order to apply DeltaBC correction during 
- * reconstruction. 
- *
- *
- */
+// *
+// *
+// *
+// * this class defines the DeltaBCOffset object to be stored
+// * in OCDB in order to apply DeltaBC correction during 
+// * reconstruction. 
+// *
+// *
+// *
 
 #include "AliTOFDeltaBCOffset.h"
 

diff --git a/TOF/AliTOFDeltaBCOffset.h b/TOF/AliTOFDeltaBCOffset.h
index e195940fbc2833e65879f44ebcd4fe4aa2cc1340..16a782b6eefac9a4cbe45d24fa6442705fff6939 100644 (file)
--- a/TOF/AliTOFDeltaBCOffset.h
+++ b/TOF/AliTOFDeltaBCOffset.h
@@ -5,15 +5,15 @@
  * See cxx source for full Copyright notice                               */
 /* $Id$ */
 
-/*
- *
- *
- * this class defines the DeltaBCOffset object to be stored
- * in OCDB in order to apply DeltaBC correction during 
- * reconstruction. 
- *
- *
- */
+// *
+// *
+// *
+// * this class defines the DeltaBCOffset object to be stored
+// * in OCDB in order to apply DeltaBC correction during 
+// * reconstruction. 
+// *
+// *
+// *
 
 #include "TObject.h"
 

diff --git a/TOF/AliTOFHitDataBuffer.cxx b/TOF/AliTOFHitDataBuffer.cxx
index 2fe97c392e3fd0c568c29b67e5a260622241d8c2..a0cbf18bca9b09f18f26adad206fb5817194555c 100644 (file)
--- a/TOF/AliTOFHitDataBuffer.cxx
+++ b/TOF/AliTOFHitDataBuffer.cxx
@@ -31,8 +31,8 @@ container for TOF raw data
 //                                                                    //
 ////////////////////////////////////////////////////////////////////////
 
-#include "AliLog.h"
 #include "AliTOFHitDataBuffer.h"
+#include "AliTOFHitData.h"
 
 ClassImp(AliTOFHitDataBuffer)
 
@@ -58,6 +58,17 @@ AliTOFHitDataBuffer::~AliTOFHitDataBuffer()
 {
 }
 
+//-----------------------------------------------------------------------------
+
+AliTOFHitDataBuffer& AliTOFHitDataBuffer::operator=(const AliTOFHitDataBuffer & source) {
+  // operator =
+  if (&source != this) {
+    TObject::operator=(source);
+    fBuffer = source.fBuffer;
+  }
+  return *this;
+}
+
 //-----------------------------------------------------------------------------
 Bool_t AliTOFHitDataBuffer::Add(AliTOFHitData &HitData) {
   // adding a new entry 

diff --git a/TOF/AliTOFHitDataBuffer.h b/TOF/AliTOFHitDataBuffer.h
index 76a94434dcd1eb14d82aa8b84ff61359d5ca7594..c43c6d0319655fe2a97fe9e7be555d49bd5ee9ca 100644 (file)
--- a/TOF/AliTOFHitDataBuffer.h
+++ b/TOF/AliTOFHitDataBuffer.h
@@ -12,9 +12,10 @@
 ///////////////////////////////////////////////////////////////
 
 #include "TObject.h"
-#include "AliTOFHitData.h"
 #include "TClonesArray.h"
 
+class AliTOFHitData;
+
 class AliTOFHitDataBuffer : 
 public TObject
 {
@@ -25,13 +26,7 @@ public TObject
   AliTOFHitDataBuffer(Int_t size); // overloaded constructor
   ~AliTOFHitDataBuffer();   // default destructor
   AliTOFHitDataBuffer(const AliTOFHitDataBuffer &source) : TObject(source), fBuffer(source.fBuffer) {}; // copy constructor 
-  AliTOFHitDataBuffer& operator=(const AliTOFHitDataBuffer & source) {
-    if (&source != this) {
-      TObject::operator=(source);
-      fBuffer = source.fBuffer;
-    }
-    return *this;
-  }; // operator =
+  AliTOFHitDataBuffer& operator=(const AliTOFHitDataBuffer & source); // operator =
 
   void Reset() {fBuffer.Clear();}; // reset
   Bool_t Add(AliTOFHitData &HitData); // add

diff --git a/TOF/AliTOFT0Fill.cxx b/TOF/AliTOFT0Fill.cxx
index 6f023507ee2db09fb76bce364b35f81f9f67602f..8a2536088ad45c39ac60c5c3758e8ba4ea5cea16 100644 (file)
--- a/TOF/AliTOFT0Fill.cxx
+++ b/TOF/AliTOFT0Fill.cxx
@@ -13,15 +13,15 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
- *
- *
- * this class defines the T0Fill object to be stored
- * in OCDB in order to apply T0Fill correction during 
- * reconstruction. 
- *
- *
- */
+// *
+// *
+// *
+// * this class defines the T0Fill object to be stored
+// * in OCDB in order to apply T0Fill correction during 
+// * reconstruction. 
+// *
+// *
+// *
 
 #include "AliTOFT0Fill.h"
 

diff --git a/TOF/AliTOFT0Fill.h b/TOF/AliTOFT0Fill.h
index b768c6d2f86874008e764b0cf8aca64e77f7d3f6..f87e528d877b095d52e679d17fb97827b93f8c9e 100644 (file)
--- a/TOF/AliTOFT0Fill.h
+++ b/TOF/AliTOFT0Fill.h
@@ -5,15 +5,15 @@
  * See cxx source for full Copyright notice                               */
 /* $Id$ */
 
-/*
- *
- *
- * this class defines the T0Fill object to be stored
- * in OCDB in order to apply T0Fill correction during 
- * reconstruction. 
- *
- *
- */
+// *
+// *
+// *
+// * this class defines the T0Fill object to be stored
+// * in OCDB in order to apply T0Fill correction during 
+// * reconstruction. 
+// *
+// *
+// *
 
 #include "TObject.h"
 

diff --git a/TOF/AliTOFT0FillOnlineCalib.cxx b/TOF/AliTOFT0FillOnlineCalib.cxx
index e5348c374356d8f0203db62464a0d2196aad9f93..2a1ae613ce5703240ff1be32a9027cdaad89275a 100644 (file)
--- a/TOF/AliTOFT0FillOnlineCalib.cxx
+++ b/TOF/AliTOFT0FillOnlineCalib.cxx
@@ -13,14 +13,14 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
- *
- *
- * this class defines the T0Fill online calibration object to be stored
- * in OCDB in order to obtain a corrected T0Fill from online algorithm
- *
- *
- */
+// *
+// *
+// *
+// * this class defines the T0Fill online calibration object to be stored
+// * in OCDB in order to obtain a corrected T0Fill from online algorithm
+// *
+// *
+// *
 
 #include "AliTOFT0FillOnlineCalib.h"
 

diff --git a/TOF/AliTOFT0FillOnlineCalib.h b/TOF/AliTOFT0FillOnlineCalib.h
index 1f6b00d6aba63d399bb0bec7eff32bfc7a33efd1..8ec410021984a3156afc2e5a34b65cb7985121ca 100644 (file)
--- a/TOF/AliTOFT0FillOnlineCalib.h
+++ b/TOF/AliTOFT0FillOnlineCalib.h
@@ -5,15 +5,15 @@
  * See cxx source for full Copyright notice                               */
 /* $Id$ */
 
-/*
- *
- *
- * this class defines the T0Fill online calibration object to be stored
- * in OCDB in order to obtain a corrected T0Fill from online algorithm
- * 
- *
- *
- */
+// *
+// *
+// *
+// * this class defines the T0Fill online calibration object to be stored
+// * in OCDB in order to obtain a corrected T0Fill from online algorithm
+// * 
+// *
+// *
+// *
 
 #include "TObject.h"
 

diff --git a/TOF/AliTOFcalibHisto.cxx b/TOF/AliTOFcalibHisto.cxx
index c597e7ec8121baa9a506500251c57b8e228a48d7..80c84764cadb67be5d1dc474a1e3136e0ff6c54b 100644 (file)
--- a/TOF/AliTOFcalibHisto.cxx
+++ b/TOF/AliTOFcalibHisto.cxx
@@ -13,16 +13,16 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*************************************************************************
- *
- * AliTOFcalibHisto - class to handle TOF calibration histograms,
- *                    map histograms and more
- *
- *
- * autors:   Roberto Preghenella (R+)
- * concacts: preghenella@bo.infn.it
- *
- *************************************************************************/
+// *
+// *
+// * AliTOFcalibHisto - class to handle TOF calibration histograms,
+// *                    map histograms and more
+// *
+// *
+// * autors:   Roberto Preghenella (R+)
+// * concacts: preghenella@bo.infn.it
+// *
+// *
 
 #include "AliTOFcalibHisto.h"
 #include "AliLog.h"
@@ -354,7 +354,7 @@ AliTOFcalibHisto::~AliTOFcalibHisto()
 //__________________________________________________________________________
 
 void 
-AliTOFcalibHisto::LoadHisto(TFile* file, TH1D **histo, const Char_t *name) 
+AliTOFcalibHisto::LoadHisto(TFile * const file, TH1D **histo, const Char_t *name) 
 {
   /* load histo */
   *histo = (TH1D *)file->Get(name);

diff --git a/TOF/AliTOFcalibHisto.h b/TOF/AliTOFcalibHisto.h
index b88ba64ede2f14618934a35191771961c49fa7bf..5df58ce462e59359e74b29a8de3240ebf03a5133 100644 (file)
--- a/TOF/AliTOFcalibHisto.h
+++ b/TOF/AliTOFcalibHisto.h
@@ -4,16 +4,16 @@
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
-/*************************************************************************
- *
- * AliTOFcalibHisto - class to handle TOF calibration histograms,
- *                    map histograms and more
- *
- *
- * autors:   Roberto Preghenella (R+)
- * concacts: preghenella@bo.infn.it
- *
- *************************************************************************/
+// *
+// *
+// * AliTOFcalibHisto - class to handle TOF calibration histograms,
+// *                    map histograms and more
+// *
+// *
+// * autors:   Roberto Preghenella (R+)
+// * concacts: preghenella@bo.infn.it
+// *
+// *
 
 #include "TObject.h"
 #include "TString.h"
@@ -99,6 +99,41 @@ public TObject
     kNcalibStats
   };
 
+  AliTOFcalibHisto(); /* default constructor */
+  virtual ~AliTOFcalibHisto(); /* default destructor */
+
+  /* getters */
+  static const Char_t *GetCalibHistoFileName() {return fgCalibHistoFileName.Data();}; /* get calib histo file name */
+  static const Char_t *GetCalibParFileName() {return fgCalibParFileName.Data();}; /* get calib par file name */
+  static const Char_t *GetCalibStatFileName() {return fgCalibStatFileName.Data();}; /* get calib stat file name */
+
+  /* setters */
+  static void SetCalibHistoFileName(const Char_t *value) {fgCalibHistoFileName = value;}; /* set calib histo file name */
+  static void SetCalibParFileName(const Char_t *value) {fgCalibParFileName = value;}; /* set calib par file name */
+  static void SetCalibStatFileName(const Char_t *value) {fgCalibStatFileName = value;}; /* set calib stat file name */
+  static void SetCableCorrectionFlag(Int_t i, Bool_t flag) {if (i < kNcorrections) fgCableCorrectionFlag[i] = flag;}; // set cable correction flag
+  static void SetFullCorrectionFlag(Int_t i, Bool_t flag) {if (i < kNcorrections) fgFullCorrectionFlag[i] = flag;}; // set full correction flag
+
+  /* methods */
+  static Int_t GetIndexEO(Int_t ddl, Int_t trm, Int_t chain, Int_t tdc, Int_t channel) {return (channel + 8 * tdc + 120 * chain + 240 * trm + 2400 * ddl);}; /* get index EO */
+  void LoadCalibHisto(); /* load calib histo */
+  void LoadCalibPar(); /* load calib par */
+  void LoadCalibStat(); /* load calib stat */
+  void WriteCalibHisto(); /* write calib histo */
+  void WriteCalibStat(); /* write calib stat */
+  Double_t GetCalibConst(Int_t histo) {return GetHisto(fCalibConst[histo], 0);}; /* get calib const */
+  Double_t GetCalibMap(Int_t histo, Int_t index) {return GetHisto(fCalibMap[histo], index);}; /* get calib map */
+  Double_t GetCalibPar(Int_t histo, Int_t index) {return GetHisto(fCalibPar[histo], index);}; /* get calib par */
+  Bool_t GetCalibStat(Int_t histo, Int_t index) {return GetHisto(fCalibStat[histo], index) != 0. ? kTRUE : kFALSE;}; /* get calib stat */
+  Double_t GetCorrection(Int_t corr, Int_t index, Double_t tot = 0.); /* get correction */
+  Double_t GetNominalCorrection(Int_t index); /* get nominal correction */
+  void ApplyNominalCorrection(AliESDtrack *track); /* apply nominal corrections */
+
+  Double_t GetCableCorrection(Int_t index); /* get cable correction */
+  Double_t GetFullCorrection(Int_t index, Double_t tot = 0.); /* get full correction */
+
+  Bool_t GetStatus(Int_t index); /* get status */
+  
  private:
 
   static TFile *fgCalibHistoFile; /* calib histo file */
@@ -135,7 +170,7 @@ public TObject
   TH1D *fCalibStat[kNcalibStats]; // calib stat array
 
   /* methods */
-  void LoadHisto(TFile *file, TH1D **histo, const Char_t *name); /* create histo */
+  void LoadHisto(TFile * const file, TH1D **histo, const Char_t *name); /* create histo */
   void CreateHisto(TH1D **histo, const Char_t *name, Int_t size); /* create histo */
   void WriteHisto(TFile *file, TH1D *histo); /* write histo */
   void SetHisto(TH1D *histo, Int_t index, Double_t value); /* set histo */
@@ -144,43 +179,6 @@ public TObject
   AliTOFcalibHisto(const AliTOFcalibHisto &source) : TObject(source) {}; /* copy constructor */
   AliTOFcalibHisto &operator=(const AliTOFcalibHisto &) {return *this;}; /* operator= */
 
- public:
-
-  AliTOFcalibHisto(); /* default constructor */
-  virtual ~AliTOFcalibHisto(); /* default destructor */
-
-  /* getters */
-  static const Char_t *GetCalibHistoFileName() {return fgCalibHistoFileName.Data();}; /* get calib histo file name */
-  static const Char_t *GetCalibParFileName() {return fgCalibParFileName.Data();}; /* get calib par file name */
-  static const Char_t *GetCalibStatFileName() {return fgCalibStatFileName.Data();}; /* get calib stat file name */
-
-  /* setters */
-  static void SetCalibHistoFileName(const Char_t *value) {fgCalibHistoFileName = value;}; /* set calib histo file name */
-  static void SetCalibParFileName(const Char_t *value) {fgCalibParFileName = value;}; /* set calib par file name */
-  static void SetCalibStatFileName(const Char_t *value) {fgCalibStatFileName = value;}; /* set calib stat file name */
-  static void SetCableCorrectionFlag(Int_t i, Bool_t flag) {if (i < kNcorrections) fgCableCorrectionFlag[i] = flag;}; // set cable correction flag
-  static void SetFullCorrectionFlag(Int_t i, Bool_t flag) {if (i < kNcorrections) fgFullCorrectionFlag[i] = flag;}; // set full correction flag
-
-  /* methods */
-  static Int_t GetIndexEO(Int_t ddl, Int_t trm, Int_t chain, Int_t tdc, Int_t channel) {return (channel + 8 * tdc + 120 * chain + 240 * trm + 2400 * ddl);}; /* get index EO */
-  void LoadCalibHisto(); /* load calib histo */
-  void LoadCalibPar(); /* load calib par */
-  void LoadCalibStat(); /* load calib stat */
-  void WriteCalibHisto(); /* write calib histo */
-  void WriteCalibStat(); /* write calib stat */
-  Double_t GetCalibConst(Int_t histo) {return GetHisto(fCalibConst[histo], 0);}; /* get calib const */
-  Double_t GetCalibMap(Int_t histo, Int_t index) {return GetHisto(fCalibMap[histo], index);}; /* get calib map */
-  Double_t GetCalibPar(Int_t histo, Int_t index) {return GetHisto(fCalibPar[histo], index);}; /* get calib par */
-  Bool_t GetCalibStat(Int_t histo, Int_t index) {return GetHisto(fCalibStat[histo], index) != 0. ? kTRUE : kFALSE;}; /* get calib stat */
-  Double_t GetCorrection(Int_t corr, Int_t index, Double_t tot = 0.); /* get correction */
-  Double_t GetNominalCorrection(Int_t index); /* get nominal correction */
-  void ApplyNominalCorrection(AliESDtrack *track); /* apply nominal corrections */
-
-  Double_t GetCableCorrection(Int_t index); /* get cable correction */
-  Double_t GetFullCorrection(Int_t index, Double_t tot = 0.); /* get full correction */
-
-  Bool_t GetStatus(Int_t index); /* get status */
-  
   ClassDef(AliTOFcalibHisto, 1);
   
 };