Remove TriggerCircuit, not needed anymore (Christian)

diff --git a/MUON/AliMUON.cxx b/MUON/AliMUON.cxx
index 0597a7004d13028330f1259c2a626487733a5f17..ec858732176875e914ab126e7e695f547b353167 100644 (file)
--- a/MUON/AliMUON.cxx
+++ b/MUON/AliMUON.cxx
@@ -57,7 +57,6 @@
 #include "AliMUONHit.h"        
 #include "AliMUONRawCluster.h"
 #include "AliMUONTransientDigit.h"
-#include "AliMUONTriggerCircuitNew.h"
 #include "AliMUONGeometry.h"
 #include "AliMUONGeometryTransformer.h"
 #include "AliMUONGeometryBuilder.h"
@@ -105,7 +104,6 @@ AliMUON::AliMUON()
     fMUONData(0),
     fSplitLevel(0),
     fChambers(0),
-    fTriggerCircuitsNew(0),
     fGeometryBuilder(0),
     fSegmentation(0),
     fAccCut(kFALSE),
@@ -143,7 +141,6 @@ AliMUON::AliMUON(const char *name, const char *title,
     fMUONData(0),
     fSplitLevel(0),
     fChambers(0),
-    fTriggerCircuitsNew(0),
     fGeometryBuilder(0),
     fSegmentation(0),
     fAccCut(kFALSE),
@@ -207,12 +204,7 @@ AliMUON::AliMUON(const char *name, const char *title,
        }
       } // Chamber stCH (0, 1) in 
     }     // Station st (0...)
-    
-// trigger circuits
-    fTriggerCircuitsNew = new TObjArray(AliMUONConstants::NTriggerCircuit());
-    for (Int_t circ=0; circ<AliMUONConstants::NTriggerCircuit(); circ++) {
-      fTriggerCircuitsNew->AddAt(new AliMUONTriggerCircuitNew(),circ);          
-    }
+
 }
 
 //____________________________________________________________________
@@ -227,10 +219,6 @@ AliMUON::~AliMUON()
     fChambers->Delete();
     delete fChambers;
   }
-  if (fTriggerCircuitsNew){
-    fTriggerCircuitsNew->Delete();
-    delete fTriggerCircuitsNew;
-  }
   
   delete fMUONData;
   delete fGeometryBuilder;

diff --git a/MUON/AliMUON.h b/MUON/AliMUON.h
index 13e1117b8a90a6a602478b897657d64854e9abfd..b5e7641aa8d77823a4cc711b3d6472f3a259c496 100644 (file)
--- a/MUON/AliMUON.h
+++ b/MUON/AliMUON.h
@@ -25,7 +25,6 @@ class TFile;
 class TTree;
 
 class AliLoader;
-class AliMUONTriggerCircuitNew;
 class AliMUONData;
 class AliMUONResponse;
 class AliMUONSegmentation;
@@ -141,8 +140,6 @@ class AliMUON : public  AliDetector
     virtual AliMUONChamber& Chamber(Int_t id)
       {return *((AliMUONChamber *) (*fChambers)[id]);}
                   /// Return reference to New Circuit \a id 
-    virtual AliMUONTriggerCircuitNew& TriggerCircuitNew(Int_t id)
-       {return *((AliMUONTriggerCircuitNew*) (*fTriggerCircuitsNew)[id]);}
 
     // Return pointers to digit
     AliMUONRawCluster    *RawCluster(Int_t ichamber, Int_t icathod,
@@ -164,7 +161,6 @@ class AliMUON : public  AliDetector
     AliMUONData*          fMUONData;           ///< Data container for MUON subsystem  
     Int_t                 fSplitLevel;         ///< Splitlevel when making branches in outfiles.
     TObjArray*            fChambers;           ///< List of Tracking Chambers
-    TObjArray*            fTriggerCircuitsNew; ///< List of Trigger Circuits
     AliMUONGeometryBuilder*  fGeometryBuilder; ///< Geometry builder 
     AliMUONSegmentation*  fSegmentation;       ///< New segmentation 
    

diff --git a/MUON/AliMUONv1.cxx b/MUON/AliMUONv1.cxx
index 756cfc41ab686debbfcd003cc04ba84c96bd7c9c..5c5f4ca8c1a8066a7b1675f4e747de42b9a398f8 100644 (file)
--- a/MUON/AliMUONv1.cxx
+++ b/MUON/AliMUONv1.cxx
@@ -27,8 +27,6 @@
 #include "AliMUONResponseFactory.h"
 #include "AliMUONSegmentation.h"
 #include "AliMUONHit.h"
-#include "AliMUONTriggerCircuitNew.h"
-#include "AliMUONTriggerCrateStore.h"
 #include "AliMUONGeometryBuilder.h"    
 #include "AliMUONGeometry.h"   
 #include "AliMUONGeometryTransformer.h"        
@@ -193,15 +191,6 @@ void AliMUONv1::Init()
   // Initialize segmentation
   //
   fSegmentation->Init();
-
-  // Initialize trigger circuits
-  AliMUONTriggerCrateStore store;
-  store.ReadFromFile();
-  for (Int_t i=0; i<AliMUONConstants::NTriggerCircuit(); i++)  
-  {
-    AliMUONTriggerCircuitNew* c = (AliMUONTriggerCircuitNew*)(fTriggerCircuitsNew->At(i));
-    c->Init(i,store);
-  }
   
 }