Corrected shadowed local variables

diff --git a/MUON/AliMUONGeometryTransformer.cxx b/MUON/AliMUONGeometryTransformer.cxx
index 0f81ee8a29d0ee6a706f050163b5729cdd651440..2b1bd8ba688f3cda2251c6038aa34421927617d4 100644 (file)
--- a/MUON/AliMUONGeometryTransformer.cxx
+++ b/MUON/AliMUONGeometryTransformer.cxx
@@ -156,22 +156,22 @@ AliMUONGeometryTransformer::CreateDEAreas() const
         const AliMpVSegmentation* cathode 
         = AliMpSegmentation::Instance()->GetMpSegmentation(detElemId,AliMp::GetCathodType(icathode));
         
-        AliMpVPadIterator* it = cathode->CreateIterator();
+        AliMpVPadIterator* itp = cathode->CreateIterator();
         
-        it->First();
+        itp->First();
         
-        while ( !it->IsDone() ) 
+        while ( !itp->IsDone() ) 
         {
-          AliMpPad pad = it->CurrentItem();
+          AliMpPad pad = itp->CurrentItem();
           AliMpArea a(pad.Position(),pad.Dimensions());
           xmin = TMath::Min(xmin,a.LeftBorder());
           xmax = TMath::Max(xmax,a.RightBorder());
           ymin = TMath::Min(ymin,a.DownBorder());
           ymax = TMath::Max(ymax,a.UpBorder());
-          it->Next();
+          itp->Next();
         }
         
-        delete it;
+        delete itp;
       }
       
       xl = (xmin+xmax)/2.0;
@@ -461,10 +461,10 @@ AliMUONGeometryTransformer::LoadTransformations()
         = (AliMUONGeometryDetElement*)detElements->GetObject(j);
 
       // Det element  symbolic name
-      TString symname = GetDESymName(detElement->GetId());
+      TString symnameDE = GetDESymName(detElement->GetId());
     
       // Set global matrix from physical node
-      TGeoHMatrix* globalMatrix = AliGeomManager::GetMatrix(symname);
+      TGeoHMatrix* globalMatrix = AliGeomManager::GetMatrix(symnameDE);
       if ( ! globalMatrix ) {
         AliErrorStream() << "Detection element matrix not found." << endl;
         return false;
@@ -828,10 +828,10 @@ void AliMUONGeometryTransformer::AddAlignableVolumes() const
         = (AliMUONGeometryDetElement*)detElements->GetObject(j);
        
       // Set detection element symbolic name
-      TGeoPNEntry* pnEntry
+      TGeoPNEntry* pnEntryDE
         = gGeoManager->SetAlignableEntry(GetDESymName(detElement->GetId()), 
                                          detElement->GetVolumePath());
-      if ( ! pnEntry ) {
+      if ( ! pnEntryDE ) {
         AliErrorStream() 
           << "Volume path for detection element "
           << detElement->GetId()
@@ -839,7 +839,7 @@ void AliMUONGeometryTransformer::AddAlignableVolumes() const
       }
       else {
         // Set detection element matrix
-        pnEntry->SetMatrix(new TGeoHMatrix(*detElement->GetGlobalTransformation()));                                      
+        pnEntryDE->SetMatrix(new TGeoHMatrix(*detElement->GetGlobalTransformation()));                                      
          // the matrix will be deleted via TGeoManager 
       }                                      
     }  

diff --git a/MUON/AliMUONVGeometryBuilder.cxx b/MUON/AliMUONVGeometryBuilder.cxx
index 6c94129c8b5d0be09957df20f4e69977048061e3..7c55f6dcdd5ba2d51b1fc6d4ee57f47521e7e442 100644 (file)
--- a/MUON/AliMUONVGeometryBuilder.cxx
+++ b/MUON/AliMUONVGeometryBuilder.cxx
@@ -149,12 +149,11 @@ void AliMUONVGeometryBuilder::MapSV(const TString& path0,
     // Get the name of the last volume in the path
     Ssiz_t npos1 = path0.Last('/')+1; 
     Ssiz_t npos2 = path0.Last('_');
-    TString volName(path0(npos1, npos2-npos1));  
+    TString volName0(path0(npos1, npos2-npos1));  
     
     // Check if it is sensitive volume
-    Int_t moduleId = AliMpDEManager::GetGeomModuleId(detElemId);
     AliMUONGeometryModule* geometry = GetGeometry(moduleId);
-    if (  geometry->IsSensitiveVolume(volName) &&
+    if (  geometry->IsSensitiveVolume(volName0) &&
         ! svMap->Get(path0) ) {
       //cout << ".. adding to the map  " 
       //     <<  path0 << "  "  << detElemId << endl;