Resolved merging conflicts

diff --git a/PHOS/AliPHOSClusterizerv1.cxx b/PHOS/AliPHOSClusterizerv1.cxx
index 6c063afe612695632de59bb472d271f8a4986587..ae1448d934296cb678b2465810ba3775a3b65682 100644 (file)
--- a/PHOS/AliPHOSClusterizerv1.cxx
+++ b/PHOS/AliPHOSClusterizerv1.cxx
@@ -185,8 +185,11 @@ void AliPHOSClusterizerv1::Exec(Option_t * option)
 
   for(ievent = 0; ievent < nevents; ievent++){
     
+    gAlice->GetEvent(ievent) ;
+    gAlice->SetEvent(ievent) ;
+
     if(!ReadDigits(ievent))  //reads digits for event fEvent
-      return;
+      continue;
     
     MakeClusters() ;
     
@@ -436,10 +439,6 @@ Bool_t AliPHOSClusterizerv1::ReadDigits(Int_t event)
   fNumberOfEmcClusters  = 0 ;
   fNumberOfCpvClusters  = 0 ;
 
-  // Get Digits Tree header from file
-  gAlice->GetEvent(event) ;
-  gAlice->SetEvent(event) ;
-
   if ( gAlice->TreeD()==0) {  
    cerr << "ERROR: AliPHOSClusterizerv1::ReadDigits There is no Digit Tree" << endl;
    return kFALSE;
@@ -504,7 +503,7 @@ void AliPHOSClusterizerv1::WriteRecPoints(Int_t event)
   TClonesArray * digits = gime->Digits() ; 
 
   Int_t index ;
-  //Evaluate poisition, dispersion and other RecPoint properties...
+  //Evaluate position, dispersion and other RecPoint properties...
   for(index = 0; index < emcRecPoints->GetEntries(); index++)
     ((AliPHOSEmcRecPoint *)emcRecPoints->At(index))->EvalAll(fW0,digits) ;
 
@@ -543,9 +542,10 @@ void AliPHOSClusterizerv1::WriteRecPoints(Int_t event)
   TString branchName(GetName()) ; 
   branchName.ReplaceAll(Version(), "") ; 
  
-  //First EMC
   Int_t bufferSize = 32000 ;    
   Int_t splitlevel = 0 ;
+
+  //First EMC
   TBranch * emcBranch = gAlice->TreeR()->Branch("PHOSEmcRP","TObjArray",&emcRecPoints,bufferSize,splitlevel);
   emcBranch->SetTitle(branchName);
   if (filename) {
@@ -555,7 +555,7 @@ void AliPHOSClusterizerv1::WriteRecPoints(Int_t event)
     while ((sb=(TBranch*)next())) {
       sb->SetFile(filename);
     }   
-
+    
     cwd->cd();
   }
     
@@ -586,9 +586,8 @@ void AliPHOSClusterizerv1::WriteRecPoints(Int_t event)
     }   
     cwd->cd();
   }
-  
-  emcBranch->Fill() ;
-  cpvBranch->Fill() ;
+  emcBranch        ->Fill() ;
+  cpvBranch        ->Fill() ;
   clusterizerBranch->Fill() ;
 
   gAlice->TreeR()->Write(0,kOverwrite) ;  
@@ -942,8 +941,7 @@ void AliPHOSClusterizerv1::UnfoldingChiSquare(Int_t & nPar, Double_t * Grad, Dou
 
   Float_t * emcEnergies = emcRP->GetEnergiesList() ;
 
-  AliPHOSGeometry * geom = AliPHOSGeometry::GetInstance() ;
-
+  const AliPHOSGeometry * geom = AliPHOSGetter::GetInstance()->PHOSGeometry() ; 
   fret = 0. ;     
   Int_t iparam ;
 
@@ -1063,7 +1061,7 @@ void AliPHOSClusterizerv1::PrintRecPoints(Option_t * option)
   TObjArray * emcRecPoints = AliPHOSGetter::GetInstance()->EmcRecPoints() ; 
   TObjArray * cpvRecPoints = AliPHOSGetter::GetInstance()->CpvRecPoints() ; 
 
-  cout << "AliPHOSClusterizerv1: " << endl ;
+  cout << "AliPHOSClusterizerv1: : event "<<gAlice->GetEvNumber() << endl ;
   cout << "       Found "<< emcRecPoints->GetEntriesFast() << " EMC Rec Points and " 
           << cpvRecPoints->GetEntriesFast() << " CPV RecPoints" << endl ;
 

diff --git a/PHOS/AliPHOSDigitizer.cxx b/PHOS/AliPHOSDigitizer.cxx
index ccf5eef1f78ef407c5b237a45f3fae57a60c6d8e..53beb2cf3038276d10a56f4e864b2efb7e7a0b6a 100644 (file)
--- a/PHOS/AliPHOSDigitizer.cxx
+++ b/PHOS/AliPHOSDigitizer.cxx
@@ -279,17 +279,18 @@ void AliPHOSDigitizer::Exec(Option_t *option)
 
   for(ievent = 0; ievent < nevents; ievent++){
 
+    gAlice->GetEvent(ievent);
+    gAlice->SetEvent(ievent) ;
     if(!ReadSDigits(ievent)) //read sdigits event(s) evaluated by Combinator() from file(s)
-      return ;    
+      continue ;    
     
     Digitize(ievent) ; //Add prepared SDigits to digits and add the noise
     
     WriteDigits(ievent) ;
-  }
    
-  if(strstr(option,"deb"))
-    PrintDigits(option);
-  
+    if(strstr(option,"deb"))
+      PrintDigits(option);
+  }
 
   if(strstr(option,"tim")){
     gBenchmark->Stop("PHOSDigitizer");
@@ -461,7 +462,7 @@ void AliPHOSDigitizer::PrintDigits(Option_t * option){
   AliPHOSGetter * gime = AliPHOSGetter::GetInstance() ; 
   TClonesArray * digits = gime->Digits() ; 
 
-  cout << "AliPHOSDigitiser:"<< endl ;
+  cout << "AliPHOSDigitiser: event " << gAlice->GetEvNumber() << endl ;
   cout << "       Number of entries in Digits list " << digits->GetEntriesFast() << endl ;
   cout << endl ;
   if(strstr(option,"all")){
@@ -510,7 +511,7 @@ Bool_t AliPHOSDigitizer::ReadSDigits(Int_t event)
   TString treeName("TreeS") ;
   treeName += event ; 
   TTree * treeS = (TTree*)file->Get(treeName.Data());
-   
+
   if(treeS==0){
     cerr << "ERROR: AliPHOSDigitizer::ReadSDigits There is no SDigit Tree" << endl;
     return kFALSE;
@@ -544,6 +545,7 @@ Bool_t AliPHOSDigitizer::ReadSDigits(Int_t event)
   
   TClonesArray * sdigits = gime->SDigits() ; 
   sdigitsBranch->SetAddress(&sdigits) ;
+  sdigits->Clear();
   
   AliPHOSSDigitizer * sdigitizer = gime->SDigitizer() ; 
   sdigitizerBranch->SetAddress(&sdigitizer) ;
@@ -553,8 +555,8 @@ Bool_t AliPHOSDigitizer::ReadSDigits(Int_t event)
  
   fPedestal = sdigitizer->GetPedestalParameter() ;
   fSlope    = sdigitizer->GetCalibrationParameter() ;
-  
-   return kTRUE ;
+
+  return kTRUE ;
 
 }
 
@@ -587,8 +589,6 @@ void AliPHOSDigitizer::WriteDigits(Int_t event)
   AliPHOSGetter * gime = AliPHOSGetter::GetInstance() ; 
   TClonesArray * digits = gime->Digits() ; 
 
-
-  gAlice->GetEvent(event) ; 
   if(gAlice->TreeD()==0)
     gAlice->MakeTree("D") ;  
 
@@ -638,5 +638,3 @@ void AliPHOSDigitizer::WriteDigits(Int_t event)
   gAlice->TreeD()->Write(0,kOverwrite) ;  
 
 }
-
-

diff --git a/PHOS/AliPHOSPIDv1.cxx b/PHOS/AliPHOSPIDv1.cxx
index 6f47a5d7746848f858d546f9836d5c90708ff5a6..c9bc8980c1b50308edac5e1320d9ca4814a4d16d 100644 (file)
--- a/PHOS/AliPHOSPIDv1.cxx
+++ b/PHOS/AliPHOSPIDv1.cxx
@@ -138,9 +138,6 @@ Bool_t AliPHOSPIDv1::ReadTrackSegments(Int_t event)
 
   //Fist read Track Segment Branch and extract RecPointsBranch from fTSMaker
 
-  gAlice->GetEvent(event) ;
-  gAlice->SetEvent(event) ;
-
   // Get TreeR header from file
   if(gAlice->TreeR()==0){
     cerr << "ERROR: AliPHOSPIDv1::ReadTrackSegments -> There is no Reconstruction Tree" << endl;
@@ -317,11 +314,14 @@ void  AliPHOSPIDv1::Exec(Option_t * option)
   Int_t ievent ;
 
   for(ievent = 0; ievent < nevents; ievent++){
+    gAlice->GetEvent(ievent) ;
+    gAlice->SetEvent(ievent) ;
+
     if(!ReadTrackSegments(ievent)) //reads TrackSegments for event ievent
-      return ;
+      continue ;
 
     MakeRecParticles() ;
-    cout << "MAKE" << endl ; 
+
     WriteRecParticles(ievent);
 
     if(strstr(option,"deb"))
@@ -374,6 +374,7 @@ void  AliPHOSPIDv1::MakeRecParticles(){
   TObjArray * cpvRecPoints = gime->CpvRecPoints() ; 
   TClonesArray * trackSegments = gime->TrackSegments() ; 
   TClonesArray * recParticles  = gime->RecParticles() ; 
+  recParticles->Clear();
 
   TIter next(trackSegments) ; 
   AliPHOSTrackSegment * ts ; 
@@ -480,8 +481,6 @@ void  AliPHOSPIDv1::WriteRecParticles(Int_t event)
   AliPHOSGetter *gime = AliPHOSGetter::GetInstance() ; 
   TClonesArray * recParticles = gime->RecParticles() ; 
 
-  gAlice->GetEvent(event) ; 
-
   //Make branch in TreeR for RecParticles 
   char * filename = 0;
   if(gSystem->Getenv("CONFIG_SPLIT_FILE")!=0){   //generating file name
@@ -616,7 +615,7 @@ void AliPHOSPIDv1::PrintRecParticles(Option_t * option)
   TClonesArray * recParticles = gime->RecParticles() ; 
 
  
-  cout << "AliPHOSPIDv1: " << endl ;
+  cout << "AliPHOSPIDv1: event "<<gAlice->GetEvNumber()  << endl ;
   cout << "       found " << recParticles->GetEntriesFast() << " RecParticles " << endl ;
 
   if(strstr(option,"all")) {  // printing found TS

diff --git a/PHOS/AliPHOSSDigitizer.cxx b/PHOS/AliPHOSSDigitizer.cxx
index 113a6367794e6d9ccec532befa3b1621a970e1f4..07ccb99ac6cde1658a0847d94d15496229a3d449 100644 (file)
--- a/PHOS/AliPHOSSDigitizer.cxx
+++ b/PHOS/AliPHOSSDigitizer.cxx
@@ -339,7 +339,7 @@ void AliPHOSSDigitizer::PrintSDigits(Option_t * option)
   AliPHOSGetter * gime = AliPHOSGetter::GetInstance() ; 
   TClonesArray * sdigits = gime->SDigits(GetName()) ; 
 
-  cout << "AliPHOSSDigitizer: " << endl ;
+  cout << "AliPHOSSDigitizer: event "<<gAlice->GetEvNumber() << endl ;
   cout << "       Number of entries in SDigits list  " << sdigits->GetEntriesFast() << endl ;
   cout << endl ;
   

diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.cxx b/PHOS/AliPHOSTrackSegmentMakerv1.cxx
index c1c682c27c21b98342feb0068673d4ed2f03fc71..9ee66ce84a8cb4719763da9fd82c1d331a077f20 100644 (file)
--- a/PHOS/AliPHOSTrackSegmentMakerv1.cxx
+++ b/PHOS/AliPHOSTrackSegmentMakerv1.cxx
@@ -138,7 +138,6 @@ void  AliPHOSTrackSegmentMakerv1::FillOneModule()
        (((AliPHOSRecPoint *) emcRecPoints->At(fEmcLast))->GetPHOSMod() == fModule ); 
       fEmcLast ++)  ;
   
-  
   //Now CPV clusters
   Int_t totalCpv = cpvRecPoints->GetEntriesFast() ;
 
@@ -303,7 +302,7 @@ void  AliPHOSTrackSegmentMakerv1::MakePairs()
   TObjArray * cpvRecPoints = gime->CpvRecPoints() ; 
   TClonesArray * trackSegments = gime->TrackSegments() ; 
   
-  //Make arrays to mark clusters already chousen
+  //Make arrays to mark clusters already chosen
   Int_t * emcExist = 0;
   if(fEmcLast > fEmcFirst)
     emcExist = new Int_t[fEmcLast-fEmcFirst] ;
@@ -436,8 +435,11 @@ void  AliPHOSTrackSegmentMakerv1::Exec(Option_t * option)
   Int_t ievent ;
 
   for(ievent = 0; ievent < nevents; ievent++){
+    gAlice->GetEvent(ievent) ;
+    gAlice->SetEvent(ievent) ;
+
     if(!ReadRecPoints(ievent))  //reads RecPoints for event ievent
-      return;
+      continue;
     
     for(fModule = 1; fModule <= geom->GetNModules() ; fModule++ ){
       
@@ -501,10 +503,6 @@ Bool_t AliPHOSTrackSegmentMakerv1::ReadRecPoints(Int_t event)
   fPpsdFirst= 0 ;   
   fPpsdLast = 0 ;   
 
-
-  gAlice->GetEvent(event) ;
-  gAlice->SetEvent(event) ;
-
   // Get TreeR header from file
   if(gAlice->TreeR()==0){
     cerr << "ERROR: AliPHOSTrackSegmentMakerv1::ReadRecPoints -> There is no Reconstruction Tree" << endl;
@@ -554,7 +552,9 @@ Bool_t AliPHOSTrackSegmentMakerv1::ReadRecPoints(Int_t event)
   TObjArray * cpvRecPoints = gime->CpvRecPoints() ;
   cpvRecPoints->Clear() ; 
   cpvbranch->SetAddress(&cpvRecPoints) ;
- 
+
+  TClonesArray * trackSegments = gime->TrackSegments() ; 
+  trackSegments->Clear() ;
 
   AliPHOSClusterizer * clusterizer = 0 ; 
   clusterizerbranch->SetAddress(&clusterizer) ;
@@ -565,7 +565,10 @@ Bool_t AliPHOSTrackSegmentMakerv1::ReadRecPoints(Int_t event)
 
   emcbranch->GetEntry(0) ;
   cpvbranch->GetEntry(0) ;
+
   clusterizerbranch->GetEntry(0) ;
+
+  printf("ReadRecPoint: EMC=%d, CPV=%d\n",emcRecPoints->GetEntries(),cpvRecPoints->GetEntries());
   
   return kTRUE ;
   
@@ -585,8 +588,6 @@ void AliPHOSTrackSegmentMakerv1::WriteTrackSegments(Int_t event)
   AliPHOSGetter *gime = AliPHOSGetter::GetInstance() ; 
   TClonesArray * trackSegments = gime->TrackSegments() ; 
 
-  gAlice->GetEvent(event) ; 
-
   //Make branch in TreeR for TrackSegments 
   char * filename = 0;
   if(gSystem->Getenv("CONFIG_SPLIT_FILE")!=0){   //generating file name
@@ -642,7 +643,7 @@ void AliPHOSTrackSegmentMakerv1::PrintTrackSegments(Option_t * option)
 
   TClonesArray * trackSegments = AliPHOSGetter::GetInstance()->TrackSegments() ; 
   
-  cout << "AliPHOSTrackSegmentMakerv1: " << endl ;
+  cout << "AliPHOSTrackSegmentMakerv1: event "<<gAlice->GetEvNumber()  << endl ;
   cout << "       Found " << trackSegments->GetEntriesFast() << "  trackSegments " << endl ;
   
   if(strstr(option,"all")) {  // printing found TS