Removed global's to comply with Coding Conventions

diff --git a/PHOS/AliPHOSAnalyze.cxx b/PHOS/AliPHOSAnalyze.cxx
index 7d3cfd1..f3e5e7c 100644 (file)
--- a/PHOS/AliPHOSAnalyze.cxx
+++ b/PHOS/AliPHOSAnalyze.cxx
@@ -274,37 +274,37 @@ void AliPHOSAnalyze::AnalyzeOneEvent(Int_t evt)
                    cout << "    primary # " << index << " =  " << listofprimaries[index] << endl ;  
                  switch(recparticle->GetType())
                    {
-                   case kGAMMA:
+                   case AliPHOSFastRecParticle::kGAMMA:
                      fhPhotonEnergy->Fill(recparticle->Energy() ) ; 
                      //fhPhotonPositionX->Fill(recpart. ) ;
                      //fhPhotonPositionY->Fill(recpart. ) ;                 
                      cout << "PHOTON" << endl;
                      break;
-                   case kELECTRON:
+                   case  AliPHOSFastRecParticle::kELECTRON:
                      fhElectronEnergy->Fill(recparticle->Energy() ) ; 
                      //fhElectronPositionX->Fill(recpart. ) ;
                      //fhElectronPositionY->Fill(recpart. ) ; 
                      cout << "ELECTRON" << endl;
                      break;
-                   case kNEUTRALHA:
+                   case  AliPHOSFastRecParticle::kNEUTRALHA:
                      fhNeutralHadronEnergy->Fill(recparticle->Energy() ) ; 
                      //fhNeutralHadronPositionX->Fill(recpart. ) ;
                      //fhNeutralHadronPositionY->Fill(recpart. ) ; 
                      cout << "NEUTRAl HADRON" << endl;
                      break ;
-                   case kNEUTRALEM:
+                   case  AliPHOSFastRecParticle::kNEUTRALEM:
                      fhNeutralEMEnergy->Fill(recparticle->Energy() ) ; 
                      //fhNeutralEMPositionX->Fill(recpart. ) ;
                      //fhNeutralEMPositionY->Fill(recpart. ) ; 
                      //cout << "NEUTRAL EM" << endl;
                      break ;
-                   case kCHARGEDHA:
+                   case  AliPHOSFastRecParticle::kCHARGEDHA:
                      fhChargedHadronEnergy->Fill(recparticle->Energy() ) ; 
                      //fhChargedHadronPositionX->Fill(recpart. ) ;
                      //fhChargedHadronPositionY->Fill(recpart. ) ; 
                      cout << "CHARGED HADRON" << endl;
                      break ;
-                   case kGAMMAHA:
+                   case  AliPHOSFastRecParticle::kGAMMAHA:
                      fhPhotonHadronEnergy->Fill(recparticle->Energy() ) ; 
                      //fhPhotonHadronPositionX->Fill(recpart. ) ;
                      //fhPhotonHadronPositionY->Fill(recpart. ) ; 
@@ -488,10 +488,10 @@ void AliPHOSAnalyze::DisplayKineEvent(Int_t evt)
   sprintf(histoname,"Event %d: Incident particles in module %d", evt, module) ; 
 
   Double_t tm, tM, pm, pM ; // min and Max theta and phi covered by module   
-  fGeom->EmcModuleCoverage(module, tm, tM, pm, pM, kDegre) ;
+  fGeom->EmcModuleCoverage(module, tm, tM, pm, pM, AliPHOSGeometry::kDegre) ;
 
   Double_t theta, phi ; 
-  fGeom->EmcXtalCoverage(theta, phi, kDegre) ;
+  fGeom->EmcXtalCoverage(theta, phi, AliPHOSGeometry::kDegre) ;
 
   Int_t tdim = (Int_t)( (tM - tm) / theta ) ; 
   Int_t pdim = (Int_t)( (pM - pm) / phi ) ; 
@@ -577,9 +577,9 @@ void AliPHOSAnalyze::DisplayRecParticles()
       Text_t histoname[80] ; 
       sprintf(histoname,"Event %d: Reconstructed particles in module %d", fEvt, module) ; 
       Double_t tm, tM, pm, pM ; // min and Max theta and phi covered by module   
-      fGeom->EmcModuleCoverage(module, tm, tM, pm, pM, kDegre) ;
+      fGeom->EmcModuleCoverage(module, tm, tM, pm, pM, AliPHOSGeometry::kDegre) ;
       Double_t theta, phi ; 
-      fGeom->EmcXtalCoverage(theta, phi, kDegre) ;
+      fGeom->EmcXtalCoverage(theta, phi, AliPHOSGeometry::kDegre) ;
       Int_t tdim = (Int_t)( (tM - tm) / theta ) ; 
       Int_t pdim = (Int_t)( (pM - pm) / phi ) ; 
       tm -= theta ; 

diff --git a/PHOS/AliPHOSFastRecParticle.cxx b/PHOS/AliPHOSFastRecParticle.cxx
index 4ece97b..12bcaca 100644 (file)
--- a/PHOS/AliPHOSFastRecParticle.cxx
+++ b/PHOS/AliPHOSFastRecParticle.cxx
@@ -33,7 +33,7 @@
 #include "TPad.h"
 #include "TPaveText.h"
 
-ClassImp(AliPHOSFastRecParticle)
+ClassImp(AliPHOSFastRecParticle) ; 
 
 //____________________________________________________________________________
  AliPHOSFastRecParticle::AliPHOSFastRecParticle(const AliPHOSFastRecParticle & rp)

diff --git a/PHOS/AliPHOSFastRecParticle.h b/PHOS/AliPHOSFastRecParticle.h
index fc4124f..9d57dc3 100644 (file)
--- a/PHOS/AliPHOSFastRecParticle.h
+++ b/PHOS/AliPHOSFastRecParticle.h
@@ -20,17 +20,6 @@
 
 // --- AliRoot header files ---
 
-const static Int_t kUNDEFINED =-1 ;
-const static Int_t kNEUTRALEM = 0 ;
-const static Int_t kNEUTRALHA = 1 ;
-const static Int_t kGAMMA     = 2 ; 
-const static Int_t kGAMMAHA   = 3 ; 
-const static Int_t kABSURDEM  = 4 ;
-const static Int_t kABSURDHA  = 5 ;
-const static Int_t kELECTRON  = 6 ;
-const static Int_t kCHARGEDHA = 7 ;
-
-
 class AliPHOSFastRecParticle : public TParticle {
 
  public:
@@ -71,6 +60,9 @@ class AliPHOSFastRecParticle : public TParticle {
     fIndexInList = val ; 
   } 
 
+  enum EParticleType { kUNDEFINED=-1, kNEUTRALEM,  kNEUTRALHA,  kGAMMA , kGAMMAHA , 
+                      kABSURDEM,  kABSURDHA ,  kELECTRON, kCHARGEDHA } ; 
+
  protected:
 
   Int_t fIndexInList ; // the index of this RecParticle in the list stored in TreeR (to be set by analysis)

diff --git a/PHOS/AliPHOSGeometry.cxx b/PHOS/AliPHOSGeometry.cxx
index 9e326f7..3280cb7 100644 (file)
--- a/PHOS/AliPHOSGeometry.cxx
+++ b/PHOS/AliPHOSGeometry.cxx
@@ -37,9 +37,12 @@
 #include "AliPHOSPpsdRecPoint.h"
 #include "AliConst.h"
 
-ClassImp(AliPHOSGeometry)
+ClassImp(AliPHOSGeometry) ;
 
-  AliPHOSGeometry * AliPHOSGeometry::fgGeom = 0 ;
+AliPHOSGeometry * AliPHOSGeometry::fgGeom = 0 ;
+
+const TString AliPHOSGeometry::kDegre  = "deg" ; 
+const TString AliPHOSGeometry::kRadian = "rad" ; 
 
 //____________________________________________________________________________
 AliPHOSGeometry::~AliPHOSGeometry(void)
@@ -255,9 +258,6 @@ void AliPHOSGeometry::Init(void)
 {
   // Initializes the PHOS parameters
   
-  kDegre  = "deg" ; 
-  kRadian = "rad" ; 
-  
   fRotMatrixArray = new TObjArray(fNModules) ; 
 
   cout << "PHOS geometry setup: parameters for option " << fName << " " << fTitle << endl ;

diff --git a/PHOS/AliPHOSGeometry.h b/PHOS/AliPHOSGeometry.h
index 4f4b2bf..b885050 100644 (file)
--- a/PHOS/AliPHOSGeometry.h
+++ b/PHOS/AliPHOSGeometry.h
@@ -39,8 +39,8 @@ public:
   virtual void  GetGlobal(const AliRecPoint* RecPoint, TVector3 & gpos, TMatrix & gmat)  ;
   virtual void  GetGlobal(const AliRecPoint* RecPoint, TVector3 & gpos)  ; 
 
-  static TString kDegre ; 
-  static TString kRadian ; 
+   const static TString kDegre ; 
+   const static TString kRadian ; 
 
 protected:
 

diff --git a/PHOS/AliPHOSReconstructioner.cxx b/PHOS/AliPHOSReconstructioner.cxx
index 7363f37..c10e1c4 100644 (file)
--- a/PHOS/AliPHOSReconstructioner.cxx
+++ b/PHOS/AliPHOSReconstructioner.cxx
@@ -35,6 +35,7 @@
 
 #include "AliPHOSReconstructioner.h"
 #include "AliPHOSClusterizer.h"
+#include "AliPHOSFastRecParticle.h"
 
 ClassImp(AliPHOSReconstructioner)
 
@@ -288,28 +289,28 @@ AliPHOSReconstructioner::AliPHOSReconstructioner(AliPHOSClusterizer * Clusterize
       primaries = (rp->GetPHOSTrackSegment())->GetPrimariesEmc(nprimaries);
       switch(rp->GetType())
        {
-       case kNEUTRALEM:
+       case  AliPHOSFastRecParticle::kNEUTRALEM:
          strcpy( particle, "NEUTRAL_EM");
          break;
-       case kNEUTRALHA:
+       case  AliPHOSFastRecParticle::kNEUTRALHA:
          strcpy(particle, "NEUTRAL_HA");
          break;
-       case kGAMMA:
+       case  AliPHOSFastRecParticle::kGAMMA:
          strcpy(particle, "GAMMA");
          break ;
-       case kGAMMAHA: 
+       case  AliPHOSFastRecParticle::kGAMMAHA: 
          strcpy(particle, "GAMMA_H");
          break ;
-       case kABSURDEM:
+       case  AliPHOSFastRecParticle::kABSURDEM:
          strcpy(particle, "ABSURD_EM") ;
          break ;
-       case kABSURDHA:
+       case  AliPHOSFastRecParticle::kABSURDHA:
          strcpy(particle, "ABSURD_HA") ;
          break ;       
-       case kELECTRON:
+       case  AliPHOSFastRecParticle::kELECTRON:
          strcpy(particle, "ELECTRON") ;
          break ;
-       case kCHARGEDHA:
+       case  AliPHOSFastRecParticle::kCHARGEDHA:
          strcpy(particle, "CHARGED_HA") ;
          break ; 
        }

diff --git a/PHOS/AliPHOSvFast.cxx b/PHOS/AliPHOSvFast.cxx
index 1c5f7ea..8add01e 100644 (file)
--- a/PHOS/AliPHOSvFast.cxx
+++ b/PHOS/AliPHOSvFast.cxx
@@ -334,7 +334,7 @@ Int_t AliPHOSvFast::MakeType(AliPHOSFastRecParticle & rp )
 {
   // Generate a particle type using the performance of the EMC+PPSD setup
 
-  Int_t rv =  kUNDEFINED ;
+  Int_t rv =   AliPHOSFastRecParticle::kUNDEFINED ;
   Int_t charge = (Int_t)rp.GetPDG()->Charge() ;
   Int_t test ; 
   Float_t ran ; 
@@ -348,54 +348,54 @@ Int_t AliPHOSvFast::MakeType(AliPHOSFastRecParticle & rp )
   case 22:    // it's a photon
     ran = fRan.Rndm() ; 
     if ( ran <= 0.5 )  // 50 % 
-      rv = kGAMMA ; 
+      rv =  AliPHOSFastRecParticle::kGAMMA ; 
     else {
       ran = fRan.Rndm() ; 
       if( ran <= 0.9498 )
-       rv = kNEUTRALEM ; 
+       rv =  AliPHOSFastRecParticle::kNEUTRALEM ; 
       else
-       rv = kNEUTRALHA ; 
+       rv =  AliPHOSFastRecParticle::kNEUTRALHA ; 
     }     
     break ; 
 
   case 2112:  // it's a neutron
     ran = fRan.Rndm() ; 
     if ( ran <= 0.9998 )
-      rv = kNEUTRALHA ; 
+      rv =  AliPHOSFastRecParticle::kNEUTRALHA ; 
     else 
-      rv = kNEUTRALEM ; 
+      rv = AliPHOSFastRecParticle::kNEUTRALEM ; 
     break ; 
 
   case -2112: // it's a anti-neutron
     ran = fRan.Rndm() ; 
     if ( ran <= 0.9984 )
-      rv = kNEUTRALHA ; 
+      rv =  AliPHOSFastRecParticle::kNEUTRALHA ; 
     else 
-      rv = kNEUTRALEM ; 
+      rv =  AliPHOSFastRecParticle::kNEUTRALEM ; 
     break ; 
     
   case 11:    // it's a electron
     ran = fRan.Rndm() ; 
     if ( ran <= 0.9996 )
-      rv = kELECTRON ; 
+      rv =  AliPHOSFastRecParticle::kELECTRON ; 
     else 
-      rv = kCHARGEDHA ; 
+      rv =  AliPHOSFastRecParticle::kCHARGEDHA ; 
     break; 
 
   case -11:   // it's a positon
     ran = fRan.Rndm() ; 
     if ( ran <= 0.9996 )
-      rv = kELECTRON ; 
+      rv =  AliPHOSFastRecParticle::kELECTRON ; 
     else 
-      rv = kCHARGEDHA ; 
+      rv =  AliPHOSFastRecParticle::kCHARGEDHA ; 
     break; 
 
   case -1:    // it's a charged
     ran = fRan.Rndm() ; 
     if ( ran <= 0.9996 )
-      rv = kCHARGEDHA ; 
+      rv =  AliPHOSFastRecParticle::kCHARGEDHA ; 
     else 
-      rv = kGAMMA ; 
+      rv =  AliPHOSFastRecParticle::kGAMMA ; 
 
     break ; 
   }