add pt spectra histograms for different pile-up event definition

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

diff --git a/MUON/AliMUONManuPainter.cxx b/MUON/AliMUONManuPainter.cxx
index c98aece1e0bd7919545ad335aae678a7e769ee29..4b53a0a3ba327503e6a1c3d9e3eb24998b50d07a 100644 (file)
--- a/MUON/AliMUONManuPainter.cxx
+++ b/MUON/AliMUONManuPainter.cxx
@@ -18,8 +18,11 @@
 
 #include "AliMUONManuPainter.h"
 
-#include "AliMUONManuPadPainter.h"
+#include "AliMpDCSNamer.h"
+#include "AliLog.h"
 #include "AliMUONContour.h"
+#include "AliMUONManuContourMaker.h"
+#include "AliMUONManuPadPainter.h"
 #include "AliMUONPainterHelper.h"
 #include "AliMUONVCalibParam.h"
 #include "AliMUONVDigit.h"
@@ -32,7 +35,6 @@
 #include "AliMpStationType.h"
 #include "AliMpVMotif.h"
 #include "AliMpVPadIterator.h"
-#include "AliLog.h"
 #include <TArrayI.h>
 #include <float.h>
 
@@ -93,19 +95,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);
@@ -170,7 +166,27 @@ AliMUONManuPainter::Describe(const AliMUONVTrackerData& data, Int_t dataIndex,
   
   Double_t value = data.Manu(fDetElemId,fManuId,dataIndex);
   
-  return AliMUONPainterHelper::Instance()->FormatValue(data.DimensionName(dataIndex).Data(),value);
+  TString rv = AliMUONPainterHelper::Instance()->FormatValue(data.DimensionName(dataIndex).Data(),value);
+  
+  if ( TString(data.GetName()).Contains("HV") )
+  {
+    rv += "\n";
+    
+    AliMpDCSNamer hvNamer("TRACKER");
+    
+    if ( AliMpDEManager::GetStationType(fDetElemId) == AliMp::kStation12 )
+    {
+      Int_t sector = hvNamer.ManuId2Sector(fDetElemId,fManuId);
+
+      rv += hvNamer.DCSNameFromAlias(hvNamer.DCSAliasName(fDetElemId,sector));
+    }
+    else
+    {
+        rv += hvNamer.DCSNameFromAlias(hvNamer.DCSAliasName(fDetElemId));
+    }
+  }
+  
+  return rv;
 }
 
 //_____________________________________________________________________________