Removed usage of fgkLengthUnit

- not needed after changing mm->cm in mapping.
(Laurent)

diff --git a/MUON/AliMUONSt12QuadrantSegmentation.cxx b/MUON/AliMUONSt12QuadrantSegmentation.cxx
index 60e501fc1c6d2a3a44ac51e2298751b5d27e0dc5..aef803e4fda7aa9804fb8db4716fc4a0dc1ce493 100644 (file)
--- a/MUON/AliMUONSt12QuadrantSegmentation.cxx
+++ b/MUON/AliMUONSt12QuadrantSegmentation.cxx
@@ -46,7 +46,6 @@
 ClassImp(AliMUONSt12QuadrantSegmentation)
 
 const Float_t  AliMUONSt12QuadrantSegmentation::fgkWireD = 0.21; 
-const Float_t  AliMUONSt12QuadrantSegmentation::fgkLengthUnit = 0.1; 
 
 //______________________________________________________________________________
 AliMUONSt12QuadrantSegmentation::AliMUONSt12QuadrantSegmentation(
@@ -165,8 +164,8 @@ void AliMUONSt12QuadrantSegmentation::UpdateCurrentPadValues(const AliMpPad& pad
 
   fIx = pad.GetIndices().GetFirst();
   fIy = pad.GetIndices().GetSecond();
-  fX = pad.Position().X() * fgkLengthUnit;
-  fY = pad.Position().Y() * fgkLengthUnit;
+  fX = pad.Position().X();
+  fY = pad.Position().Y();
   fZone = fSectorSegmentation->Zone(pad);
 }  
 
@@ -222,7 +221,7 @@ Bool_t  AliMUONSt12QuadrantSegmentation::HasPad(Float_t x, Float_t y, Float_t /*
   // fSector->GetMotifMap()->Print();
 
   AliMpPad pad = fSectorSegmentation
-               ->PadByPosition(TVector2(x/fgkLengthUnit, y/fgkLengthUnit), false);
+               ->PadByPosition(TVector2(x,y), false);
 
   return pad.IsValid();
 }  
@@ -294,8 +293,7 @@ void  AliMUONSt12QuadrantSegmentation::GetPadI(Float_t x, Float_t y,
 // If there is no pad, ix = 0, iy = 0 are returned.
 // ---
 
-  AliMpPad pad = fSectorSegmentation
-               ->PadByPosition(TVector2(x/fgkLengthUnit, y/fgkLengthUnit), true);
+  AliMpPad pad = fSectorSegmentation->PadByPosition(TVector2(x,y), true);
 
   ix = pad.GetIndices().GetFirst();
   iy = pad.GetIndices().GetSecond();
@@ -322,8 +320,8 @@ void  AliMUONSt12QuadrantSegmentation::GetPadC(Int_t ix, Int_t iy,
 
   AliMpPad pad = fSectorSegmentation->PadByIndices(AliMpIntPair(ix,iy), true);
 
-  x = pad.Position().X() * fgkLengthUnit;
-  y = pad.Position().Y() * fgkLengthUnit;
+  x = pad.Position().X();
+  y = pad.Position().Y();
 }
 
 
@@ -370,7 +368,7 @@ Float_t AliMUONSt12QuadrantSegmentation::Dpx(Int_t isector) const
 // Pad size in x by sector
 // ---
 
-  return fSectorSegmentation->PadDimensions(isector).X()*2.*fgkLengthUnit;
+  return fSectorSegmentation->PadDimensions(isector).X()*2.0;
 } 
 
 //______________________________________________________________________________
@@ -379,7 +377,7 @@ Float_t AliMUONSt12QuadrantSegmentation::Dpy(Int_t isector) const
 // Pad size in x, y by Sector 
 // ---
 
-  return fSectorSegmentation->PadDimensions(isector).Y()*2.*fgkLengthUnit;
+  return fSectorSegmentation->PadDimensions(isector).Y()*2.0;
 }
 
 //______________________________________________________________________________
@@ -447,9 +445,11 @@ void  AliMUONSt12QuadrantSegmentation::FirstPad(Float_t xhit, Float_t yhit, Floa
   
   fSectorIterator 
     = fSectorSegmentation
-        ->CreateIterator(AliMpArea(TVector2(fXhit/fgkLengthUnit, fYhit/fgkLengthUnit), 
-                                  TVector2(dx/fgkLengthUnit, dy/fgkLengthUnit)));
+        ->CreateIterator(AliMpArea(TVector2(fXhit,fYhit),TVector2(dx,dy)));
 
+  AliDebug(1,Form("CreateIterator area=%e,%e +- %e,%e %s",
+                  fXhit,fYhit,dx,dy,PlaneTypeName(fPlaneType)));
+  
   fSectorIterator->First();            
 
   if (! fSectorIterator->IsDone())
@@ -493,7 +493,7 @@ Float_t AliMUONSt12QuadrantSegmentation::Distance2AndOffset(Int_t iX, Int_t iY,
   if (!pad.IsValid())
     AliFatal("Cannot locate pad.");
 
-  return (pad.Position()*fgkLengthUnit - TVector2(x, y)).Mod2();
+  return (pad.Position() - TVector2(x, y)).Mod2();
 }
 
 //______________________________________________________________________________
@@ -576,7 +576,7 @@ Int_t AliMUONSt12QuadrantSegmentation::Sector(Float_t x, Float_t y)
 
   return fSectorSegmentation
            ->Zone(fSectorSegmentation
-                   ->PadByPosition(TVector2(x/fgkLengthUnit, y/fgkLengthUnit)));
+                   ->PadByPosition(TVector2(x,y)));
 }
 
 //______________________________________________________________________________

diff --git a/MUON/AliMUONSt12QuadrantSegmentation.h b/MUON/AliMUONSt12QuadrantSegmentation.h
index ab62f616e976895af6f2c0fff4ffbdc161c6d8db..35f506ed02744b896c5a10a6d81c14638d7d7f91 100644 (file)
--- a/MUON/AliMUONSt12QuadrantSegmentation.h
+++ b/MUON/AliMUONSt12QuadrantSegmentation.h
@@ -166,8 +166,7 @@ class AliMUONSt12QuadrantSegmentation : public AliMUONVGeometryDESegmentation
   
     // constants
     static const Float_t  fgkWireD;     // default wire pitch
-    static const Float_t  fgkLengthUnit;// conversion between length units
-                                        // from mapping (mm) to AliRoot (cm)
+
     // data members
 
     // From mapping

diff --git a/MUON/AliMUONSt345SlatSegmentationV2.cxx b/MUON/AliMUONSt345SlatSegmentationV2.cxx
index 8082b649557bba79e1b56ad60fc87a32fb021938..5a6c8006bfd505041155ca3b74faac47428ce5e9 100644 (file)
--- a/MUON/AliMUONSt345SlatSegmentationV2.cxx
+++ b/MUON/AliMUONSt345SlatSegmentationV2.cxx
@@ -43,8 +43,6 @@ ClassImp(AliMUONSt345SlatSegmentationV2)
 
 namespace
 {
-  Double_t fgkLengthUnit = 0.1; // This class expects centimeters, while
-                                                                                                                               // AliMpSlat works with milimeters.
   Int_t fgIntOffset = 1;
   Float_t FMAX(1E9);
 }
@@ -141,7 +139,7 @@ AliMUONSt345SlatSegmentationV2::Dpx(int ipcb) const
   {
     AliFatal("pcb is null!");
   }
-       return pcb->PadSizeX() * fgkLengthUnit;
+       return pcb->PadSizeX();
 }
 
 //_____________________________________________________________________________
@@ -153,7 +151,7 @@ AliMUONSt345SlatSegmentationV2::Dpy(int ipcb) const
   {
     AliFatal("pcb is null!");
   }
-       return pcb->PadSizeY() * fgkLengthUnit;
+       return pcb->PadSizeY();
 }
 
 //_____________________________________________________________________________
@@ -191,9 +189,11 @@ AliMUONSt345SlatSegmentationV2::FirstPad(Float_t xhit, Float_t yhit,
   // Note that we convert the area position to a reference frame
   // located in the lower-left corner of the slat, instead of its
   // center.
-  AliMpArea area(TVector2((x01+x02)/2.0/fgkLengthUnit+fSlat->DX(),
-                                                                                                       (y01+y02)/2.0/fgkLengthUnit+fSlat->DY()),
-                                                                TVector2(xext/2.0/fgkLengthUnit,yext/2.0/fgkLengthUnit));
+//  AliMpArea area(TVector2((x01+x02)/2.0+fSlat->DX(),
+//                                                                                                     (y01+y02)/2.0+fSlat->DY()),
+//                                                              TVector2(xext/2.0,yext/2.0));
+  AliMpArea area(TVector2((x01+x02)/2.0,(y01+y02)/2.0),
+                                                                TVector2(xext/2.0,yext/2.0));
        
   delete fPadIterator;
        
@@ -257,8 +257,8 @@ AliMUONSt345SlatSegmentationV2::GetPadC(Int_t ix, Int_t iy,
   AliMpPad pad = 
   fSlatSegmentation->PadByIndices(AliMpIntPair(ix-fgIntOffset,iy-fgIntOffset),
                                   kTRUE);
-  x = pad.Position().X() * fgkLengthUnit;
-  y = pad.Position().Y() * fgkLengthUnit;
+  x = pad.Position().X();
+  y = pad.Position().Y();
 }
 
 
@@ -275,11 +275,11 @@ void
 AliMUONSt345SlatSegmentationV2::GetPadI(Float_t x, Float_t y,
                                                                                                                                                                Int_t& ix, Int_t& iy)
 {
-  Double_t slatx = fSlat->DX();
-  Double_t slaty = fSlat->DY();
+//  Double_t slatx = fSlat->DX();
+//  Double_t slaty = fSlat->DY();
   AliMpPad pad = 
-    fSlatSegmentation->PadByPosition(TVector2(x/fgkLengthUnit+slatx, 
-                                                                                                                                       y/fgkLengthUnit+slaty), kTRUE);
+    fSlatSegmentation->PadByPosition(TVector2(x,y), kTRUE);
+//  fSlatSegmentation->PadByPosition(TVector2(x+slatx,y+slaty), kTRUE);
        
   if ( pad != AliMpPad::Invalid() )
        {
@@ -336,11 +336,11 @@ AliMUONSt345SlatSegmentationV2::IntegrationLimits(Float_t& x1, Float_t& x2,
        //   y1 = fYhit - fY - Dpy(fSector)/2.;
        //   y2 = y1 + Dpy(fSector);    
        
-  Float_t x = fCurrentPad.Position().X() * fgkLengthUnit;
-  Float_t y = fCurrentPad.Position().Y() * fgkLengthUnit;
+  Float_t x = fCurrentPad.Position().X();
+  Float_t y = fCurrentPad.Position().Y();
        
-  Float_t padsizex = fCurrentPad.Dimensions().X() * 2.0 * fgkLengthUnit;
-  Float_t padsizey = fCurrentPad.Dimensions().Y() * 2.0 * fgkLengthUnit;
+  Float_t padsizex = fCurrentPad.Dimensions().X() * 2.0;
+  Float_t padsizey = fCurrentPad.Dimensions().Y() * 2.0;
        
   x1 = fXhit - x - padsizex/2.0;
   x2 = x1 + padsizex;
@@ -404,7 +404,8 @@ AliMUONSt345SlatSegmentationV2::Neighbours(Int_t iX, Int_t iY, Int_t* Nlist,
        
   // Define the region to look into : a region slightly bigger
   // than the pad itself (10% bigger), in order to catch first neighbours.
-  AliMpArea area(pad.Position()+fSlat->Dimensions(),pad.Dimensions()*2.1); 
+//  AliMpArea area(pad.Position()+fSlat->Dimensions(),pad.Dimensions()*2.1); 
+  AliMpArea area(pad.Position(),pad.Dimensions()*2.1); 
                
   AliMpVPadIterator* it = fSlatSegmentation->CreateIterator(area);
   it->First();