X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUON.cxx;h=293c403c694d6856f5bc8e2eeb659b3bbb1de1aa;hb=68e015fa3e792a59235f42e9cea01f36ab33d1d6;hp=31c0bb3417fb19f6c64b0b3b3b85743f35aab073;hpb=05315e710a77b08084a05ec4438e8fd1bed44645;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUON.cxx b/MUON/AliMUON.cxx
index 31c0bb3417f..293c403c694 100644
--- a/MUON/AliMUON.cxx
+++ b/MUON/AliMUON.cxx
@@ -55,7 +55,7 @@
 
 #include "AliLoader.h"
 #include "AliCDBManager.h"
-#include "AliRunDigitizer.h"
+#include "AliDigitizationInput.h"
 #include "AliMC.h"
 #include "AliRun.h"
 #include "AliRawDataHeaderSim.h"
@@ -100,9 +100,9 @@ AliMUON::AliMUON()
     fCurIterPad(0),
     fIsMaxStep(kTRUE),
     fTriggerScalerEvent(kFALSE),
-    fTriggerResponseV1(kFALSE),
+    fTriggerResponseV1(0),
     fTriggerCoinc44(0),
-    fTriggerEffCells(0),
+    fTriggerEffCells(kTRUE),
     fDigitizerWithNoise(1),
     fDigitizerNSigmas(4.0),
     fIsTailEffect(kTRUE),
@@ -139,9 +139,9 @@ AliMUON::AliMUON(const char *name, const char* title)
     fCurIterPad(0),
     fIsMaxStep(kTRUE),
     fTriggerScalerEvent(kFALSE),
-    fTriggerResponseV1(kFALSE),
+    fTriggerResponseV1(0),
     fTriggerCoinc44(0),
-    fTriggerEffCells(0),
+    fTriggerEffCells(kTRUE),
     fDigitizerWithNoise(1),
     fDigitizerNSigmas(4.0),
     fIsTailEffect(kTRUE),
@@ -439,11 +439,11 @@ void   AliMUON::SetResponseModel(Int_t id, const AliMUONResponse& response)
 }
 
 //____________________________________________________________________
-AliDigitizer* AliMUON::CreateDigitizer(AliRunDigitizer* manager) const
+AliDigitizer* AliMUON::CreateDigitizer(AliDigitizationInput* digInput) const
 {
 /// Return digitizer
   
-  AliMUONDigitizerV3* digitizer = new AliMUONDigitizerV3(manager, fDigitizerWithNoise);
+  AliMUONDigitizerV3* digitizer = new AliMUONDigitizerV3(digInput, fDigitizerWithNoise);
   AliMUONDigitizerV3::SetNSigmas(fDigitizerNSigmas);
   digitizer->SetCalibrationData(fCalibrationData,GetRecoParam());
   return digitizer;
@@ -466,7 +466,7 @@ void AliMUON::Hits2SDigits()
 /// Perform Hits2Digits using SDigitizerV2
   
   AliMUONSDigitizerV2 sdigitizer;
-  sdigitizer.ExecuteTask();
+  sdigitizer.Digitize();
 }
 
 //_____________________________________________________________________
@@ -608,7 +608,7 @@ AliMUON::ResetGeometryBuilder()
 }
 
 //____________________________________________________________________
-Bool_t  AliMUON::GetTriggerResponseV1() const
+Int_t  AliMUON::GetTriggerResponseV1() const
 {
 ///
 /// Returns fTriggerResponseV1