Introducing new DP CavernAtmosPressure2.

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

diff --git a/MUON/AliMUONManuPainter.cxx b/MUON/AliMUONManuPainter.cxx
index c98aece1e0bd7919545ad335aae678a7e769ee29..503d526299119256295c64ec179caf9be49ebb05 100644 (file)
--- a/MUON/AliMUONManuPainter.cxx
+++ b/MUON/AliMUONManuPainter.cxx
@@ -18,8 +18,10 @@
 
 #include "AliMUONManuPainter.h"
 
-#include "AliMUONManuPadPainter.h"
+#include "AliLog.h"
 #include "AliMUONContour.h"
+#include "AliMUONManuContourMaker.h"
+#include "AliMUONManuPadPainter.h"
 #include "AliMUONPainterHelper.h"
 #include "AliMUONVCalibParam.h"
 #include "AliMUONVDigit.h"
@@ -32,7 +34,6 @@
 #include "AliMpStationType.h"
 #include "AliMpVMotif.h"
 #include "AliMpVPadIterator.h"
-#include "AliLog.h"
 #include <TArrayI.h>
 #include <float.h>
 
@@ -93,19 +94,13 @@ AliMUONManuPainter::AliMUONManuPainter(const AliMUONAttPainter& att,
     return;    
   }
     
-  AliMUONContour* contour = h->GetContour(ContourName());
-  
-  if (!contour)
-  {
-    contour = h->GenerateManuContour(fDetElemId,
-                                     fManuId,
-                                     Attributes(),
-                                     ContourName());
-  }
+  TString name = AliMUONManuContourMaker::ManuPathName(detElemId, manuId);
 
+  AliMUONContour* contour = h->GetContour(name.Data());
+  
   if (!contour)
   {
-    AliFatal(Form("Could not get manuId %04d from DE %04d",manuId,detElemId));
+    AliError(Form("Could not get manuId %04d from DE %04d (name=%s)",manuId,detElemId,name.Data()));
   }
   
   SetContour(contour);