Improved QAchecker and plots for DQM

[u/mrichter/AliRoot.git] / TOF / AliTOFDigitizer.cxx

diff --git a/TOF/AliTOFDigitizer.cxx b/TOF/AliTOFDigitizer.cxx
index 419ab6c92ade8ea07e8c276f6dee64d4f4444578..aa9eb3dc8b62d921556ac9cc94df5a2314ec35d6 100644 (file)
--- a/TOF/AliTOFDigitizer.cxx
+++ b/TOF/AliTOFDigitizer.cxx
@@ -36,7 +36,7 @@
 
 #include "AliLoader.h"
 #include "AliLog.h"
-#include "AliRunDigitizer.h"
+#include "AliDigitizationInput.h"
 #include "AliRunLoader.h"
 #include "AliRun.h"
 
@@ -51,8 +51,6 @@
 #include "AliTOFSDigit.h"
 #include "AliTOF.h"
 
-extern TDirectory *gDirectory;
-//extern TFile *gFile;
 extern TRandom *gRandom;
 
 extern AliRun *gAlice;
@@ -73,8 +71,8 @@ ClassImp(AliTOFDigitizer)
 }
 
 //___________________________________________
-AliTOFDigitizer::AliTOFDigitizer(AliRunDigitizer* manager): 
-  AliDigitizer(manager), 
+AliTOFDigitizer::AliTOFDigitizer(AliDigitizationInput* digInput): 
+  AliDigitizer(digInput), 
   fDigits(new TClonesArray("AliTOFdigit",4000)),
   fSDigitsArray(new TClonesArray("AliTOFSDigit",1000)),
   fhitMap(0x0),
@@ -131,7 +129,7 @@ AliTOFDigitizer::~AliTOFDigitizer()
 
 //---------------------------------------------------------------------
 
-void AliTOFDigitizer::Exec(Option_t* /*option*/)
+void AliTOFDigitizer::Digitize(Option_t* /*option*/)
 {
   //
   // Perform digitization and merging.
@@ -150,10 +148,12 @@ void AliTOFDigitizer::Exec(Option_t* /*option*/)
   AliTOF * tof = (AliTOF *) gAlice->GetDetector("TOF") ;
 
   //Make branches
-  char branchname[20];
-  sprintf (branchname, "%s", tof->GetName ());
+
+  const Int_t kSize = 20;
+  char branchname[kSize];
+  snprintf(branchname,kSize,"%s", tof->GetName ());
  
-  AliRunLoader* outrl = AliRunLoader::GetRunLoader(fManager->GetOutputFolderName());
+  AliRunLoader* outrl = AliRunLoader::GetRunLoader(fDigInput->GetOutputFolderName());
   if (outrl == 0x0)
    {
      AliError("Can not find Run Loader in output folder.");
@@ -184,7 +184,7 @@ void AliTOFDigitizer::Exec(Option_t* /*option*/)
   
   // Loop over files to digitize
 
-  for (Int_t inputFile=0; inputFile<fManager->GetNinputs();
+  for (Int_t inputFile=0; inputFile<fDigInput->GetNinputs();
        inputFile++) {
     ReadSDigit(inputFile);
    }
@@ -306,8 +306,8 @@ void AliTOFDigitizer::ReadSDigit(Int_t inputFile )
   static TClonesArray sdigitsClonesArray("AliTOFSDigit",  1000); 
   sdigitsClonesArray.Clear();
 
-  // get the treeS from manager
-  AliRunLoader* rl = AliRunLoader::GetRunLoader(fManager->GetInputFolderName(inputFile));
+  // get the treeS from digInput
+  AliRunLoader* rl = AliRunLoader::GetRunLoader(fDigInput->GetInputFolderName(inputFile));
   if (rl == 0x0)
    {
      AliError(Form("Can not find Run Loader in input %d folder.",inputFile));
@@ -344,6 +344,7 @@ void AliTOFDigitizer::ReadSDigit(Int_t inputFile )
 
   if(!tofBranch){
     AliFatal(Form("TOF branch not found for input %d",inputFile));
+    return;
   }
   
   tofBranch->SetAddress(&sdigitsDummyContainer);