add a data member to count the number of produced objects by run

diff --git a/PHOS/AliPHOSClusterizer.h b/PHOS/AliPHOSClusterizer.h
index 5963be46d7ba2e80f52b29d7d914e123fa23ed62..fd28665031b3a2a0ec6237b6e36fcec07b58970e 100644 (file)
--- a/PHOS/AliPHOSClusterizer.h
+++ b/PHOS/AliPHOSClusterizer.h
@@ -34,6 +34,7 @@ public:
   virtual Float_t GetCpvLogWeight()const = 0 ; 
   virtual Float_t GetPpsdClusteringThreshold()const = 0 ; 
   virtual char *  GetRecPointsBranch() const = 0 ;
+  virtual const Int_t GetRecPointsInRun()  const = 0 ; 
   virtual char *  GetDigitsBranch() const = 0 ;
 
   virtual void MakeClusters() = 0 ; 

diff --git a/PHOS/AliPHOSClusterizerv1.cxx b/PHOS/AliPHOSClusterizerv1.cxx
index 392f7be7428f5cba533a59900af9cad644162f09..3100d3e9b0a24f3c4bd75e365d5b01e648da0daa 100644 (file)
--- a/PHOS/AliPHOSClusterizerv1.cxx
+++ b/PHOS/AliPHOSClusterizerv1.cxx
@@ -104,7 +104,7 @@ ClassImp(AliPHOSClusterizerv1)
 
   fHeaderFileName          = "" ; 
   fDigitsBranchTitle       = "" ;
-  
+  fRecPointsInRun          = 0 ; 
 }
 
 //____________________________________________________________________________
@@ -135,7 +135,8 @@ AliPHOSClusterizerv1::AliPHOSClusterizerv1(const char* headerFile,const char* na
   TString tempo(GetName()) ; 
   tempo.Append(Version()) ; 
   SetName(tempo.Data()) ; 
-  
+  fRecPointsInRun          = 0 ; 
+
   Init() ;
 
 }
@@ -1065,6 +1066,9 @@ void AliPHOSClusterizerv1::PrintRecPoints(Option_t * option)
   cout << "       Found "<< emcRecPoints->GetEntriesFast() << " EMC Rec Points and " 
           << cpvRecPoints->GetEntriesFast() << " CPV RecPoints" << endl ;
 
+  fRecPointsInRun +=  emcRecPoints->GetEntriesFast() ; 
+  fRecPointsInRun +=  cpvRecPoints->GetEntriesFast() ; 
+
   if(strstr(option,"all")) {
     cout << "EMC clusters " << endl ;
     cout << "  Index    " 

diff --git a/PHOS/AliPHOSClusterizerv1.h b/PHOS/AliPHOSClusterizerv1.h
index 80ecda8a5feb1a85d19f6120a21f4f775d9820a9..9f0be80857a115f9123046c17d1a20dbd0bbc0b5 100644 (file)
--- a/PHOS/AliPHOSClusterizerv1.h
+++ b/PHOS/AliPHOSClusterizerv1.h
@@ -46,9 +46,10 @@ public:
   virtual Float_t GetCpvClusteringThreshold()const{ return fCpvClusteringThreshold;  } 
   virtual Float_t GetCpvLocalMaxCut()const        { return fCpvLocMaxCut;} 
   virtual Float_t GetCpvLogWeight()const          { return fW0CPV;}  
-  virtual Float_t GetPpsdClusteringThreshold()const{ return fPpsdClusteringThreshold;  } 
-  virtual char *  GetRecPointsBranch() const      { return (char*) fRecPointsBranchTitle.Data() ;}
-  virtual char *  GetDigitsBranch() const         { return (char*) fDigitsBranchTitle.Data() ;}
+  virtual Float_t GetPpsdClusteringThreshold() const { return fPpsdClusteringThreshold;  } 
+  virtual char *  GetRecPointsBranch() const     { return (char*) fRecPointsBranchTitle.Data() ;}
+  virtual const Int_t GetRecPointsInRun() const  {return fRecPointsInRun ;}  
+  virtual char *  GetDigitsBranch() const        { return (char*) fDigitsBranchTitle.Data() ;}
 
   void    Exec(Option_t *option);                // Does the job
 
@@ -112,7 +113,8 @@ private:
   Float_t fW0 ;                      // logarithmic weight for the cluster center of gravity calculation
   Float_t fCpvLocMaxCut ;            // minimum energy difference to distinguish local maxima in a CPV cluster
   Float_t fW0CPV ;                   // logarithmic weight for the CPV cluster center of gravity calculation
-    
+  Int_t fRecPointsInRun ;            //! Total number of recpoints in one run
+
   ClassDef(AliPHOSClusterizerv1,1)   // Clusterizer implementation version 1
 
 };

diff --git a/PHOS/AliPHOSDigitizer.cxx b/PHOS/AliPHOSDigitizer.cxx
index 2ecf2f65dfa1ccecfddcc33b7b70fc89bee29854..6dc4b8af262eab0b78be5d15e9242355c1868c3d 100644 (file)
--- a/PHOS/AliPHOSDigitizer.cxx
+++ b/PHOS/AliPHOSDigitizer.cxx
@@ -90,6 +90,7 @@ ClassImp(AliPHOSDigitizer)
   fCPVDigitThreshold  = 0.09 ;
   fPPSDNoise          = 0.0000001;
   fPPSDDigitThreshold = 0.0000002 ;  
+  fDigitsInRun  = 0 ; 
 
 }
 
@@ -105,6 +106,7 @@ AliPHOSDigitizer::AliPHOSDigitizer(const char *headerFile,const char * name):
   fCPVDigitThreshold  = 0.09 ;
   fPPSDNoise          = 0.0000001;
   fPPSDDigitThreshold = 0.0000002 ;  
+  fDigitsInRun  = 0 ; 
 
   Init() ;
   
@@ -459,6 +461,9 @@ void AliPHOSDigitizer::PrintDigits(Option_t * option){
   cout << "AliPHOSDigitiser: event " << gAlice->GetEvNumber() << endl ;
   cout << "       Number of entries in Digits list " << digits->GetEntriesFast() << endl ;
   cout << endl ;
+  
+  fDigitsInRun +=  digits->GetEntriesFast() ; 
+
   if(strstr(option,"all")){
     
     //loop over digits

diff --git a/PHOS/AliPHOSDigitizer.h b/PHOS/AliPHOSDigitizer.h
index e938ec2de8e59a7ca4150f260c33c3284a0b8e51..244440e707881ea6170904c0f32fb6ef5905d775 100644 (file)
--- a/PHOS/AliPHOSDigitizer.h
+++ b/PHOS/AliPHOSDigitizer.h
@@ -37,6 +37,7 @@ public:
 
   const Float_t GetCPVNoise()     const { return fCPVNoise ;}
   const Float_t GetCPVThreshold() const { return fCPVDigitThreshold ;}
+  const Int_t   GetDigitsInRun()  const { return fDigitsInRun ;}  
   const Float_t GetEMCThreshold() const { return fEMCDigitThreshold;}
   const Float_t GetPedestal()     const { return fPedestal; }
   const Float_t GetPinNoise()     const { return fPinNoise;}
@@ -81,6 +82,7 @@ private:
   Float_t fCPVDigitThreshold  ;     // Threshold for storing digits in CPV
   Float_t fPPSDNoise ;              // Noise in PPSD
   Float_t fPPSDDigitThreshold ;     // Threshold for storing digits in PPSD
+  Int_t fDigitsInRun ;             //! Total number of digits in one run
 
 
   ClassDef(AliPHOSDigitizer,1)  // description 

diff --git a/PHOS/AliPHOSPID.h b/PHOS/AliPHOSPID.h
index 39b0ad69c88202d6e94cb7fbb36d132ddb3d54fe..84a8711c7e63d3537b893d1dbbe66a4a8e7a299b 100644 (file)
--- a/PHOS/AliPHOSPID.h
+++ b/PHOS/AliPHOSPID.h
@@ -36,6 +36,7 @@ public:
   virtual void Exec(Option_t * option) = 0 ;
   virtual char * GetRecParticlesBranch()const = 0 ;
   virtual char * GetTrackSegmentsBranch()const = 0 ;
+  virtual const Int_t GetRecParticlesInRun()  const = 0 ; 
   virtual void Init()= 0 ;
   virtual void Print(Option_t * option) const = 0 ; 
   virtual void PlotDispersionCuts()const = 0;

diff --git a/PHOS/AliPHOSPIDv1.cxx b/PHOS/AliPHOSPIDv1.cxx
index c9bc8980c1b50308edac5e1320d9ca4814a4d16d..03dcc8816bedaab5ffc9df73593396bb39027bf8 100644 (file)
--- a/PHOS/AliPHOSPIDv1.cxx
+++ b/PHOS/AliPHOSPIDv1.cxx
@@ -98,6 +98,7 @@ AliPHOSPIDv1::AliPHOSPIDv1():AliPHOSPID()
   fRecPointsTitle    = "" ; 
   fRecParticlesTitle = "" ; 
   fIDOptions         = "" ; 
+  fRecParticlesInRun = 0 ; 
 }
 
 //____________________________________________________________________________
@@ -118,6 +119,7 @@ AliPHOSPIDv1::AliPHOSPIDv1(const char * headerFile,const char * name) : AliPHOSP
   TString tempo(GetName()) ; 
   tempo.Append(Version()) ; 
   SetName(tempo.Data()) ; 
+  fRecParticlesInRun = 0 ; 
    
   Init() ;
 
@@ -618,6 +620,8 @@ void AliPHOSPIDv1::PrintRecParticles(Option_t * option)
   cout << "AliPHOSPIDv1: event "<<gAlice->GetEvNumber()  << endl ;
   cout << "       found " << recParticles->GetEntriesFast() << " RecParticles " << endl ;
 
+  fRecParticlesInRun += recParticles->GetEntriesFast() ; 
+
   if(strstr(option,"all")) {  // printing found TS
     
     cout << "  PARTICLE "   

diff --git a/PHOS/AliPHOSPIDv1.h b/PHOS/AliPHOSPIDv1.h
index c3341e11068f3de897fcc0faaa52c9f696e94704..08acb78f721941d00000f809b1eafb10215b9f8b 100644 (file)
--- a/PHOS/AliPHOSPIDv1.h
+++ b/PHOS/AliPHOSPIDv1.h
@@ -35,7 +35,8 @@ public:
   virtual void Exec(Option_t * option);
   virtual char * GetRecParticlesBranch()const {return (char*) fRecParticlesTitle.Data() ;}      
   virtual char * GetTrackSegmentsBranch()const{return (char*) fTrackSegmentsTitle.Data(); }
-
+  virtual const Int_t GetRecParticlesInRun() const  {return fRecParticlesInRun ;}  
+  
   virtual void Init() ;
   virtual void PlotDispersionCuts()const ;
   virtual void Print(Option_t * option)const ; 
@@ -75,7 +76,7 @@ public:
   TFormula             * fFormula ;           // formula to define cut on the shouer elips axis
   Float_t                fDispersion ;        // dispersion cut
   Float_t                fCpvEmcDistance ;    // Max EMC-CPV distance
-
+  Int_t                  fRecParticlesInRun ; //! Total number of recparticles in one run
   ClassDef( AliPHOSPIDv1,1)  // Particle identifier implementation version 1
 
 };

diff --git a/PHOS/AliPHOSSDigitizer.cxx b/PHOS/AliPHOSSDigitizer.cxx
index 07ccb99ac6cde1658a0847d94d15496229a3d449..0c692bd62668119dd3bfa60e5d59d95994996dff 100644 (file)
--- a/PHOS/AliPHOSSDigitizer.cxx
+++ b/PHOS/AliPHOSSDigitizer.cxx
@@ -78,6 +78,7 @@ ClassImp(AliPHOSSDigitizer)
   fA             = 0;
   fB             = 10000000.;
   fPrimThreshold = 0.01 ;
+  fSDigitsInRun  = 0 ; 
 }
 
 //____________________________________________________________________________ 
@@ -87,6 +88,7 @@ AliPHOSSDigitizer::AliPHOSSDigitizer(const char * headerFile, const char * sDigi
   fA             = 0;
   fB             = 10000000.;
   fPrimThreshold = 0.01 ;
+  fSDigitsInRun  = 0 ; 
   Init();
 }
 
@@ -342,6 +344,8 @@ void AliPHOSSDigitizer::PrintSDigits(Option_t * option)
   cout << "AliPHOSSDigitizer: event "<<gAlice->GetEvNumber() << endl ;
   cout << "       Number of entries in SDigits list  " << sdigits->GetEntriesFast() << endl ;
   cout << endl ;
+
+  fSDigitsInRun +=  sdigits->GetEntriesFast() ; 
   
   if(strstr(option,"all")){// print all digits
     

diff --git a/PHOS/AliPHOSSDigitizer.h b/PHOS/AliPHOSSDigitizer.h
index 1b4ab37c04f8cb5a011b0736d2ac487797335d4c..f52e585db4f2eadc4b54d241c5501c31b9af1daf 100644 (file)
--- a/PHOS/AliPHOSSDigitizer.h
+++ b/PHOS/AliPHOSSDigitizer.h
@@ -35,6 +35,7 @@ public:
   const Float_t  GetPedestalParameter()const {return fA;}
   const Float_t  GetCalibrationParameter()const{return fB;}
   const char *   GetSDigitsBranch()const{return GetName();}  
+  const Int_t    GetSDigitsInRun() const {return fSDigitsInRun ;}  
 
   virtual void Print(Option_t* option) const ;
 
@@ -55,6 +56,7 @@ private:
   Float_t fA ;              // Pedestal parameter
   Float_t fB ;              // Slope Digitizition parameters
   Float_t fPrimThreshold ;  // To store primari if Elos > threshold
+  Int_t fSDigitsInRun ;     //! Total number of sdigits in one run
 
 
   ClassDef(AliPHOSSDigitizer,1)  // description 

diff --git a/PHOS/AliPHOSTrackSegmentMaker.h b/PHOS/AliPHOSTrackSegmentMaker.h
index 5606aa4cfc142f6a9d685984a351f6b40e06ca38..d1abd03ef69f77c3944807a4305bd33ce51b60aa 100644 (file)
--- a/PHOS/AliPHOSTrackSegmentMaker.h
+++ b/PHOS/AliPHOSTrackSegmentMaker.h
@@ -38,6 +38,7 @@ public:
   virtual void    Exec(Option_t * option) = 0 ;
   virtual char*   GetRecPointsBranch ()const = 0 ;
   virtual char*   GetTrackSegmentsBranch ()const = 0 ;
+  virtual const Int_t GetTrackSegmentsInRun()  const = 0 ; 
 
   virtual void    Print(Option_t * option)const = 0;
   //  virtual void Set...   // method to choose recPoints: along z only, along x ...???

diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.cxx b/PHOS/AliPHOSTrackSegmentMakerv1.cxx
index fe907403aece9f960e862dbbecdf5e97f6626ac1..6a8cbbb53583fd27eb8c78949241a5aa5b6650e9 100644 (file)
--- a/PHOS/AliPHOSTrackSegmentMakerv1.cxx
+++ b/PHOS/AliPHOSTrackSegmentMakerv1.cxx
@@ -86,6 +86,7 @@ ClassImp( AliPHOSTrackSegmentMakerv1)
   fHeaderFileName           = "" ;
   fRecPointsBranchTitle     = "" ;
   fTrackSegmentsBranchTitle = "" ; 
+  fTrackSegmentsInRun       = 0 ; 
 }
 
 //____________________________________________________________________________
@@ -104,7 +105,8 @@ ClassImp( AliPHOSTrackSegmentMakerv1)
   fHeaderFileName           = GetTitle() ;
   fRecPointsBranchTitle     = GetName() ;
   fTrackSegmentsBranchTitle = GetName() ; 
-  
+  fTrackSegmentsInRun       = 0 ; 
+
   TString tempo(GetName()) ; 
   tempo.Append(Version()) ; 
   SetName(tempo.Data()) ; 
@@ -646,6 +648,8 @@ void AliPHOSTrackSegmentMakerv1::PrintTrackSegments(Option_t * option)
   cout << "AliPHOSTrackSegmentMakerv1: event "<<gAlice->GetEvNumber()  << endl ;
   cout << "       Found " << trackSegments->GetEntriesFast() << "  trackSegments " << endl ;
   
+  fTrackSegmentsInRun += trackSegments->GetEntriesFast() ; 
+
   if(strstr(option,"all")) {  // printing found TS
     cout << "TrackSegment # " << "    EMC RP#    " << "    CPV RP#    " << "     PPSD RP#" << endl ; 
     

diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.h b/PHOS/AliPHOSTrackSegmentMakerv1.h
index 348f05da4475207dece21107b3978c81cd829063..d2963726dd68af384f37f6213fdf1d007bbdc4d4 100644 (file)
--- a/PHOS/AliPHOSTrackSegmentMakerv1.h
+++ b/PHOS/AliPHOSTrackSegmentMakerv1.h
@@ -37,8 +37,9 @@ public:
    
   virtual ~ AliPHOSTrackSegmentMakerv1() ; // dtor
   
-  virtual char*  GetRecPointsBranch    (void)const{return (char*)fRecPointsBranchTitle.Data() ;}
-  virtual char*  GetTrackSegmentsBranch(void)const{return (char*)fTrackSegmentsBranchTitle.Data() ;}
+  virtual char*  GetRecPointsBranch    (void)const {return (char*)fRecPointsBranchTitle.Data() ;}
+  virtual char*  GetTrackSegmentsBranch(void)const {return (char*)fTrackSegmentsBranchTitle.Data() ;}
+  virtual const Int_t GetTrackSegmentsInRun()const {return fTrackSegmentsInRun ;}  
 
   virtual void   Exec(Option_t * option) ;
           void   FillOneModule() ;       // Finds range in which RecPoints belonging current PHOS module are
@@ -85,6 +86,7 @@ private:
   Int_t fPpsdFirst;    //! Cpv low layer     
   Int_t fPpsdLast;     //!
   Int_t fModule ;      //! number of module being processed
+  Int_t fTrackSegmentsInRun ; //! Total number of track segments in one run
 
   ClassDef( AliPHOSTrackSegmentMakerv1,1)  // Implementation version 1 of algorithm class to make PHOS track segments 
 

diff --git a/PHOS/Makefile b/PHOS/Makefile
index 033b5a008d344e2ea40a6489a9f940ba01768d82..8a5b3e3fe2e9ab358bc94db43c6ffd5336a7b904 100644 (file)
--- a/PHOS/Makefile
+++ b/PHOS/Makefile
@@ -77,8 +77,17 @@ include $(ALICE_ROOT)/conf/GeneralMacros
 -include tgt_$(ALICE_TARGET)/Make-depend 
 
 test:  
-               @aliroot -b -q simPHOStest.C > out
-               @aliroot -b -q anaPHOStest.C > out
+               @echo " ____________________________________________________________ "
+               @echo " "
+               @echo " Starting the test of the simulation/reconstruction software. Please don't take the warning messages into account. "
+               @echo " ____________________________________________________________ "
+               @aliroot -b -q testsim.C > out
+               @aliroot -b -q testsimexam.C > out
+               @aliroot -b -q testreconSDigits.C > out
+               @aliroot -b -q testreconDigits.C > out
+               @aliroot -b -q testreconRecPoints.C > out
+               @aliroot -b -q testreconTrackSegments.C > out
+               @aliroot -b -q testreconRecParticles.C > out
                @rm out
 #              @rm galice.root