Changes default values of pin noise and emc threshold

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

diff --git a/PHOS/AliPHOSDigitizer.cxx b/PHOS/AliPHOSDigitizer.cxx
index 6f849eeb9d93bd687ed4e1e2c3a3ff99d73b249b..6c6ad8b8ada88fd7ee9c6729ac2c98d90a32890f 100644 (file)
--- a/PHOS/AliPHOSDigitizer.cxx
+++ b/PHOS/AliPHOSDigitizer.cxx
@@ -86,8 +86,8 @@ ClassImp(AliPHOSDigitizer)
 {
   // ctor
 
-  fPinNoise           = 0.01 ;
-  fEMCDigitThreshold  = 0.01 ;
+  fPinNoise           = 0.004 ;
+  fEMCDigitThreshold  = 0.012 ;
   fCPVNoise           = 0.01;
   fCPVDigitThreshold  = 0.09 ;
   fTimeResolution     = 0.5e-9 ;
@@ -178,8 +178,10 @@ void AliPHOSDigitizer::Digitize(const Int_t event)
   TObjArray * sdigArray = new TObjArray(2) ;
   while ( (folder = (TFolder*)next()) ) 
     if ( (sdigits = (TClonesArray*)folder->FindObject(GetName()) ) ) {
+      TString fileName(folder->GetName()) ;
+      fileName.ReplaceAll("_","/") ;
       cout << "INFO: AliPHOSDigitizer::Digitize -> Adding SDigits " 
-          << GetName() << " from " << folder->GetName() << endl ; 
+          << GetName() << " from " << fileName << endl ; 
       sdigArray->AddAt(sdigits, input) ;
       input++ ;
     }
@@ -510,7 +512,7 @@ Bool_t AliPHOSDigitizer::Init()
     
   if(fManager)
     SetTitle("aliroot") ;
-  else if (!GetTitle()) 
+  else if (strcmp(GetTitle(),"")==0) 
    SetTitle("galice.root") ;
 
   if( strcmp(GetName(), "") == 0 )
@@ -770,9 +772,7 @@ void AliPHOSDigitizer::WriteDigits(Int_t event)
     cwd->cd();
   }
   
-  digitsBranch->Fill() ;      
-  digitizerBranch->Fill() ;
-
-  treeD->Write(0,kOverwrite) ;  
+  digitsBranch->Fill() ;
+  treeD->AutoSave() ; // Write(0,kOverwrite) ;  
  
 }