Changes required in QA for the amoreQAshifter agent; change units of titles from...

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

diff --git a/MUON/AliMUONTriggerElectronics.cxx b/MUON/AliMUONTriggerElectronics.cxx
index 361fedb03c4e287c3ddc5e3a210498935295ce7c..a8b347b9efb92c0a1ef314b9f1c4a6dad69fe0c9 100644 (file)
--- a/MUON/AliMUONTriggerElectronics.cxx
+++ b/MUON/AliMUONTriggerElectronics.cxx
@@ -28,7 +28,6 @@
 
 #include "AliLoader.h"
 #include "AliLog.h"
-#include "AliMUON.h" 
 #include "AliMUONCalibrationData.h"
 #include "AliMUONVDigit.h"
 #include "AliMUONVDigitStore.h"
@@ -47,6 +46,7 @@
 #include "AliMUONVTriggerStore.h"
 #include "AliMUONVCalibParam.h"
 #include "AliMpCathodType.h"
+#include "AliMpCDB.h"
 #include "AliMpDEManager.h"
 #include "AliMpSegmentation.h"
 #include "AliMpVSegmentation.h"
@@ -84,6 +84,12 @@ AliMUONTriggerElectronics::AliMUONTriggerElectronics(AliMUONCalibrationData* cal
     fCopyYInput[i]->SetOwner();
   }
 
+  // force loading of mapping if not already done
+  if ( !AliMpDDLStore::Instance(kFALSE) )
+  {
+    AliMpCDB::LoadDDLStore();
+  }
+  
   SetCopyInput();
   
   Factory(calibData);
@@ -195,15 +201,13 @@ void AliMUONTriggerElectronics::Feed(const AliMUONVDigitStore& digitStore)
       
       AliDebug(3,Form("cathode %d ix %d iy %d ",cathode,ix,iy));
 
-      AliMpPad pad = seg->PadByIndices(AliMpIntPair(ix,iy),kTRUE);
+      AliMpPad pad = seg->PadByIndices(ix,iy,kTRUE);
       
       for (Int_t i=0; i<pad.GetNofLocations(); i++) 
       {
-        AliMpIntPair location = pad.GetLocation(i);
-        
-        Int_t nboard = location.GetFirst();
+        Int_t nboard = pad.GetLocalBoardId(i);
         
-        Int_t ibitxy = location.GetSecond();
+        Int_t ibitxy = pad.GetLocalBoardChannel(i);
         
         AliMUONLocalTriggerBoard *b = fCrates->LocalBoard(nboard);