polishing

diff --git a/PHOS/AliPHOSv0.cxx b/PHOS/AliPHOSv0.cxx
index 3b864a26ffc237c7ecb9a830e9ad6c4f5e388c2a..e0293ea59359495151cdb8cab50d2e9ff1471205 100644 (file)
--- a/PHOS/AliPHOSv0.cxx
+++ b/PHOS/AliPHOSv0.cxx
@@ -57,10 +57,7 @@ AliPHOSv0::AliPHOSv0(const char *name, const char *title):
   AliPHOS(name,title)
 {
   // ctor : title is used to identify the layout
- 
-  // create the getter not needed
-  //AliPHOSGetter::GetInstance(gDirectory->GetName(), 0);
-  
+  GetGeometry() ; 
 }
 
 //____________________________________________________________________________
@@ -879,25 +876,25 @@ void AliPHOSv0::Init(void)
   Int_t i;
 
   if(fDebug) {
-    printf("\n%s: ",ClassName());
-    for(i=0;i<35;i++) printf("*");
-    printf(" PHOS_INIT ");
-    for(i=0;i<35;i++) printf("*");
-    printf("\n%s: ",ClassName());
-    
-    
+    cout << endl ;  
+    for(i=0;i<35;i++) 
+      cout <<"*";
+    cout << "INFO: " << ClassName() << "::Init ";
+    for(i=0;i<35;i++) 
+      cout << "*";
+    cout << endl;
+   
     // Here the PHOS initialisation code (if any!)
-
+    
     AliPHOSGeometry * geom = GetGeometry() ; 
 
     if (geom!=0)  
       cout << "AliPHOS" << Version() << " : PHOS geometry intialized for " << geom->GetName() << endl ;
     else
-      cout << "AliPHOS" << Version() << " : PHOS geometry initialization failed !" << endl ;   
+      cout << "AliPHOS" << Version() << " : PHOS geometry initialization failed !" << endl ;       
+    for(i=0;i<80;i++) 
+      cout << "*" ;
+    cout << endl;
     
-    for(i=0;i<80;i++) printf("*");
-    printf("\n");
-  }  
+  }
 }
-
-

diff --git a/PHOS/AliPHOSv0.h b/PHOS/AliPHOSv0.h
index 7aed230b111f9597be2438b977e8f415bfac5189..51920af94d94dac226624f026487691752a2b6db 100644 (file)
--- a/PHOS/AliPHOSv0.h
+++ b/PHOS/AliPHOSv0.h
@@ -54,7 +54,7 @@ class AliPHOSv0 : public AliPHOS {
     // Gives the version number 
     return 0 ; 
   }
-  virtual TString Version(void){ 
+  virtual const TString Version(void)const { 
     // As above
     return TString("v0") ; 
   }

diff --git a/PHOS/AliPHOSv1.h b/PHOS/AliPHOSv1.h
index e388762ec2a10a24cd2e39a8ac0e31b1a58c8b0d..72a085a044ca4cfae17f0df480e08c18ebdb0d8f 100644 (file)
--- a/PHOS/AliPHOSv1.h
+++ b/PHOS/AliPHOSv1.h
@@ -42,7 +42,7 @@ public:
   }
 
   virtual void   StepManager(void) ;                              
-  virtual TString Version(void){ return TString("v1") ;  }
+  virtual const TString Version(void)const { return TString("v1") ;  }
 
   AliPHOSv1 & operator = (const AliPHOSv1 & rvalue)  {
     // assignement operator requested by coding convention but not needed

diff --git a/PHOS/AliPHOSv2.h b/PHOS/AliPHOSv2.h
index 2570a394fd75abef64f1cbc84e4fa14b37ae5278..6fc61ec49c21136442ce1ff62ba05cc11b2f814e 100644 (file)
--- a/PHOS/AliPHOSv2.h
+++ b/PHOS/AliPHOSv2.h
@@ -27,7 +27,7 @@ public:
     // Gives the version number 
     return 2 ; 
   }
-  virtual TString Version(void){ 
+  virtual const TString Version(void)const { 
     // returns the version number 
     return TString("v2") ; 
   }

diff --git a/PHOS/AliPHOSv3.h b/PHOS/AliPHOSv3.h
index 928472f2b5cb770fb43492b91981d5b5750f4f15..25983702a8990c22960cd6cb96de6fd7887fcf6c 100644 (file)
--- a/PHOS/AliPHOSv3.h
+++ b/PHOS/AliPHOSv3.h
@@ -36,7 +36,7 @@ class AliPHOSv3 : public AliPHOSv1 {
     // Gives the version number 
     return 3 ; 
   }
-  virtual TString Version(void){ 
+  virtual const TString Version(void)const { 
     // returns the version number 
     return TString("v3") ; 
   }   

diff --git a/PHOS/AliPHOSv4.h b/PHOS/AliPHOSv4.h
index bbb9ff44de0efb5a8dc09dbe2eddc4cec8fccfdf..e2905fc1a4b06765f3550162fd6e89b09c900e42 100644 (file)
--- a/PHOS/AliPHOSv4.h
+++ b/PHOS/AliPHOSv4.h
@@ -67,7 +67,7 @@ public:
   Double_t     SigmaE(Double_t energy) ;    // calulates the energy resolution at a given Energy                           
   Double_t     SigmaP(Double_t energy, Double_t inc) ; // calulates the position resolution at a given Energy at a given incidence                           
   virtual void StepManager(void) ;          // does the tracking through PHOS and a preliminary digitalization
-  virtual TString Version(void){ 
+  virtual const TString Version(void)const { 
     // As IsVersion
     return TString("v4") ; 
   }

diff --git a/PHOS/AliPHOSvFast.h b/PHOS/AliPHOSvFast.h
index 1cc77c918554535f5e125e716f6fb0a376606da4..4e65a1f517a29c8958cb76e206507696535ed59c 100644 (file)
--- a/PHOS/AliPHOSvFast.h
+++ b/PHOS/AliPHOSvFast.h
@@ -50,7 +50,7 @@ public:
   virtual void   Init(void) ;                                        // does nothing
   virtual Int_t  IsVersion(void) const {
     // Gives the version number 
-    return 4 ; 
+    return 99 ; 
   }
 
   void    MakeBranch(Option_t* opt, const char *file=0) ;
@@ -67,7 +67,7 @@ public:
   Double_t     SigmaE(Double_t energy) ;    // calulates the energy resolution at a given Energy                           
   Double_t     SigmaP(Double_t energy, Double_t inc) ; // calulates the position resolution at a given Energy at a given incidence                           
   virtual void StepManager(void) ;          // does the tracking through PHOS and a preliminary digitalization
-  virtual TString Version(void){ 
+  virtual const TString Version(void)const { 
     // As IsVersion
     return TString("vFast") ; 
   }