Coding rule violation corrected

diff --git a/PHOS/AliPHOSAnalyze.cxx b/PHOS/AliPHOSAnalyze.cxx
index 337d0ef46066da8f7319c799f00dec28b738a739..3891c4a78fad13bd2eebe49c656b2e26ddceb78c 100644 (file)
--- a/PHOS/AliPHOSAnalyze.cxx
+++ b/PHOS/AliPHOSAnalyze.cxx
@@ -61,45 +61,36 @@
 //*-- Author: Dmitri Peressounko (SUBATECH & RRC Kurchatov Institute)
 //////////////////////////////////////////////////////////////////////////////
 
+
 // --- ROOT system ---
 
 #include "TFile.h"
 #include "TH1.h"
-#include "TPad.h"
 #include "TH2.h"
 #include "TH2.h"
 #include "TParticle.h"
 #include "TClonesArray.h"
 #include "TTree.h"
 #include "TMath.h"
-#include "TCanvas.h" 
-#include "TStyle.h" 
 
 // --- Standard library ---
 
-#include <iostream.h>
 #include <iomanip.h>
-#include <stdio.h>
 
 // --- AliRoot header files ---
 
 #include "AliRun.h"
 #include "AliPHOSv1.h"
 #include "AliPHOSAnalyze.h"
-#include "AliPHOSClusterizerv1.h"
-#include "AliPHOSTrackSegmentMakerv1.h"
-#include "AliPHOSPIDv1.h"
-#include "AliPHOSReconstructioner.h"
 #include "AliPHOSDigit.h"
-#include "AliPHOSDigitizer.h"
 #include "AliPHOSSDigitizer.h"
 #include "AliPHOSTrackSegment.h"
 #include "AliPHOSRecParticle.h"
 #include "AliPHOSIndexToObject.h"
-#include "AliPHOSHit.h"
 #include "AliPHOSCpvRecPoint.h"
 #include "AliPHOSPpsdRecPoint.h"
 
+
 ClassImp(AliPHOSAnalyze)
 
 //____________________________________________________________________________
@@ -201,7 +192,7 @@ void AliPHOSAnalyze::DrawRecon(Int_t Nevent,Int_t Nmod,const char * branchName,c
        fGeom->AbsToRelNumbering(sdigit->GetId(), relid) ;
        Float_t x,z ;
        fGeom->RelPosInModule(relid,x,z) ;
-       Float_t e = fObjGetter->GimeSDigitizer()->Calibrate(sdigit->GetAmp()) ;
+       Float_t e = fObjGetter->GimeSDigitizer()->Calibrate(sdigit->GetAmp()) ;
        if(relid[0]==Nmod){
          if(relid[1]==0)  //EMC
            sdigitOccupancy->Fill(x,z,e) ;

diff --git a/PHOS/AliPHOSAnalyze.h b/PHOS/AliPHOSAnalyze.h
index 7106d16fb6a0c487be21262c3fd6eac518a82d80..6cb7e9446cea4941939e70be155e0d107731ec89 100644 (file)
--- a/PHOS/AliPHOSAnalyze.h
+++ b/PHOS/AliPHOSAnalyze.h
@@ -24,7 +24,6 @@ class TH2F ;
 
 class AliPHOSv1 ;
 class AliPHOSGeometry ;
-class AliPHOSPID ;
 class AliPHOSIndexToObject ;
 
 class AliPHOSAnalyze : public TObject {
@@ -54,13 +53,13 @@ public:
   void SetEnergyCorrection(const Float_t ecor){fCorrection = ecor ;} 
 
   AliPHOSAnalyze & operator = (const AliPHOSAnalyze & rvalue)  {
-    // assignement operator requested by coding convention
-    // but not needed
+    // assignement operator requested by coding convention but not needed
     abort() ;
     return *this ; 
   }
  
- private:
+private:
+
   Float_t CorrectedEnergy(const Float_t ReconstEnergy)const
     {return ReconstEnergy * fCorrection;} 
   //Converts reconstructed energy (energy of the EMCRecPoint) to the energy of primary
@@ -68,10 +67,10 @@ public:
   //(see Energy Resolution function). However, if one change parameters of reconstruction 
   //or geometry, one have to recalculate coefficient!
 
- private:
+private:
 
-  Float_t fCorrection ;                 //! Conversion coefficient between True and Reconstructed energies
-  Int_t fEvt ;                        //! the evt number being processed 
+  Float_t fCorrection ;               //! Conversion coefficient between True and Reconstructed energies
+  Int_t   fEvt ;                      //! the evt number being processed 
   AliPHOSGeometry * fGeom ;           //! the PHOS Geometry object
   AliPHOSIndexToObject * fObjGetter ; //! provides methods to retrieve objects from their index in a list
   AliPHOSv1 * fPHOS ;                 //! the PHOS object from the root file 

diff --git a/PHOS/AliPHOSCPVBaseGeometry.cxx b/PHOS/AliPHOSCPVBaseGeometry.cxx
index 6c80f3aec42c808b605e0c8d0fd8f8f8ac1cc18c..b74bd02ebdc96f33da439b647e85d346c78a11b9 100644 (file)
--- a/PHOS/AliPHOSCPVBaseGeometry.cxx
+++ b/PHOS/AliPHOSCPVBaseGeometry.cxx
@@ -15,6 +15,9 @@
 
 /* 
    $Log$
+   Revision 1.1  2000/11/03 16:27:47  schutz
+   CPV base geometry class to correct previous name-convetion rule violation
+
 */
 
 //_________________________________________________________________________
@@ -26,8 +29,6 @@
 
 // --- Standard library ---
 
-#include <iostream.h>
-
 // --- AliRoot header files ---
 
 #include "AliPHOSCPVBaseGeometry.h"

diff --git a/PHOS/AliPHOSCPVBaseGeometry.h b/PHOS/AliPHOSCPVBaseGeometry.h
index fa73553cf09c4f3a9f8977dfad5e858df641bb51..f02a63e33470494b61a4c0e7929491a7bc83735c 100644 (file)
--- a/PHOS/AliPHOSCPVBaseGeometry.h
+++ b/PHOS/AliPHOSCPVBaseGeometry.h
@@ -24,45 +24,45 @@ public:
 
   // Return common for PPSD and CPV geometrical parameters
 
-  virtual Float_t GetCPVBoxSize(Int_t index)        = 0 ;
+  virtual Float_t GetCPVBoxSize(Int_t index)       = 0 ;
 
   // Return PPSD geometrical parameters
 
-  virtual Float_t GetAnodeThickness(void)           = 0 ;
-  virtual Float_t GetAvalancheGap(void)             = 0 ;
-  virtual Float_t GetCathodeThickness(void)         = 0 ;
-  virtual Float_t GetCompositeThickness(void)       = 0 ;
-  virtual Float_t GetConversionGap(void)            = 0 ;
-  virtual Float_t GetLeadConverterThickness(void)   = 0 ;
-  virtual Float_t GetLeadToMicro2Gap(void)          = 0 ;
-  virtual Float_t GetLidThickness(void)             = 0 ;
-  virtual Float_t GetMicromegas1Thickness(void)     = 0 ;
-  virtual Float_t GetMicromegas2Thickness(void)     = 0 ;
-  virtual Float_t GetMicromegasWallThickness(void)  = 0 ;
-  virtual Float_t GetMicro1ToLeadGap(void)          = 0 ;
-  virtual Int_t   GetNumberOfPadsPhi(void)          = 0 ;
-  virtual Int_t   GetNumberOfPadsZ(void)            = 0 ;
-  virtual Int_t   GetNumberOfModulesPhi(void)       = 0 ;
-  virtual Int_t   GetNumberOfModulesZ(void)         = 0 ;
-  virtual Float_t GetPCThickness(void)              = 0 ;
-  virtual Float_t GetPhiDisplacement(void)          = 0 ;
-  virtual Float_t GetPPSDModuleSize(Int_t index)    = 0 ;
-  virtual Float_t GetZDisplacement(void)            = 0 ;
+  virtual Float_t GetAnodeThickness(void)          = 0 ;
+  virtual Float_t GetAvalancheGap(void)            = 0 ;
+  virtual Float_t GetCathodeThickness(void)        = 0 ;
+  virtual Float_t GetCompositeThickness(void)      = 0 ;
+  virtual Float_t GetConversionGap(void)           = 0 ;
+  virtual Float_t GetLeadConverterThickness(void)  = 0 ;
+  virtual Float_t GetLeadToMicro2Gap(void)         = 0 ;
+  virtual Float_t GetLidThickness(void)            = 0 ;
+  virtual Float_t GetMicromegas1Thickness(void)    = 0 ;
+  virtual Float_t GetMicromegas2Thickness(void)    = 0 ;
+  virtual Float_t GetMicromegasWallThickness(void) = 0 ;
+  virtual Float_t GetMicro1ToLeadGap(void)         = 0 ;
+  virtual Int_t   GetNumberOfPadsPhi(void)         = 0 ;
+  virtual Int_t   GetNumberOfPadsZ(void)           = 0 ;
+  virtual Int_t   GetNumberOfModulesPhi(void)      = 0 ;
+  virtual Int_t   GetNumberOfModulesZ(void)        = 0 ;
+  virtual Float_t GetPCThickness(void)             = 0 ;
+  virtual Float_t GetPhiDisplacement(void)         = 0 ;
+  virtual Float_t GetPPSDModuleSize(Int_t index)   = 0 ;
+  virtual Float_t GetZDisplacement(void)           = 0 ;
   virtual void    SetLeadConverterThickness(Float_t x) = 0 ;
 
   // Return CPV geometrical parameters
 
-  virtual Int_t   GetNumberOfCPVLayers(void)        = 0 ;
-  virtual Bool_t  IsLeadConverterExists(void)       = 0 ;
-  virtual Float_t GetCPVActiveSize(Int_t index)     = 0 ;
-  virtual Int_t   GetNumberOfCPVChipsPhi(void)      = 0 ;
-  virtual Int_t   GetNumberOfCPVChipsZ(void)        = 0 ;
-  virtual Float_t GetGassiplexChipSize(Int_t index) = 0 ;
-  virtual Float_t GetCPVGasThickness(void)          = 0 ;
-  virtual Float_t GetCPVTextoliteThickness(void)    = 0 ;
-  virtual Float_t GetCPVCuNiFoilThickness(void)     = 0 ;
-  virtual Float_t GetFTPosition(Int_t index)        = 0 ;
-  virtual Float_t GetCPVFrameSize(Int_t index)      = 0 ;
+  virtual Int_t   GetNumberOfCPVLayers(void)       = 0 ;
+  virtual Bool_t  IsLeadConverterExists(void)      = 0 ;
+  virtual Float_t GetCPVActiveSize(Int_t index)    = 0 ;
+  virtual Int_t   GetNumberOfCPVChipsPhi(void)     = 0 ;
+  virtual Int_t   GetNumberOfCPVChipsZ(void)       = 0 ;
+  virtual Float_t GetGassiplexChipSize(Int_t index)= 0 ;
+  virtual Float_t GetCPVGasThickness(void)         = 0 ;
+  virtual Float_t GetCPVTextoliteThickness(void)   = 0 ;
+  virtual Float_t GetCPVCuNiFoilThickness(void)    = 0 ;
+  virtual Float_t GetFTPosition(Int_t index)       = 0 ;
+  virtual Float_t GetCPVFrameSize(Int_t index)     = 0 ;
  
   ClassDef(AliPHOSCPVBaseGeometry,1)        // CPV base geometry class 
 

diff --git a/PHOS/AliPHOSCPVGeometry.h b/PHOS/AliPHOSCPVGeometry.h
index 01bdeb8e986232e207ca2359538510958ac4aac7..6cc15b3d66d931169f870299d0a3024fb6ae94ef 100644 (file)
--- a/PHOS/AliPHOSCPVGeometry.h
+++ b/PHOS/AliPHOSCPVGeometry.h
@@ -64,7 +64,7 @@ public:
   virtual Int_t   GetNumberOfPadsZ(void)           { AssertPPSD("GetNumberOfPadsZ");           return 0; }
   virtual Int_t   GetNumberOfModulesPhi(void)      { AssertPPSD("GetNumberOfModulesPhi");      return 0; }
   virtual Int_t   GetNumberOfModulesZ(void)        { AssertPPSD("GetNumberOfModulesZ");        return 0; }
-  virtual void    SetLeadConverterThickness(Float_t x)  { AssertPPSD("SetLeadConverterThickness");       }
+  virtual void    SetLeadConverterThickness(Float_t x) { AssertPPSD("SetLeadConverterThickness");       }
  
 private:
 

diff --git a/PHOS/AliPHOSClusterizer.cxx b/PHOS/AliPHOSClusterizer.cxx
index 4300ead1c672ffc84ace1cb3ed9685d55661858a..c4d8dc4f6169ab1f98e8ea61526a97c76f7050d6 100644 (file)
--- a/PHOS/AliPHOSClusterizer.cxx
+++ b/PHOS/AliPHOSClusterizer.cxx
@@ -17,7 +17,7 @@
 
 //_________________________________________________________________________
 //  Base class for the clusterization algorithm (pure abstract)
-//
+//*--
 //*-- Author: Yves Schutz  SUBATECH 
 //////////////////////////////////////////////////////////////////////////////
 

diff --git a/PHOS/AliPHOSClusterizerv1.h b/PHOS/AliPHOSClusterizerv1.h
index 1d48e0fb0908b712e68a665dac5f6b54239c4a8e..228123b8613a673217e68cdcb895ef131e37f121 100644 (file)
--- a/PHOS/AliPHOSClusterizerv1.h
+++ b/PHOS/AliPHOSClusterizerv1.h
@@ -7,6 +7,10 @@
 
 //_________________________________________________________________________
 //  Implementation version 1 of the clusterization algorithm                     
+//  Performs clusterization (collects neighbouring active cells) and 
+//  unfolding of the clusters with several local maxima.  
+//  results are stored in TreeR#, branches PHOSEmcRP (EMC recPoints),
+//  PHOSCpvRP (CPV RecPoints) and AliPHOSClusterizer
 //
 //*-- Author: Yves Schutz (SUBATECH)
 
@@ -33,8 +37,8 @@ public:
   
   Int_t           AreNeighbours(AliPHOSDigit * d1, AliPHOSDigit * d2)const ; 
                                // Checks if digits are in neighbour cells 
-  virtual void    GetNumberOfClustersFound(int * numb ){  numb[0] = fNumberOfEmcClusters ; 
-                                                          numb[1] = fNumberOfCpvClusters ; }
+  virtual void    GetNumberOfClustersFound(int * numb )const{  numb[0] = fNumberOfEmcClusters ; 
+                                                               numb[1] = fNumberOfCpvClusters ; }
 
   virtual Float_t GetEmcClusteringThreshold()const{ return fEmcClusteringThreshold;}
   virtual Float_t GetEmcLocalMaxCut()const        { return fEmcLocMaxCut;} 
@@ -71,7 +75,7 @@ public:
 private:
   virtual Float_t Calibrate(Int_t amp)const {  return (amp-fPedestal)/fSlope ;}  // Tranforms Amp to energy 
   Bool_t  FindFit(AliPHOSEmcRecPoint * emcRP, int * MaxAt, Float_t * maxAtEnergy, 
-                 Int_t NPar, Float_t * FitParametres) ; //Used in UnfoldClusters, calls TMinuit
+                 Int_t NPar, Float_t * FitParametres) const; //Used in UnfoldClusters, calls TMinuit
   void Init() ;
 
   virtual Bool_t IsInEmc (AliPHOSDigit * digit)const ;     // Tells if id digit is in EMC
@@ -95,7 +99,7 @@ private:
   Int_t   fEvent ;                   // Number of event currently processed 
   Bool_t  fToUnfold ;                // To perform unfolding 
 
-  Bool_t  fIsInitialized ;
+  Bool_t  fIsInitialized ;           // kTRUE if clisterizer is initialized
 
   AliPHOSGeometry * fGeom ;          // !pointer to PHOS geometry
 

diff --git a/PHOS/AliPHOSCpvRecPoint.cxx b/PHOS/AliPHOSCpvRecPoint.cxx
index 1a92baa87bbe9b8c3203a2be97bdf97fc09533e1..c949e06a5cabe488b56997bcf70ba49ffcb64c4f 100644 (file)
--- a/PHOS/AliPHOSCpvRecPoint.cxx
+++ b/PHOS/AliPHOSCpvRecPoint.cxx
@@ -135,7 +135,7 @@ Int_t AliPHOSCpvRecPoint::Compare(const TObject * obj) const
 }
 
 //______________________________________________________________________________
-void AliPHOSCpvRecPoint::ExecuteEvent(Int_t event, Int_t px, Int_t py)
+void AliPHOSCpvRecPoint::ExecuteEvent(Int_t event, Int_t px, Int_t py) const
 {
 //   // Execute action corresponding to one event
 //   //  This member function is called when a AliPHOSRecPoint is clicked with the locator

diff --git a/PHOS/AliPHOSCpvRecPoint.h b/PHOS/AliPHOSCpvRecPoint.h
index e40925b7651f4139895edd88fa8f19ddf605c0cc..1de5c39b0036a0619b71583878a29b42e7c3ac7c 100644 (file)
--- a/PHOS/AliPHOSCpvRecPoint.h
+++ b/PHOS/AliPHOSCpvRecPoint.h
@@ -41,9 +41,9 @@ public:
   void   EvalLocalPosition(Float_t logWeight,TClonesArray * digits ) ;  
   void   EvalClusterLengths(TClonesArray * digits) ;
 
-  virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py) ; 
+  virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py) const ; 
 
-  void   GetClusterLengths(Int_t &lengX, Int_t &lengZ){lengX = fLengX ;lengZ = fLengZ ;}
+  void   GetClusterLengths(Int_t &lengX, Int_t &lengZ) const {lengX = fLengX ;lengZ = fLengZ ;}
   Bool_t IsEmc(void) const {return kFALSE ;   }              // tells that this is not a EMC
   Bool_t IsCPV(void) const {return (fPHOSMod <= ((AliPHOSGeometry*) fGeom)->GetNCPVModules()) ; }     
                                                                   // true if the recpoint is in CPV

diff --git a/PHOS/AliPHOSDigitizer.h b/PHOS/AliPHOSDigitizer.h
index 252bd8ce751605af945d8b7e2dcc30b3f08317fd..8cf50c0dd79e56b9ac366b8b7c93f8091a3f3309 100644 (file)
--- a/PHOS/AliPHOSDigitizer.h
+++ b/PHOS/AliPHOSDigitizer.h
@@ -7,6 +7,9 @@
 
 //_________________________________________________________________________
 //  Task Class for making SDigits in PHOS      
+// Class performs digitization of Summable digits (in the PHOS case this is just
+// sum of contributions of all primary particles into given cell). 
+// In addition it performs mixing of summable digits from different events.
 //                  
 //*-- Author: Dmitri Peressounko(SUBATECH & KI)
 
@@ -26,6 +29,7 @@ class AliPHOSDigitizer: public TTask {
 public:
   AliPHOSDigitizer() ;          // ctor
   AliPHOSDigitizer(const char *headerFile,const char * sDigitsBranchTitle = 0) ; 
+  AliPHOSDigitizer(const AliPHOSDigitizer & dtizer) {( (AliPHOSDigitizer &)dtizer ).Copy(*this) ;} // cpy ctor
   virtual ~AliPHOSDigitizer() ;       
 
   void    Digitize(Option_t *option);            // Make Digits from SDigits stored in fSDigits
@@ -41,8 +45,8 @@ public:
   Float_t GetSlope()        const { return fSlope; }
   char *  GetDigitsBranch ()const { return (char*)fDigitsTitle.Data() ;}
   char *  GetSDigitsBranch()const { return (char*)((TObjString*)fSDigitsTitles->At(0))->GetString().Data() ;}
-  TClonesArray * GetHeadersFiles(){ return fHeaderFiles ;}
-  TArrayI*    GetCurrentEvents()  { return fIevent ;}
+  TClonesArray * GetHeadersFiles() const { return fHeaderFiles ;}
+  TArrayI      * GetCurrentEvents()const { return fIevent ;}
 
   void    MixWith(char* HeaderFile, char* SDigitsTitle =0) ; // Add another one file to mix
   virtual void    Print(Option_t* option)const ;
@@ -58,6 +62,12 @@ public:
   void    SetDigitsBranch (const char* file) ;
   void    SetSDigitsBranch(const char* file) ;
 
+  AliPHOSDigitizer & operator = (const AliPHOSDigitizer & rvalue)  {
+    // assignement operator requested by coding convention but not needed
+    abort() ;
+    return *this ; 
+  }
+
 private:
   Bool_t  Combinator() ;                         // makes all desirable combination sig+Bg
   void    Init();                   
@@ -73,7 +83,7 @@ private:
   TClonesArray * fDigits ;          // ! Final list of digits
   AliPHOSSDigitizer * fSDigitizer ; // ! SDigitizer to extarct some sdigitizing parameters
   Int_t   fNinputs ;                // Number of input files
-  Bool_t  fInitialized ;            // 
+  Bool_t  fInitialized ;            // kTRUE if AliPHOSDigitizer is initialized
   TArrayI * fIevent ;               // events to read at the next ReadSDigits() call
   TArrayI * fIeventMax ;            // Maximal number of events in each input file
 

diff --git a/PHOS/AliPHOSEmcRecPoint.cxx b/PHOS/AliPHOSEmcRecPoint.cxx
index 0bc8ebad62901a5087df8fc8bd65a9ee0b40f57c..d77e96bdf612648eff4a682bb413b468ccae93b7 100644 (file)
--- a/PHOS/AliPHOSEmcRecPoint.cxx
+++ b/PHOS/AliPHOSEmcRecPoint.cxx
@@ -18,7 +18,7 @@
 //_________________________________________________________________________
 //  RecPoint implementation for PHOS-EMC 
 //  An EmcRecPoint is a cluster of digits   
-//           
+//*--
 //*-- Author: Dmitri Peressounko (RRC KI & SUBATECH)
 
 
@@ -174,7 +174,7 @@ Int_t AliPHOSEmcRecPoint::Compare(const TObject * obj) const
 }
 
 //______________________________________________________________________________
-void AliPHOSEmcRecPoint::ExecuteEvent(Int_t event, Int_t px, Int_t py)
+void AliPHOSEmcRecPoint::ExecuteEvent(Int_t event, Int_t px, Int_t py) const
 {
 //   Commented by Dmitri Peressounko: there is no possibility to ensure, 
 //   that AliPHOSIndexToObject keeps the correct information.
@@ -418,7 +418,8 @@ void  AliPHOSEmcRecPoint::EvalElipsAxis(Float_t logWeight,TClonesArray * digits)
 //____________________________________________________________________________
 void AliPHOSEmcRecPoint::EvalAll(Float_t logWeight, TClonesArray * digits )
 {
-  // calculates the various parameters characterizing the RecPoint 
+  // Evaluates all shower parameters
+
   AliPHOSRecPoint::EvalAll(logWeight,digits) ;
   EvalLocalPosition(logWeight, digits) ;
   EvalElipsAxis(logWeight, digits) ;

diff --git a/PHOS/AliPHOSEmcRecPoint.h b/PHOS/AliPHOSEmcRecPoint.h
index 5b4dc1873f45f083ba130ce6084562a7e60fa65a..d00ff9d9250409de45b3b42561df2f6bf989738f 100644 (file)
--- a/PHOS/AliPHOSEmcRecPoint.h
+++ b/PHOS/AliPHOSEmcRecPoint.h
@@ -44,7 +44,7 @@ public:
   virtual void  EvalLocalPosition(Float_t logWeight,TClonesArray * digits) ;// computes the position in the PHOS module 
   virtual void  EvalDispersion(Float_t logWeight,TClonesArray * digits) ;   // computes the dispersion of the shower
   virtual void  EvalElipsAxis(Float_t logWeight, TClonesArray * digits );   // computes the axis of shower ellipsoide
-  virtual void  ExecuteEvent(Int_t event, Int_t px, Int_t py) ; 
+  virtual void  ExecuteEvent(Int_t event, Int_t px, Int_t py) const; 
 
   Float_t         GetCoreEnergy()const {return fCoreEnergy ;}
   virtual Float_t GetDispersion()const {return fDispersion ;}
@@ -64,8 +64,7 @@ public:
   void        Print(Option_t * opt = "void") ; 
 
   AliPHOSEmcRecPoint & operator = (const AliPHOSEmcRecPoint & rvalue)  {
-    // assignement operator requested by coding convention
-    // but not needed
+    // assignement operator requested by coding convention but not needed
     assert(0==1) ;
     return *this ; 
   }
@@ -74,10 +73,10 @@ public:
 
   virtual Bool_t AreNeighbours(AliPHOSDigit * digit1, AliPHOSDigit * digit2 ) const ;
 
-  Float_t fCoreEnergy ;
-  Float_t fLambda[2] ;        //
-  Float_t fDispersion ;
-  Float_t *fEnergyList ;    //[fMulDigit] energy of digits
+  Float_t fCoreEnergy ;       // energy in a shower core 
+  Float_t fLambda[2] ;        // shower ellipse axes
+  Float_t fDispersion ;       // shower dispersion
+  Float_t *fEnergyList ;      //[fMulDigit] energy of digits
   
   ClassDef(AliPHOSEmcRecPoint,1)  // EMC RecPoint (cluster)
 

diff --git a/PHOS/AliPHOSHit.cxx b/PHOS/AliPHOSHit.cxx
index 2c5711031860d2aa41cc73b7b5056d065304ebc1..b4ff709c1d7db8c7d0a66e5f3f9594da9a6cc967 100644 (file)
--- a/PHOS/AliPHOSHit.cxx
+++ b/PHOS/AliPHOSHit.cxx
@@ -18,7 +18,7 @@
 //_________________________________________________________________________
 //  Hits class for PHOS     
 //  A hit in PHOS is the sum of all hits in a single crystal
-//               
+//*--
 //*-- Author: Maxime Volkov (RRC KI) & Yves Schutz (SUBATECH)
 
 // --- ROOT system ---

diff --git a/PHOS/AliPHOSIndexToObject.h b/PHOS/AliPHOSIndexToObject.h
index f6ac1b8073c514aa22ba381bae7b2eb16d9e2eac..f8e0c47b34cc8938fb8112157afd7e97fadc88e0 100644 (file)
--- a/PHOS/AliPHOSIndexToObject.h
+++ b/PHOS/AliPHOSIndexToObject.h
@@ -76,7 +76,7 @@ class AliPHOSIndexToObject : public TObject {
   Int_t                 GimeNDigits() 
                           {if(fDigits) return fDigits->GetEntriesFast(); 
                          return 0 ;} 
-  TParticle *           GimePrimary(Int_t index) ;
+  TParticle *           GimePrimary(Int_t index) const ;
   Int_t                 GimeNPrimaries()const { return fNPrimaries; }
   AliPHOSRecParticle *  GimeRecParticle(Int_t index) 
                           { if(fRecParticles) return (AliPHOSRecParticle*)fRecParticles->At(index); 

diff --git a/PHOS/AliPHOSPID.cxx b/PHOS/AliPHOSPID.cxx
index b0b73aad4564b1b4645a194a207aa0ff175d1f55..26f413a48f19b2b5f55132be53d815fc7e818f9f 100644 (file)
--- a/PHOS/AliPHOSPID.cxx
+++ b/PHOS/AliPHOSPID.cxx
@@ -32,7 +32,6 @@
 
 // --- Standard library ---
 #include <iostream.h>
-#include <stdlib.h>
 
 
 // --- AliRoot header files ---

diff --git a/PHOS/AliPHOSPIDv1.h b/PHOS/AliPHOSPIDv1.h
index 9b78a7fe86e4fc6a4e5983682147abe288f2fe4c..af1c8e64d60c17445bd05ae7dba768bb9f6db8b0 100644 (file)
--- a/PHOS/AliPHOSPIDv1.h
+++ b/PHOS/AliPHOSPIDv1.h
@@ -67,30 +67,28 @@ public:
 
  private:
 
-  TString                fHeaderFileName ;
-  TString                fTSTitle;
-  TString                fRecPointsTitle ;
-  TString                fRecparticlesTitle ;
+  TString                fHeaderFileName ;    // file name with event header
+  TString                fTSTitle;            // branch name with track segments
+  TString                fRecPointsTitle ;    // branch name with rec points
+  TString                fRecparticlesTitle ; // branch name with rec particles
 
-  TString                fIDOptions ;
+  TString                fIDOptions ;         // PID option
 
-  Int_t                  fNEvent ;
-  TObjArray            * fEmcRecPoints ;  // ! initial EMC RecPoints
-  TObjArray            * fCpvRecPoints ;  // ! initial CPV RecPoints
-  TClonesArray         * fTrackSegments;  // ! initial list of TrackSegments
-  TClonesArray         * fRecParticles ;  // ! output
+  Int_t                  fNEvent ;            // current event number
+  TObjArray            * fEmcRecPoints ;      // ! initial EMC RecPoints
+  TObjArray            * fCpvRecPoints ;      // ! initial CPV RecPoints
+  TClonesArray         * fTrackSegments;      // ! initial list of TrackSegments
+  TClonesArray         * fRecParticles ;      // ! output
 
-  AliPHOSClusterizer   * fClusterizer ;    // !
-  AliPHOSTrackSegmentMaker * fTSMaker ;    // !
-
-  AliPHOSGeometry      * fGeom ;           // !pointer to PHOS geometry  
-  TFormula             * fFormula ;        // formula to define cut on the shouer elips axis
-  Float_t                fDispersion ;     // dispersion cut
-  Float_t                fCpvEmcDistance ; 
-
-  Bool_t                 fIsInitialized ;
+  AliPHOSClusterizer   * fClusterizer ;       // !
+  AliPHOSTrackSegmentMaker * fTSMaker ;       // !
 
+  AliPHOSGeometry      * fGeom ;              // !pointer to PHOS geometry  
+  TFormula             * fFormula ;           // formula to define cut on the shouer elips axis
+  Float_t                fDispersion ;        // dispersion cut
+  Float_t                fCpvEmcDistance ;    // Max EMC-CPV distance
 
+  Bool_t                 fIsInitialized ;     // kTRUE is inifialized
 
 
   ClassDef( AliPHOSPIDv1,1)  // Particle identifier implementation version 1

diff --git a/PHOS/AliPHOSPPSDGeometry.h b/PHOS/AliPHOSPPSDGeometry.h
index e3c46527c6cf3d15bbbbf51f509c6720f1f26ac8..c59eed1424c1cfffc233152f1cf1182b77b393f2 100644 (file)
--- a/PHOS/AliPHOSPPSDGeometry.h
+++ b/PHOS/AliPHOSPPSDGeometry.h
@@ -47,7 +47,7 @@ public:
   virtual Float_t GetCPVBoxSize(Int_t index)       { return  fPPSDBoxSize[index] ;      }
   virtual Float_t GetPPSDModuleSize(Int_t index)   { return  fPPSDModuleSize[index] ;   }
   virtual Float_t GetZDisplacement(void)           { return  fZDisplacement ;           }
-  virtual void    SetLeadConverterThickness(Float_t x)  { fLeadConverterThickness = x;  }
+  virtual void    SetLeadConverterThickness(Float_t x) { fLeadConverterThickness = x;  }
   
   // CPV functions cannot be used for PPSD
   

diff --git a/PHOS/AliPHOSRecParticle.cxx b/PHOS/AliPHOSRecParticle.cxx
index 6dfb60e1293923c52440e333b39f9d48bfca4a18..dfd80005d4bcfc1541b25b5494dfd120e3ddde51 100644 (file)
--- a/PHOS/AliPHOSRecParticle.cxx
+++ b/PHOS/AliPHOSRecParticle.cxx
@@ -27,12 +27,10 @@
 
 // --- Standard library ---
 
-#include <assert.h>
 
 // --- AliRoot header files ---
 
 #include "AliPHOSRecParticle.h"
-#include "TPad.h"
 
 ClassImp(AliPHOSRecParticle)
 

diff --git a/PHOS/AliPHOSRecParticle.h b/PHOS/AliPHOSRecParticle.h
index 0d8c07a4fa9fbc0b4314d4210537781b00f2c1b9..55bf1a40190afb6f9bacb78a683f0367c6c5b5ca 100644 (file)
--- a/PHOS/AliPHOSRecParticle.h
+++ b/PHOS/AliPHOSRecParticle.h
@@ -13,9 +13,6 @@
 
 // --- ROOT system ---
 
-#include "TParticle.h"
-#include "TVector3.h"
-
 // --- Standard library ---
 
 // --- AliRoot header files ---
@@ -24,13 +21,13 @@
 
 class AliPHOSRecParticle : public AliPHOSFastRecParticle {
 
-public:
+ public:
   
   AliPHOSRecParticle() {  }
   AliPHOSRecParticle(const AliPHOSRecParticle & rp) ;  // ctor
   virtual ~AliPHOSRecParticle(){  }
 
-  Int_t  GetPHOSTSIndex(){    return fPHOSTrackSegment ;  }
+  Int_t  GetPHOSTSIndex()const {    return fPHOSTrackSegment ;  }
   void   SetTraskSegment(Int_t index){fPHOSTrackSegment = index; }
 
   typedef TClonesArray RecParticlesList ; 

diff --git a/PHOS/AliPHOSRecPoint.cxx b/PHOS/AliPHOSRecPoint.cxx
index 874b489d1510b625444e76ba8e4d74d853c91f30..e756bea8e06cabdb2775b51b77fbb1a14c62cba8 100644 (file)
--- a/PHOS/AliPHOSRecPoint.cxx
+++ b/PHOS/AliPHOSRecPoint.cxx
@@ -44,7 +44,7 @@ AliPHOSRecPoint::AliPHOSRecPoint()
   // ctor
 
   fGeom = (AliPHOSGeometry*) AliPHOSGeometry::GetInstance() ;
-  fMaxTrack = 50 ;
+  fMaxTrack = 200 ;
   fPHOSMod = 0;
 }
 

diff --git a/PHOS/AliPHOSRecPoint.h b/PHOS/AliPHOSRecPoint.h
index c2adc61b1c70d0bab472f82185c4ab74dbef14c4..31192d46589965811ecf3c17695a94059714d9e5 100644 (file)
--- a/PHOS/AliPHOSRecPoint.h
+++ b/PHOS/AliPHOSRecPoint.h
@@ -60,13 +60,12 @@ class AliPHOSRecPoint : public AliRecPoint {
     return kTRUE ; 
   }  
   virtual void    Paint(Option_t * option="");
-  virtual void    Print(Option_t * opt = "void") {
+  virtual void    Print(Option_t * opt = "void") const {
     // Print prototype
   } 
 
   AliPHOSRecPoint & operator = (const AliPHOSRecPoint & )  {
-    // assignement operator requested by coding convention
-    // but not needed
+    // assignement operator requested by coding convention but not needed
     assert(0==1) ;
     return *this ; 
   }

diff --git a/PHOS/AliPHOSReconstructioner.cxx b/PHOS/AliPHOSReconstructioner.cxx
index e05530f31f66afefa1041118660c056fcdc86456..a30f4ee2372ba026c16e71fe7f70d53a01912da6 100644 (file)
--- a/PHOS/AliPHOSReconstructioner.cxx
+++ b/PHOS/AliPHOSReconstructioner.cxx
@@ -387,7 +387,8 @@ void AliPHOSReconstructioner::Exec(Option_t *option)
 //____________________________________________________________________________
 AliPHOSReconstructioner::~AliPHOSReconstructioner()
 {
-  // dtor  
+  // Delete data members if any
+
   if(fSDigitizer)
     delete fSDigitizer ;
   
@@ -404,7 +405,8 @@ AliPHOSReconstructioner::~AliPHOSReconstructioner()
     delete fPID ;
 } 
 //____________________________________________________________________________
-void AliPHOSReconstructioner::SetBranchTitle(const char* branch, const char * title){
+void AliPHOSReconstructioner::SetBranchTitle(const char* branch, const char * title)
+{
   //Diverge correcpoinding branch to the file "title"
 
   if(strcmp(branch,"SDigits") == 0){ 
@@ -521,9 +523,10 @@ void AliPHOSReconstructioner::StartFrom(char * module,char* title)
   delete moduleName;
 }
 //____________________________________________________________________________
-void AliPHOSReconstructioner::Print(Option_t * option)const 
-{
-  // Print the parameters of the reconstructioner  
+
+void AliPHOSReconstructioner::Print(Option_t * option)const {
+  // Print reconstructioner data  
+
   cout << "-----------------AliPHOSReconstructioner---------------" << endl ;
   cout << " Reconstruction of the header file " <<fHeaderFileName.Data() << endl ;
   cout << " with the following modules: " << endl ;

diff --git a/PHOS/AliPHOSReconstructioner.h b/PHOS/AliPHOSReconstructioner.h
index 7b6c4abeea246d11290f89085134357d54071835..c38eea788b0adcfa408a242b2237967f9f209036 100644 (file)
--- a/PHOS/AliPHOSReconstructioner.h
+++ b/PHOS/AliPHOSReconstructioner.h
@@ -13,7 +13,6 @@
 
 // --- ROOT system ---
 
-#include <stdlib.h>
 #include "TTask.h"
 class AliPHOSDigitizer ;
 class AliPHOSClusterizer ;
@@ -41,11 +40,11 @@ public:
 
   virtual void Exec(Option_t * option) ;
 
-  AliPHOSDigitizer         * GetDigitizer()  { return fDigitizer   ; }
-  AliPHOSClusterizer       * GetClusterizer(){ return fClusterizer ; }
-  AliPHOSPID               * GetPID()        { return fPID;          }
-  AliPHOSTrackSegmentMaker * GetTSMaker()    { return fTSMaker ;     }
-  AliPHOSSDigitizer        * GetSDigitizer() { return fSDigitizer  ; }
+  AliPHOSDigitizer         * GetDigitizer()  const { return fDigitizer   ; }
+  AliPHOSClusterizer       * GetClusterizer()const { return fClusterizer ; }
+  AliPHOSPID               * GetPID()        const { return fPID;          }
+  AliPHOSTrackSegmentMaker * GetTSMaker()    const { return fTSMaker ;     }
+  AliPHOSSDigitizer        * GetSDigitizer() const { return fSDigitizer  ; }
 
   void Print(Option_t * option)const ;
   
@@ -76,13 +75,13 @@ private:
   TString  fSDigitsBranch ;     // -"-      SDigits       -"-
 
 
-  AliPHOSDigitizer         * fDigitizer ;
-  AliPHOSClusterizer       * fClusterizer ;
-  AliPHOSPID               * fPID ;
-  AliPHOSTrackSegmentMaker * fTSMaker ;
-  AliPHOSSDigitizer        * fSDigitizer ;
+  AliPHOSDigitizer         * fDigitizer ;   // Pointer to AliPHOSDigitizer
+  AliPHOSClusterizer       * fClusterizer ; // Pointer to AliPHOSClusterizer
+  AliPHOSPID               * fPID ;         // Pointer to AliPHOSPID
+  AliPHOSTrackSegmentMaker * fTSMaker ;     // Pointer to AliPHOSTrackSegmentMaker
+  AliPHOSSDigitizer        * fSDigitizer ;  // Pointer to AliPHOSSDigitizer
 
-  Bool_t   fIsInitialized ;
+  Bool_t   fIsInitialized ; // kTRUE if reconstructioner is initialized
  
   ClassDef(AliPHOSReconstructioner,1)  // Reconstruction algorithm class (Base Class)
 

diff --git a/PHOS/AliPHOSSDigitizer.h b/PHOS/AliPHOSSDigitizer.h
index c3f4ae07a0530b2c9c9b42fcc3fc17f15faf4221..5075eace06dbbcf135c21c59203d1731f8dbabfe 100644 (file)
--- a/PHOS/AliPHOSSDigitizer.h
+++ b/PHOS/AliPHOSSDigitizer.h
@@ -7,7 +7,9 @@
 
 //_________________________________________________________________________
 //  Task Class for making SDigits in PHOS      
-//                  
+// A Summable Digits is the sum of all hits originating 
+// from one primary in one active cell
+//*--
 //*-- Author: Dmitri Peressounko(SUBATECH & KI)
 
 
@@ -53,7 +55,7 @@ private:
   Float_t fPrimThreshold ;  // To store primari if Elos > threshold
   TString fSDigitsTitle ;   // title of SDigits branch
   TString fHeadersFile ;    //input file
-  Bool_t         fIsInitialized ; 
+  Bool_t         fIsInitialized ; // kTRUE if SDigitizer is initialized
   TClonesArray * fSDigits ; //! list of SDigits
   TClonesArray * fHits ;    //!
 

diff --git a/PHOS/AliPHOSTrackSegment.cxx b/PHOS/AliPHOSTrackSegment.cxx
index e00d52a5d0b4d457ef2300115bce56e3f6f72deb..979656b15a7b9379754beecfd52c03e0f17c26c5 100644 (file)
--- a/PHOS/AliPHOSTrackSegment.cxx
+++ b/PHOS/AliPHOSTrackSegment.cxx
@@ -81,7 +81,7 @@ void AliPHOSTrackSegment::Copy(TObject & obj)
 }
 
 //____________________________________________________________________________
-void AliPHOSTrackSegment::Print(Option_t * opt)
+void AliPHOSTrackSegment::Print(Option_t * opt) const
 {
   // Print all information on this track Segment
   

diff --git a/PHOS/AliPHOSTrackSegment.h b/PHOS/AliPHOSTrackSegment.h
index bb0df8428c6f6922d9d6180ad335d8cefd507e02..10f25b53ebb35a8a3ec8ac999b6fbc058ea4e47d 100644 (file)
--- a/PHOS/AliPHOSTrackSegment.h
+++ b/PHOS/AliPHOSTrackSegment.h
@@ -37,12 +37,12 @@ public:
 
   void Copy(TObject & obj) ;  
 
-  Int_t   GetIndexInList() const {    return fIndexInList ;   } 
-  Int_t   GetEmcIndex()const {  return fEmcRecPoint ;   }
-  Int_t   GetPpsdIndex()const{  return fPpsdLowRecPoint;}
-  Int_t   GetCpvIndex()const {  return fPpsdUpRecPoint; }
+  Int_t   GetIndexInList() const {  return fIndexInList ;   } 
+  Int_t   GetEmcIndex()    const {  return fEmcRecPoint ;   }
+  Int_t   GetPpsdIndex()   const {  return fPpsdLowRecPoint;}
+  Int_t   GetCpvIndex()    const {  return fPpsdUpRecPoint; }
 
-  virtual void  Print(Option_t * option) ;
+  virtual void  Print(Option_t * option) const;
   void    SetIndexInList(Int_t val){ fIndexInList = val ;     } 
   void    SetCpvRecPoint(AliPHOSRecPoint * PpsdUpRecPoint ); //sets PPSD up Rec Point
 

diff --git a/PHOS/AliPHOSTrackSegmentMaker.cxx b/PHOS/AliPHOSTrackSegmentMaker.cxx
index 70e15e7a998c255891a21acdec66245290c72b2b..b8571ad4ef3df1181f49f1669bc790bb35c3359e 100644 (file)
--- a/PHOS/AliPHOSTrackSegmentMaker.cxx
+++ b/PHOS/AliPHOSTrackSegmentMaker.cxx
@@ -17,22 +17,16 @@
 // Algorithm Base class to construct PHOS track segments
 // Associates EMC and PPSD clusters
 // Unfolds the EMC cluster   
-//                  
+//*-- 
 //*-- Author: Dmitri Peressounko (RRC Ki & SUBATECH)
 
 
 // --- ROOT system ---
 
-#include "TFile.h"
-#include "TROOT.h"
-
 // --- Standard library ---
 
 // --- AliRoot header files ---
-#include "AliRun.h"
 #include "AliPHOSTrackSegmentMaker.h"
-#include "AliPHOS.h"
-#include "AliPHOSGeometry.h"
 
 ClassImp( AliPHOSTrackSegmentMaker) 
 

diff --git a/PHOS/AliPHOSTrackSegmentMaker.h b/PHOS/AliPHOSTrackSegmentMaker.h
index 77020fe51c77bdcbd312ef9c7ea42debf950c066..f79d2d3ed9908aa130c6fe2597d90a7cf83f7c8d 100644 (file)
--- a/PHOS/AliPHOSTrackSegmentMaker.h
+++ b/PHOS/AliPHOSTrackSegmentMaker.h
@@ -48,8 +48,6 @@ public:
   virtual void SetTrackSegmentsBranch(const char * title) = 0 ;
   virtual void WriteTrackSegments() = 0 ;
   
- protected:
-
   ClassDef( AliPHOSTrackSegmentMaker,1)    // Algorithm class to make PHOS track segments (Base Class)
 
 };

diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.cxx b/PHOS/AliPHOSTrackSegmentMakerv1.cxx
index a43d19f977ef38da5f1f43ff0c259439749c488b..bf7af53949e37ae868c04176c121b66b469213cb 100644 (file)
--- a/PHOS/AliPHOSTrackSegmentMakerv1.cxx
+++ b/PHOS/AliPHOSTrackSegmentMakerv1.cxx
@@ -61,7 +61,7 @@
 #include "AliPHOSCpvRecPoint.h"
 #include "AliPHOSPpsdRecPoint.h"
 #include "AliPHOSLink.h"
-#include "AliPHOSv0.h"
+#include "AliPHOS.h"
 #include "AliRun.h"
 
 ClassImp( AliPHOSTrackSegmentMakerv1) 
@@ -210,7 +210,7 @@ void  AliPHOSTrackSegmentMakerv1::FillOneModule()
     
 }
 //____________________________________________________________________________
-Float_t  AliPHOSTrackSegmentMakerv1::GetDistanceInPHOSPlane(AliPHOSEmcRecPoint * emcClu,AliPHOSRecPoint * cpvClu, Bool_t &toofar)
+Float_t  AliPHOSTrackSegmentMakerv1::GetDistanceInPHOSPlane(AliPHOSEmcRecPoint * emcClu,AliPHOSRecPoint * cpvClu, Bool_t &toofar)const
 {
   // Calculates the distance between the EMC RecPoint and the PPSD RecPoint
   // Clusters are sorted in "rows" and "columns" of width 1 cm
@@ -246,7 +246,7 @@ Float_t  AliPHOSTrackSegmentMakerv1::GetDistanceInPHOSPlane(AliPHOSEmcRecPoint *
 }
 
 //____________________________________________________________________________
-void  AliPHOSTrackSegmentMakerv1::MakeLinks()
+void  AliPHOSTrackSegmentMakerv1::MakeLinks()const
 { 
   // Finds distances (links) between all EMC and PPSD clusters, 
   // which are not further apart from each other than fR0 
@@ -436,9 +436,10 @@ void  AliPHOSTrackSegmentMakerv1::Exec(Option_t * option)
 
 }
 //____________________________________________________________________________
-void AliPHOSTrackSegmentMakerv1::Print(Option_t * option)const 
+void AliPHOSTrackSegmentMakerv1::Print(Option_t * option)const
 {
-  // Prints the parameters of track segment maker
+  //  Print TrackSegmentMaker parameters
+
   if(fIsInitialized){
     cout <<  "======== AliPHOSTrackSegmentMakerv1 ========" << endl ;
     cout <<  "Making Track segments "<< endl ;
@@ -621,8 +622,10 @@ void AliPHOSTrackSegmentMakerv1::WriteTrackSegments()
     cwd->cd();
   } 
   
+
   tsBranch->Fill() ;  
   tsMakerBranch->Fill() ;
+//    gAlice->TreeR()->Fill() ;    // YK 28.05.01  
   gAlice->TreeR()->Write(0,kOverwrite) ;  
   
 }

diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.h b/PHOS/AliPHOSTrackSegmentMakerv1.h
index 2e58f7b54a2e8d983dc68b751b757d9ff1576b18..0d99a01a09d9964c16c7448f1dfd282b379d696f 100644 (file)
--- a/PHOS/AliPHOSTrackSegmentMakerv1.h
+++ b/PHOS/AliPHOSTrackSegmentMakerv1.h
@@ -43,7 +43,7 @@ public:
   virtual void   Exec(Option_t * option) ;
           void   FillOneModule() ;       // Finds range in which RecPoints belonging current PHOS module are
 
-          void   MakeLinks() ;           //Evaluates distances(links) between EMC and PPSD
+          void   MakeLinks() const;      //Evaluates distances(links) between EMC and PPSD
           void   MakePairs() ;           //Finds pairs(triplets) with smallest link
   virtual void   Print(Option_t * option) const ;
   virtual Bool_t ReadRecPoints() ;
@@ -53,14 +53,13 @@ public:
   virtual void   WriteTrackSegments() ;
 
   AliPHOSTrackSegmentMakerv1 & operator = (const AliPHOSTrackSegmentMakerv1 & )  {
-    // assignement operator requested by coding convention
-    // but not needed
+    // assignement operator requested by coding convention but not needed
     abort() ;
     return *this ; 
   }
 
 private:
-  Float_t GetDistanceInPHOSPlane(AliPHOSEmcRecPoint * EmcClu , AliPHOSRecPoint * Ppsd , Bool_t & TooFar ) ; // see R0
+  Float_t GetDistanceInPHOSPlane(AliPHOSEmcRecPoint * EmcClu , AliPHOSRecPoint * Ppsd , Bool_t & TooFar )const ; // see R0
   void    Init() ;
   void    PrintTrackSegments(Option_t *option) ;
 
@@ -78,7 +77,7 @@ private:
   TClonesArray * fTrackSegments;     // ! list of final track segments
 
 
-  Bool_t  fIsInitialized ; //
+  Bool_t  fIsInitialized ; // kTRUE if track segment maker is initialized
 
   Float_t fR0 ;        // Maximum distance between a EMC RecPoint and a PPSD RecPoint   
 

diff --git a/PHOS/AliPHOSv0.h b/PHOS/AliPHOSv0.h
index 8a6d52d5d428f37033e4d0762948ffd0b4a92d2d..6d861c6fd27a0d3493f354a735ed40126aef39ca 100644 (file)
--- a/PHOS/AliPHOSv0.h
+++ b/PHOS/AliPHOSv0.h
@@ -51,7 +51,7 @@ class AliPHOSv0 : public AliPHOS {
   virtual Float_t ZMin() const;                    // overall dimension of the module (min)
   virtual Float_t ZMax() const;                    // overall dimension of the module (max)
 
-  virtual AliPHOSGeometry * GetGeometry() {
+  virtual AliPHOSGeometry * GetGeometry() const {
     // gets the pointer to the AliPHOSGeometry unique instance  
     return fGeom ; 
   }  

diff --git a/PHOS/AliPHOSv1.cxx b/PHOS/AliPHOSv1.cxx
index a86a32406fc74bb383490d19ac769596a0323d4c..e28e8661408961035e18782abd17a79802e4b712 100644 (file)
--- a/PHOS/AliPHOSv1.cxx
+++ b/PHOS/AliPHOSv1.cxx
@@ -62,7 +62,6 @@ AliPHOSv1::AliPHOSv1():
 AliPHOSv0()
 {
   // ctor
- 
 }
 
 //____________________________________________________________________________
@@ -350,8 +349,6 @@ void AliPHOSv1::CPVDigitize (TLorentzVector p, Float_t *zxhit, Int_t moduleNumbe
   Float_t pNorm = p.Py();
   Float_t eloss = kdEdx;
 
-//    cout << "CPVDigitize: YVK : "<<hitX<<" "<<hitZ<<" | "<<pX<<" "<<pZ<<" "<<pNorm<<endl;
-
   Float_t dZY   = pZ/pNorm * fGeom->GetCPVGasThickness();
   Float_t dXY   = pX/pNorm * fGeom->GetCPVGasThickness();
   gRandom->Rannor(rnor1,rnor2);

diff --git a/PHOS/AliPHOSv1.h b/PHOS/AliPHOSv1.h
index 67486a59e10fe9182f589396695e4fdb6ddd7403..22a5948a18b68ced66a7817b7af4b01d91b0c6b5 100644 (file)
--- a/PHOS/AliPHOSv1.h
+++ b/PHOS/AliPHOSv1.h
@@ -31,7 +31,7 @@ public:
   }
   virtual ~AliPHOSv1(void) ;
 
-  virtual void   AddHit( Int_t shunt, Int_t primary, Int_t track, Int_t id, Float_t *hits) ; 
+  virtual void   AddHit( Int_t shunt, Int_t primary, Int_t track, Int_t id, Float_t *hits); 
  virtual Int_t  IsVersion(void) const {
     // Gives the version number 
     return 1 ; 

diff --git a/PHOS/AliPHOSv2.h b/PHOS/AliPHOSv2.h
index ba8fdb8461c32fbedc626f015aebf33aa12b6b7d..2570a394fd75abef64f1cbc84e4fa14b37ae5278 100644 (file)
--- a/PHOS/AliPHOSv2.h
+++ b/PHOS/AliPHOSv2.h
@@ -22,7 +22,7 @@ public:
   AliPHOSv2(const char *name, const char *title="") ;
   virtual ~AliPHOSv2(void) ;
 
-  virtual void    AddHit( Int_t shunt, Int_t primary, Int_t track, Int_t id, Float_t *hits) ; 
+  virtual void    AddHit( Int_t shunt, Int_t primary, Int_t track, Int_t id, Float_t *hits); 
   virtual Int_t   IsVersion(void) const { 
     // Gives the version number 
     return 2 ; 

diff --git a/PHOS/AliPHOSv4.cxx b/PHOS/AliPHOSv4.cxx
index a33706561554144bebf690ebdd6cf92ba13e279b..c932cef923bb42bd7ea2ab906814f245bbf5f02e 100644 (file)
--- a/PHOS/AliPHOSv4.cxx
+++ b/PHOS/AliPHOSv4.cxx
@@ -219,7 +219,7 @@ void AliPHOSv4::Init(void)
 }
 
 //___________________________________________________________________________
-Float_t AliPHOSv4::GetBigBox(Int_t index)
+Float_t AliPHOSv4::GetBigBox(Int_t index) const
 {
   // Get the X, Y or Z dimension of the box describing a PHOS module
   

diff --git a/PHOS/AliPHOSv4.h b/PHOS/AliPHOSv4.h
index 657d20638998b8ee5995a1f0fa4a9640dd71b806..8ba06b91444ad204b5c01ac1b92b1dfccda9f38e 100644 (file)
--- a/PHOS/AliPHOSv4.h
+++ b/PHOS/AliPHOSv4.h
@@ -49,8 +49,8 @@ public:
   void           AddRecParticle(const AliPHOSFastRecParticle & rp) ; // adds primary particle to the RecParticles list
   virtual void   BuildGeometry(void) ;                               // creates the geometry for the ROOT display
   virtual void   CreateGeometry(void) ;                              // creates the geometry for GEANT
-  Float_t        GetBigBox(Int_t index) ;                             
-  virtual AliPHOSGeometry * GetGeometry() {
+  Float_t        GetBigBox(Int_t index) const;                             
+  virtual AliPHOSGeometry * GetGeometry() const {
     // gets the pointer to the AliPHOSGeometry unique instance  
     return fGeom ; 
   }  
@@ -67,7 +67,7 @@ public:
   void MakeRecParticle(const Int_t modid, const TVector3 pos, AliPHOSFastRecParticle & rp) ;  // makes a reconstructes particle from primary
   Int_t   MakeType(AliPHOSFastRecParticle & rp) ;                    // gets the detected type of particle
   // gets TClonesArray of reconstructed particles
-  TClonesArray * FastRecParticles() { return fFastRecParticles ; } 
+  TClonesArray * FastRecParticles() const { return fFastRecParticles ; } 
   virtual void ResetPoints() ; 
   void         ResetFastRecParticles() ; 
   void         SetBigBox(Int_t index, Float_t value) ;                             
@@ -80,8 +80,7 @@ public:
   }
 
   AliPHOSv4 & operator = (const AliPHOSv4 & )  {
-    // assignement operator requested by coding convention
-    // but not needed
+    // assignement operator requested by coding convention but not needed
     assert(0==1) ;
     return *this ; 
   }