- Adding check and flagging for HG present

[u/mrichter/AliRoot.git] / MUON / MUONReCalcGlobalTrigger.C

diff --git a/MUON/MUONReCalcGlobalTrigger.C b/MUON/MUONReCalcGlobalTrigger.C
index 8b1a1695cd57fcb61efba2dee008e164c7d63054..65642d50658c3b297d9761a9d15a905be70f97ec 100644 (file)
--- a/MUON/MUONReCalcGlobalTrigger.C
+++ b/MUON/MUONReCalcGlobalTrigger.C
@@ -151,14 +151,13 @@ Bool_t ReCalcGlobalTrigger(TIter *nextCrates) {
   if (!globalConfig)
     printf("No valid trigger crate configuration in CDB\n");
 
-  UShort_t gmask = 0;
+  UInt_t gmask = 0;
+
+  for (Int_t i = 0; i < 4; i++) {
+    gmask = globalConfig->GetGlobalMask(i);
+    fGlobalTriggerBoard->Mask(i,gmask);
+  }
 
-  gmask = globalConfig->GetFirstDarcDisable();
-  fGlobalTriggerBoard->Mask(0,gmask);
-  
-  gmask = globalConfig->GetSecondDarcDisable();
-  fGlobalTriggerBoard->Mask(1,gmask);
-  
   nextCrates->Reset();
   
   UShort_t regional[16];
@@ -169,11 +168,17 @@ Bool_t ReCalcGlobalTrigger(TIter *nextCrates) {
     return kFALSE;
   }
   
-  while ( ( cr = static_cast<AliMUONTriggerCrate*>(nextCrates->Next()) ) ) {
-    AliMUONTriggerBoard* rb =
-      static_cast<AliMUONTriggerBoard*>(cr->Boards()->At(0));
-    regional[irb] = rb->GetResponse();
-    ++irb;
+  for (Int_t iSide = 0; iSide < 2; iSide++) // right & left side
+  {
+    for (Int_t iReg = 0; iReg < 8; iReg++) // 8 crates/regional boards for each side.
+    {
+      cr = fCrates->Crate(iSide, iReg);
+
+      AliMUONTriggerBoard* rb =
+        static_cast<AliMUONTriggerBoard*>(cr->Boards()->At(0));
+      regional[irb] = rb->GetResponse();
+      ++irb;
+    }
   }
   
   fGlobalTriggerBoard->SetRegionalResponse(regional);