coding convention corrections

diff --git a/PHOS/AliPHOSBeamTestEvent.cxx b/PHOS/AliPHOSBeamTestEvent.cxx
index d52e0c3544d1b9e4b3f141d8b814febb12d2fe5f..806f699c5c33e14ed14eab2788ca5720a7bbae1b 100644 (file)
--- a/PHOS/AliPHOSBeamTestEvent.cxx
+++ b/PHOS/AliPHOSBeamTestEvent.cxx
@@ -16,8 +16,10 @@
 /* $Id$ */
 
 //_________________________________________________________________________
-// Short description  
-//
+// Class for PHOS Beam Test event header. 
+// Contains all information 
+//  about triggers, etc.    
+// 
 //*-- Author : Maxim Volkov (RRC KI) & Dmitri Peressounko (RRC KI & SUBATECH) 
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/PHOS/AliPHOSBeamTestEvent.h b/PHOS/AliPHOSBeamTestEvent.h
index 727ce2892f2588fe8c32a989d9c00eb2fda3e758..52ea511761077c0bd3e8a06937fb488718413d85 100644 (file)
--- a/PHOS/AliPHOSBeamTestEvent.h
+++ b/PHOS/AliPHOSBeamTestEvent.h
@@ -25,14 +25,14 @@ public:
 
   virtual ~AliPHOSBeamTestEvent() ; // dtor
 
-  Float_t   GetBeamEnergy(void){return fBeamEnergy ;}
-  UInt_t *  GetUserVector(void){return fUserVector ;}
-  UInt_t *  GetHeader(void){return fHeader ;}
-  UShort_t  GetPattern(void){return fPattern ;}
-  UShort_t *GetScanning(void){return fScanning ;}
-  UShort_t *GetCharge(void){return fCharge ;}
-  UInt_t *  GetScaler(void){return fScaler ;}
-  UShort_t *GetTDC(void) {return fTDC2228 ;}
+  Float_t   GetBeamEnergy(void) const {return fBeamEnergy ;}
+  UInt_t *  GetUserVector(void)       {return fUserVector ;}
+  UInt_t *  GetHeader(void)           {return fHeader ;}
+  UShort_t  GetPattern(void) const    {return fPattern ;}
+  UShort_t *GetScanning(void)         {return fScanning ;}
+  UShort_t *GetCharge(void)           {return fCharge ;}
+  UInt_t *  GetScaler(void)           {return fScaler ;}
+  UShort_t *GetTDC(void)              {return fTDC2228 ;}
 
   void SetBeamEnergy(Float_t energy ){fBeamEnergy = energy ;}
   void SetUserVector(UInt_t * uv){

diff --git a/PHOS/AliPHOSCalibrManager.cxx b/PHOS/AliPHOSCalibrManager.cxx
index ccf7d14ec2b62b5e92289e7b4b3ee028f63af4ff..20912f4eeb9ce25eeb301851aad98a281f51dd3a 100644 (file)
--- a/PHOS/AliPHOSCalibrManager.cxx
+++ b/PHOS/AliPHOSCalibrManager.cxx
@@ -28,7 +28,7 @@
 #include "TFile.h"
 
 // --- Standard library ---
-#include <fstream>
+#include <fstream> 
 
 // --- AliRoot header files ---
 #include "AliPHOSConTableDB.h"
@@ -41,6 +41,7 @@ AliPHOSCalibrManager * AliPHOSCalibrManager::fgCaMa = 0 ;
 //____________________________________________________________________________ 
 AliPHOSCalibrManager::AliPHOSCalibrManager():TNamed() 
 {
+  // default ctor: nott to be used
   fctdb = 0 ;
   fFileName="" ;
   Fatal("Default constructor","Should not use") ;
@@ -54,6 +55,7 @@ AliPHOSCalibrManager::AliPHOSCalibrManager(const char* filename ):
 //____________________________________________________________________________ 
   AliPHOSCalibrManager::~AliPHOSCalibrManager()
 {
+  //dtor
   TFile * f = gROOT->GetFile(fFileName) ;
   if(f && f->IsOpen())
     f->Close() ;
@@ -64,11 +66,14 @@ AliPHOSCalibrManager::AliPHOSCalibrManager(const char* filename ):
 //____________________________________________________________________________ 
 AliPHOSCalibrManager * AliPHOSCalibrManager::GetInstance(void)
 { 
+  // gets the instance of the unique object
  return fgCaMa ;
 }
 //____________________________________________________________________________ 
 AliPHOSCalibrManager * AliPHOSCalibrManager::GetInstance(const char* filename )
 {
+  // gets the instance of the unique object
+
   if(!fgCaMa)
     fgCaMa = new AliPHOSCalibrManager(filename) ;
   else{
@@ -81,7 +86,8 @@ AliPHOSCalibrManager * AliPHOSCalibrManager::GetInstance(const char* filename )
   return fgCaMa ;       
 }
 //____________________________________________________________________________
-void AliPHOSCalibrManager::ReadFromASCII(AliPHOSCalibrationData &data,const char * filename){
+void AliPHOSCalibrManager::ReadFromASCII(AliPHOSCalibrationData &data,const char * filename)
+{
   //reads calibration parameters from ascii file
 
   if(!fctdb){
@@ -97,7 +103,8 @@ void AliPHOSCalibrManager::ReadFromASCII(AliPHOSCalibrationData &data,const char
   file.close();   
 }
 //____________________________________________________________________________
-void AliPHOSCalibrManager::ReadFromRoot(AliPHOSCalibrationData & data,Int_t run){
+void AliPHOSCalibrManager::ReadFromRoot(AliPHOSCalibrationData & data,Int_t run)
+{
   //reads calibration parameters from root file
 
   //construct name
@@ -134,7 +141,9 @@ void AliPHOSCalibrManager::ReadFromRoot(AliPHOSCalibrationData & data,Int_t run)
   Error("ReadFromRoot","Can not find key %s for run %d in file %s \n",searchname.Data(),run,fFileName.Data()) ;
 }
 //____________________________________________________________________________
-void AliPHOSCalibrManager::WriteData(AliPHOSCalibrationData * data){
+void AliPHOSCalibrManager::WriteData(AliPHOSCalibrationData * data)
+{
+  //Writes data
   TFile * file = gROOT->GetFile(fFileName) ;
   if(!file || !file->IsOpen()){
     file = TFile::Open(fFileName,"UPDATE") ;
@@ -159,7 +168,7 @@ void AliPHOSCalibrManager::WriteData(AliPHOSCalibrationData * data){
 //____________________________________________________________________________
 AliPHOSCalibrManager& AliPHOSCalibrManager::operator=(AliPHOSCalibrManager const & cdb)
 {
-  //
+  //overloads = operator
   fFileName = cdb.fFileName;
   return *this ;
 }

diff --git a/PHOS/AliPHOSCalibrManager.h b/PHOS/AliPHOSCalibrManager.h
index 3288bc803af689f9e43448e93cb0b37769020e73..25c10c988194a49df43cdc1940fea219bec797bf 100644 (file)
--- a/PHOS/AliPHOSCalibrManager.h
+++ b/PHOS/AliPHOSCalibrManager.h
@@ -12,9 +12,8 @@
 
 // --- ROOT system ---
 #include "TNamed.h"
-#include "TArrayF.h" 
 #include "TString.h" 
-
+class TArrayF ; 
 // --- Standard library ---
 
 // --- AliRoot header files ---

diff --git a/PHOS/AliPHOSCalibrationData.cxx b/PHOS/AliPHOSCalibrationData.cxx
index 15e2cbe5f11145d58f484069ab399e2918c7d1cf..a3f4b4492f1fb6d78104b0f8917c9e1663ef1024 100644 (file)
--- a/PHOS/AliPHOSCalibrationData.cxx
+++ b/PHOS/AliPHOSCalibrationData.cxx
@@ -15,7 +15,9 @@
 
 
 //_________________________________________________________________________
-// Calibration data and their quality  
+// Calibration data 
+// and their 
+// quality  
 //
 //*-- Author : D.Peressounko
 //////////////////////////////////////////////////////////////////////////////
@@ -32,7 +34,9 @@ ClassImp(AliPHOSCalibrationData)
 
 
 //____________________________________________________________________________ 
-  AliPHOSCalibrationData::AliPHOSCalibrationData():TObject() {
+  AliPHOSCalibrationData::AliPHOSCalibrationData():TObject() 
+{
+  // default ctor : does nothing
   fBegin=0;
   fEnd=0;
   fData = 0 ;
@@ -42,14 +46,18 @@ ClassImp(AliPHOSCalibrationData)
 }
 
 //____________________________________________________________________________ 
-  AliPHOSCalibrationData::AliPHOSCalibrationData(const char * category, const char * version, Int_t nchannels){
+  AliPHOSCalibrationData::AliPHOSCalibrationData(const char * category, const char * version, Int_t nchannels)
+{
+  // ctor: sets up the calibration IO
   fData      = new TArrayF(nchannels) ;
   fDataCheck = new TArrayF(nchannels) ;
   fCategory=category; 
   fVersion=version ; 
 }
 //____________________________________________________________________________ 
-AliPHOSCalibrationData::AliPHOSCalibrationData(const AliPHOSCalibrationData & cd){
+AliPHOSCalibrationData::AliPHOSCalibrationData(const AliPHOSCalibrationData & cd)
+{
+  //copy ctor
   fData = new TArrayF(*cd.fData) ;
   fDataCheck = new TArrayF(*cd.fDataCheck) ;
   fCategory=cd.fCategory; 
@@ -58,6 +66,7 @@ AliPHOSCalibrationData::AliPHOSCalibrationData(const AliPHOSCalibrationData & cd
 //____________________________________________________________________________ 
   AliPHOSCalibrationData::~AliPHOSCalibrationData()
 {
+  // dtor: deletes the arrays
   if(fData){
     delete fData ;
     fData=0 ;
@@ -68,15 +77,21 @@ AliPHOSCalibrationData::AliPHOSCalibrationData(const AliPHOSCalibrationData & cd
   }
 }
 //____________________________________________________________________________ 
-Float_t AliPHOSCalibrationData::Data(Int_t channel)const {
+Float_t AliPHOSCalibrationData::Data(Int_t channel)const 
+{
+  // returns calibration data for a given channel   
   return fData->At(channel) ;
 }
 //____________________________________________________________________________ 
-Float_t AliPHOSCalibrationData::DataCheck(Int_t channel)const {
+Float_t AliPHOSCalibrationData::DataCheck(Int_t channel)const 
+{
+  // returns calibration data check for a given channel   
   return fDataCheck->At(channel) ;
 }
 //____________________________________________________________________________ 
-AliPHOSCalibrationData & AliPHOSCalibrationData::operator = (const AliPHOSCalibrationData & rvalue){
+AliPHOSCalibrationData & AliPHOSCalibrationData::operator = (const AliPHOSCalibrationData & rvalue)
+{ 
+  // overload of =
   if(fData)
     delete fData; 
   fData      = new TArrayF(*rvalue.fData) ;

diff --git a/PHOS/AliPHOSCalibrationData.h b/PHOS/AliPHOSCalibrationData.h
index 3db81a09c8447350e59aebafb156a549776c6fc9..58a85a57f625eaa6c0836b8298d7d852f258600b 100644 (file)
--- a/PHOS/AliPHOSCalibrationData.h
+++ b/PHOS/AliPHOSCalibrationData.h
@@ -7,7 +7,7 @@
 
 //_________________________________________________________________________
 //  Base Class for PHOS     
-//                  
+//  for Calibration data                 
 //*-- Author:D.Peressounko
 
 
@@ -31,7 +31,7 @@ public:
   virtual const char* GetSubsystem(void)const{return "PHOS" ;}
   virtual const char* GetVersion(void)  const{return fVersion ;}
   virtual const char* GetCategory(void) const {return fCategory ;} 
-  virtual const void  GetValidityRange(Int_t &begin,Int_t &end){begin=fBegin;end=fEnd ;}
+  virtual const void  GetValidityRange(Int_t &begin,Int_t &end) const {begin=fBegin;end=fEnd ;}
   
   Float_t Data(Int_t channel)const ;
   Float_t DataCheck(Int_t channel) const ;

diff --git a/PHOS/AliPHOSCalibrator.cxx b/PHOS/AliPHOSCalibrator.cxx
index 2f9e1d475395c011781fb33b96c4bc3b0fc8b874..1d2404c1ad1026711bf966fe95d6113d3cfe1a4c 100644 (file)
--- a/PHOS/AliPHOSCalibrator.cxx
+++ b/PHOS/AliPHOSCalibrator.cxx
@@ -46,9 +46,7 @@
 
 // --- ROOT system ---
 #include "TROOT.h"
-#include "TH1F.h"
 #include "TF1.h"
-#include "TMinuit.h"
 #include "TObjString.h"
 // --- Standard library ---
 
@@ -79,7 +77,8 @@ ClassImp(AliPHOSCalibrator)
 //____________________________________________________________________________ 
 AliPHOSCalibrator::AliPHOSCalibrator(const char* file, const char* title,Bool_t toSplit):
   TTask("AliPHOSCalibrator",title) 
-{ //Constructor which should normally be used.
+{ 
+  //Constructor which should normally be used.
   //file: path/galice.root  - header file
   //title: branch name of PHOS reconstruction (e.g. "Default")
   //toSplit: wether we work in Split mode?
@@ -113,6 +112,7 @@ AliPHOSCalibrator::AliPHOSCalibrator(const char* file, const char* title,Bool_t
 //____________________________________________________________________________ 
   AliPHOSCalibrator::~AliPHOSCalibrator()
 {
+  // dtor
   if(fPedHistos)
     delete fPedHistos ;
   if(fGainHistos)
@@ -127,7 +127,8 @@ AliPHOSCalibrator::AliPHOSCalibrator(const char* file, const char* title,Bool_t
     delete fRunList ;
 }
 //____________________________________________________________________________ 
-void AliPHOSCalibrator::AddRun(const char * filename){
+void AliPHOSCalibrator::AddRun(const char * filename)
+{
   //Adds one more run to list of runs, which will be scanned in ScanXXX methods
   
   TObjString * fn = new TObjString(filename) ;
@@ -153,6 +154,7 @@ void AliPHOSCalibrator::AddRun(const char * filename){
 //____________________________________________________________________________ 
 void AliPHOSCalibrator::Exec(Option_t * option)
 {
+  // reads parameters and does the calibration
   ScanPedestals(option);
   CalculatePedestals();             
   WritePedestals();
@@ -161,7 +163,9 @@ void AliPHOSCalibrator::Exec(Option_t * option)
   WriteGains() ;
 }
 //____________________________________________________________________________ 
-void AliPHOSCalibrator::Init(void){
+void AliPHOSCalibrator::Init(void)
+{
+  // intializes everything
 
   //check if ConTableDB already read 
   if(!fctdb){     
@@ -182,7 +186,8 @@ void AliPHOSCalibrator::Init(void){
   fhGainsWid    = new TH1F("hGainsWid","Gains width",fNch,0.,fNch) ; 
 }
 //____________________________________________________________________________ 
-void AliPHOSCalibrator::SetConTableDB(const char * file,const char * name){
+void AliPHOSCalibrator::SetConTableDB(const char * file,const char * name)
+{
   //Reads Connection Table database with name "name" from file "file" 
 
   if(file==0 || name == 0){
@@ -209,7 +214,8 @@ void AliPHOSCalibrator::SetConTableDB(const char * file,const char * name){
   
 }
 //____________________________________________________________________________ 
-void AliPHOSCalibrator::PlotPedestal(Int_t chanel){
+void AliPHOSCalibrator::PlotPedestal(Int_t chanel)
+{
   //Plot histogram for a given channel, filled in Scan method
   if(fPedHistos && fPedHistos->GetEntriesFast()){
     static_cast<TH1F*>(fPedHistos->At(chanel))->Draw() ;
@@ -219,11 +225,14 @@ void AliPHOSCalibrator::PlotPedestal(Int_t chanel){
   } 
 }
 //____________________________________________________________________________ 
-void AliPHOSCalibrator::PlotPedestals(void){
+void AliPHOSCalibrator::PlotPedestals(void)
+{
+  // draws pedestals distribution
   fhPedestals->Draw() ;
 }
 //____________________________________________________________________________ 
-void AliPHOSCalibrator::PlotGain(Int_t chanel){
+void AliPHOSCalibrator::PlotGain(Int_t chanel)
+{
   //Plot histogram for a given channel, filled in Scan method
   if(fGainHistos && fGainHistos->GetEntriesFast()){
     static_cast<TH1F*>(fGainHistos->At(chanel))->Draw() ;
@@ -233,11 +242,14 @@ void AliPHOSCalibrator::PlotGain(Int_t chanel){
   } 
 }
 //____________________________________________________________________________ 
-void AliPHOSCalibrator::PlotGains(void){
+void AliPHOSCalibrator::PlotGains(void)
+{
+  // draws gains distribution
   fhGains->Draw() ;
 }
 //____________________________________________________________________________ 
-void AliPHOSCalibrator::ScanPedestals(Option_t * option ){
+void AliPHOSCalibrator::ScanPedestals(Option_t * option )
+{
   //scan all files in list fRunList and fill pedestal hisgrams
   //option: "clear" - clear pedestal histograms filled up to now
   //        "deb" - plot file name currently processed
@@ -292,7 +304,8 @@ void AliPHOSCalibrator::ScanPedestals(Option_t * option ){
    
 }
 //____________________________________________________________________________ 
-void AliPHOSCalibrator::CalculatePedestals(){
+void AliPHOSCalibrator::CalculatePedestals()
+{
   //Fit histograms, filled in ScanPedestals method with Gaussian
   //find mean and width, check deviation from mean for each channel.
 
@@ -344,7 +357,8 @@ void AliPHOSCalibrator::CalculatePedestals(){
     
 }
 //____________________________________________________________________________ 
-void AliPHOSCalibrator::ScanGains(Option_t * option){
+void AliPHOSCalibrator::ScanGains(Option_t * option)
+{
   //Scan all runs, listed in fRunList and fill histograms for all channels
   //options: "clear" - clean histograms, filled up to now
   //         "deb" - print current file name
@@ -406,9 +420,9 @@ void AliPHOSCalibrator::ScanGains(Option_t * option){
        Int_t ich = fctdb->AbsId2Raw(digit->GetId());
        if(ich>=0){
          Float_t pedestal = fhPedestals->GetBinContent(ich) ;
-         const Float_t showerInCrystall = 0.9 ;
+         const Float_t kshowerInCrystall = 0.9 ;
          Float_t beamEnergy = gime->BeamEnergy() ;
-         Float_t gain = beamEnergy*showerInCrystall/
+         Float_t gain = beamEnergy*kshowerInCrystall/
                         (digit->GetAmp() - pedestal) ;
          static_cast<TH1F*>(fGainHistos->At(ich))->Fill(gain) ;
        } 
@@ -419,7 +433,9 @@ void AliPHOSCalibrator::ScanGains(Option_t * option){
   }
 }   
 //____________________________________________________________________________ 
-void AliPHOSCalibrator::CalculateGains(void){
+void AliPHOSCalibrator::CalculateGains(void)
+{
+  //calculates gain
 
   if(!fGainHistos || !fGainHistos->GetEntriesFast()){
     Error("CalculateGains","You should run ScanGains first!") ; 
@@ -472,7 +488,8 @@ void AliPHOSCalibrator::CalculateGains(void){
 
 //_____________________________________________________________________________
 void AliPHOSCalibrator::WritePedestals(const char * version,
-                                        Int_t begin,Int_t end){
+                                        Int_t begin,Int_t end)
+{
   //Write calculated data to file using AliPHOSCalibrManager
   //version and validitirange (begin-end) will be used to identify data 
 
@@ -521,7 +538,8 @@ void AliPHOSCalibrator::WritePedestals(const char * version,
 //_____________________________________________________________________________
 void AliPHOSCalibrator::ReadPedestals(const char * version,
                                         Int_t range)
-{ //Read data from file using AliPHOSCalibrManager 
+{ 
+  //Read data from file using AliPHOSCalibrManager 
   //version and range will be used to choose proper data
 
   AliPHOSCalibrationData ped("Pedestals",version);
@@ -547,7 +565,8 @@ void AliPHOSCalibrator::ReadPedestals(const char * version,
 //_____________________________________________________________________________
 void AliPHOSCalibrator::ReadGains(const char * version,
                                         Int_t range)
-{ //Read data from file using AliPHOSCalibrManager 
+{ 
+  //Read data from file using AliPHOSCalibrManager 
   //version and range will be used to choose proper data
 
   AliPHOSCalibrationData gains("Gains",version);
@@ -573,7 +592,8 @@ void AliPHOSCalibrator::ReadGains(const char * version,
 //_____________________________________________________________________________
 void AliPHOSCalibrator::WriteGains(const char * version,
                                     Int_t begin,Int_t end)
-{ //Write gains through AliPHOSCalibrManager
+{ 
+  //Write gains through AliPHOSCalibrManager
   //version and validity range(begin-end) are used to identify data
 
   if(!fctdb){
@@ -615,7 +635,9 @@ void AliPHOSCalibrator::WriteGains(const char * version,
   cmngr->WriteData(&gains) ;
 }      
 //_____________________________________________________________________________
-void AliPHOSCalibrator::Print(const Option_t * option)const {
+void AliPHOSCalibrator::Print(const Option_t * option)const 
+{
+  // prints everything
   printf("--------------AliPHOSCalibrator-----------------\n") ;
   printf("Files to handle:\n") ;
   TIter next(fRunList) ;