X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FAliTOFDigitizer.cxx;h=aa9eb3dc8b62d921556ac9cc94df5a2314ec35d6;hb=f21fc003c20acf4ef162ab5c82e902915a6c92f0;hp=8f39f43df201ac339dd18bb9a6c9f0539526546e;hpb=c0f9fd2dccabc4c92bdbbb0ed2272748272b628f;p=u%2Fmrichter%2FAliRoot.git diff --git a/TOF/AliTOFDigitizer.cxx b/TOF/AliTOFDigitizer.cxx index 8f39f43df20..aa9eb3dc8b6 100644 --- 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" @@ -71,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), @@ -129,7 +129,7 @@ AliTOFDigitizer::~AliTOFDigitizer() //--------------------------------------------------------------------- -void AliTOFDigitizer::Exec(Option_t* /*option*/) +void AliTOFDigitizer::Digitize(Option_t* /*option*/) { // // Perform digitization and merging. @@ -153,7 +153,7 @@ void AliTOFDigitizer::Exec(Option_t* /*option*/) 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; inputFileGetNinputs(); + for (Int_t inputFile=0; inputFileGetNinputs(); 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));