Merge branch 'master' of https://git.cern.ch/reps/AliRoot

[u/mrichter/AliRoot.git] / ACORDE / AliACORDEDigitizer.cxx

diff --git a/ACORDE/AliACORDEDigitizer.cxx b/ACORDE/AliACORDEDigitizer.cxx
index 9cb1507ce78396dfd4ad29799b05a39a7097ef89..ec780d2fedbb40fb4c8a9ee01ebbcb33793ceef5 100644 (file)
--- a/ACORDE/AliACORDEDigitizer.cxx
+++ b/ACORDE/AliACORDEDigitizer.cxx
@@ -34,7 +34,7 @@
 #include "AliACORDEhit.h"
 #include "AliRunLoader.h"
 #include "AliLoader.h"
-#include "AliRunDigitizer.h"
+#include "AliDigitizationInput.h"
 #include "AliCDBManager.h"
 #include "AliCDBStorage.h"
 #include "AliCDBEntry.h"
@@ -56,8 +56,8 @@ AliACORDEDigitizer::AliACORDEDigitizer()
   // default constructor
 }
 
-AliACORDEDigitizer::AliACORDEDigitizer(AliRunDigitizer* manager)
-  :AliDigitizer(manager),
+AliACORDEDigitizer::AliACORDEDigitizer(AliDigitizationInput* digInput)
+  :AliDigitizer(digInput),
    fCalibData(GetCalibData()),
    fNdigits(0),
    fDigits(0)
@@ -89,7 +89,7 @@ Bool_t AliACORDEDigitizer::Init()
   return kTRUE;
 }
 
-void AliACORDEDigitizer::Exec(Option_t* /*option*/)
+void AliACORDEDigitizer::Digitize(Option_t* /*option*/)
 {
 
   // Creates digits from hits
@@ -128,7 +128,7 @@ void AliACORDEDigitizer::Exec(Option_t* /*option*/)
 
   // 2.- get loaders
   AliRunLoader* outRunLoader =
-    AliRunLoader::GetRunLoader(fManager->GetOutputFolderName());
+    AliRunLoader::GetRunLoader(fDigInput->GetOutputFolderName());
   if (!outRunLoader) {
     Error("Exec", "Can not get output Run Loader");
     return;}
@@ -146,9 +146,9 @@ void AliACORDEDigitizer::Exec(Option_t* /*option*/)
   treeD->Branch("ACORDEdigit", &fDigits, bufsize);
   
   // 3. loop over inputs
-  for (Int_t iInput = 0; iInput < fManager->GetNinputs(); iInput++) {
+  for (Int_t iInput = 0; iInput < fDigInput->GetNinputs(); iInput++) {
     AliRunLoader* runLoader =
-      AliRunLoader::GetRunLoader(fManager->GetInputFolderName(iInput));
+      AliRunLoader::GetRunLoader(fDigInput->GetInputFolderName(iInput));
     AliLoader* loader = runLoader->GetLoader("ACORDELoader");
     if (!loader) {
       Error("Exec", "Can not get ACORDE Loader for input %d", iInput);
@@ -215,9 +215,10 @@ void AliACORDEDigitizer::Exec(Option_t* /*option*/)
        tracks[1] = PlasticTracks[1][i];
       if(moduls[i]==1) {
        mods = i;
-       Float_t module_time = (PlasticTimes[0][i] > PlasticTimes[1][i] ? 
-                              PlasticTimes[0][i] : PlasticTimes[1][i]);
-       AddDigit(tracks, mods, module_time);
+       //      Float_t module_time = (PlasticTimes[0][i] > PlasticTimes[1][i] ? 
+       //                             PlasticTimes[0][i] : PlasticTimes[1][i]);
+       //      AddDigit(tracks, mods, module_time);
+       AddDigit(tracks, mods, 0);
       }
     }
   }
@@ -269,7 +270,7 @@ AliACORDECalibData* AliACORDEDigitizer::GetCalibData() const
     AliWarning("Load of calibration data from default storage failed!");
     AliWarning("Calibration data will be loaded from local storage ($ALICE_ROOT)");
     Int_t runNumber = man->GetRun();
-    entry = man->GetStorage("local://$ALICE_ROOT")
+    entry = man->GetStorage("local://$ALICE_ROOT/OCDB")
       ->Get("ACORDE/Calib/Data",runNumber);
 
   }