remove usage old trigger code

diff --git a/MUON/AliMUONDigitizerV3.cxx b/MUON/AliMUONDigitizerV3.cxx
index fb258d0cc97b8ebb423f9610ab2bba61d2f0b907..4ae62678c6b16d5876e45ab43d9d64e9f1fccdb8 100644 (file)
--- a/MUON/AliMUONDigitizerV3.cxx
+++ b/MUON/AliMUONDigitizerV3.cxx
@@ -25,7 +25,6 @@
 #include "AliMUONDataIterator.h"
 #include "AliMUONDigit.h"
 #include "AliMUONSegmentation.h"
-#include "AliMUONTriggerDecisionV1.h"
 #include "AliMUONTriggerEfficiencyCells.h"
 #include "AliMUONTriggerElectronics.h"
 #include "AliMUONVCalibParam.h"
@@ -77,14 +76,12 @@ ClassImp(AliMUONDigitizerV3)
 
 //_____________________________________________________________________________
 AliMUONDigitizerV3::AliMUONDigitizerV3(AliRunDigitizer* manager, 
-                                       ETriggerCodeVersion triggerCodeVersion,
                                        Bool_t generateNoisyDigits)
 : AliDigitizer(manager),
 fIsInitialized(kFALSE),
 fOutputData(0x0),
 fCalibrationData(0x0),
 fTriggerProcessor(0x0),
-fTriggerCodeVersion(triggerCodeVersion),
 fTriggerEfficiency(0x0),
 fFindDigitIndexTimer(),
 fGenerateNoisyDigitsTimer(),
@@ -704,20 +701,7 @@ AliMUONDigitizerV3::Init()
   
   fCalibrationData = new AliMUONCalibrationData(runnumber);
   
-  switch (fTriggerCodeVersion)
-  {
-    case kTriggerDecision:
-      fTriggerProcessor = new AliMUONTriggerDecisionV1(fOutputData);
-      break;
-    case kTriggerElectronics:
-      fTriggerProcessor = new AliMUONTriggerElectronics(fOutputData,fCalibrationData);
-      break;
-    default:
-      AliFatal("Unknown trigger processor type");
-      break;
-  }
-  AliDebug(1,Form("Using the following trigger code %s - %s",
-                  fTriggerProcessor->GetName(),fTriggerProcessor->GetTitle()));
+  fTriggerProcessor = new AliMUONTriggerElectronics(fOutputData,fCalibrationData);
   
   if ( muon()->GetTriggerEffCells() )
   {

diff --git a/MUON/AliMUONDigitizerV3.h b/MUON/AliMUONDigitizerV3.h
index 838db20e5e65ad9693b350abb9248eb92f642163..fd360843ae0d2a0afd44179721ca89fb671efa48 100644 (file)
--- a/MUON/AliMUONDigitizerV3.h
+++ b/MUON/AliMUONDigitizerV3.h
@@ -31,14 +31,7 @@ class TString;
 class AliMUONDigitizerV3 : public AliDigitizer
 {
 public:
-  enum ETriggerCodeVersion
-  {
-    kTriggerDecision=-1,
-    kTriggerElectronics
-  };
-  
   AliMUONDigitizerV3(AliRunDigitizer* manager=0, 
-                     ETriggerCodeVersion=kTriggerDecision,
                      Bool_t generateNoisyDigits=kTRUE);
   virtual ~AliMUONDigitizerV3();
 
@@ -79,7 +72,6 @@ private:
   AliMUONData* fOutputData; //!< pointer to access digits
   AliMUONCalibrationData* fCalibrationData; //!< pointer to access calib parameters
   TTask* fTriggerProcessor; ///< pointer to the trigger part of the job
-  ETriggerCodeVersion fTriggerCodeVersion; ///< which version of trigger job
   AliMUONTriggerEfficiencyCells* fTriggerEfficiency; ///< trigger efficiency map  
   mutable TStopwatch fFindDigitIndexTimer; //!< counting time spent in FindDigitIndex
   TStopwatch fGenerateNoisyDigitsTimer; //!< counting time spent in GenerateNoisyDigits()