X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONTriggerCircuit.cxx;h=9b443d26c571e5b2d4d99ff9aaeb87c7302dfeb1;hb=a4b77ddff576e722011ce8a5efaf793c55c5efa5;hp=1dd652efadcc85d16d1d6932c6c3b9c0aa3099b1;hpb=002920d13e4b0c2b1fb2f1d9676e9041a9157f42;p=u%2Fmrichter%2FAliRoot.git diff --git a/MUON/AliMUONTriggerCircuit.cxx b/MUON/AliMUONTriggerCircuit.cxx index 1dd652efadc..9b443d26c57 100644 --- a/MUON/AliMUONTriggerCircuit.cxx +++ b/MUON/AliMUONTriggerCircuit.cxx @@ -34,7 +34,6 @@ AliMUONTriggerCircuit::AliMUONTriggerCircuit() fIdCircuit(0), fX2m(0), fX2ud(0) - // fSegmentationType(1) { // Constructor @@ -77,15 +76,11 @@ AliMUONTriggerCircuit::operator=(const AliMUONTriggerCircuit& rhs) void AliMUONTriggerCircuit::Init(Int_t iCircuit) { // initialize circuit characteristics fIdCircuit=AliMUONTriggerConstants::CircuitId(iCircuit); - AliMUON *pMUON = (AliMUON*)gAlice->GetModule("MUON"); LoadX2(); LoadXCode(); LoadYCode(); - if (pMUON->WhichSegmentation() == 1) - AliFatal("Old Segmentation no more supported."); - LoadXPos2(); LoadYPos2(); @@ -399,6 +394,7 @@ void AliMUONTriggerCircuit::LoadXPos2(){ Int_t idModule=Module(fIdCircuit); // corresponding module Id. // number of Y strips idDE = DetElemId(chamber, idModule); + Int_t nStrY=AliMUONTriggerConstants::NstripY(ModuleNumber(idModule)); Int_t idSector=segmentation->Sector(idDE, idModule,0); // corresp. sector Float_t width=segmentation->Dpx(idDE, idSector); // corresponding strip width @@ -527,9 +523,15 @@ Float_t AliMUONTriggerCircuit::GetX11Pos(Int_t istrip) const { Int_t AliMUONTriggerCircuit::DetElemId(Int_t ichamber, Int_t idModule) { +// 07/22/05 bug found by Christophe. +// due to the inversion right-left of detElemId somewhere in the code +// (AliMUONTriggerGeometrybuilder is correct!!!) +// fixed temporary here. to be changed with official numbering of DeElemId. +// // returns the detection element Id for given chamber and module // ichamber (from 11 to 14), idModule (from 11 to 97) - Int_t itmp = (idModule > 0) ? 0 : 50; // right=0, left=50 +// Int_t itmp = (idModule > 0) ? 0 : 50; // right=0, left=50 + Int_t itmp = (idModule > 0) ? 50 : 0; // right=50, left=0 return (ichamber*100)+itmp+(9-Int_t(TMath::Abs(idModule)/10)); }