changed range for plot in GammaConv task

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

diff --git a/PHOS/AliPHOSSDigitizer.cxx b/PHOS/AliPHOSSDigitizer.cxx
index 5c595abcb2986540ea2fe143085ce0354a7be78f..3cb16338d7d1022c51b664413bbbcf80a3694839 100644 (file)
--- a/PHOS/AliPHOSSDigitizer.cxx
+++ b/PHOS/AliPHOSSDigitizer.cxx
@@ -56,7 +56,7 @@
 // User case:
 //  root [0] AliPHOSSDigitizer * s = new AliPHOSSDigitizer("galice.root")
 //  Warning in <TDatabasePDG::TDatabasePDG>: object already instantiated
-//  root [1] s->ExecuteTask()
+//  root [1] s->Digitize()
 //             // Makes SDigitis for all events stored in galice.root
 //  root [2] s->SetPedestalParameter(0.001)
 //             // One can change parameters of digitization
@@ -90,7 +90,7 @@ ClassImp(AliPHOSSDigitizer)
            
 //____________________________________________________________________________ 
 AliPHOSSDigitizer::AliPHOSSDigitizer() : 
-  TTask("",""),
+  TNamed("",""),
   fPrimThreshold(0.f),
   fDefaultInit(kTRUE),
   fEventFolderName(""),
@@ -106,7 +106,7 @@ AliPHOSSDigitizer::AliPHOSSDigitizer() :
 //____________________________________________________________________________ 
 AliPHOSSDigitizer::AliPHOSSDigitizer(const char * alirunFileName, 
                                     const char * eventFolderName):
-  TTask("PHOS"+AliConfig::Instance()->GetSDigitizerTaskName(), alirunFileName),
+  TNamed("PHOSSDigitizer", alirunFileName),
   fPrimThreshold(0.f),
   fDefaultInit(kFALSE),
   fEventFolderName(eventFolderName),
@@ -123,7 +123,7 @@ AliPHOSSDigitizer::AliPHOSSDigitizer(const char * alirunFileName,
 
 //____________________________________________________________________________
 AliPHOSSDigitizer::AliPHOSSDigitizer(const AliPHOSSDigitizer& sd) :
-  TTask(sd.GetName(), sd.GetTitle()),
+  TNamed(sd.GetName(), sd.GetTitle()),
   fPrimThreshold(sd.fPrimThreshold),
   fDefaultInit(kFALSE),
   fEventFolderName(sd.fEventFolderName),
@@ -146,15 +146,9 @@ AliPHOSSDigitizer& AliPHOSSDigitizer::operator = (const AliPHOSSDigitizer& qa)
 }
 
 //____________________________________________________________________________ 
-AliPHOSSDigitizer::~AliPHOSSDigitizer() {
+AliPHOSSDigitizer::~AliPHOSSDigitizer() 
+{
   //dtor
-  AliRunLoader* rl = AliRunLoader::GetRunLoader(fEventFolderName) ;
-  if(rl){
-    AliPHOSLoader * phosLoader = 
-      dynamic_cast<AliPHOSLoader*>(rl->GetLoader("PHOSLoader"));
-    if(phosLoader)
-      phosLoader->CleanSDigitizer() ;
-  }
 }
 
 //____________________________________________________________________________ 
@@ -166,12 +160,7 @@ void AliPHOSSDigitizer::Init()
   
   //to prevent cleaning of this object while GetEvent is called
   AliRunLoader* rl = AliRunLoader::GetRunLoader(fEventFolderName) ;
-  if (!rl)
-    rl = AliRunLoader::Open(GetTitle(), fEventFolderName) ; 
-
-  AliPHOSLoader * phosLoader = dynamic_cast<AliPHOSLoader*>(rl->GetLoader("PHOSLoader"));
-  phosLoader->PostSDigitizer(this);
-  phosLoader->GetSDigitsDataLoader()->GetBaseTaskLoader()->SetDoNotReload(kTRUE);
+  if (!rl) AliRunLoader::Open(GetTitle(), fEventFolderName) ; 
 }
 
 //____________________________________________________________________________ 
@@ -183,7 +172,7 @@ void AliPHOSSDigitizer::InitParameters()
 }
 
 //____________________________________________________________________________
-void AliPHOSSDigitizer::Exec(Option_t *option) 
+void AliPHOSSDigitizer::Digitize(Option_t *option) 
 { 
   // Steering method to produce summable digits for events
   // in the range from fFirstEvent to fLastEvent.
@@ -215,17 +204,14 @@ void AliPHOSSDigitizer::Exec(Option_t *option)
   }
 */
   AliRunLoader* rl = AliRunLoader::GetRunLoader(fEventFolderName) ;
-  AliPHOSLoader * phosLoader = dynamic_cast<AliPHOSLoader*>(rl->GetLoader("PHOSLoader"));
-
-  if(!phosLoader) 
-    AliFatal("phosLoader is null pointer!!") ; 
+  AliPHOSLoader * phosLoader = static_cast<AliPHOSLoader*>(rl->GetLoader("PHOSLoader"));
   
   //switch off reloading of this task while getting event
   if (!fInit) { // to prevent overwrite existing file
     AliError( Form("Give a version name different from %s", fEventFolderName.Data()) ) ;
     return ;
   }
-
+  
   if (fLastEvent == -1) 
     fLastEvent = rl->GetNumberOfEvents() - 1 ;
   else 
@@ -257,9 +243,7 @@ void AliPHOSSDigitizer::Exec(Option_t *option)
     //Now make SDigits from hits, for PHOS it is the same, so just copy    
     for ( i = 0 ; i < hits->GetEntries() ; i++ ) {
       
-      AliPHOSHit * hit = dynamic_cast<AliPHOSHit *>(hits->At(i)) ;
-      if(!hit) AliFatal("Wrong conversion to AliPHOSHit gives a null pointer!");
-      
+      AliPHOSHit * hit = static_cast<AliPHOSHit *>(hits->At(i)) ;
       // Assign primary number only if contribution is significant
       
       if( hit->GetEnergy() > fPrimThreshold)
@@ -278,15 +262,12 @@ void AliPHOSSDigitizer::Exec(Option_t *option)
 
     fSDigitsInRun += nSdigits ;  
     sdigits->Expand(nSdigits) ;
-
-    for (i = 0 ; i < nSdigits ; i++) { 
-      
-      AliPHOSDigit * digit = dynamic_cast<AliPHOSDigit *>(sdigits->At(i)) ;
-      if(!digit) AliFatal("Wrong dynamic cast to AliPHOSDigit gives a null pointer!");
-      
+    
+    for (i = 0 ; i < nSdigits ; i++) {       
+      AliPHOSDigit * digit = static_cast<AliPHOSDigit *>(sdigits->At(i)) ;
       digit->SetIndexInList(i) ;     
     }
-
+    
 //    // make Quality Assurance data
 //
 //    if (GetQADataMaker()->IsCycleDone() ) {
@@ -309,7 +290,6 @@ void AliPHOSSDigitizer::Exec(Option_t *option)
     sdigitsBranch->Fill() ;
 
     phosLoader->WriteSDigits("OVERWRITE");
-    phosLoader->WriteSDigitizer("OVERWRITE");
 
     if(strstr(option,"deb"))
       PrintSDigits(option) ;
@@ -403,7 +383,7 @@ void AliPHOSSDigitizer::PrintSDigits(Option_t * option)
     Int_t maxEmc = geom->GetNModules() * geom->GetNCristalsInModule() ;
     Int_t index ;
     for (index = 0 ; index < sdigits->GetEntriesFast(); index++) {
-      digit = dynamic_cast<AliPHOSDigit *>( sdigits->At(index) ) ;
+      digit = static_cast<AliPHOSDigit *>( sdigits->At(index) ) ;
       if(digit->GetId() > maxEmc){
        printf("\n%6d  %8d    %4d      %2d :",
                digit->GetId(), digit->GetAmp(), digit->GetIndexInList(), digit->GetNprimary()) ;  
@@ -421,10 +401,7 @@ void AliPHOSSDigitizer::Unload() const
 {
   // Unloads the objects from the folder
   AliRunLoader* rl = AliRunLoader::GetRunLoader(fEventFolderName) ;
-  AliPHOSLoader * phosLoader = dynamic_cast<AliPHOSLoader*>(rl->GetLoader("PHOSLoader"));
-
-  if(!phosLoader)
-    AliFatal("Wrong dynamic cast from AliRunLoader to AliPHOSLoader gives a null pointer!");
+  AliPHOSLoader * phosLoader = static_cast<AliPHOSLoader*>(rl->GetLoader("PHOSLoader"));
   
   phosLoader->UnloadHits() ; 
   phosLoader->UnloadSDigits() ;