replacing AliMUONTriggerCircuitNew by AliMUONTriggerCircuitNew

diff --git a/MUON/AliMUONDigitMaker.cxx b/MUON/AliMUONDigitMaker.cxx
index 42a1950a1fb075bb03759b8d48e0a484541f8bd2..27e046017c8f9c1dd086cf185828807eb08fe42b 100644 (file)
--- a/MUON/AliMUONDigitMaker.cxx
+++ b/MUON/AliMUONDigitMaker.cxx
@@ -60,7 +60,7 @@
 #include "AliMUONLocalTriggerBoard.h"
 #include "AliMUONLocalTrigger.h"
 #include "AliMUONGlobalTrigger.h"
-#include "AliMUONTriggerCircuitNew.h"
+#include "AliMUONTriggerCircuit.h"
 
 #include "AliMpSegmentation.h"
 #include "AliMpVSegmentation.h"
@@ -472,7 +472,7 @@ Int_t AliMUONDigitMaker::TriggerDigits(AliMUONLocalTriggerBoard* localBoard,
     if (!xyPattern) continue;
 
     // get detElemId
-    AliMUONTriggerCircuitNew triggerCircuit;
+    AliMUONTriggerCircuit triggerCircuit;
     detElemId = triggerCircuit.DetElemId(iChamber, localBoard->GetName());
     nBoard    = localBoard->GetNumber();
 

diff --git a/MUON/AliMUONReconstructor.cxx b/MUON/AliMUONReconstructor.cxx
index 626d81162e932bc25ba9d906af35d00d5aa8c1d6..913d0e3ddfa6bc8d4b4b72a49cb99c400b64911c 100644 (file)
--- a/MUON/AliMUONReconstructor.cxx
+++ b/MUON/AliMUONReconstructor.cxx
@@ -40,7 +40,7 @@
 #include "AliMUONTrackReconstructor.h"
 #include "AliMUONTrackReconstructorK.h"
 #include "AliMUONTriggerTrack.h"
-#include "AliMUONTriggerCircuitNew.h"
+#include "AliMUONTriggerCircuit.h"
 #include "AliMUONTriggerCrateStore.h"
 
 #include "AliMpSegmentation.h"
@@ -62,7 +62,7 @@ AliMUONReconstructor::AliMUONReconstructor()
     fDigitMaker(new AliMUONDigitMaker()), 
     fCalibrationData(0x0),
     fCrateManager(new AliMUONTriggerCrateStore()),
-    fTriggerCircuit(new TClonesArray("AliMUONTriggerCircuitNew", 234)),
+    fTriggerCircuit(new TClonesArray("AliMUONTriggerCircuit", 234)),
     fTransformer(new AliMUONGeometryTransformer(kTRUE))
 
 {
@@ -80,11 +80,11 @@ AliMUONReconstructor::AliMUONReconstructor()
 
     // trigger circuit
     for (Int_t i = 0; i < AliMUONConstants::NTriggerCircuit(); i++)  {
-      AliMUONTriggerCircuitNew* c = new AliMUONTriggerCircuitNew();
+      AliMUONTriggerCircuit* c = new AliMUONTriggerCircuit();
       c->SetTransformer(fTransformer);
       c->Init(i,*fCrateManager);
       TClonesArray& circuit = *fTriggerCircuit;
-      new(circuit[circuit.GetEntriesFast()])AliMUONTriggerCircuitNew(*c);
+      new(circuit[circuit.GetEntriesFast()])AliMUONTriggerCircuit(*c);
       delete c;
     }
 

diff --git a/MUON/AliMUONVTrackReconstructor.cxx b/MUON/AliMUONVTrackReconstructor.cxx
index 501dac621122d13e568fa22255025b00347b2822..02c956aefffcecee07aab1bc8ade57e01d21f626 100644 (file)
--- a/MUON/AliMUONVTrackReconstructor.cxx
+++ b/MUON/AliMUONVTrackReconstructor.cxx
@@ -39,7 +39,7 @@
 #include "AliMUONConstants.h"
 #include "AliMUONHitForRec.h"
 #include "AliMUONTriggerTrack.h"
-#include "AliMUONTriggerCircuitNew.h"
+#include "AliMUONTriggerCircuit.h"
 #include "AliMUONLocalTrigger.h"
 #include "AliMUONGlobalTrigger.h"
 #include "AliMUONSegment.h"
@@ -509,8 +509,8 @@ Bool_t AliMUONVTrackReconstructor::MakeTriggerTracks(void)
       locTrg = (AliMUONLocalTrigger*)localTrigger->UncheckedAt(i);     
 
       AliDebug(1, "AliMUONTrackReconstructor::MakeTriggerTrack using NEW trigger \n");
-      AliMUONTriggerCircuitNew* circuit = 
-       (AliMUONTriggerCircuitNew*)fTriggerCircuit->At(locTrg->LoCircuit()-1); // -1 !!!
+      AliMUONTriggerCircuit* circuit = 
+       (AliMUONTriggerCircuit*)fTriggerCircuit->At(locTrg->LoCircuit()-1); // -1 !!!
 
       y11 = circuit->GetY11Pos(locTrg->LoStripX()); 
       stripX21 = locTrg->LoStripX()+locTrg->LoDev()+1;

diff --git a/MUON/MUONCheck.C b/MUON/MUONCheck.C
index cf12067e7505d4f942cf6d86519a8c06dafae9c9..e73fb35c392c3565aa664b1094a36f373e003c55 100644 (file)
--- a/MUON/MUONCheck.C
+++ b/MUON/MUONCheck.C
@@ -50,7 +50,7 @@
 #include "AliMUONLocalTrigger.h"
 #include "AliMUONTrack.h"
 #include "AliMUONTrackParam.h"
-#include "AliMUONTriggerCircuitNew.h"
+#include "AliMUONTriggerCircuit.h"
 #include "AliMUONTriggerCrateStore.h"
 
 #include "AliMpVSegmentation.h"
@@ -461,15 +461,15 @@ void MUONrectrigger (Int_t event2Check=0, char * filename="galice.root", Int_t W
   AliMUONGeometryTransformer* transformer = new AliMUONGeometryTransformer(kFALSE);
   transformer->ReadGeometryData("volpath.dat", "geometry.root");
 
-  TClonesArray*  triggerCircuit = new TClonesArray("AliMUONTriggerCircuitNew", 234);
+  TClonesArray*  triggerCircuit = new TClonesArray("AliMUONTriggerCircuit", 234);
 
   for (Int_t i = 0; i < AliMUONConstants::NTriggerCircuit(); i++)  {
-      AliMUONTriggerCircuitNew* c = new AliMUONTriggerCircuitNew();
+      AliMUONTriggerCircuit* c = new AliMUONTriggerCircuit();
       c->SetSegFactory(segFactory);
       c->SetTransformer(transformer);
       c->Init(i,*crateManager);
       TClonesArray& circuit = *triggerCircuit;
-      new(circuit[circuit.GetEntriesFast()])AliMUONTriggerCircuitNew(*c);
+      new(circuit[circuit.GetEntriesFast()])AliMUONTriggerCircuit(*c);
       delete c;
   }
   
@@ -534,7 +534,7 @@ void MUONrectrigger (Int_t event2Check=0, char * filename="galice.root", Int_t W
       locTrg = static_cast<AliMUONLocalTrigger*>(localTrigger->At(ilocal));
       if (PRINTOUT) locTrg->Print("full");
       
-      AliMUONTriggerCircuitNew* circuit = (AliMUONTriggerCircuitNew*)triggerCircuit->At(locTrg->LoCircuit()-1); 
+      AliMUONTriggerCircuit* circuit = (AliMUONTriggerCircuit*)triggerCircuit->At(locTrg->LoCircuit()-1); 
       
       TgtupleLoc->Fill(ievent,locTrg->LoCircuit(),locTrg->LoStripX(),locTrg->LoDev(),locTrg->LoStripY(),locTrg->LoLpt(),locTrg->LoHpt(),circuit->GetY11Pos(locTrg->LoStripX()),circuit->GetY21Pos(locTrg->LoStripX()+locTrg->LoDev()+1),circuit->GetX11Pos(locTrg->LoStripY()));
     } // end of loop on Local Trigger

diff --git a/MUON/MUONbaseLinkDef.h b/MUON/MUONbaseLinkDef.h
index 48de803eb34130bda3048b42bc05d9c59939425c..61f85ca3a8a6370a48852998cf290687764d9bd9 100644 (file)
--- a/MUON/MUONbaseLinkDef.h
+++ b/MUON/MUONbaseLinkDef.h
@@ -23,7 +23,7 @@
 #pragma link C++ class AliMUONLoader+; 
 #pragma link C++ class AliMUONChamber+; 
 #pragma link C++ class AliMUONChamberTrigger+; 
-#pragma link C++ class AliMUONTriggerCircuitNew+; 
+#pragma link C++ class AliMUONTriggerCircuit+; 
 #pragma link C++ class AliMUONTriggerCrateStore+; 
 
 // containers

diff --git a/MUON/libMUONbase.pkg b/MUON/libMUONbase.pkg
index 2fcf9e6742afb2911a2ed5fd98447a2a137ee7e9..b1494d91d691d6a00a6dc10c2c415eb87548bc92 100644 (file)
--- a/MUON/libMUONbase.pkg
+++ b/MUON/libMUONbase.pkg
@@ -8,7 +8,7 @@ SRCS:=  AliMUON.cxx AliMUONv1.cxx \
         AliMUONChamber.cxx \
         AliMUONTriggerCrateStore.cxx \
         AliMUONChamberTrigger.cxx \
-        AliMUONTriggerCircuitNew.cxx \
+        AliMUONTriggerCircuit.cxx \
         AliMUONData.cxx \
         AliMUONDataIterator.cxx \
         AliMUONVDataIterator.cxx \