Fix compiler problems

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

diff --git a/PHOS/AliPHOSSDigitizer.cxx b/PHOS/AliPHOSSDigitizer.cxx
index 9d3f8938cfbf293e83f318debcd7b471ca2d3f4a..65a73193f25143a1065f057b5046d4ab8cd1f7c9 100644 (file)
--- a/PHOS/AliPHOSSDigitizer.cxx
+++ b/PHOS/AliPHOSSDigitizer.cxx
@@ -16,6 +16,11 @@
 
 /* $Id$ */
 
+/* History of cvs commits:
+ *
+ * $Log$
+ */
+
 //_________________________________________________________________________
 // This is a TTask that makes SDigits out of Hits
 // The name of the TTask is also the title of the branch that will contain 
@@ -52,16 +57,18 @@
 
 // --- ROOT system ---
 #include "TBenchmark.h"
-#include "TRandom.h"
+               //#include "TObjectTable.h"
 
 // --- Standard library ---
 
 // --- AliRoot header files ---
+#include "AliLog.h"
 #include "AliPHOSGeometry.h" 
 #include "AliPHOSDigit.h"
 #include "AliPHOSGetter.h"
 #include "AliPHOSHit.h"
 #include "AliPHOSSDigitizer.h"
+               //#include "AliMemoryWatcher.h"
 
 ClassImp(AliPHOSSDigitizer)
 
@@ -70,17 +77,19 @@ ClassImp(AliPHOSSDigitizer)
   AliPHOSSDigitizer::AliPHOSSDigitizer():TTask("","")
 {
   // ctor
-  InitParameters() ;
+  fFirstEvent = fLastEvent  = 0 ;  
   fDefaultInit = kTRUE ; 
 }
 
 //____________________________________________________________________________ 
-AliPHOSSDigitizer::AliPHOSSDigitizer(const char * alirunFileName, const char * eventFolderName):
-  TTask("PHOS"+AliConfig::fgkSDigitizerTaskName, alirunFileName),
+AliPHOSSDigitizer::AliPHOSSDigitizer(const char * alirunFileName, 
+                                    const char * eventFolderName):
+  TTask("PHOS"+AliConfig::Instance()->GetSDigitizerTaskName(), alirunFileName),
   fEventFolderName(eventFolderName)
 {
 
   // ctor
+  fFirstEvent = fLastEvent  = 0 ; // runs one event by defaut  
   InitParameters() ; 
   Init();
   fDefaultInit = kFALSE ; 
@@ -92,6 +101,8 @@ AliPHOSSDigitizer::AliPHOSSDigitizer(const AliPHOSSDigitizer & sd)
 {
   //cpy ctor 
 
+  fFirstEvent    = sd.fFirstEvent ; 
+  fLastEvent     = sd.fLastEvent ;
   fA             = sd.fA ;
   fB             = sd.fB ;
   fPrimThreshold = sd.fPrimThreshold ;
@@ -105,8 +116,10 @@ AliPHOSSDigitizer::AliPHOSSDigitizer(const AliPHOSSDigitizer & sd)
 //____________________________________________________________________________ 
 AliPHOSSDigitizer::~AliPHOSSDigitizer() {
   //dtor
+  //  AliPHOSGetter * gime =
+  //  AliPHOSGetter::Instance(GetTitle(),fEventFolderName.Data());  
   AliPHOSGetter * gime =
-    AliPHOSGetter::Instance(GetTitle(),fEventFolderName.Data());  
+    AliPHOSGetter::Instance();  
   gime->PhosLoader()->CleanSDigitizer();
 }
 //____________________________________________________________________________ 
@@ -130,7 +143,7 @@ void AliPHOSSDigitizer::Init()
 
   gime->PostSDigitizer(this);
   gime->PhosLoader()->GetSDigitsDataLoader()->GetBaseTaskLoader()->SetDoNotReload(kTRUE);
-  
+ 
 }
 
 //____________________________________________________________________________ 
@@ -141,7 +154,6 @@ void AliPHOSSDigitizer::InitParameters()
   fB             = 10000000.;
   fPrimThreshold = 0.01 ;
   fSDigitsInRun  = 0 ;
-  SetEventRange(0,-1) ;
 }
 
 //____________________________________________________________________________
@@ -167,22 +179,22 @@ void AliPHOSSDigitizer::Exec(Option_t *option)
 
   //switch off reloading of this task while getting event
   if (!fInit) { // to prevent overwrite existing file
-    Error( "Exec", "Give a version name different from %s", fEventFolderName.Data() ) ;
+    AliError( Form("Give a version name different from %s", fEventFolderName.Data()) ) ;
     return ;
   }
 
-
   if (fLastEvent == -1) 
     fLastEvent = gime->MaxEvent() - 1 ;
   else 
-    fLastEvent = TMath::Min(fLastEvent,gime->MaxEvent());
+    fLastEvent = TMath::Min(fFirstEvent, gime->MaxEvent()); // only ine event at the time 
   Int_t nEvents   = fLastEvent - fFirstEvent + 1;
   
   Int_t ievent ;
-  for (ievent = fFirstEvent; ievent <= fLastEvent; ievent++) {
 
-    gime->Event(ievent,"H") ;
+  //AliMemoryWatcher memwatcher;
 
+  for (ievent = fFirstEvent; ievent <= fLastEvent; ievent++) {    
+    gime->Event(ievent,"H") ;   
     TTree * treeS = gime->TreeS(); 
     TClonesArray * hits = gime->Hits() ;
     TClonesArray * sdigits = gime->SDigits() ;
@@ -197,10 +209,10 @@ void AliPHOSSDigitizer::Exec(Option_t *option)
     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)) ;
-       // Assign primary number only if contribution is significant
+     Int_t i;
+       for ( i = 0 ; i < hits->GetEntries() ; i++ ) {
+       AliPHOSHit * hit = dynamic_cast<AliPHOSHit *>(hits->At(i)) ;
+       // Assign primary number only if contribution is significant
        
        if( hit->GetEnergy() > fPrimThreshold)
          new((*sdigits)[nSdigits]) AliPHOSDigit(hit->GetPrimary(),hit->GetId(),
@@ -210,7 +222,7 @@ void AliPHOSSDigitizer::Exec(Option_t *option)
                                                  Digitize(hit->GetEnergy()), hit->GetTime()) ;
        nSdigits++ ;    
        
-      }
+       }
  
     } // loop over iprim
 
@@ -242,24 +254,31 @@ void AliPHOSSDigitizer::Exec(Option_t *option)
     //Next - SDigitizer
 
     gime->WriteSDigitizer("OVERWRITE");
-
+    //gObjectTable->Print() ; 
+  
     if(strstr(option,"deb"))
       PrintSDigits(option) ;
-  }
+      
+    //memwatcher.Watch(ievent); 
+  }// event loop
   
   Unload();
 
-  gime->PhosLoader()->GetSDigitsDataLoader()->GetBaseTaskLoader()->SetDoNotReload(kTRUE);
+  //  gime->PhosLoader()->GetSDigitsDataLoader()->GetBaseTaskLoader()->SetDoNotReload(kTRUE);
   
   if(strstr(option,"tim")){
     gBenchmark->Stop("PHOSSDigitizer");
     Info("Exec","   took %f seconds for SDigitizing  %f seconds per event",
         gBenchmark->GetCpuTime("PHOSSDigitizer"), gBenchmark->GetCpuTime("PHOSSDigitizer")/nEvents) ;
   }
+  
+  //TFile f("out.root","RECREATE");
+  //memwatcher.WriteToFile(); 
+  //f.Close();
 }
 
 //__________________________________________________________________
-void AliPHOSSDigitizer::Print()const
+void AliPHOSSDigitizer::Print(const Option_t *)const
 {
   // Prints parameters of SDigitizer
   Info("Print", "\n------------------- %s -------------", GetName() ) ; 
@@ -306,7 +325,7 @@ void AliPHOSSDigitizer::PrintSDigits(Option_t * option)
       digit = dynamic_cast<AliPHOSDigit *>( sdigits->At(index) ) ;
       //  if(digit->GetNprimary() == 0) 
       //       continue;
-      printf("%6d  %8d    %6.5e %4d      %2d :",
+      printf("%6d  %8d    %6.5e %4d      %2d :\n",
              digit->GetId(), digit->GetAmp(), digit->GetTime(), digit->GetIndexInList(), digit->GetNprimary()) ;  
       Int_t iprimary;
       for (iprimary=0; iprimary<digit->GetNprimary(); iprimary++) {