Reading ListOfHits using the entries in treeH, since the primaries in treeK does...

[u/mrichter/AliRoot.git] / PHOS / AliPHOSSDigitizer.cxx

diff --git a/PHOS/AliPHOSSDigitizer.cxx b/PHOS/AliPHOSSDigitizer.cxx
index 92f415792771780511f4f7585bf2a299cc0af041..5cd484e927f58955cd3600625acdde887de92706 100644 (file)
--- a/PHOS/AliPHOSSDigitizer.cxx
+++ b/PHOS/AliPHOSSDigitizer.cxx
@@ -57,11 +57,14 @@
 #include "TROOT.h"
 #include "TFolder.h"
 #include "TBenchmark.h"
+#include "TGeometry.h"
+
 // --- Standard library ---
 #include <iomanip.h>
 
 // --- AliRoot header files ---
 #include "AliRun.h"
+#include "AliHeader.h"
 #include "AliPHOSDigit.h"
 #include "AliPHOSGeometry.h"
 #include "AliPHOSGetter.h"
@@ -89,7 +92,7 @@ AliPHOSSDigitizer::AliPHOSSDigitizer(const char * headerFile, const char * sDigi
   fA             = 0;
   fB             = 10000000.;
   fPrimThreshold = 0.01 ;
-  fSDigitsInRun  = 0 ; 
+  fSDigitsInRun  = 0 ;
   Init();
 }
 
@@ -120,7 +123,6 @@ void AliPHOSSDigitizer::Init()
   sdname.Append(GetTitle() ) ;
   SetName(sdname) ;
   gime->PostSDigitizer(this) ;
-     
 }
 
 //____________________________________________________________________________
@@ -179,13 +181,12 @@ void AliPHOSSDigitizer::Exec(Option_t *option)
     
     
     //Now make SDigits from hits, for PHOS it is the same, so just copy    
-
-//******************** CHECK HERE
-//YS DOES NOT UNDERSTAND THE NEED FOR THE FOLLOWING LOOP
-//     Int_t itrack ;
-//     for (itrack=0; itrack < gAlice->GetNtrack(); itrack++){
-//       //=========== Get the PHOS branch from Hits Tree for the Primary track itrack
-//       gime->Track(itrack) ;
+    Int_t Nprim =  (Int_t)  (gAlice->TreeH())->GetEntries(); 
+    // Attention Nprim is the number of primaries tracked by Geant and this number could be different to the number of Primaries in TreeK;
+    Int_t iprim;
+    for (iprim=0; iprim<Nprim; iprim++) { 
+      //=========== Get the PHOS branch from Hits Tree for the Primary iprim
+      gime->Track(iprim) ;
       Int_t i;
       for ( i = 0 ; i < hits->GetEntries() ; i++ ) {
        AliPHOSHit * hit = dynamic_cast<AliPHOSHit *>(hits->At(i)) ;
@@ -200,44 +201,26 @@ void AliPHOSSDigitizer::Exec(Option_t *option)
        nSdigits++ ;    
        
       }
-//    } // loop over tracks
+    } // loop over iprim
     
     sdigits->Sort() ;
     
     nSdigits = sdigits->GetEntriesFast() ;
     fSDigitsInRun += nSdigits ;  
     sdigits->Expand(nSdigits) ;
-//    Int_t i ;
+    Int_t i ;
     for (i = 0 ; i < nSdigits ; i++) { 
       AliPHOSDigit * digit = dynamic_cast<AliPHOSDigit *>(sdigits->At(i)) ; 
       digit->SetIndexInList(i) ;     
     }
 
     if(gAlice->TreeS() == 0)
-      gAlice->MakeTree("S") ;
-    
-    //Make (if necessary) branches    
-    char * file =0;
-    if(gSystem->Getenv("CONFIG_SPLIT_FILE")){ //generating file name
-      file = new char[strlen(gAlice->GetBaseFile())+20] ;
-      sprintf(file,"%s/PHOS.SDigits.root",gAlice->GetBaseFile()) ;
-    }
-    
-    TDirectory *cwd = gDirectory;
-    
+       gAlice->MakeTree("S") ;
+        
     //First list of sdigits
     Int_t bufferSize = 32000 ;    
     TBranch * sdigitsBranch = gAlice->TreeS()->Branch("PHOS",&sdigits,bufferSize);
     sdigitsBranch->SetTitle(sdname);
-    if (file) {
-      sdigitsBranch->SetFile(file);
-      TIter next( sdigitsBranch->GetListOfBranches());
-      TBranch * subbr;
-      while ((subbr=static_cast<TBranch*>(next()))) {
-       subbr->SetFile(file);
-      }   
-      cwd->cd();
-    } 
       
     //Next - SDigitizer
     Int_t splitlevel = 0 ;
@@ -245,20 +228,9 @@ void AliPHOSSDigitizer::Exec(Option_t *option)
     TBranch * sdigitizerBranch = gAlice->TreeS()->Branch("AliPHOSSDigitizer","AliPHOSSDigitizer",
                                               &sd,bufferSize,splitlevel); 
     sdigitizerBranch->SetTitle(sdname);
-    if (file) {
-      sdigitizerBranch->SetFile(file);
-      TIter next( sdigitizerBranch->GetListOfBranches());
-      TBranch * subbr ;
-      while ((subbr=static_cast<TBranch*>(next()))) {
-       subbr->SetFile(file);
-      }   
-      cwd->cd();
-      delete file;
-    }
+    sdigitsBranch->Fill() ; 
 
-    sdigitsBranch->Fill() ;
-    sdigitizerBranch->Fill() ;
-    gAlice->TreeS()->Write(0,TObject::kOverwrite) ;
+    gAlice->TreeS()->AutoSave() ;
     
     if(strstr(option,"deb"))
       PrintSDigits(option) ;
@@ -275,6 +247,7 @@ void AliPHOSSDigitizer::Exec(Option_t *option)
   
   
 }
+
 //__________________________________________________________________
 void AliPHOSSDigitizer::SetSDigitsBranch(const char * title )
 {
@@ -303,6 +276,41 @@ void AliPHOSSDigitizer::SetSDigitsBranch(const char * title )
   gime->PostSDigits( title, GetTitle()) ; 
 }
 
+//__________________________________________________________________
+void AliPHOSSDigitizer::SetSplitFile(const TString splitFileName) const
+{
+  // Diverts the SDigits in a file separate from the hits file
+  
+  TDirectory * cwd = gDirectory ;
+  TFile * splitFile = gAlice->InitTreeFile("S",splitFileName.Data());
+  splitFile->cd() ; 
+  gAlice->Write();
+  
+  TTree *treeE  = gAlice->TreeE();
+  if (!treeE) {
+    cerr<<"No TreeE found "<<endl;
+    abort() ;
+  }      
+  
+  // copy TreeE
+  AliHeader *header = new AliHeader();
+  treeE->SetBranchAddress("Header", &header);
+  treeE->SetBranchStatus("*",1);
+  TTree *treeENew =  treeE->CloneTree();
+  treeENew->Write();
+  
+  // copy AliceGeom
+  TGeometry *AliceGeom = static_cast<TGeometry*>(cwd->Get("AliceGeom"));
+  if (!AliceGeom) {
+    cerr<<"AliceGeom was not found in the input file "<<endl;
+    abort() ;
+  }
+  AliceGeom->Write();
+  cwd->cd() ; 
+  gAlice->MakeTree("S",splitFile);
+  cout << "INFO: AliPHOSSDigitizer::SetSPlitMode -> SDigits will be stored in " << splitFileName.Data() << endl ; 
+}
+
 //__________________________________________________________________
 void AliPHOSSDigitizer::Print(Option_t* option)const
 {