Using the correct prototype for SetQA method

[u/mrichter/AliRoot.git] / MUON / AliMUONPainterContourMaker.cxx

diff --git a/MUON/AliMUONPainterContourMaker.cxx b/MUON/AliMUONPainterContourMaker.cxx
index 89530a83dcd1b6e02774287eacba166e62ec1944..c7f9f5d527298a1e0ca058782aec80e8b995242e 100644 (file)
--- a/MUON/AliMUONPainterContourMaker.cxx
+++ b/MUON/AliMUONPainterContourMaker.cxx
@@ -29,10 +29,8 @@
 #include "AliMpMotifPosition.h"
 #include "AliMpMotifType.h"
 #include "AliMpSector.h"
-#include "AliMpSectorSegmentation.h"
 #include "AliMpSegmentation.h"
 #include "AliMpSlat.h"
-#include "AliMpSlatSegmentation.h"
 #include "AliMpStationType.h"
 #include "AliMpVMotif.h"
 #include "AliCodeTimer.h"
@@ -210,16 +208,16 @@ AliMUONPainterContourMaker::AddSegments(TObjArray& segments,
       Double_t x2 = line->GetX()[i+1];
       Double_t y2 = line->GetY()[i+1];
       
-      TLine* line = new TLine(x1,y1,x2,y2);
+      TLine* l = new TLine(x1,y1,x2,y2);
       
-      if ( !HasLine(segments,*line) )
+      if ( !HasLine(segments,*l) )
       {
-        segments.Add(line);      
-        AliDebug(1,Form("Adding line %s",LineAsString(*line).Data()));
+        segments.Add(l);      
+        AliDebug(1,Form("Adding line %s",LineAsString(*l).Data()));
       }
       else
       {
-        AliDebug(1,Form("Line %s is already there",LineAsString(*line).Data()));
+        AliDebug(1,Form("Line %s is already there",LineAsString(*l).Data()));
       }      
     }
   }
@@ -491,23 +489,23 @@ AliMUONPainterContourMaker::SplitSegments(TObjArray& segments) const
         Double_t xmin(FLT_MAX), ymin(FLT_MAX);
         Double_t xmax(-FLT_MAX), ymax(-FLT_MAX);
 
-        for ( Int_t i = 0; i < 4; ++i )
+        for ( Int_t k = 0; k < 4; ++k )
         {
-          xmin = TMath::Min(x[i],xmin);
-          ymin = TMath::Min(y[i],ymin);
-          xmax = TMath::Max(x[i],xmax);
-          ymax = TMath::Max(y[i],ymax);
+          xmin = TMath::Min(x[k],xmin);
+          ymin = TMath::Min(y[k],ymin);
+          xmax = TMath::Max(x[k],xmax);
+          ymax = TMath::Max(y[k],ymax);
         }
         
         TLine fullLine(xmin,ymin,xmax,ymax);
         
-        for ( Int_t i = 0; i < 4; ++i )
+        for ( Int_t i1 = 0; i1 < 4; ++i1 )
         {
-          for ( Int_t j = i+1; j < 4; ++j )
+          for ( Int_t j1 = i1+1; j1 < 4; ++j1 )
           {
-            if ( TMath::Abs(i-j) != 2 ) 
+            if ( TMath::Abs(i1-j1) != 2 ) 
             {
-              TLine test(x[i],y[i],x[j],y[j]);
+              TLine test(x[i1],y[i1],x[j1],y[j1]);
 
               Bool_t isFullLine = IsEqual(test,fullLine);
               
@@ -622,7 +620,7 @@ AliMUONPainterContourMaker::MergeContours(const TObjArray& contours,
 //  AliDebug(1,"After AddSegments");
 //  StdoutToAliDebug(1,PrintSegments(segments));
   
-  while (SplitSegments(segments));
+  while (SplitSegments(segments)) {}
 
 //  AliDebug(1,"After SplitSegments");
 //  StdoutToAliDebug(1,PrintSegments(segments));
@@ -690,25 +688,25 @@ AliMUONPainterContourMaker::FindMotifPosition(Int_t detElemId, Int_t manuId) con
   
   AliCodeTimerAuto("")
   
-  const AliMpVSegmentation* vseg = AliMpSegmentation::Instance()->GetMpSegmentationByElectronics(detElemId,manuId);
-  if (!vseg)
-  {
-    AliFatal(Form("Could not find motif for DE %d manu %d",detElemId,manuId));
-  }
-  
   AliMp::StationType stationType = AliMpDEManager::GetStationType(detElemId);
   
   if ( stationType == AliMp::kStation345 ) 
   {
-    const AliMpSlatSegmentation* seg = static_cast<const AliMpSlatSegmentation*>(vseg);
-    const AliMpSlat* slat = seg->Slat();
-    return slat->FindMotifPosition(manuId);
+    const AliMpSlat* kSlat 
+      = AliMpSegmentation::Instance()->GetSlatByElectronics(detElemId,manuId);
+    if ( ! kSlat ) {
+      AliFatal(Form("Could not find motif for DE %d manu %d",detElemId,manuId));
+    }
+    return kSlat->FindMotifPosition(manuId);
   }
   else
   {
-    const AliMpSectorSegmentation* seg = static_cast<const AliMpSectorSegmentation*>(vseg);
-    const AliMpSector* sector = seg->GetSector();
-    return sector->GetMotifMap()->FindMotifPosition(manuId);
+    const AliMpSector* kSector 
+      = AliMpSegmentation::Instance()->GetSectorByElectronics(detElemId,manuId);
+    if ( ! kSector ) {
+      AliFatal(Form("Could not find motif for DE %d manu %d",detElemId,manuId));
+    }
+    return kSector->GetMotifMap()->FindMotifPosition(manuId);
   }
   return 0x0;
 }