Updated for changes in AliMUONSegmentation

(now only GetModuleSegmentationByDEId available)

diff --git a/MUON/AliMUONChamber.cxx b/MUON/AliMUONChamber.cxx
index c3f94d440cc1222ee87ddd01db5c787010a9d28e..b79200510430fa94fb7d84120d0a03d2c99c1aae 100644 (file)
--- a/MUON/AliMUONChamber.cxx
+++ b/MUON/AliMUONChamber.cxx
@@ -124,7 +124,7 @@ void AliMUONChamber::DisIntegration(AliMUONHit *hit,
     Float_t qcath = qtot * (i==1? fCurrentCorrel : 1/fCurrentCorrel);
     
     AliMUONGeometrySegmentation* segmentation=
-      fMUON->GetSegmentation()->GetModuleSegmentation(fId, i-1); 
+      fMUON->GetSegmentation()->GetModuleSegmentationByDEId(id, i-1); 
 
     for (segmentation->FirstPad(id, xhit, yhit, zhit, dx, dy); 
         segmentation->MorePads(id); 

diff --git a/MUON/AliMUONChamberTrigger.cxx b/MUON/AliMUONChamberTrigger.cxx
index dd394f1527299d8edec2a650a9fc1acda2b6fda0..58f4fe13a6edbaf4c927f8ee7f2e1cd913df040a 100644 (file)
--- a/MUON/AliMUONChamberTrigger.cxx
+++ b/MUON/AliMUONChamberTrigger.cxx
@@ -89,7 +89,7 @@ void AliMUONChamberTrigger::DisIntegration(AliMUONHit* hit,
   for (Int_t i = 1; i <= 2; i++) {
 
     AliMUONGeometrySegmentation* segmentation=
-      fMUON->GetSegmentation()->GetModuleSegmentation(fId, i-1); 
+      fMUON->GetSegmentation()->GetModuleSegmentationByDEId(id, i-1); 
 
     
 // Find the module & strip Id. which has fired

diff --git a/MUON/AliMUONClusterInput.cxx b/MUON/AliMUONClusterInput.cxx
index 312009460c6bcf360e27a0697ad5bc9ef1f1ca6a..558f6510931422baa2c6f78435d6e40d3971b73d 100644 (file)
--- a/MUON/AliMUONClusterInput.cxx
+++ b/MUON/AliMUONClusterInput.cxx
@@ -109,8 +109,8 @@ void AliMUONClusterInput::SetDigits(Int_t chamber, Int_t idDE, TClonesArray* dig
     delete fgMathieson;
     fgMathieson = new AliMUONMathieson();
 
-    fSegmentation2[0]= fgSegmentation->GetModuleSegmentation(chamber, 0);
-    fSegmentation2[1]= fgSegmentation->GetModuleSegmentation(chamber, 1);
+    fSegmentation2[0]= fgSegmentation->GetModuleSegmentationByDEId(fDetElemId, 0);
+    fSegmentation2[1]= fgSegmentation->GetModuleSegmentationByDEId(fDetElemId, 1);
 
     fNseg = 2;
     if (chamber < AliMUONConstants::NTrackingCh()) {
@@ -136,7 +136,7 @@ void AliMUONClusterInput::SetDigits(Int_t chamber, Int_t idDE, TClonesArray* dig
     fDetElemId = idDE;
     fDigits[0] = dig;
 
-    fSegmentation2[0]= fgSegmentation->GetModuleSegmentation(chamber, 0);
+    fSegmentation2[0]= fgSegmentation->GetModuleSegmentationByDEId(fDetElemId, 0);
     fNseg=1;
 }
 
@@ -192,11 +192,11 @@ Float_t AliMUONClusterInput::DiscrChargeCombiS1(Int_t i,Double_t *par, Int_t cat
 // par[0]    x-position of cluster
 // par[1]    y-position of cluster
 
-    Float_t q1;
-    fSegmentation2[cath]->SetPad(fDetElemId, fix[i][cath], fiy[i][cath]);
-    //  First Cluster
-    fSegmentation2[cath]->SetHit(fDetElemId, par[0],par[1],fZ);
-    q1 = fgMathieson->IntXY(fDetElemId, fSegmentation2[cath]);
+   Float_t q1;
+   fSegmentation2[cath]-> SetPad(fDetElemId, fix[i][cath], fiy[i][cath]);
+   //  First Cluster
+   fSegmentation2[cath]-> SetHit(fDetElemId, par[0],par[1],fZ);
+   q1 = fgMathieson->IntXY(fDetElemId, fSegmentation2[cath]);
        
    Float_t value = fQtot[cath]*q1;
    return value;

diff --git a/MUON/AliMUONDetElement.cxx b/MUON/AliMUONDetElement.cxx
index 1298587e26576e4ee58225bb3e802790db8cc52b..7c12842959eab06e7bed26f0cfba60b14be21e48 100644 (file)
--- a/MUON/AliMUONDetElement.cxx
+++ b/MUON/AliMUONDetElement.cxx
@@ -78,8 +78,8 @@ AliMUONDetElement::AliMUONDetElement(Int_t idDE, AliMUONDigit *dig, AliMUONClust
   fHitsForRec = new TClonesArray("AliMUONHitForRec",10);
   AliMUON *pMUON = (AliMUON*) gAlice->GetModule("MUON");
   AliMUONSegmentation *pSegmentation = pMUON->GetSegmentation();
-  fSeg[0] = pSegmentation->GetModuleSegmentation(fChamber, 0);
-  fSeg[1] = pSegmentation->GetModuleSegmentation(fChamber, 1);
+  fSeg[0] = pSegmentation->GetModuleSegmentationByDEId(fidDE, 0);
+  fSeg[1] = pSegmentation->GetModuleSegmentationByDEId(fidDE, 1);
   Float_t x, y, z;
   fSeg[dig->Cathode()]->GetPadC(fidDE, dig->PadX(), dig->PadY(), x, y, z);
   fZ = z;

diff --git a/MUON/AliMUONDisplay.cxx b/MUON/AliMUONDisplay.cxx
index cb0d9f2acb3c2933d82282c165848495e2fa7800..73f7a21a4dff6e3c23e4ec00e5aee9e7be2676f7 100644 (file)
--- a/MUON/AliMUONDisplay.cxx
+++ b/MUON/AliMUONDisplay.cxx
@@ -1056,8 +1056,6 @@ void AliMUONDisplay::LoadDigits(Int_t chamber, Int_t cathode)
     
     AliMUON *pMUON  =     (AliMUON*)gAlice->GetModule("MUON");
 
-    AliMUONGeometrySegmentation*  segmentation2 = 0x0;
-
     GetMUONData()->SetTreeAddress("D");
 
     TClonesArray *muonDigits  = GetMUONData()->Digits(chamber-1);
@@ -1095,8 +1093,6 @@ void AliMUONDisplay::LoadDigits(Int_t chamber, Int_t cathode)
        if (chamber > 10) printf(">>> old segmentation for trigger \n");
        else printf(">>> old segmentation for tracking \n");
 
-       segmentation2
-           = pMUON->GetSegmentation()->GetModuleSegmentation(chamber-1, cathode-1);
        for (Int_t digit = 0; digit < ndigits; digit++) {
            mdig    = (AliMUONDigit*)muonDigits->UncheckedAt(digit);
            if (mdig->Cathode() != cathode-1) continue;
@@ -1130,6 +1126,8 @@ void AliMUONDisplay::LoadDigits(Int_t chamber, Int_t cathode)
            Float_t dpx, dpy;
            
            Int_t detElemId = mdig->DetElemId();
+           AliMUONGeometrySegmentation* segmentation2
+             = pMUON->GetSegmentation()->GetModuleSegmentationByDEId(detElemId, cathode-1);
            segmentation2->GetPadC(detElemId, mdig->PadX(), mdig->PadY(), xpad, ypad, zpad);
            isec = segmentation2->Sector(detElemId, mdig->PadX(), mdig->PadY());
            dpx = segmentation2->Dpx(detElemId, isec)/2;