coding convention

diff --git a/PHOS/AliPHOS.cxx b/PHOS/AliPHOS.cxx
index 232c895a13e37431f4e97057a4abae4a46008a33..0d3176b4b4bd7a28b1088d3c2e775d7f22a35052 100644 (file)
--- a/PHOS/AliPHOS.cxx
+++ b/PHOS/AliPHOS.cxx
@@ -28,20 +28,17 @@
 // --- ROOT system ---
 class TFile;
 #include <TFolder.h> 
-#include <TROOT.h>
 #include <TTree.h>
 #include <TVirtualMC.h> 
 
 // --- Standard library ---
-#include <Riostream.h>
 
 // --- AliRoot header files ---
 #include "AliMagF.h"
 #include "AliPHOS.h"
 #include "AliPHOSGeometry.h"
 #include "AliPHOSLoader.h"
-#include "AliPHOSQAChecker.h"
-#include "AliRun.h"
+
 
 ClassImp(AliPHOS)
 //____________________________________________________________________________
@@ -371,7 +368,7 @@ AliPHOSGeometry * AliPHOS::GetGeometry() const
 //____________________________________________________________________________
 void AliPHOS::SetTreeAddress()
 { 
-
+  // Links Hits in the Tree to Hits array
   TBranch *branch;
   char branchname[20];
   sprintf(branchname,"%s",GetName());

diff --git a/PHOS/AliPHOS.h b/PHOS/AliPHOS.h
index ba5c56fadae811ce5924aed2ca74d0e4d1d75985..f612c8d644a35587ec51ea0cb5a8ccf63325a812 100644 (file)
--- a/PHOS/AliPHOS.h
+++ b/PHOS/AliPHOS.h
@@ -9,16 +9,14 @@
 //                  
 //*-- Author: Laurent Aphecetche & Yves Schutz (SUBATECH)
 
-#include <stdlib.h>
 
 // --- ROOT system ---
-
 class TString ; 
 class TTask ;
 class TFolder ;
+class TTree ; 
 
 // --- AliRoot header files ---
-
 #include "AliDetector.h" 
 class AliPHOSGeometry ; 
 class AliPHOSQAChecker ;
@@ -52,11 +50,7 @@ class AliPHOS : public AliDetector {
   virtual const TString Version() const {return TString(" ") ; } 
   virtual void WriteQA() ; 
   AliPHOS & operator = (const AliPHOS & /*rvalue*/)  {
-    // assignement operator requested by coding convention
-    // but not needed
-    Fatal("operator =", "not implemented") ;
-    return *this ; 
-  }
+    Fatal("operator =", "not implemented") ; return *this ; }
 
   virtual AliLoader* MakeLoader(const char* topfoldername);
  

diff --git a/PHOS/AliPHOSAnalyze.cxx b/PHOS/AliPHOSAnalyze.cxx
index 66e06ba388b6560c8e39af3657917417fea19306..0a0ec831e11e709f4802e67542a2ee81073fee07 100644 (file)
--- a/PHOS/AliPHOSAnalyze.cxx
+++ b/PHOS/AliPHOSAnalyze.cxx
@@ -69,24 +69,23 @@
 #include "TH2.h"
 #include "TParticle.h"
 #include "TClonesArray.h"
-#include "TTree.h"
 #include "TMath.h"
 #include "TROOT.h"
-#include "TFolder.h"
 
 // --- Standard library ---
 
 // --- AliRoot header files ---
 
-#include "AliRun.h"
+//#include "AliRun.h"
 #include "AliStack.h"
-#include "AliPHOSv1.h"
+#include "AliPHOSGeometry.h"
 #include "AliPHOSAnalyze.h"
 #include "AliPHOSDigit.h"
 #include "AliPHOSSDigitizer.h"
+#include "AliPHOSEmcRecPoint.h"
+#include "AliPHOSCpvRecPoint.h"
 #include "AliPHOSTrackSegment.h"
 #include "AliPHOSRecParticle.h"
-#include "AliPHOSCpvRecPoint.h"
 #include "AliPHOSLoader.h"
 
 

diff --git a/PHOS/AliPHOSCalibrationDB.cxx b/PHOS/AliPHOSCalibrationDB.cxx
index a324c237ff66f6f511e67c2c0bb5c54d4c7d4162..672d75aa63e376d78c116b699b44c07f8b6b09dc 100644 (file)
--- a/PHOS/AliPHOSCalibrationDB.cxx
+++ b/PHOS/AliPHOSCalibrationDB.cxx
@@ -22,7 +22,7 @@
 //////////////////////////////////////////////////////////////////////////////
 
 // --- ROOT system ---
-#include "TFile.h"
+
 // --- Standard library ---
 #include <fstream>
 

diff --git a/PHOS/AliPHOSCalibrator.cxx b/PHOS/AliPHOSCalibrator.cxx
index 767673694a9ab194a767ac23c1231e2a7f59c68e..12634dff3f43d5c2b17bdb1abcbe2bbdd10541b6 100644 (file)
--- a/PHOS/AliPHOSCalibrator.cxx
+++ b/PHOS/AliPHOSCalibrator.cxx
@@ -48,6 +48,7 @@
 #include "TROOT.h"
 #include "TF1.h"
 #include "TObjString.h"
+
 // --- Standard library ---
 
 // --- AliRoot header files ---
@@ -634,7 +635,7 @@ void AliPHOSCalibrator::WriteGains(const char * version,
   cmngr->WriteData(&gains) ;
 }      
 //_____________________________________________________________________________
-void AliPHOSCalibrator::Print(const Option_t *)const 
+void AliPHOSCalibrator::Print()const 
 {
   // prints everything
   printf("--------------AliPHOSCalibrator-----------------\n") ;

diff --git a/PHOS/AliPHOSCalibrator.h b/PHOS/AliPHOSCalibrator.h
index e301c0799db52a729325633d240b22882574863a..bf2930a0cf65bfa91329413078ce3290a3e93824 100644 (file)
--- a/PHOS/AliPHOSCalibrator.h
+++ b/PHOS/AliPHOSCalibrator.h
@@ -48,7 +48,7 @@ public:
   void PlotGain(Int_t channel) ; //Plot histo with gains for a channel
   void PlotGains() ;             //Plot all gains
 
-  virtual void Print(const Option_t *) const ;
+  virtual void Print() const ;
 
   TH1F * PedestalHisto(Int_t channel)
     {return dynamic_cast<TH1F* >(fPedHistos->At(channel)) ;} ;

diff --git a/PHOS/AliPHOSClusterizer.cxx b/PHOS/AliPHOSClusterizer.cxx
index ca6c5ace4486484366cf038b06402c5ea2a779fc..d69f20bc5ba142c29cfa8e23dcf87ad71262482f 100644 (file)
--- a/PHOS/AliPHOSClusterizer.cxx
+++ b/PHOS/AliPHOSClusterizer.cxx
@@ -22,21 +22,11 @@
 //////////////////////////////////////////////////////////////////////////////
 
 // --- ROOT system ---
-#include "TGeometry.h"
-#include "TDirectory.h"
-#include "TFile.h"
-#include "TTree.h"
 
 // --- Standard library ---
-#include <stdlib.h>   
 
 // --- AliRoot header files ---
-#include "AliRun.h" 
 #include "AliPHOSClusterizer.h"
-#include "AliHeader.h" 
-#include "AliPHOSGetter.h"
-#include "AliPHOSSDigitizer.h"
-#include "AliPHOSDigitizer.h"
 
 ClassImp(AliPHOSClusterizer)
 

diff --git a/PHOS/AliPHOSClusterizerv1.cxx b/PHOS/AliPHOSClusterizerv1.cxx
index 75e1385c91b08abeb9827c451a66912b7b16d90c..44b067e3d3132681b1b9f9f1eccb1579d773f57a 100644 (file)
--- a/PHOS/AliPHOSClusterizerv1.cxx
+++ b/PHOS/AliPHOSClusterizerv1.cxx
@@ -45,27 +45,21 @@
 
 // --- ROOT system ---
 
-#include "TROOT.h" 
-#include "TFile.h" 
-#include "TFolder.h" 
 #include "TMath.h" 
 #include "TMinuit.h"
 #include "TTree.h" 
-#include "TSystem.h" 
 #include "TBenchmark.h"
 
 // --- Standard library ---
-//#include <iostream.h> 
 
 // --- AliRoot header files ---
 #include "AliPHOSGetter.h"
+#include "AliPHOSGeometry.h" 
 #include "AliPHOSClusterizerv1.h"
 #include "AliPHOSEmcRecPoint.h"
 #include "AliPHOSCpvRecPoint.h"
 #include "AliPHOSDigit.h"
 #include "AliPHOSDigitizer.h"
-#include "AliPHOS.h"
-#include "AliPHOSCalibrationDB.h"
 
 ClassImp(AliPHOSClusterizerv1)
   
@@ -436,7 +430,7 @@ void AliPHOSClusterizerv1::WriteRecPoints()
   
   //Now the same for CPV
   for(index = 0; index < cpvRecPoints->GetEntries(); index++)
-    dynamic_cast<AliPHOSRecPoint *>( cpvRecPoints->At(index) )->EvalAll(fW0CPV,digits)  ;
+    dynamic_cast<AliPHOSRecPoint *>( cpvRecPoints->At(index) )->EvalAll(digits)  ;
   
   cpvRecPoints->Sort() ;
   

diff --git a/PHOS/AliPHOSClusterizerv2.cxx b/PHOS/AliPHOSClusterizerv2.cxx
index 5adb4ac88717d38c68c003ff0add9f34f380467e..4eab56e020f8b3f368138b0cd18041f308546bba 100644 (file)
--- a/PHOS/AliPHOSClusterizerv2.cxx
+++ b/PHOS/AliPHOSClusterizerv2.cxx
@@ -23,7 +23,6 @@
 
 // --- ROOT system ---
 #include "TBenchmark.h"
-#include "TROOT.h"
 
 // --- Standard library ---
 
@@ -34,6 +33,7 @@
 #include "AliPHOSEvalRecPoint.h"
 #include "AliPHOSRecCpvManager.h"
 #include "AliPHOSRecEmcManager.h"
+#include "AliPHOSGeometry.h"
 
 ClassImp(AliPHOSClusterizerv2)
 

diff --git a/PHOS/AliPHOSConTableDB.cxx b/PHOS/AliPHOSConTableDB.cxx
index 76d3a1a7dc785847ff548df5c7582f8508d1a3da..48814bd4c4dab33a3cc819c5c3b389f40fd87469 100644 (file)
--- a/PHOS/AliPHOSConTableDB.cxx
+++ b/PHOS/AliPHOSConTableDB.cxx
@@ -190,7 +190,7 @@ Int_t AliPHOSConTableDB::Raw2AbsId(Int_t rawId)const{
     return 0 ;
 }
 //____________________________________________________________________________ 
-void AliPHOSConTableDB::Print(Option_t *)const {
+void AliPHOSConTableDB::Print()const {
 //prints configuraion
 
   TString message ; 

diff --git a/PHOS/AliPHOSConTableDB.h b/PHOS/AliPHOSConTableDB.h
index 4e43626e01fa0b623c6646a1e978010a4d836f2d..ef21364d0673fdc5124f11a8f0cbe2222515c620 100644 (file)
--- a/PHOS/AliPHOSConTableDB.h
+++ b/PHOS/AliPHOSConTableDB.h
@@ -53,7 +53,7 @@ public:
   //Transforms AbsId number in PHOS into channel number in prototype 
   Int_t AbsId2Raw(Int_t AbsId)const ;
 
-  virtual void Print(Option_t *) const ;
+  virtual void Print() const ;
 
 
   AliPHOSConTableDB& operator=(const AliPHOSConTableDB& cdb) ;

diff --git a/PHOS/AliPHOSCpvRecPoint.cxx b/PHOS/AliPHOSCpvRecPoint.cxx
index 6cbc45312e0d7aaea33f0117686b35a3aca11f4c..ff04696f8b75cb5a25a6481e025880ec46f31340 100644 (file)
--- a/PHOS/AliPHOSCpvRecPoint.cxx
+++ b/PHOS/AliPHOSCpvRecPoint.cxx
@@ -23,18 +23,18 @@
 //  30 October 2000 
 
 // --- ROOT system ---
-#include "TPad.h"
-#include "TH2.h"
+
 #include "TMath.h" 
-#include "TCanvas.h" 
 #include "TClonesArray.h" 
 
 // --- Standard library ---
 
 // --- AliRoot header files ---
-
+#include "AliPHOSGeometry.h" 
+#include "AliPHOSDigit.h"
 #include "AliPHOSCpvRecPoint.h"
 #include "AliPHOSLoader.h"
+
 ClassImp(AliPHOSCpvRecPoint)
 
 //____________________________________________________________________________
@@ -340,7 +340,7 @@ void AliPHOSCpvRecPoint::EvalClusterLengths(TClonesArray * digits)
 
 
 //____________________________________________________________________________
-void AliPHOSCpvRecPoint::Print(Option_t *) 
+void AliPHOSCpvRecPoint::Print() 
 {
   // Print the list of digits belonging to the cluster
   

diff --git a/PHOS/AliPHOSCpvRecPoint.h b/PHOS/AliPHOSCpvRecPoint.h
index 7131b4f533e46ee4923023eac284e574d4ececf9..b1f75ce898ac62e2009f7b237a41dc09ffb1ce9a 100644 (file)
--- a/PHOS/AliPHOSCpvRecPoint.h
+++ b/PHOS/AliPHOSCpvRecPoint.h
@@ -13,16 +13,16 @@
 //  30 October 2000 
 // --- ROOT system ---
 
-#include "TObject.h"
-#include "TArrayI.h"
+//#include "TObject.h"
+//#include "TArrayI.h"
  
 // --- Standard library ---
 
 // --- AliRoot header files ---
 
-#include "AliPHOSDigit.h"
+//#include "AliPHOSDigit.h"
 #include "AliPHOSEmcRecPoint.h"
-#include "AliPHOSGeometry.h"
+//#include "AliPHOSGeometry.h"
 
 class AliPHOSCpvRecPoint : public AliPHOSEmcRecPoint  {
 
@@ -31,9 +31,7 @@ public:
   AliPHOSCpvRecPoint() ;
   AliPHOSCpvRecPoint(const char * opt) ;
   AliPHOSCpvRecPoint(const AliPHOSCpvRecPoint & rp) : AliPHOSEmcRecPoint(rp) {
-    // cpy ctor requested by Coding Convention 
-    // but not yet needed
-    assert(0==1) ; 
+    Fatal("cpy ctor", "not implemented") ; 
   } 
  
   virtual ~AliPHOSCpvRecPoint() ;  
@@ -49,12 +47,10 @@ public:
   Bool_t IsEmc(void) const {return kFALSE ; }        // tells that this is not a EMC
   Bool_t IsCPV(void) const {return kTRUE  ; }        // true if the recpoint is in CPV
   Bool_t IsSortable() const { return kTRUE ; }    // tells that this is a sortable object
-  void   Print(Option_t *) ; 
+  void   Print() ; 
 
   AliPHOSCpvRecPoint & operator = (const AliPHOSCpvRecPoint & /*rvalue*/)  {
-    // assignement operator requested by coding convention but not needed
-    assert(0==1) ;
-    return *this ; 
+   Fatal("operator =", "not implemented") ; return *this ; 
   }
 
  protected:

diff --git a/PHOS/AliPHOSDigit.cxx b/PHOS/AliPHOSDigit.cxx
index a374834c68b88734c518e6e780ce53cdfb1b7069..c11d050ef332bb54419dec39faf0494e0a963294 100644 (file)
--- a/PHOS/AliPHOSDigit.cxx
+++ b/PHOS/AliPHOSDigit.cxx
@@ -132,8 +132,9 @@ Int_t AliPHOSDigit::GetPrimary(Int_t index) const
   
 }
 //____________________________________________________________________________
-void AliPHOSDigit::Print(Option_t *) const
+void AliPHOSDigit::Print() const
 {
+  // Print the digit together with list of primaries
   printf("PHOS digit: Amp=%d, Id=%d, Time=%f, NPrim=%d ",fAmp,fId,fTime,fNprimary);
   for(Int_t index = 0; index <fNprimary; index ++ )
     printf(" %d ",fPrimary[index]); 

diff --git a/PHOS/AliPHOSDigit.h b/PHOS/AliPHOSDigit.h
index eff0dd6a8089208309dc779bd3daafe504145e05..f0dcf26ad488f0ee63d200cf9bb76723003750cf 100644 (file)
--- a/PHOS/AliPHOSDigit.h
+++ b/PHOS/AliPHOSDigit.h
@@ -17,7 +17,7 @@
 
 // --- ROOT system ---
 
-#include "TObject.h" 
+//#include "TObject.h" 
 
 // --- Standard library ---
 
@@ -39,13 +39,14 @@ class AliPHOSDigit : public AliDigitNew {
   Bool_t operator==(const AliPHOSDigit &rValue) const;
   AliPHOSDigit& operator+(AliPHOSDigit const &rValue) ;
   AliPHOSDigit& operator*(Float_t factor) ; 
-
+  AliPHOSDigit& operator=(const AliPHOSDigit) {
+    Fatal("operator = ", "not implemented") ; return *this ; } 
   Int_t   Compare(const TObject * obj) const ;  
   Int_t   GetNprimary() const { return fNprimary ; }
   Int_t   GetPrimary(Int_t index) const ; 
   Float_t GetTime(void) const {return fTime ;}
   Bool_t  IsSortable() const { return kTRUE ; }
-  void    Print(Option_t *) const;
+  void    Print() const;
   void    SetAmp(Int_t Amp) { fAmp=Amp ; } 
   void    SetTime(Float_t Time) {fTime = Time ;}
   void    ShiftPrimary(Int_t shift); // shift to separate different TreeK in merging

diff --git a/PHOS/AliPHOSDigitizer.cxx b/PHOS/AliPHOSDigitizer.cxx
index de9983a147bd16d7391ab273846b62808d70275d..8b8acf535a5495b89e569ed9cda97cb197ba0d0f 100644 (file)
--- a/PHOS/AliPHOSDigitizer.cxx
+++ b/PHOS/AliPHOSDigitizer.cxx
@@ -56,24 +56,17 @@
 //
 
 // --- ROOT system ---
-#include "TFile.h"
 #include "TTree.h"
 #include "TSystem.h"
-#include "TROOT.h"
-#include "TFolder.h"
-#include "TObjString.h"
-#include "TGeometry.h"
 #include "TBenchmark.h"
+#include "TRandom.h"
 
 // --- Standard library ---
 
 // --- AliRoot header files ---
-#include "AliRun.h"
-#include "AliHeader.h"
-#include "AliStream.h"
+
 #include "AliRunDigitizer.h"
 #include "AliPHOSDigit.h"
-#include "AliPHOS.h"
 #include "AliPHOSGetter.h"
 #include "AliPHOSDigitizer.h"
 #include "AliPHOSSDigitizer.h"

diff --git a/PHOS/AliPHOSDigitizer.h b/PHOS/AliPHOSDigitizer.h
index ccb955cd40bae6ed39561e3048d1b7d333be2e18..7088c02e1972fef2fb5613de321caafc20123537 100644 (file)
--- a/PHOS/AliPHOSDigitizer.h
+++ b/PHOS/AliPHOSDigitizer.h
@@ -15,7 +15,7 @@
 
 
 // --- ROOT system ---
-#include "TObjString.h"
+//#include "TObjString.h"
 class TArrayI ;
 class TClonesArray ; 
 

diff --git a/PHOS/AliPHOSEMCAGeometry.h b/PHOS/AliPHOSEMCAGeometry.h
index 24a8024754dd3397c722ba768854c0470914c4d8..9ca7dcf8cd4d4d4297897f59d256eeaeea0f3434 100644 (file)
--- a/PHOS/AliPHOSEMCAGeometry.h
+++ b/PHOS/AliPHOSEMCAGeometry.h
@@ -36,21 +36,21 @@ public:
     return *this ; 
   }
 
-  Float_t * GetStripHalfSize()   {return fStripHalfSize ;}
-  Float_t   GetStripWallWidthOut() {return fStripWallWidthOut ;}
+  Float_t * GetStripHalfSize() {return fStripHalfSize ;}
+  Float_t   GetStripWallWidthOut() const {return fStripWallWidthOut ;}
   Float_t * GetAirCellHalfSize() {return fAirCellHalfSize ;}
   Float_t * GetWrappedHalfSize() {return fWrappedHalfSize ;}
   Float_t   GetAirGapLed() const {return fAirGapLed ;}
   Float_t * GetCrystalHalfSize() {return fCrystalHalfSize ;}
   Float_t * GetSupportPlateHalfSize() { return fSupportPlateHalfSize ;}
-  Float_t * GetSupportPlateInHalfSize() {return fSupportPlateInHalfSize ;}
+  Float_t * GetSupportPlateInHalfSize()  {return fSupportPlateInHalfSize ;}
   Float_t   GetSupportPlateThickness(void)   const { return fSupportPlateThickness ; }    
 
   Float_t * GetPreampHalfSize() {return fPreampHalfSize ;}
   Float_t * GetAPDHalfSize(void) {return fPinDiodeHalfSize ; }
   Float_t * GetOuterThermoParams(void) {return  fOuterThermoParams ; }
-  Float_t * GetCoolerHalfSize(void) {return fCoolerHalfSize ;}
-  Float_t * GetAirGapHalfSize(void) {return fAirGapHalfSize; }
+  Float_t * GetCoolerHalfSize(void)  {return fCoolerHalfSize ;}
+  Float_t * GetAirGapHalfSize(void)  {return fAirGapHalfSize; }
   Float_t * GetInnerThermoHalfSize(void) {return  fInnerThermoHalfSize ; }
   Float_t * GetAlCoverParams() {return fAlCoverParams ; }
   Float_t * GetFiberGlassHalfSize() {return fFiberGlassHalfSize ; }
@@ -60,7 +60,7 @@ public:
   Float_t * GetTSupport2HalfSize() {return fTSupport2HalfSize ;}
   Float_t * GetTCables1HalfSize() {return fTCables1HalfSize ; }
   Float_t * GetTCables2HalfSize() {return fTCables2HalfSize ; }
-  Float_t   GetTSupportDist() {return fTSupportDist ; }
+  Float_t   GetTSupportDist() const {return fTSupportDist ; }
   Float_t * GetFrameXHalfSize() {return fFrameXHalfSize ;}
   Float_t * GetFrameZHalfSize() {return fFrameZHalfSize ;}
   Float_t * GetFrameXPosition() {return fFrameXPosition ;}

diff --git a/PHOS/AliPHOSEmcRecPoint.cxx b/PHOS/AliPHOSEmcRecPoint.cxx
index 5c7dd85eb10d353adef126538bc909f902134f96..87467a8184b2ad5417aa704b0b2247032ada881a 100644 (file)
--- a/PHOS/AliPHOSEmcRecPoint.cxx
+++ b/PHOS/AliPHOSEmcRecPoint.cxx
@@ -23,7 +23,6 @@
 
 
 // --- ROOT system ---
-#include "TPad.h"
 #include "TH2.h"
 #include "TMath.h" 
 #include "TCanvas.h" 
@@ -32,13 +31,12 @@
 // --- Standard library ---
 
 // --- AliRoot header files ---
-
+#include "AliPHOSLoader.h"
 #include "AliGenerator.h"
 #include "AliPHOSGeometry.h"
+#include "AliPHOSDigit.h"
 #include "AliPHOSEmcRecPoint.h"
-#include "AliRun.h"
-#include "AliPHOSGetter.h"
-
+ 
 ClassImp(AliPHOSEmcRecPoint)
 
 //____________________________________________________________________________
@@ -645,7 +643,7 @@ void AliPHOSEmcRecPoint::EvalAll(Float_t logWeight, TClonesArray * digits )
   EvalDispersion(logWeight, digits) ;
   EvalCoreEnergy(logWeight, digits);
   EvalTime(digits) ;
-  AliPHOSRecPoint::EvalAll(logWeight,digits) ;
+  AliPHOSRecPoint::EvalAll(digits) ;
 }
 //____________________________________________________________________________
 void AliPHOSEmcRecPoint::EvalLocalPosition(Float_t logWeight, TClonesArray * digits)

diff --git a/PHOS/AliPHOSEmcRecPoint.h b/PHOS/AliPHOSEmcRecPoint.h
index 255aa6814c7bc43b204550523e0437726ca7f040..bdfe3c59c25128f02e637f3c72e7cea8b7971635 100644 (file)
--- a/PHOS/AliPHOSEmcRecPoint.h
+++ b/PHOS/AliPHOSEmcRecPoint.h
@@ -13,14 +13,11 @@
 
 // --- ROOT system ---
 
-//#include "TObject.h"
-#include "TArrayI.h"
- 
 // --- Standard library ---
 
 // --- AliRoot header files ---
 
-#include "AliPHOSDigit.h"
+//#include "AliPHOSDigit.h"
 #include "AliPHOSRecPoint.h"
 
 class AliPHOSEmcRecPoint : public AliPHOSRecPoint  {

diff --git a/PHOS/AliPHOSEvalRecPoint.cxx b/PHOS/AliPHOSEvalRecPoint.cxx
index 8ed06d3c5c67943e7c97caa4aff0480759e5b5b2..59311ddc03c44f6edcfc60c47caa851452afeb94 100644 (file)
--- a/PHOS/AliPHOSEvalRecPoint.cxx
+++ b/PHOS/AliPHOSEvalRecPoint.cxx
@@ -31,6 +31,7 @@
 
 // --- AliRoot header files ---
 #include "AliConfig.h"
+#include "AliPHOSDigit.h" 
 #include "AliPHOSClusterizer.h"
 #include "AliPHOSEvalRecPoint.h"
 #include "AliRun.h"
@@ -38,6 +39,7 @@
 #include "AliPHOSRecCpvManager.h"
 #include "AliPHOSRecEmcManager.h"
 #include "AliPHOSDigitizer.h"
+#include "AliPHOSGeometry.h" 
 
 // --- Standard library ---
 
@@ -62,8 +64,7 @@ AliPHOSEvalRecPoint::AliPHOSEvalRecPoint(Bool_t cpv, AliPHOSEvalRecPoint* parent
 //    fParent=parent;
   TObjArray* wPool = (TObjArray*)GetWorkingPool();
   if(!wPool) {
-    Error("AliPHOSEvalRecPoint", "Couldn't find working pool. Exit.") ; 
-    exit(1);
+    Fatal("ctor", "Couldn't find working pool") ; 
   }
 
   fParent = wPool->IndexOf((TObject*)parent);
@@ -130,8 +131,7 @@ AliPHOSClusterizer* AliPHOSEvalRecPoint::GetClusterizer()
   TFolder* wPoolF = (TFolder*)aliceF->FindObject("WhiteBoard/RecPoints/PHOS/SmP");
   AliPHOSClusterizer* clu = (AliPHOSClusterizer*)wPoolF->FindObject("PHOS:clu-v1");
   if(!clu) { 
-    Error("GetClusterizer", "Couldn't find Clusterizer. Exit.") ; 
-    exit(1); 
+    Fatal("GetClusterizer", "Couldn't find Clusterizer") ; 
   }
 
   return clu;
@@ -222,8 +222,7 @@ void AliPHOSEvalRecPoint::Init()
   // initialization
   AliPHOSClusterizer* clusterizer = GetClusterizer();
   if(!clusterizer) {
-    Error("Init", "Cannot get clusterizer. Exit.") ;
-    exit(1);
+    Fatal("Init", "Cannot get clusterizer") ;
   }
 
   TClonesArray* digits = AliPHOSLoader::GetPHOSLoader(fEventFolderName)->Digits();
@@ -661,7 +660,7 @@ void AliPHOSEvalRecPoint::UnfoldTwoMergedPoints(Float_t* gamma1, Float_t* gamma2
          newRP->AddDigit(*digit,eDigit);
        }
       Info("UnfoldTwoMergedPoints", "======= Split: daughter rec point %d =================", iMax) ;
-      newRP->Print("");
+      newRP->Print();
 
     }
 
@@ -867,9 +866,9 @@ void AliPHOSEvalRecPoint::MergeClosePoint()
              if(TooClose(rp))
                {
                  Info("MergeClosePoint", "+++++++ Merging point 1: ++++++") ;
-                 this->Print("");
+                 this->Print();
                  Info("MergeClosePoint", "+++++++ and point 2: ++++++++++") ;
-                 ((AliPHOSEvalRecPoint*)rp)->Print("");
+                 ((AliPHOSEvalRecPoint*)rp)->Print();
 
                  //merge two rec. points
                  TVector3 lpos1;
@@ -898,7 +897,7 @@ void AliPHOSEvalRecPoint::MergeClosePoint()
                  delete rp;
                  
                  Info("MergeClosePoint", "++++++ Resulting point: ++++++++") ;
-                 this->Print("");
+                 this->Print();
 
                  break;
                } 
@@ -925,8 +924,7 @@ Int_t AliPHOSEvalRecPoint::UnfoldLocalMaxima()
 
   AliPHOSClusterizer* clusterizer = GetClusterizer();
   if(!clusterizer) {
-    Error("UnfoldLocalMaxima", "Cannot get clusterizer. Exit.") ;
-    exit(1);
+    Fatal("UnfoldLocalMaxima", "Cannot get clusterizer") ;
   }
 
   if(this->IsEmc()) {
@@ -1017,7 +1015,7 @@ Int_t AliPHOSEvalRecPoint::UnfoldLocalMaxima()
 
       newRP->EvalLocalPosition(logWeight,digits);
       Info("UnfoldLocalMaxima", "======= Unfold: daughter rec point %d =================", iMax) ;
-      newRP->Print("");
+      newRP->Print();
     }
 
 //    RemoveFromWorkingPool(this);
@@ -1028,10 +1026,10 @@ Int_t AliPHOSEvalRecPoint::UnfoldLocalMaxima()
 
 }
 
-void AliPHOSEvalRecPoint::PrintPoint(Option_t* opt)
+void AliPHOSEvalRecPoint::PrintPoint()
 {
   // print rec.point to stdout
-  AliPHOSCpvRecPoint::Print(opt);
+  AliPHOSCpvRecPoint::Print();
 
   TVector3 lpos;
   GetLocalPosition(lpos);
@@ -1050,8 +1048,7 @@ AliPHOSRecManager* AliPHOSEvalRecPoint::GetReconstructionManager() const
   TFolder* wPoolF = (TFolder*)aliceF->FindObject("WhiteBoard/RecPoints/PHOS/SmP");
   AliPHOSRecManager* recMng = (AliPHOSRecManager*)wPoolF->FindObject("AliPHOSRecManager");
   if(!recMng) { 
-    Error("GetReconstructionManager", "Couldn't find Reconstruction Manager. Exit.") ; 
-    exit(1); 
+    Fatal("GetReconstructionManager", "Couldn't find Reconstruction Manager") ;  
   }
 
   return recMng;
@@ -1080,8 +1077,7 @@ const TObject* AliPHOSEvalRecPoint::GetWorkingPool()
   TFolder* wPoolF = (TFolder*)aliceF->FindObject("WhiteBoard/RecPoints/PHOS/SmP");
   TObject* wPool = wPoolF->FindObject("SmartPoints");
   if(!wPool) { 
-    Error("GetWorkingPool", "Couldn't find Working Pool. Exit.") ; 
-    exit(1); 
+    Fatal("GetWorkingPool", "Couldn't find Working Pool") ;  
   }
 
   return wPool;
@@ -1116,5 +1112,5 @@ void AliPHOSEvalRecPoint::RemoveFromWorkingPool(TObject* obj)
 void AliPHOSEvalRecPoint::PrintWorkingPool()
 {
   // print pool of rec.points to stdout
-  ((TObjArray*)GetWorkingPool())->Print("");
+  ((TObjArray*)GetWorkingPool())->Print();
 }

diff --git a/PHOS/AliPHOSEvalRecPoint.h b/PHOS/AliPHOSEvalRecPoint.h
index 894cd44580aff2e9a7ee88acab418f960938253e..3469503443cfcbb2c66ccc79789f7bc65daa2a84 100644 (file)
--- a/PHOS/AliPHOSEvalRecPoint.h
+++ b/PHOS/AliPHOSEvalRecPoint.h
@@ -43,7 +43,7 @@ public:
   AliPHOSClusterizer* GetClusterizer();
   AliPHOSRecManager* GetReconstructionManager() const;
   
-  void PrintPoint(Option_t* opt);
+  void PrintPoint();
 
   AliPHOSRecPoint* Parent();
   Float_t Chi2Dof() const;

diff --git a/PHOS/AliPHOSFastGlobalReconstruction.cxx b/PHOS/AliPHOSFastGlobalReconstruction.cxx
index 72ddac2c31bb16d7ba44d9ed56b1d60e11ccf428..ca40d7f7e36cc7f34779305c13dd83b56f93f853 100644 (file)
--- a/PHOS/AliPHOSFastGlobalReconstruction.cxx
+++ b/PHOS/AliPHOSFastGlobalReconstruction.cxx
@@ -34,7 +34,6 @@
 //!
 // Author: Yuri Kharlov. 17 April 2003
 
-#include "AliRun.h"
 #include "AliGenerator.h"
 #include "AliPHOSGetter.h"
 #include "AliPHOSFastGlobalReconstruction.h"
@@ -48,7 +47,7 @@ AliPHOSFastGlobalReconstruction::AliPHOSFastGlobalReconstruction(const char* hea
   // create an instance of the PHOS getter,
   // create an array or reconstructed particles.
 
-  gime = AliPHOSGetter::Instance(headerFile);
+  fgime = AliPHOSGetter::Instance(headerFile);
   fGenerator = gAlice->Generator();
   fParticles = new TClonesArray("TParticle",100);
   fNParticles = 0;
@@ -76,11 +75,11 @@ void AliPHOSFastGlobalReconstruction::FastReconstruction(Int_t event)
   TLorentzVector p,v;
   Int_t kf,ks,imom1,imom2,idaug1,idaug2;
 
-  gime->Event(event,"X") ;
+  fgime->Event(event,"X") ;
   fParticles  ->Clear();
   fNParticles = 0;
-  Int_t        nPrimaries = gime->NPrimaries();
-  TClonesArray *primaries = gime->Primaries();
+  Int_t        nPrimaries = fgime->NPrimaries();
+  TClonesArray *primaries = fgime->Primaries();
 
   for (Int_t iprim=0; iprim<nPrimaries; iprim++) {
     primary = (TParticle*)primaries->At(iprim);

diff --git a/PHOS/AliPHOSFastGlobalReconstruction.h b/PHOS/AliPHOSFastGlobalReconstruction.h
index 92633507115e75c7781c8c5ee826a88e901a59ed..055373677c446aaf3b1c05384dda3249eca16a34 100644 (file)
--- a/PHOS/AliPHOSFastGlobalReconstruction.h
+++ b/PHOS/AliPHOSFastGlobalReconstruction.h
@@ -33,7 +33,7 @@ private:
   void    SmearMomentum(TLorentzVector &p);
 
 private:
-  AliPHOSGetter *gime;        //! Instance of the PHOS getter
+  AliPHOSGetter *fgime;        //! Instance of the PHOS getter
   AliGenerator  *fGenerator;  //! MC generator used in simulation
   TClonesArray  *fParticles;  //! Array of reconstructed particles
   Int_t          fNParticles; //! Number of reconstructed particles

diff --git a/PHOS/AliPHOSFastRecParticle.cxx b/PHOS/AliPHOSFastRecParticle.cxx
index 8eb302e08bcc3c5ee8455159419839f312bafba9..b86ebae6ea427be517fa3be5c1a41d738b79fab7 100644 (file)
--- a/PHOS/AliPHOSFastRecParticle.cxx
+++ b/PHOS/AliPHOSFastRecParticle.cxx
@@ -461,7 +461,7 @@ void AliPHOSFastRecParticle::Paint(Option_t *)
 }
 
 //____________________________________________________________________________
-void AliPHOSFastRecParticle::Print(Option_t *)const
+void AliPHOSFastRecParticle::Print()const
 {
   // Print the type, energy and momentum of the reconstructed particle
 

diff --git a/PHOS/AliPHOSFastRecParticle.h b/PHOS/AliPHOSFastRecParticle.h
index cc89e0f65a69829853d32ee701765ebfeddcd27b..090dbfe9f7dfebd4f00628ffbf21cfaad747ce73 100644 (file)
--- a/PHOS/AliPHOSFastRecParticle.h
+++ b/PHOS/AliPHOSFastRecParticle.h
@@ -71,7 +71,7 @@ class AliPHOSFastRecParticle : public TParticle {
 
   TString Name() const ; 
   virtual void Paint(Option_t * option="");
-  virtual void Print(Option_t *) const ; 
+  virtual void Print() const ; 
   
   void SetType(Int_t type) ;
   

diff --git a/PHOS/AliPHOSGammaJet.cxx b/PHOS/AliPHOSGammaJet.cxx
index 4be1e19164fbbd664b8374aff9d2312bf26413e0..04f26a5d7c54449e8ea1d25495e10816214703f7 100644 (file)
--- a/PHOS/AliPHOSGammaJet.cxx
+++ b/PHOS/AliPHOSGammaJet.cxx
@@ -23,14 +23,11 @@
 
 
 // --- ROOT system ---
+#include "TRandom.h"
 
-#include "TString.h"
-#include "TFile.h"
 #include "TLorentzVector.h"
 #include "TList.h"
-#include "TTree.h"
 #include "TParticle.h"
-#include "AliRun.h"
 #include "AliPHOSGammaJet.h" 
 #include "AliPHOSGetter.h" 
 
@@ -56,10 +53,13 @@ AliPHOSGammaJet::~AliPHOSGammaJet() {
 }
 
 //____________________________________________________________________________
-void AliPHOSGammaJet::Exec(Option_t *) 
+void AliPHOSGammaJet::Exec(Option_t * opt) 
 {
   // does the job
   
+  if (! opt) 
+    return ; 
+
   AliPHOSGetter * gime = AliPHOSGetter::Instance() ; 
   Int_t nEvent1 = gime->MaxEvent() ;   
   Int_t iEvent = 0 ; 
@@ -114,14 +114,14 @@ void AliPHOSGammaJet::Exec(Option_t *)
       }//final particle etacut
     }//for (iParticle<nParticle)
     TLorentzVector gamma,charge,pi0, gammapair;
-    Int_t id_g = -1;
-    GetGammaJet(particleList,gamma, id_g);
-    GetLeadingCharge(particleList,charge, id_g);
+    Int_t idg = -1;
+    GetGammaJet(particleList,gamma, idg);
+    GetLeadingCharge(particleList,charge, idg);
     GetLeadingPi0(particleList,pi0);
-    Info("Pi0Decay", "Gamma: %f %d", gamma.Energy(), id_g) ;
+    Info("Pi0Decay", "Gamma: %f %d", gamma.Energy(), idg) ;
     Info("Pi0Decay", "Charge: %f", charge.Energy()) ;
     Info("Pi0Decay", "Pi0: %f", pi0.Energy()) ;
-    //    GetLeadingGammaPair(particleList, gammapair, id_g, 
+    //    GetLeadingGammaPair(particleList, gammapair, idg, 
     //                 0.04,0.2, 1.0,0.13,0.14);
     Info("Pi0Decay", "Pair: %f", gammapair.Energy()) ;
   }//loop: events
@@ -169,6 +169,7 @@ void AliPHOSGammaJet::Pi0Decay(Double_t mPi0, TLorentzVector &p0,
 //____________________________________________________________________________
 void AliPHOSGammaJet::GetGammaJet(TList &particleList, TLorentzVector &gamma, Int_t & id) 
 {
+  // Get the lists of jet particles and gamma
   TParticle *particle = 0x0;
   
   Int_t iPrimary=-1, id_motherg = -1;
@@ -198,10 +199,11 @@ void AliPHOSGammaJet::GetGammaJet(TList &particleList, TLorentzVector &gamma, In
 //____________________________________________________________________________
 void AliPHOSGammaJet::GetLeadingCharge(TList &particleList, TLorentzVector &charge, Int_t & id) 
 {
+  // Gets the leading particle from the list of charged particles
   TParticle *particle = 0x0;
   
   Int_t iPrimary=-1;
-  Double_t pt_max = 0, pt_i = 0;
+  Double_t ptmax = 0, pti = 0;
   TIter next(&particleList);
   while ( (particle = (TParticle*)next()) ) {
     iPrimary++;  
@@ -209,11 +211,11 @@ void AliPHOSGammaJet::GetLeadingCharge(TList &particleList, TLorentzVector &char
     
     if((ksCode == 1)&&(id != iPrimary)
        &&(particle->GetPDG(0)->Charge()!=0)){
-      pt_i = particle->Pt(); 
-      if(pt_i> pt_max){
-       pt_max = pt_i;
+      pti = particle->Pt(); 
+      if(pti> ptmax){
+       ptmax = pti;
        particle->Momentum(charge);
-      }//pt_max   
+      }//ptmax   
     }// kscode == 1
   }// while
 }
@@ -221,10 +223,11 @@ void AliPHOSGammaJet::GetLeadingCharge(TList &particleList, TLorentzVector &char
 //____________________________________________________________________________
 void AliPHOSGammaJet::GetLeadingPi0(TList &particleList, TLorentzVector &pi0) 
 {
+  // Gets the leading pi0 from the list of particles
   TParticle *particle = 0x0;
   
   Int_t iPrimary=-1;
-  Double_t pt_max = 0, pt_i = 0;
+  Double_t ptmax = 0, pti = 0;
   TIter next(&particleList);
   while ( (particle = (TParticle*)next()) ) {
     iPrimary++;  
@@ -232,11 +235,11 @@ void AliPHOSGammaJet::GetLeadingPi0(TList &particleList, TLorentzVector &pi0)
     
     if((ksCode == 2))
       {
-       pt_i = particle->Pt(); 
-       if(pt_i> pt_max){
-         pt_max = pt_i;
+       pti = particle->Pt(); 
+       if(pti> ptmax){
+         ptmax = pti;
          particle->Momentum(pi0);
-       }//pt_max   
+       }//ptmax   
       }// kscode == 1
   }// while
 }

diff --git a/PHOS/AliPHOSGammaJet.h b/PHOS/AliPHOSGammaJet.h
index 31ae00d6896c0b873204f85ad171982cc9782c85..461ff800e170dad8b9377868b4cb3e441d217d88 100644 (file)
--- a/PHOS/AliPHOSGammaJet.h
+++ b/PHOS/AliPHOSGammaJet.h
@@ -21,8 +21,8 @@ public:
   AliPHOSGammaJet() ; // default ctor
   AliPHOSGammaJet(const TString inputfilename) ; //ctor 
   AliPHOSGammaJet(const AliPHOSGammaJet & gj) ; // cpy ctor
-  ~AliPHOSGammaJet() ; // dtor
-  virtual void   Exec(Option_t *); 
+  virtual ~AliPHOSGammaJet() ; // dtor
+  virtual void   Exec(Option_t * = ""); 
   void GetGammaJet(TList & particleList, TLorentzVector & gamma, Int_t & id) ; 
   void GetLeadingCharge(TList & particleList, TLorentzVector & charge, Int_t & id) ;
   void GetLeadingPi0(TList & particleList, TLorentzVector & pi0) ;

diff --git a/PHOS/AliPHOSGeometry.cxx b/PHOS/AliPHOSGeometry.cxx
index d50991e6229d935b684a6d13755eab6b74cdba2c..b124521a14c198b737de2f403a0180939c11a14c 100644 (file)
--- a/PHOS/AliPHOSGeometry.cxx
+++ b/PHOS/AliPHOSGeometry.cxx
@@ -30,19 +30,15 @@
 
 #include "TVector3.h"
 #include "TRotation.h" 
-#include "TFolder.h" 
-#include "TROOT.h" 
+#include "TParticle.h"
 
 // --- Standard library ---
 
-#include <stdlib.h>
-
 // --- AliRoot header files ---
 
 #include "AliPHOSGeometry.h"
 #include "AliPHOSEMCAGeometry.h" 
 #include "AliPHOSRecPoint.h"
-#include "AliConst.h"
 
 ClassImp(AliPHOSGeometry) ;
 
@@ -50,6 +46,18 @@ ClassImp(AliPHOSGeometry) ;
 AliPHOSGeometry * AliPHOSGeometry::fgGeom = 0 ;
 Bool_t            AliPHOSGeometry::fgInit = kFALSE ;
 
+//____________________________________________________________________________
+AliPHOSGeometry::AliPHOSGeometry() {
+    // default ctor 
+    // must be kept public for root persistency purposes, but should never be called by the outside world
+    fPHOSAngle      = 0 ;
+    fGeometryEMCA   = 0 ;
+    fGeometrySUPP   = 0 ;
+    fGeometryCPV    = 0 ;
+    fgGeom          = 0 ;
+    fRotMatrixArray = 0 ;  
+}  
+
 //____________________________________________________________________________
 AliPHOSGeometry::~AliPHOSGeometry(void)
 {
@@ -342,15 +350,19 @@ void AliPHOSGeometry::ImpactOnEmc(const Double_t theta, const Double_t phi, Int_
   }
 }
 
+//____________________________________________________________________________
 Bool_t  AliPHOSGeometry::Impact(const TParticle * particle) const 
 {
-  Bool_t In=kFALSE;
-  Int_t ModuleNumber=0;
+  // Tells if a particle enters PHOS
+  Bool_t in=kFALSE;
+  Int_t moduleNumber=0;
   Double_t z,x;
-  ImpactOnEmc(particle->Theta(),particle->Phi(),ModuleNumber,z,x);
-  if(ModuleNumber) In=kTRUE;
-  else In=kFALSE;
-  return In;
+  ImpactOnEmc(particle->Theta(),particle->Phi(),moduleNumber,z,x);
+  if(moduleNumber) 
+    in=kTRUE;
+  else 
+    in=kFALSE;
+  return in;
 }
 
 //____________________________________________________________________________

diff --git a/PHOS/AliPHOSGeometry.h b/PHOS/AliPHOSGeometry.h
index 503ead9a601cf70358f5347cc92200c7802cdf1e..5556546ebff26cc4360f55be095c4a54f03ffc34 100644 (file)
--- a/PHOS/AliPHOSGeometry.h
+++ b/PHOS/AliPHOSGeometry.h
@@ -16,19 +16,11 @@
 // 
 //*-- Author: Yves Schutz (SUBATECH)
 
-#include <assert.h> 
-
 // --- ROOT system ---
 
-#include "TString.h"
-#include "TObjArray.h"
-#include "TParticle.h"
-#include "TVector3.h" 
-
 // --- AliRoot header files ---
 
 #include "AliGeometry.h"
-
 #include "AliPHOSEMCAGeometry.h"
 #include "AliPHOSCPVGeometry.h"
 #include "AliPHOSSupportGeometry.h"
@@ -38,20 +30,10 @@ class AliPHOSGeometry : public AliGeometry {
 
 public: 
 
-  AliPHOSGeometry() {
-    // default ctor 
-    // must be kept public for root persistency purposes, but should never be called by the outside world
-    fPHOSAngle = 0 ;
-    fGeometryEMCA = 0;
-    fGeometrySUPP = 0;
-    fGeometryCPV  = 0;
-    fgGeom        = 0;
-    fRotMatrixArray = 0;  }  
+  AliPHOSGeometry() ;
 
   AliPHOSGeometry(const AliPHOSGeometry & geom) : AliGeometry(geom) {
-    // cpy ctor requested by Coding Convention but not yet needed
-    
-    assert(0==1) ;
+    Fatal("cpy ctor", "not implemented") ; 
   } 
   
   virtual ~AliPHOSGeometry(void) ; 
@@ -62,10 +44,7 @@ public:
   virtual Bool_t Impact(const TParticle * particle) const ;
 
   AliPHOSGeometry & operator = (const AliPHOSGeometry  & /*rvalue*/) const {
-    // assignement operator requested by coding convention but not needed
-    assert(0==1) ;
-    return *(GetInstance()) ; 
-  }
+    Fatal("operator =", "nt implemented") ; return *(GetInstance()) ; }
  
   // General
 

diff --git a/PHOS/AliPHOSGetter.cxx b/PHOS/AliPHOSGetter.cxx
index 1b221d9546608558fd2534cf108d1d23f3093d15..6e3cd6b72ed42ed3c467ef0c64e13c46836ac518 100644 (file)
--- a/PHOS/AliPHOSGetter.cxx
+++ b/PHOS/AliPHOSGetter.cxx
@@ -41,20 +41,17 @@
 // --- ROOT system ---
 
 #include "TSystem.h"
-#include "TFile.h"
 #include "TROOT.h"
 
 
 // --- Standard library ---
 
 // --- AliRoot header files ---
-
 #include "AliPHOSGetter.h"
+#include "AliPHOS.h"
 #include "AliRunLoader.h"
 #include "AliStack.h"  
 #include "AliPHOSLoader.h"
-// #include "AliPHOSRaw2Digits.h"
-//#include "AliPHOSCalibrationDB.h"
 #include "AliPHOSBeamTestEvent.h"
 #include "AliMC.h"
 
@@ -112,6 +109,7 @@ AliPHOSGetter::~AliPHOSGetter()
 //____________________________________________________________________________ 
 AliPHOSClusterizer * AliPHOSGetter::Clusterizer()
 { 
+  // Returns pointer to the Clusterizer task 
   AliPHOSClusterizer * rv ; 
   rv =  dynamic_cast<AliPHOSClusterizer *>(PhosLoader()->Reconstructioner()) ;
   if (!rv) {
@@ -154,6 +152,7 @@ TClonesArray * AliPHOSGetter::Digits()
 //____________________________________________________________________________ 
 AliPHOSDigitizer * AliPHOSGetter::Digitizer() 
 { 
+  // Returns pointer to the Digitizer task 
   AliPHOSDigitizer * rv ; 
   rv =  dynamic_cast<AliPHOSDigitizer *>(PhosLoader()->Digitizer()) ;
   if (!rv) {
@@ -195,8 +194,9 @@ TClonesArray * AliPHOSGetter::TrackSegments()
 }
 
 //____________________________________________________________________________ 
-AliPHOSTrackSegmentMaker * AliPHOSGetter::TrackSegmentMaker() 
+AliPHOSTrackSegmentMaker * AliPHOSGetter::TrackSegmentMaker()
 { 
+  // Returns pointer to the TrackSegmentMaker task 
   AliPHOSTrackSegmentMaker * rv ; 
   rv =  dynamic_cast<AliPHOSTrackSegmentMaker *>(PhosLoader()->TrackSegmentMaker()) ;
   if (!rv) {
@@ -386,8 +386,9 @@ AliPHOS * AliPHOSGetter:: PHOS() const
 
 
 //____________________________________________________________________________ 
-AliPHOSPID * AliPHOSGetter::PID() 
+AliPHOSPID * AliPHOSGetter::PID()
 { 
+  // Returns pointer to the PID task 
   AliPHOSPID * rv ; 
   rv =  dynamic_cast<AliPHOSPID *>(PhosLoader()->PIDTask()) ;
   if (!rv) {
@@ -562,8 +563,9 @@ TClonesArray * AliPHOSGetter::SDigits()
 }
 
 //____________________________________________________________________________ 
-AliPHOSSDigitizer * AliPHOSGetter::SDigitizer() 
+AliPHOSSDigitizer * AliPHOSGetter::SDigitizer()
 { 
+  // Returns pointer to the SDigitizer task 
   AliPHOSSDigitizer * rv ; 
   rv =  dynamic_cast<AliPHOSSDigitizer *>(PhosLoader()->SDigitizer()) ;
   if (!rv) {
@@ -615,6 +617,7 @@ void AliPHOSGetter::Track(const Int_t itrack)
 //____________________________________________________________________________ 
 TTree * AliPHOSGetter::TreeD() const 
 {
+  // Returns pointer to the Digits Tree
   TTree * rv = 0 ; 
   rv = PhosLoader()->TreeD() ; 
   if ( !rv ) {
@@ -628,6 +631,7 @@ TTree * AliPHOSGetter::TreeD() const
 //____________________________________________________________________________ 
 TTree * AliPHOSGetter::TreeH() const 
 {
+  // Returns pointer to the Hits Tree
   TTree * rv = 0 ; 
   rv = PhosLoader()->TreeH() ; 
   if ( !rv ) {
@@ -641,6 +645,7 @@ TTree * AliPHOSGetter::TreeH() const
 //____________________________________________________________________________ 
 TTree * AliPHOSGetter::TreeR() const 
 {
+  // Returns pointer to the RecPoints Tree
   TTree * rv = 0 ; 
   rv = PhosLoader()->TreeR() ; 
   if ( !rv ) {
@@ -654,6 +659,7 @@ TTree * AliPHOSGetter::TreeR() const
 //____________________________________________________________________________ 
 TTree * AliPHOSGetter::TreeT() const 
 {
+  // Returns pointer to the TrackSegments Tree
   TTree * rv = 0 ; 
   rv = PhosLoader()->TreeT() ; 
   if ( !rv ) {
@@ -666,6 +672,7 @@ TTree * AliPHOSGetter::TreeT() const
 //____________________________________________________________________________ 
 TTree * AliPHOSGetter::TreeP() const 
 {
+  // Returns pointer to the RecParticles  Tree
   TTree * rv = 0 ; 
   rv = PhosLoader()->TreeP() ; 
   if ( !rv ) {
@@ -678,7 +685,8 @@ TTree * AliPHOSGetter::TreeP() const
 
 //____________________________________________________________________________ 
 TTree * AliPHOSGetter::TreeS() const 
-{
+{ 
+ // Returns pointer to the SDigits Tree
   TTree * rv = 0 ; 
   rv = PhosLoader()->TreeS() ; 
   if ( !rv ) {

diff --git a/PHOS/AliPHOSGetter.h b/PHOS/AliPHOSGetter.h
index a97e4632c26f47c1cb51a43e10bd4e9ecf89bd34..17317c8178dd2150c274a2fc5b2744bdef7cf40c 100644 (file)
--- a/PHOS/AliPHOSGetter.h
+++ b/PHOS/AliPHOSGetter.h
@@ -18,13 +18,8 @@
 
 // --- ROOT system ---
 #include "TObject.h"  
-#include "TClonesArray.h" 
-// #include "TFolder.h"  
-// #include "TTree.h"
-// #include "TFile.h"
-// class TString ;
- class TParticle ;
-// class TTask ;
+class TParticle ;
+class TTree ; 
 
 // --- Standard library ---
 
@@ -32,18 +27,22 @@
 #include "AliConfig.h" 
 
 // #include "AliRun.h"
-class AliPHOS ; 
-#include "AliPHOSHit.h"   
-
-class AliPHOSGeometry ;
+#include "AliPHOSLoader.h" 
+#include "AliPHOSHit.h" 
+#include "AliPHOSDigit.h"
+#include "AliPHOSEmcRecPoint.h" 
+#include "AliPHOSCpvRecPoint.h" 
+#include "AliPHOSTrackSegment.h" 
+#include "AliPHOSRecParticle.h" 
 #include "AliPHOSDigitizer.h"
-#include "AliPHOSSDigitizer.h" 
-// //class AliPHOSCalibrationDB ;
-// class AliPHOSConTableDB ;
+#include "AliPHOSSDigitizer.h"
+class AliPHOS ;  
+class AliPHOSGeometry ;
+class AliPHOSClusterizer ;
+class AliPHOSTrackSegmentMaker ;  
+class AliPHOSPID ; 
 class AliPHOSBeamTestEvent ;
 
-#include "AliPHOSLoader.h" 
-
 class AliPHOSGetter : public TObject {
   
  public:  
@@ -94,7 +93,7 @@ class AliPHOSGetter : public TObject {
 
   //=========== Primaries ============
 //   TTree *           TreeK(TString filename="") ; 
-  TClonesArray *    Primaries(void)  ;
+  TClonesArray *    Primaries(void) ;
   TParticle * Primary(Int_t index) const ;
   Int_t       NPrimaries()const { return fNPrimaries; }
   TParticle * Secondary(const TParticle * p, const Int_t index=1) const ;  
@@ -111,11 +110,11 @@ class AliPHOSGetter : public TObject {
   TTree *             TreeS() const ; 
   AliPHOSSDigitizer * SDigitizer() ;  
 
-  TString             GetSDigitsFileName() { return PhosLoader()->GetSDigitsFileName() ; }  
-  Int_t               LoadSDigits(Option_t* opt="") { return PhosLoader()->LoadSDigits(opt) ; }
-  Int_t               LoadSDigitizer(Option_t* opt=""){ return  PhosLoader()->LoadSDigitizer(opt) ; }
-  Int_t               WriteSDigits(Option_t* opt="") { return PhosLoader()->WriteSDigits(opt) ; }
-  Int_t               WriteSDigitizer(Option_t* opt=""){
+  TString             GetSDigitsFileName() const { return PhosLoader()->GetSDigitsFileName() ; }  
+  Int_t               LoadSDigits(Option_t* opt="") const { return PhosLoader()->LoadSDigits(opt) ; }
+  Int_t               LoadSDigitizer(Option_t* opt="") const { return  PhosLoader()->LoadSDigitizer(opt) ; }
+  Int_t               WriteSDigits(Option_t* opt="") const  { return PhosLoader()->WriteSDigits(opt) ; }
+  Int_t               WriteSDigitizer(Option_t* opt="") const {
     return  PhosLoader()->WriteSDigitizer(opt) ; }
   
   //========== Digits ================
@@ -123,12 +122,12 @@ class AliPHOSGetter : public TObject {
   AliPHOSDigit * Digit(const Int_t index) { return static_cast<AliPHOSDigit *>(Digits()->At(index)) ;} 
   TTree *        TreeD() const ; 
   AliPHOSDigitizer * Digitizer() ;
-  TString             GetDigitsFileName() { return PhosLoader()->GetDigitsFileName() ; }  
-  Int_t               LoadDigits(Option_t* opt="") { return PhosLoader()->LoadDigits(opt) ; }
-  Int_t               LoadDigitizer(Option_t* opt=""){
+  TString             GetDigitsFileName() const { return PhosLoader()->GetDigitsFileName() ; }  
+  Int_t               LoadDigits(Option_t* opt="") const { return PhosLoader()->LoadDigits(opt) ; }
+  Int_t               LoadDigitizer(Option_t* opt="") const {
     return  PhosLoader()->LoadDigitizer(opt) ; }
-  Int_t               WriteDigits(Option_t* opt="") { return PhosLoader()->WriteDigits(opt) ; }
-  Int_t               WriteDigitizer(Option_t* opt=""){
+  Int_t               WriteDigits(Option_t* opt="") const { return PhosLoader()->WriteDigits(opt) ; }
+  Int_t               WriteDigitizer(Option_t* opt="") const {
     return  PhosLoader()->WriteDigitizer(opt) ; }
   
   //========== RecPoints =============
@@ -137,13 +136,13 @@ class AliPHOSGetter : public TObject {
   TObjArray *           CpvRecPoints() ; 
   AliPHOSCpvRecPoint *  CpvRecPoint(const Int_t index) { return static_cast<AliPHOSCpvRecPoint *>(CpvRecPoints()->At(index)) ;} 
   TTree *               TreeR() const ;
-  AliPHOSClusterizer * Clusterizer()  ;
-  TString               GetRecPointsFileName() { return PhosLoader()->GetRecPointsFileName() ; } 
-  Int_t                 LoadRecPoints(Option_t* opt="") { return PhosLoader()->LoadRecPoints(opt) ; }
-  Int_t                 LoadClusterizer(Option_t* opt=""){
+  AliPHOSClusterizer * Clusterizer() ;
+  TString               GetRecPointsFileName() const { return PhosLoader()->GetRecPointsFileName() ; } 
+  Int_t                 LoadRecPoints(Option_t* opt="") const { return PhosLoader()->LoadRecPoints(opt) ; }
+  Int_t                 LoadClusterizer(Option_t* opt="") const {
     return  PhosLoader()->LoadClusterizer(opt) ; }
-  Int_t                 WriteRecPoints(Option_t* opt="") { return PhosLoader()->WriteRecPoints(opt) ; }
-  Int_t                 WriteClusterizer(Option_t* opt=""){
+  Int_t                 WriteRecPoints(Option_t* opt="") const { return PhosLoader()->WriteRecPoints(opt) ; }
+  Int_t                 WriteClusterizer(Option_t* opt="") const {
     return  PhosLoader()->WriteClusterizer(opt) ; }
 
   //========== TrackSegments   TClonesArray * TrackSegments(const char * name = 0) { 
@@ -151,12 +150,12 @@ class AliPHOSGetter : public TObject {
   AliPHOSTrackSegment *  TrackSegments(const Int_t index) { return static_cast<AliPHOSTrackSegment *>(TrackSegments()->At(index)) ;} 
   TTree *               TreeT() const ;
   AliPHOSTrackSegmentMaker * TrackSegmentMaker() ;
-  TString               GetTracksFileName() { return PhosLoader()->GetTracksFileName() ; } 
-  Int_t                 LoadTracks(Option_t* opt="") { return PhosLoader()->LoadTracks(opt) ; }
-  Int_t                 LoadTrackSegementMaker(Option_t* opt=""){
+  TString               GetTracksFileName() const { return PhosLoader()->GetTracksFileName() ; } 
+  Int_t                 LoadTracks(Option_t* opt="") const { return PhosLoader()->LoadTracks(opt) ; }
+  Int_t                 LoadTrackSegementMaker(Option_t* opt="") const {
     return  PhosLoader()->LoadTrackSegmentMaker(opt) ; }
-  Int_t                 WriteTracks(Option_t* opt="") { return PhosLoader()->WriteTracks(opt) ; }
-  Int_t                 WriteTrackSegmentMaker(Option_t* opt=""){
+  Int_t                 WriteTracks(Option_t* opt="") const { return PhosLoader()->WriteTracks(opt) ; }
+  Int_t                 WriteTrackSegmentMaker(Option_t* opt="") const {
     return  PhosLoader()->WriteTracker(opt) ; }
   //========== RecParticles ===========
 
@@ -164,12 +163,12 @@ class AliPHOSGetter : public TObject {
   AliPHOSRecParticle *   RecPaticles(const Int_t index) { return static_cast<AliPHOSRecParticle *>(RecParticles()->At(index)) ;} 
   TTree *               TreeP() const ;
   AliPHOSPID * PID() ;
-  TString               GetRecParticlesFileName() { return PhosLoader()->GetRecParticlesFileName() ; } 
-  Int_t                 LoadRecParticles(Option_t* opt="") { return PhosLoader()->LoadRecParticles(opt) ; }
-  Int_t                 LoadPID(Option_t* opt=""){
+  TString               GetRecParticlesFileName() const { return PhosLoader()->GetRecParticlesFileName() ; } 
+  Int_t                 LoadRecParticles(Option_t* opt="") const { return PhosLoader()->LoadRecParticles(opt) ; }
+  Int_t                 LoadPID(Option_t* opt="") const {
     return  PhosLoader()->LoadPID(opt) ; }
-  Int_t                 WriteRecParticles(Option_t* opt="") { return PhosLoader()->WriteRecParticles(opt) ; }
-  Int_t                 WritePID(Option_t* opt=""){
+  Int_t                 WriteRecParticles(Option_t* opt="") const { return PhosLoader()->WriteRecParticles(opt) ; }
+  Int_t                 WritePID(Option_t* opt="") const {
     return  PhosLoader()->WritePID(opt) ; }
 
 
@@ -218,7 +217,7 @@ private:
 
 //  AliPHOSCalibrationDB * fcdb ;       //!
    
-  static AliPHOSLoader * fgPhosLoader ;
+  static AliPHOSLoader * fgPhosLoader ; // the loader for the NewIO
   static AliPHOSGetter * fgObjGetter; // pointer to the unique instance of the singleton 
   
   enum EDataTypes{kHits,kSDigits,kDigits,kRecPoints,kTracks,kNDataTypes};

diff --git a/PHOS/AliPHOSHit.cxx b/PHOS/AliPHOSHit.cxx
index 8544fdc3705f7d35c116ab786ea3573d22333459..d0d817105e27c9b39abf9a1c687c5a57fdbba516 100644 (file)
--- a/PHOS/AliPHOSHit.cxx
+++ b/PHOS/AliPHOSHit.cxx
@@ -22,16 +22,13 @@
 //*-- Author: Maxime Volkov (RRC KI) & Yves Schutz (SUBATECH) & Dmitri Peressounko (RRC KI & SUBATECH)
 
 // --- ROOT system ---
+#include "TVector3.h"
 
 // --- Standard library ---
-#include <string.h>
-#include <stdlib.h>
 
 // --- AliRoot header files ---
 #include "AliPHOSHit.h"
 #include "AliRun.h"
-#include "AliConst.h"
-#include "AliPHOSLoader.h"
 #include "AliPHOSGeometry.h"
 #include "AliPHOS.h"
 

diff --git a/PHOS/AliPHOSHit.h b/PHOS/AliPHOSHit.h
index 8c6929e9c3115a6c78f77c252c7bfab58363c283..1b132e5995fe700afbcf72fb331a82d075bb2aca 100644 (file)
--- a/PHOS/AliPHOSHit.h
+++ b/PHOS/AliPHOSHit.h
@@ -12,7 +12,6 @@
 //*-- Author: Maxime Volkov (RRC KI) & Yves Schutz (SUBATECH)
 
 // --- ROOT system ---
-#include <TLorentzVector.h>
 
 // --- AliRoot header files ---
 #include "AliHit.h"

diff --git a/PHOS/AliPHOSImpact.cxx b/PHOS/AliPHOSImpact.cxx
index 896cc6bdda237d729fcc40d65ea404f75effbbf3..313907a36312ed6ea0904355a0aae695615ddd1d 100644 (file)
--- a/PHOS/AliPHOSImpact.cxx
+++ b/PHOS/AliPHOSImpact.cxx
@@ -72,6 +72,7 @@ AliPHOSImpact::AliPHOSImpact(Int_t shunt, Int_t primary, Int_t track, Int_t pid,
 //____________________________________________________________________________
 void AliPHOSImpact::Print()
 {
+  // Prints particle info
   printf("Impact Pid=%4d, p=(%6.2f,%6.2f,%6.2f,%6.2f) GeV, x=(%6.1f,%6.1f,%6.1f) cm\n",
         fPid,fMomentum.Px(),fMomentum.Py(),fMomentum.Pz(),fMomentum.E(),
         fX,fY,fZ);

diff --git a/PHOS/AliPHOSJetFinder.cxx b/PHOS/AliPHOSJetFinder.cxx
index a09e1e0d7b020bac967a777b6cd22ea5e8364bbc..a8996ff19577cc0423a83029e8fb1531bf7e3e84 100644 (file)
--- a/PHOS/AliPHOSJetFinder.cxx
+++ b/PHOS/AliPHOSJetFinder.cxx
@@ -30,6 +30,7 @@
 
 // --- AliRoot header files ---
 #include "AliPHOSJet.h"
+#include "AliPHOSGeometry.h"
 #include "AliPHOSDigit.h"
 #include "AliPHOSGetter.h"
 #include "AliPHOSJetFinder.h"

diff --git a/PHOS/AliPHOSLink.h b/PHOS/AliPHOSLink.h
index e17576f89685b2e4929067b6f63734df9b62c28a..4c99393d617490e17a9193850d21bc585aee94b7 100644 (file)
--- a/PHOS/AliPHOSLink.h
+++ b/PHOS/AliPHOSLink.h
@@ -28,18 +28,9 @@ public:
     // dtor
   }
   Int_t   Compare(const TObject * obj) const;
-  Int_t   GetEmc(void) { 
-    // returns the index of EMC
-    return fEmcN; 
-  }
-  Int_t   GetPpsd(void) { 
-    // returns the index of PPSD
-    return fPpsdN ; 
-  }
-  Float_t GetR(void) { 
-    // returns the distance between EMC and PPSD
-    return fR ; 
-  } 
+  Int_t   GetEmc(void) const { return fEmcN; }
+  Int_t   GetPpsd(void) const { return fPpsdN ; }
+  Float_t GetR(void) const { return fR ; } 
   Bool_t  IsSortable() const{ 
     // tells if this is a sortable object 
     return kTRUE ; 

diff --git a/PHOS/AliPHOSLoader.cxx b/PHOS/AliPHOSLoader.cxx
index ad286785db6690509ca9b24234be1d573c7ff475..1756101b65c406602a0e4bfb7be63279a51e75d6 100644 (file)
--- a/PHOS/AliPHOSLoader.cxx
+++ b/PHOS/AliPHOSLoader.cxx
@@ -43,30 +43,14 @@
 #include "TFile.h"
 #include "TTree.h"
 #include "TROOT.h"
-#include "TObjString.h"
-#include "TFolder.h"
-#include "TParticle.h"
 
 // --- Standard library ---
-#include <Riostream.h>
 
 // --- AliRoot header files ---
 
-#include "AliRun.h"
-#include "AliConfig.h"
-#include "AliDataLoader.h"
 #include "AliPHOSLoader.h"
 #include "AliPHOS.h"
-#include "AliPHOSDigitizer.h"
-#include "AliPHOSSDigitizer.h"
-#include "AliPHOSClusterizer.h"
-#include "AliPHOSClusterizerv1.h"
-#include "AliPHOSTrackSegmentMaker.h"
-#include "AliPHOSTrackSegmentMakerv1.h"
-#include "AliPHOSTrackSegment.h"
-#include "AliPHOSPID.h" 
-#include "AliPHOSPIDv1.h" 
-#include "AliPHOSGeometry.h"
+#include "AliPHOSHit.h"
 #include "AliPHOSCalibrationDB.h"
 
 ClassImp(AliPHOSLoader)

diff --git a/PHOS/AliPHOSLoader.h b/PHOS/AliPHOSLoader.h
index 5e74fd056294388714567eea856a65ab87e18aac..67ec1949f448b80360123432e0d926e26314d710 100644 (file)
--- a/PHOS/AliPHOSLoader.h
+++ b/PHOS/AliPHOSLoader.h
@@ -18,35 +18,32 @@
 
 // --- ROOT system ---
 #include "TClonesArray.h"
-#include "TFolder.h"  
-#include "TTree.h"
 class TString ;
 class TParticle ;
 class TTask ;
 
 // --- Standard library ---
-#include <stdlib.h>
-#include <Riostream.h>
 
 // --- AliRoot header files ---
 
 #include "AliRun.h"
 #include "AliLoader.h"
 #include "AliRunLoader.h"
-#include "AliPHOS.h" 
-#include "AliPHOSHit.h" 
-#include "AliPHOSDigit.h"
-#include "AliPHOSEmcRecPoint.h"
-#include "AliPHOSCpvRecPoint.h"
-#include "AliPHOSTrackSegment.h"
-#include "AliPHOSRecParticle.h"
-class AliPHOSGeometry ;
-#include "AliPHOSDigitizer.h"
-#include "AliPHOSSDigitizer.h"
 #include "AliPHOSClusterizer.h"
 #include "AliPHOSTrackSegmentMaker.h"
 #include "AliPHOSPID.h"
+class AliPHOS ; 
+class AliPHOSGeometry ;
+class AliPHOSHit ; 
+class AliPHOSDigit ; 
+class AliPHOSEmcRecPoint ; 
+class AliPHOSCpvRecPoint ; 
+class AliPHOSTrackSegment ;
+class AliPHOSRecParticle ;  
 class AliPHOSCalibrationDB ;
+class AliPHOSSDigitizer ; 
+class AliPHOSDigitizer ;
+  
 
 
 //

diff --git a/PHOS/AliPHOSPID.cxx b/PHOS/AliPHOSPID.cxx
index 22320cda3aedcf2f589fad76064f3a59eca14471..40b01e34f4681dab6985dc9578c5f6edace8c4c5 100644 (file)
--- a/PHOS/AliPHOSPID.cxx
+++ b/PHOS/AliPHOSPID.cxx
@@ -27,15 +27,11 @@
 
 
 // --- ROOT system ---
-#include "TGeometry.h"
-#include "TDirectory.h"
-#include "TFile.h"
-#include "TTree.h"
- 
+
 // --- Standard library ---
 
 // --- AliRoot header files ---
-#include "AliRun.h" 
+#include "AliConfig.h"
 #include "AliPHOSPID.h"
 
 ClassImp(AliPHOSPID)

diff --git a/PHOS/AliPHOSPID.h b/PHOS/AliPHOSPID.h
index 4858900bce48f67e47a2a02adc27f15c4f518102..71826fdba16e5f826dd148ae29b74b1681091b30 100644 (file)
--- a/PHOS/AliPHOSPID.h
+++ b/PHOS/AliPHOSPID.h
@@ -43,12 +43,12 @@ class AliPHOSPID : public TTask {
   virtual const char * Version() const { Warning("Version", "not defined" ) ; return 0 ; }  
   virtual void WriteRecParticles() = 0;
 
-private: 
-  virtual void Init() { Warning("Init", "not defined" ) ; } 
-
 protected:
   TString fEventFolderName ;  // event folder name
 
+private: 
+  virtual void Init() { Warning("Init", "not defined" ) ; } 
+
   ClassDef(AliPHOSPID,3)  // Particle Identifier algorithm (base class)
 
 } ;

diff --git a/PHOS/AliPHOSPIDv0.cxx b/PHOS/AliPHOSPIDv0.cxx
index e6b06cf9be49f7f7e8de7bf810c386e41cc04c31..ba4c53de256c004e2991bd4c681ae7c6ab96dacb 100644 (file)
--- a/PHOS/AliPHOSPIDv0.cxx
+++ b/PHOS/AliPHOSPIDv0.cxx
@@ -74,6 +74,7 @@
 #include "AliGenerator.h"
 #include "AliPHOS.h"
 #include "AliPHOSPIDv0.h"
+#include "AliPHOSEmcRecPoint.h"
 #include "AliPHOSClusterizerv1.h"
 #include "AliPHOSTrackSegment.h"
 #include "AliPHOSTrackSegmentMakerv1.h"

diff --git a/PHOS/AliPHOSQAAlarm.cxx b/PHOS/AliPHOSQAAlarm.cxx
index bfc3e2234497894d76daa83587d17e6057d963ca..cb9b457da87d6858dff8fc10d8c182d8a48d57fd 100644 (file)
--- a/PHOS/AliPHOSQAAlarm.cxx
+++ b/PHOS/AliPHOSQAAlarm.cxx
@@ -28,6 +28,7 @@
 // --- AliRoot header files ---
 
 #include "AliPHOSQAAlarm.h"
+#include "AliRun.h"
 
 ClassImp(AliPHOSQAAlarm)
 

diff --git a/PHOS/AliPHOSQAAlarm.h b/PHOS/AliPHOSQAAlarm.h
index 395015c2206adea3908158764721c0db2e6a37eb..ff79b15f281751e890586b839148eb92de8fae68 100644 (file)
--- a/PHOS/AliPHOSQAAlarm.h
+++ b/PHOS/AliPHOSQAAlarm.h
@@ -19,12 +19,8 @@
 
 // --- Standard library ---
 
-#include <assert.h>
-
 // --- AliRoot header files ---
 
-#include "AliRun.h"
-
 class AliPHOSQAAlarm : public TObject {
 
 public:

diff --git a/PHOS/AliPHOSQAChecker.cxx b/PHOS/AliPHOSQAChecker.cxx
index 120213180268385ea07bfa8c7da6aaa01d256924..2abce85720b16bd041ba0f6c5f4dd3a672c90ec0 100644 (file)
--- a/PHOS/AliPHOSQAChecker.cxx
+++ b/PHOS/AliPHOSQAChecker.cxx
@@ -22,7 +22,7 @@
 //////////////////////////////////////////////////////////////////////////////
 
 // --- ROOT system ---
-#include "TROOT.h"
+#include "TDatime.h"
 #include "TFolder.h" 
 
 // --- Standard library ---
@@ -31,7 +31,6 @@
 #include "AliConfig.h"
 
 #include "AliPHOSQAChecker.h"
-#include "AliPHOSQAVirtualCheckable.h"
 
 ClassImp(AliPHOSQAChecker)
 

diff --git a/PHOS/AliPHOSQAChecker.h b/PHOS/AliPHOSQAChecker.h
index f6a0b7a991792e338b739a306e63d7744f815d64..b39c33eba036cc88025214c857df7af7a6a400b5 100644 (file)
--- a/PHOS/AliPHOSQAChecker.h
+++ b/PHOS/AliPHOSQAChecker.h
@@ -18,8 +18,6 @@ class TString ;
 
 // --- Standard library ---
 
-#include <assert.h>
-
 // --- AliRoot header files ---
 
 #include "AliPHOSQAVirtualCheckable.h"

diff --git a/PHOS/AliPHOSRaw2Digits.cxx b/PHOS/AliPHOSRaw2Digits.cxx
index 95e0bd15c3884a7cc073c50afe1619f58607f8d6..361c06b2e7e8f5eb4cacc867d9bbded9472a2f15 100644 (file)
--- a/PHOS/AliPHOSRaw2Digits.cxx
+++ b/PHOS/AliPHOSRaw2Digits.cxx
@@ -61,15 +61,13 @@
 
 // --- Standard library ---
 
-#include <unistd.h>
+//#include <unistd.h>
 
 // --- AliRoot header files ---
 #include "AliPHOSDigit.h"
 #include "AliPHOSConTableDB.h"
 #include "AliPHOSBeamTestEvent.h"
 #include "AliPHOSRaw2Digits.h"
-#include "AliPHOSv1.h"
-#include "../EVGEN/AliGenBox.h"
 #include "AliRun.h"
 
 ClassImp(AliPHOSRaw2Digits)
@@ -133,6 +131,7 @@ ClassImp(AliPHOSRaw2Digits)
 //____________________________________________________________________________ 
 AliPHOSRaw2Digits::AliPHOSRaw2Digits(AliPHOSRaw2Digits & r2d):TTask(r2d.GetName(), r2d.GetTitle()) 
 {
+  // cpy ctor
   fInName=r2d.fInName ;
 
   fMK1 =  r2d.fMK1 ;
@@ -192,7 +191,7 @@ Bool_t AliPHOSRaw2Digits::Init(void){
 
 }
 //____________________________________________________________________________ 
-Bool_t AliPHOSRaw2Digits::StartRootFiles(void ){
+Bool_t AliPHOSRaw2Digits::StartRootFiles(void ) const {
 //   //Create PHOS geometry, sets magnetic field to zero, 
 //   //create Generator - to store target position, 
 //   //opens out file, creates TreeE 

diff --git a/PHOS/AliPHOSRaw2Digits.h b/PHOS/AliPHOSRaw2Digits.h
index b5c929cf2fe2de5a18a2cfbd4637b1e75b68bb3c..017d3f8d417566f3cc3780f8917c597776166c17 100644 (file)
--- a/PHOS/AliPHOSRaw2Digits.h
+++ b/PHOS/AliPHOSRaw2Digits.h
@@ -50,7 +50,7 @@ public:
   AliPHOSRaw2Digits & operator = ( AliPHOSRaw2Digits & /*r2d*/ ) { return *this ; } 
   
 private:
-  Bool_t StartRootFiles(void) ;
+  Bool_t StartRootFiles(void) const ;
   Bool_t CloseRootFiles(void) ;
   Bool_t ProcessRawFile() ;
   void Swab4(void *from, void *to, size_t nwords) const ;

diff --git a/PHOS/AliPHOSRecCpvManager.cxx b/PHOS/AliPHOSRecCpvManager.cxx
index ae0595dd42dfcc98b756737b017af0a59b769c6f..fba2e8ae3c4296a5c56c1f74af0d242980aad625 100644 (file)
--- a/PHOS/AliPHOSRecCpvManager.cxx
+++ b/PHOS/AliPHOSRecCpvManager.cxx
@@ -26,7 +26,8 @@
 // --- AliRoot header files ---
 
 #include "AliPHOSRecCpvManager.h"
-#include "AliPHOSGetter.h"
+#include "AliPHOSGeometry.h" 
+#include "AliPHOSLoader.h"
 
 ClassImp(AliPHOSRecCpvManager) 
 

diff --git a/PHOS/AliPHOSRecEmcManager.cxx b/PHOS/AliPHOSRecEmcManager.cxx
index 4348c8224dc1006d59a8e5a2a5826fc0482391b0..907f8ca10b88055be9dfe5efa3c4570af1208361 100644 (file)
--- a/PHOS/AliPHOSRecEmcManager.cxx
+++ b/PHOS/AliPHOSRecEmcManager.cxx
@@ -26,8 +26,6 @@
 // --- AliRoot header files ---
 
 #include "AliPHOSRecEmcManager.h"
-#include "AliPHOS.h"
-#include "AliRun.h"
 
 ClassImp(AliPHOSRecEmcManager) 
 
@@ -72,11 +70,12 @@ Float_t AliPHOSRecEmcManager::Dispersion(Float_t ei) const
   return ei;
 }
 
-Float_t AliPHOSRecEmcManager::OneGamChi2(Float_t ai, Float_t ei, Float_t, Float_t& gi) const
+Float_t AliPHOSRecEmcManager::OneGamChi2(Float_t ai, Float_t ei, Float_t fi, Float_t& gi) const
 {
   // Chi2 used in OneGam (one-gamma fitting).
   // gi is d(Chi2)/d(ai).
 
+  fi = 0 ; 
   Float_t da = ai - ei;
   Float_t d = ei; // we assume that sigma(E) = sqrt(E)
   gi = 2.*(ai-ei)/d;
@@ -85,9 +84,10 @@ Float_t AliPHOSRecEmcManager::OneGamChi2(Float_t ai, Float_t ei, Float_t, Float_
 
 }
 
-Float_t AliPHOSRecEmcManager::TwoGamChi2(Float_t ai, Float_t ei, Float_t, Float_t& gi) const
+Float_t AliPHOSRecEmcManager::TwoGamChi2(Float_t ai, Float_t ei, Float_t fi, Float_t& gi) const
 {
   // calculates chi^2
+  fi = 0 ; 
   Float_t da = ai - ei;
   Float_t d = ei; // we assume that sigma(E) = sqrt(E)
   gi = 2.*(ai-ei)/d;

diff --git a/PHOS/AliPHOSRecEmcManager.h b/PHOS/AliPHOSRecEmcManager.h
index d5fdb79792d3bdd3344f15141448cd59c18a2a12..ec9de0b3bf60a575f91d79f6c707a3799d09eb5c 100644 (file)
--- a/PHOS/AliPHOSRecEmcManager.h
+++ b/PHOS/AliPHOSRecEmcManager.h
@@ -9,7 +9,6 @@
 // 6 March 2001
 
 #include "AliPHOSRecManager.h"
-#include "AliPHOSGeometry.h"
 
 class AliPHOSRecEmcManager : public AliPHOSRecManager {
 

diff --git a/PHOS/AliPHOSRecParticle.cxx b/PHOS/AliPHOSRecParticle.cxx
index 740c94fbec401cbad25f3fde0636e18823d335d0..0c2d14707f143bbf3355ece697afcfc5244b1935 100644 (file)
--- a/PHOS/AliPHOSRecParticle.cxx
+++ b/PHOS/AliPHOSRecParticle.cxx
@@ -31,7 +31,6 @@
 // --- AliRoot header files ---
 #include "AliPHOSRecParticle.h"
 #include "AliPHOSGetter.h" 
-#include "TParticle.h"
 
 ClassImp(AliPHOSRecParticle)
 
@@ -78,7 +77,7 @@ const Int_t AliPHOSRecParticle::GetNPrimaries() const
 //____________________________________________________________________________
 const Int_t AliPHOSRecParticle::GetNPrimariesToRecParticles() const  
 { 
-
+  // Get the number of primaries at the origine of the RecParticle
   Int_t rv = 0 ;
   AliPHOSGetter * gime = AliPHOSGetter::Instance() ; 
   Int_t emcRPindex = dynamic_cast<AliPHOSTrackSegment*>(gime->TrackSegments()->At(GetPHOSTSIndex()))->GetEmcIndex();
@@ -89,6 +88,7 @@ const Int_t AliPHOSRecParticle::GetNPrimariesToRecParticles() const
 //____________________________________________________________________________
 const TParticle * AliPHOSRecParticle::GetPrimary(Int_t index) const  
 {
+  // Get the list of primary particles at the origine of the RecParticle
   if ( index > GetNPrimariesToRecParticles() ) { 
     if (fDebug) 
       Warning("GetPrimary", "AliPHOSRecParticle::GetPrimary -> %d is larger that the number of primaries %d", 

diff --git a/PHOS/AliPHOSRecParticle.h b/PHOS/AliPHOSRecParticle.h
index 6f494f65f946bebf9b47a7c444948a8e046bf2e2..b66974a7d56f03862ec3cfcc8b69fd6b1792d8ea 100644 (file)
--- a/PHOS/AliPHOSRecParticle.h
+++ b/PHOS/AliPHOSRecParticle.h
@@ -41,7 +41,7 @@ class AliPHOSRecParticle : public AliPHOSFastRecParticle {
  private:
 
   Int_t fPHOSTrackSegment ; // pointer to the associated track segment in PHOS  
-  Bool_t fDebug ; 
+  Bool_t fDebug ; // to steer debug output 
 
   ClassDef(AliPHOSRecParticle,2)  // Reconstructed Particle
 };

diff --git a/PHOS/AliPHOSRecPoint.cxx b/PHOS/AliPHOSRecPoint.cxx
index a049f8f7a6569b10324eac5633271235918ecff9..0e28471360593ac3e618581acb147169de707d5c 100644 (file)
--- a/PHOS/AliPHOSRecPoint.cxx
+++ b/PHOS/AliPHOSRecPoint.cxx
@@ -22,6 +22,8 @@
 
 // --- ROOT system ---
 #include "TPad.h"
+#include "TGraph.h"
+#include "TPaveText.h"
 #include "TClonesArray.h"
 
 // --- Standard library ---
@@ -171,7 +173,7 @@ break;
   }
 }
 //____________________________________________________________________________
-void AliPHOSRecPoint::EvalAll(Float_t,TClonesArray * digits) 
+void AliPHOSRecPoint::EvalAll(TClonesArray * digits) 
 {
   //evaluates (if necessary) all RecPoint data members 
 

diff --git a/PHOS/AliPHOSRecPoint.h b/PHOS/AliPHOSRecPoint.h
index e2de3f7a7c92a6b944c9d064d3df9eed435a03c1..82e1badb4056bb038399f5f3c620b342b1b2a6aa 100644 (file)
--- a/PHOS/AliPHOSRecPoint.h
+++ b/PHOS/AliPHOSRecPoint.h
@@ -7,20 +7,18 @@
 //  A recpoint being equivalent to a cluster in encal terminology                 
 //*-- Author: Gines Martinez (SUBATECH)
 
-#include <assert.h>
-
 // --- ROOT system ---
 
-#include "TMarker.h"
-#include "TGraph.h"
-#include "TPaveText.h"
-
+//#include "TMarker.h"
+//#include "TGraph.h"
+//#include "TPaveText.h"
+  class TClonesArray ;
 // --- Standard library ---
 
 // --- AliRoot header files ---
 
 #include "AliRecPoint.h"
-#include "AliPHOSDigit.h"
+class AliPHOSDigit ; 
 
 class AliPHOSRecPoint : public AliRecPoint {
 
@@ -31,24 +29,20 @@ class AliPHOSRecPoint : public AliRecPoint {
   AliPHOSRecPoint() ;                   // ctor         
   AliPHOSRecPoint(const char * opt) ;   // ctor 
   AliPHOSRecPoint(const AliPHOSRecPoint & rp) : AliRecPoint(rp) {
-    // cpy ctor requested by Coding Convention 
-    // but not yet needed
-    assert(0==1) ; 
-  } 
+    Fatal("Cpy ctor", "not implemented") ; } 
   
   virtual ~AliPHOSRecPoint(){
     // dtor
   }
   virtual  void   AddDigit(AliDigitNew &){
-    // do not use this definition but the one below
-    assert(0==1) ; 
+   Fatal("AddDigit", "use AddDigit(AliPHOSDigit & digit, Float_t Energy)") ; 
   }
   virtual  void   AddDigit(AliPHOSDigit & digit, Float_t Energy) = 0 ; 
   virtual Int_t   Compare(const TObject * obj) const = 0 ;   
   virtual Int_t   DistancetoPrimitive(Int_t px, Int_t py);
   virtual void    Draw(Option_t * option="") ;
   virtual void    ExecuteEvent(Int_t event, Int_t px, Int_t py) ;
-  virtual void    EvalAll(Float_t ,TClonesArray * digits) ;  
+  virtual void    EvalAll(TClonesArray * digits) ;  
   virtual void    EvalPHOSMod(AliPHOSDigit * digit) ;  
   virtual void    EvalPrimaries(TClonesArray * digits) ;  
   virtual void    GetGlobalPosition(TVector3 & gpos, TMatrix & gmat) const ; // return global position in ALICE
@@ -66,9 +60,7 @@ class AliPHOSRecPoint : public AliRecPoint {
   } 
 
   AliPHOSRecPoint & operator = (const AliPHOSRecPoint & )  {
-    // assignement operator requested by coding convention but not needed
-    assert(0==1) ;
-    return *this ; 
+    Fatal("operator = ", "not implemented") ;  return *this ; 
   }
 protected:
   

diff --git a/PHOS/AliPHOSReconstructioner.cxx b/PHOS/AliPHOSReconstructioner.cxx
index b9f5c24c8ba9106dd68f77bfd7502512abd4a74a..be93fe0d18f2c849c90c66d22b3bbbccc564eff7 100644 (file)
--- a/PHOS/AliPHOSReconstructioner.cxx
+++ b/PHOS/AliPHOSReconstructioner.cxx
@@ -59,15 +59,10 @@
 
 // --- ROOT system ---
 
-#include "TClonesArray.h"
-#include "TROOT.h"
-#include "TTree.h"
-#include "TFile.h"
-
 // --- Standard library ---
+#include "Riostream.h"
 
 // --- AliRoot header files ---
-#include "AliRun.h"
 #include "AliRunLoader.h"
 #include "AliPHOSReconstructioner.h"
 #include "AliPHOSClusterizerv1.h"
@@ -75,8 +70,7 @@
 #include "AliPHOSSDigitizer.h"
 #include "AliPHOSTrackSegmentMakerv1.h"
 #include "AliPHOSPIDv1.h"
-#include "AliPHOSFastRecParticle.h"
-#include "AliPHOSCpvRecPoint.h"
+
 #include "AliPHOSLoader.h"
 
 ClassImp(AliPHOSReconstructioner)
@@ -166,10 +160,12 @@ TTask("AliPHOSReconstructioner",evFoldName)
   fIsInitialized = kTRUE ;
 } 
 //____________________________________________________________________________
-void AliPHOSReconstructioner::Exec(Option_t)
+void AliPHOSReconstructioner::Exec(Option_t opt)
 {
   //check, if the names of branches, which should be made conicide with already
   //existing
+  if (!opt) 
+    return ; 
   if(!fIsInitialized)
     Init() ;
 }

diff --git a/PHOS/AliPHOSReconstructioner.h b/PHOS/AliPHOSReconstructioner.h
index 5afedfe2e594796b83b2b323841afc898f8c3596..5de72d17cac81838e3959457bacb70165b0b6d59 100644 (file)
--- a/PHOS/AliPHOSReconstructioner.h
+++ b/PHOS/AliPHOSReconstructioner.h
@@ -11,7 +11,7 @@
 //*-- Author: Gines Martinez & Yves Schutz (SUBATECH) 
 //*--         Dmitri Peressounko (SUBATECH & Kurchatov Institute)
 
-#include <stdlib.h>
+  //#include <stdlib.h>
 
 // --- ROOT system ---
 

diff --git a/PHOS/AliPHOSSDigitizer.cxx b/PHOS/AliPHOSSDigitizer.cxx
index dabc4c98b0897eb24ac3db4dc6ee74efe6135ff0..112468bf234ca997b67723d21616465abbf44543 100644 (file)
--- a/PHOS/AliPHOSSDigitizer.cxx
+++ b/PHOS/AliPHOSSDigitizer.cxx
@@ -51,14 +51,13 @@
 
 
 // --- ROOT system ---
-#include "TFile.h"
-#include "TROOT.h"
 #include "TBenchmark.h"
+#include "TRandom.h"
 
 // --- Standard library ---
 
 // --- AliRoot header files ---
-#include "AliRun.h"
+#include "AliPHOSGeometry.h" 
 #include "AliPHOSDigit.h"
 #include "AliPHOSGetter.h"
 #include "AliPHOSHit.h"
@@ -335,6 +334,7 @@ void AliPHOSSDigitizer::PrintSDigits(Option_t * option)
 //____________________________________________________________________________ 
 void AliPHOSSDigitizer::Unload() const
 {
+  // Unloads the objects from the folder
   AliPHOSGetter * gime = AliPHOSGetter::Instance() ; 
   AliPHOSLoader * loader = gime->PhosLoader() ; 
   loader->UnloadHits() ; 

diff --git a/PHOS/AliPHOSSDigitizer.h b/PHOS/AliPHOSSDigitizer.h
index 9661c1e40367a147409cf60bb1a144b217839bf5..48bfcd3f377bc9314631c17ec05d2cd6e4c2aac1 100644 (file)
--- a/PHOS/AliPHOSSDigitizer.h
+++ b/PHOS/AliPHOSSDigitizer.h
@@ -21,7 +21,6 @@ class TFile ;
 // --- Standard library ---
 
 // --- AliRoot header files ---
-#include "AliConfig.h"
 
 class AliPHOSSDigitizer: public TTask {
 

diff --git a/PHOS/AliPHOSSupportGeometry.h b/PHOS/AliPHOSSupportGeometry.h
index a2760281717718f55bc7068e7d99163537618229..714cdd13e300564cfa0fd2e3df36623c3e836a4f 100644 (file)
--- a/PHOS/AliPHOSSupportGeometry.h
+++ b/PHOS/AliPHOSSupportGeometry.h
@@ -12,11 +12,9 @@
 // Author:   Yuri Kharlov (IHEP, Protvino)
 // 13 November 2000
 
-#include <assert.h> 
-
 // --- ROOT system ---
 
-#include "TObjArray.h"
+#include "TObject.h" 
 
 // --- AliRoot header files ---
 
@@ -26,16 +24,11 @@ public:
 
   AliPHOSSupportGeometry();
   AliPHOSSupportGeometry(const AliPHOSSupportGeometry & geom) : TObject(geom) {
-    // cpy ctor requested by Coding Convention but not yet needed
-    assert(0==1) ;
-  } 
+    Fatal("cpy ctor", "not implemented") ; } 
   virtual ~AliPHOSSupportGeometry(void) {}
 
   AliPHOSSupportGeometry & operator = (const AliPHOSSupportGeometry  & /*rvalue*/) {
-    // assignement operator requested by coding convention but not needed
-    assert(0==1) ;
-    return *this ; 
-  }
+    Fatal("operator =", "not implemented") ; return *this ; }
   Float_t GetRailOuterSize(Int_t index)     const { return fRailOuterSize[index]; }
   Float_t GetRailPart1    (Int_t index)     const { return fRailPart1[index]; }
   Float_t GetRailPart2    (Int_t index)     const { return fRailPart2[index]; }

diff --git a/PHOS/AliPHOSTrackSegment.cxx b/PHOS/AliPHOSTrackSegment.cxx
index f152009914c6c61c906c6f2c8822420bae12d12b..a2cf6ce00bc17e7eda349e2b7a2eb1057154c7bf 100644 (file)
--- a/PHOS/AliPHOSTrackSegment.cxx
+++ b/PHOS/AliPHOSTrackSegment.cxx
@@ -27,7 +27,7 @@
 // --- Standard library ---
 
 // --- AliRoot header files ---
-
+#include "AliPHOSEmcRecPoint.h" 
 #include "AliPHOSTrackSegment.h" 
 
 ClassImp(AliPHOSTrackSegment)
@@ -74,7 +74,7 @@ void AliPHOSTrackSegment::Copy(TObject & obj)
 }
 
 //____________________________________________________________________________
-void AliPHOSTrackSegment::Print(Option_t *) const
+void AliPHOSTrackSegment::Print() const
 {
   // Print all information on this track Segment
   

diff --git a/PHOS/AliPHOSTrackSegment.h b/PHOS/AliPHOSTrackSegment.h
index aca3306289abf03ca32af5b21176232a76783bf6..8b691e76783eace3a60a9cc875708ae8ad306920 100644 (file)
--- a/PHOS/AliPHOSTrackSegment.h
+++ b/PHOS/AliPHOSTrackSegment.h
@@ -16,13 +16,14 @@
 // --- ROOT system ---
 
 #include "TObject.h"
+class TClonesArray ; 
 
 // --- Standard library ---
 
 // --- AliRoot header files ---
-
-#include "AliPHOSEmcRecPoint.h"
-#include "AliPHOSRecPoint.h"
+class AliPHOSRecPoint ; 
+class AliPHOSEmcRecPoint ; 
+class AliPHOSCpvRecPoint ; 
 
 class AliPHOSTrackSegment : public TObject  {
 
@@ -40,7 +41,7 @@ public:
   Int_t   GetEmcIndex()    const {  return fEmcRecPoint ;   }
   Int_t   GetCpvIndex()    const {  return fPpsdUpRecPoint; }
 
-  virtual void  Print(Option_t *) const;
+  virtual void  Print() 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 a442780048d305e8b7c077ce385e71d0620e52bc..9a595f0d206c2525d20fd901651baa811200b5bd 100644 (file)
--- a/PHOS/AliPHOSTrackSegmentMaker.cxx
+++ b/PHOS/AliPHOSTrackSegmentMaker.cxx
@@ -22,15 +22,15 @@
 
 
 // --- ROOT system ---
-#include "TGeometry.h"
-#include "TFile.h"
-#include "TTree.h"
+//#include "TGeometry.h"
+  //#include "TFile.h"
+  //#include "TTree.h"
 
 // --- Standard library ---
 
 // --- AliRoot header files ---
 #include "AliPHOSTrackSegmentMaker.h"
-#include "AliHeader.h" 
+  //#include "AliHeader.h" 
 
 ClassImp( AliPHOSTrackSegmentMaker) 
 

diff --git a/PHOS/AliPHOSTrackSegmentMaker.h b/PHOS/AliPHOSTrackSegmentMaker.h
index 1b8ef1b8e6a83c364fd28d1b3ca0779a7a5d5b09..02de07a62544197bd9d48e7b83cf95bd1bde024c 100644 (file)
--- a/PHOS/AliPHOSTrackSegmentMaker.h
+++ b/PHOS/AliPHOSTrackSegmentMaker.h
@@ -18,7 +18,7 @@
 class TFile ; 
 
 // --- Standard library ---
-#include <iostream>
+//#include <iostream>
 
 // --- AliRoot header files ---
 

diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.cxx b/PHOS/AliPHOSTrackSegmentMakerv1.cxx
index dde92cf0cc0523c7a82e94468c74010c71f9951f..fec7a0006969f527b81272e8285cafcef1fad471 100644 (file)
--- a/PHOS/AliPHOSTrackSegmentMakerv1.cxx
+++ b/PHOS/AliPHOSTrackSegmentMakerv1.cxx
@@ -44,24 +44,17 @@
 //
 
 // --- ROOT system ---
-#include "TROOT.h"
-#include "TFile.h"
-#include "TFolder.h"
 #include "TTree.h"
-#include "TSystem.h"
 #include "TBenchmark.h"
 
 // --- Standard library ---
 
 // --- AliRoot header files ---
-
+#include "AliPHOSGeometry.h"
 #include "AliPHOSTrackSegmentMakerv1.h"
-#include "AliPHOSClusterizerv1.h"
 #include "AliPHOSTrackSegment.h"
-#include "AliPHOSCpvRecPoint.h"
 #include "AliPHOSLink.h"
 #include "AliPHOSGetter.h"
-#include "AliPHOS.h"
 
 ClassImp( AliPHOSTrackSegmentMakerv1) 
 
@@ -181,6 +174,7 @@ void  AliPHOSTrackSegmentMakerv1::Init()
 //____________________________________________________________________________
 void  AliPHOSTrackSegmentMakerv1::InitParameters()
 {
+  //Initializes parameters
   fRcpv      = 10. ;   
   fEmcFirst  = 0 ;    
   fEmcLast   = 0 ;   
@@ -365,6 +359,7 @@ void  AliPHOSTrackSegmentMakerv1::Exec(Option_t * option)
 //____________________________________________________________________________
 void AliPHOSTrackSegmentMakerv1::Unload() 
 {
+  // Unloads the task from the folder
   AliPHOSGetter * gime = AliPHOSGetter::Instance() ;  
   gime->PhosLoader()->UnloadRecPoints() ;
   gime->PhosLoader()->UnloadTracks() ;

diff --git a/PHOS/AliPHOSv1.cxx b/PHOS/AliPHOSv1.cxx
index 307533ee85ceb3630d2cb0889409619fdbd0a599..96f09195b022cebf1da6b9bb716afd4f9a0204a7 100644 (file)
--- a/PHOS/AliPHOSv1.cxx
+++ b/PHOS/AliPHOSv1.cxx
@@ -27,22 +27,13 @@
 
 
 // --- ROOT system ---
-
-#include <TBRIK.h>
-#include <TNode.h>
 #include <TParticle.h>
-#include <TRandom.h>
-#include <TTree.h>
 #include <TVirtualMC.h>
 
 // --- Standard library ---
 
-#include <string.h>
-#include <stdlib.h>
 
 // --- AliRoot header files ---
-
-#include "AliConst.h"
 #include "AliPHOSCPVDigit.h"
 #include "AliPHOSGeometry.h"
 #include "AliPHOSHit.h"

diff --git a/PHOS/AliPHOSvFast.cxx b/PHOS/AliPHOSvFast.cxx
index 07d9cfac0dd56b6569d00b64ec98975ac08a9ae2..724356cfc355a9363259a9dee19ea8e0de19870d 100644 (file)
--- a/PHOS/AliPHOSvFast.cxx
+++ b/PHOS/AliPHOSvFast.cxx
@@ -27,17 +27,15 @@
 // --- ROOT system ---
  
 #include <TBRIK.h>
-#include <TFile.h>
 #include <TGeometry.h>
 #include <TNode.h>
 #include <TParticle.h>
-#include <TTree.h>
+#include "TClonesArray.h" 
 #include <TVirtualMC.h>
 
 // --- Standard library ---
 
 // --- AliRoot header files ---
-#include "AliConst.h"
 #include "AliPHOSFastRecParticle.h"
 #include "AliPHOSGeometry.h"
 #include "AliPHOSLoader.h"

diff --git a/PHOS/AliPHOSvFast.h b/PHOS/AliPHOSvFast.h
index 0fbfdebc2a4dc9b1fbe714a701592cb7a70fedc8..38480c7f57187397011f9a95949151c22fe8508e 100644 (file)
--- a/PHOS/AliPHOSvFast.h
+++ b/PHOS/AliPHOSvFast.h
@@ -15,7 +15,7 @@
 //*-- Author: Yves Schutz (SUBATECH)
 
 // --- ROOT system ---
-#include "TClonesArray.h"
+//#include "TClonesArray.h"
 #include "TRandom.h"
 
 class TVector3 ;

diff --git a/PHOS/AliPHOSvImpacts.cxx b/PHOS/AliPHOSvImpacts.cxx
index e8dc33efeed4e96e0bca6e9bb951c15e074293f1..75c2985d52baef3db36a0a78f4457189210c5876 100644 (file)
--- a/PHOS/AliPHOSvImpacts.cxx
+++ b/PHOS/AliPHOSvImpacts.cxx
@@ -29,7 +29,7 @@
 
 // --- ROOT system ---
 
-#include <TTree.h>
+//#include <TTree.h>
 #include <TVirtualMC.h>
 
 // --- Standard library ---