Remove TriggerCircuit, not needed anymore (Christian)

[u/mrichter/AliRoot.git] / MUON / AliMUON.cxx

diff --git a/MUON/AliMUON.cxx b/MUON/AliMUON.cxx
index 9e862ad6fa79e47930cc25409f426f03f953cd15..ec858732176875e914ab126e7e695f547b353167 100644 (file)
--- a/MUON/AliMUON.cxx
+++ b/MUON/AliMUON.cxx
@@ -57,8 +57,6 @@
 #include "AliMUONHit.h"        
 #include "AliMUONRawCluster.h"
 #include "AliMUONTransientDigit.h"
-#include "AliMUONTriggerCircuit.h"
-#include "AliMUONTriggerCircuitNew.h"
 #include "AliMUONGeometry.h"
 #include "AliMUONGeometryTransformer.h"
 #include "AliMUONGeometryBuilder.h"
@@ -106,8 +104,6 @@ AliMUON::AliMUON()
     fMUONData(0),
     fSplitLevel(0),
     fChambers(0),
-    fTriggerCircuits(0),
-    fTriggerCircuitsNew(0),
     fGeometryBuilder(0),
     fSegmentation(0),
     fAccCut(kFALSE),
@@ -122,6 +118,7 @@ AliMUON::AliMUON()
     fTriggerScalerEvent(kFALSE),
     fTriggerResponseV1(kFALSE),
     fTriggerCoinc44(0),
+    fTriggerEffCells(0),
     fSDigitizerType(""),
     fDigitizerType(""),
     fRawWriter(0x0),
@@ -144,8 +141,6 @@ AliMUON::AliMUON(const char *name, const char *title,
     fMUONData(0),
     fSplitLevel(0),
     fChambers(0),
-    fTriggerCircuits(0),
-    fTriggerCircuitsNew(0),
     fGeometryBuilder(0),
     fSegmentation(0),
     fAccCut(kFALSE),
@@ -160,6 +155,7 @@ AliMUON::AliMUON(const char *name, const char *title,
     fTriggerScalerEvent(kFALSE),
     fTriggerResponseV1(kFALSE),
     fTriggerCoinc44(0),
+    fTriggerEffCells(0),
     fSDigitizerType(sDigitizerClassName),
     fDigitizerType(digitizerClassName),
     fRawWriter(0x0),
@@ -208,17 +204,7 @@ AliMUON::AliMUON(const char *name, const char *title,
        }
       } // Chamber stCH (0, 1) in 
     }     // Station st (0...)
-    
-    // cp new design of AliMUONTriggerDecision
-    fTriggerCircuits = new TObjArray(AliMUONConstants::NTriggerCircuit());
-    for (Int_t circ=0; circ<AliMUONConstants::NTriggerCircuit(); circ++) {
-      fTriggerCircuits->AddAt(new AliMUONTriggerCircuit(),circ);          
-    }
 
-    fTriggerCircuitsNew = new TObjArray(AliMUONConstants::NTriggerCircuit());
-    for (Int_t circ=0; circ<AliMUONConstants::NTriggerCircuit(); circ++) {
-      fTriggerCircuitsNew->AddAt(new AliMUONTriggerCircuitNew(),circ);          
-    }
 }
 
 //____________________________________________________________________
@@ -233,14 +219,6 @@ AliMUON::~AliMUON()
     fChambers->Delete();
     delete fChambers;
   }
-  if (fTriggerCircuits){
-    fTriggerCircuits->Delete();
-    delete fTriggerCircuits;
-  }
-  if (fTriggerCircuitsNew){
-    fTriggerCircuitsNew->Delete();
-    delete fTriggerCircuitsNew;
-  }
   
   delete fMUONData;
   delete fGeometryBuilder;
@@ -443,26 +421,14 @@ AliDigitizer* AliMUON::CreateDigitizer(AliRunDigitizer* manager) const
   
   AliInfo(Form("Digitizer used : %s",fDigitizerType.Data()));
   
-  if ( fDigitizerType == "digitizer:default" )
-  {
-    return new AliMUONDigitizerv2(manager);
-  }
-  else if ( fDigitizerType == "digitizer:NewDigitizerNewTrigger" ) 
-  {
-    return new AliMUONDigitizerV3(manager,AliMUONDigitizerV3::kTriggerElectronics);
-  }
-  else if ( fDigitizerType == "digitizer:NewDigitizerOldTrigger" )
+  if ( fDigitizerType == "digitizer:default" ) // NewDigitizerNewTrigger
   {
-    return new AliMUONDigitizerV3(manager,AliMUONDigitizerV3::kTriggerDecision, kFALSE, kFALSE);
+      return new AliMUONDigitizerV3(manager,kTRUE);
+  } 
+  else if ( fDigitizerType == "digitizer:NewDigitizerWONoiseNewTrigger" ) 
+  {                                     
+      return new AliMUONDigitizerV3(manager,kFALSE);
   }
-  else if ( fDigitizerType == "digitizer:NewDigitizerEffTrigger" )
-  {
-    return new AliMUONDigitizerV3(manager,AliMUONDigitizerV3::kTriggerDecision, kTRUE, kFALSE);
-  }  
-  else if ( fDigitizerType == "digitizer:NewDigitizerWithNoiseOldTrigger" )
-  {
-    return new AliMUONDigitizerV3(manager,AliMUONDigitizerV3::kTriggerDecision, kFALSE, kTRUE);
-  }    
   else
   {
     AliFatal(Form("Unknown digitizer type : %s",fDigitizerType.Data()));
@@ -645,5 +611,15 @@ Int_t  AliMUON::GetTriggerCoinc44() const
 ///  
     return fTriggerCoinc44;
     
+}
+
+//____________________________________________________________________
+Bool_t  AliMUON::GetTriggerEffCells() const
+{
+///
+/// Returns fTriggerEffCells
+///  
+    return fTriggerEffCells;
+    
 }