X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONTriggerElectronics.cxx;h=13fc26cc12a883baa82ce9884f2b1546cd7610b3;hb=6b2521a479cb9a9fa784030dc9583c3a51cef856;hp=ac665de0afe6e495af238b41c55821b8999a3b07;hpb=00d46f2444b09f1c88a2268e2359bf584d9b2926;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONTriggerElectronics.cxx b/MUON/AliMUONTriggerElectronics.cxx
index ac665de0afe..13fc26cc12a 100644
--- a/MUON/AliMUONTriggerElectronics.cxx
+++ b/MUON/AliMUONTriggerElectronics.cxx
@@ -217,13 +217,13 @@ void AliMUONTriggerElectronics::Feed(const AliMUONVDigitStore& digitStore)
         
         if (b) 
         {
-          if (cathode && b->GetSwitch(6)) ibitxy += 8;
+          if (cathode && b->GetSwitch(AliMpLocalBoard::kZeroAllYLSB)) ibitxy += 8;
           
           b->SetbitM(ibitxy,cathode,ichamber-10);
         }
         else
         {
-          AliError(Form("Could not get local board number %d",b->GetNumber()));
+          AliError(Form("Could not get local board number %d",nboard));
         }
       }
     }		
@@ -370,7 +370,7 @@ void AliMUONTriggerElectronics::DumpOS()
 }
 
 //___________________________________________
-void AliMUONTriggerElectronics::Scan(Option_t *option)
+void AliMUONTriggerElectronics::Scan(const Option_t *option)
 {
   /// SCAN
   ///
@@ -433,9 +433,10 @@ void AliMUONTriggerElectronics::LoadMasks(AliMUONCalibrationData* calibData)
   // Set mask
   
   AliMUONRegionalTriggerConfig* regionalConfig = calibData->RegionalTriggerConfig();
-  if (!regionalConfig)
-     AliWarning("No valid regional trigger configuration in CDB");
-
+  if (!regionalConfig) {
+     AliError("No valid regional trigger configuration in CDB");
+     return;
+  }   
   
   AliMUONTriggerCrate* cr;
   TIter next(fCrates->CreateCrateIterator());
@@ -480,8 +481,10 @@ void AliMUONTriggerElectronics::LoadMasks(AliMUONCalibrationData* calibData)
   }
   
    AliMUONGlobalCrateConfig * globalConfig = calibData->GlobalTriggerCrateConfig();
-  if (!globalConfig)
-     AliWarning("No valid trigger crate configuration in CDB");
+   if (!globalConfig) {
+     AliError("No valid trigger crate configuration in CDB");
+     return;
+   }   
 
     UInt_t gmask = 0;
     for (Int_t i = 0; i < 4; i++) {
@@ -573,7 +576,7 @@ void AliMUONTriggerElectronics::GlobalResponse()
   AliMUONTriggerCrate* cr;
   Int_t irb(0);
   
-  if ( !fCrates->NumberOfCrates() >= 16 ) 
+  if ( fCrates->NumberOfCrates() > 16 ) 
   {
     AliFatal(Form("Something is wrong : too many crates %d",
                   fCrates->NumberOfCrates()));
@@ -718,7 +721,7 @@ void AliMUONTriggerElectronics::Digits2Trigger(const AliMUONVDigitStore& digitSt
 }
 
 //___________________________________________
-void AliMUONTriggerElectronics::Feed(AliMUONVTriggerStore& triggerStore)
+void AliMUONTriggerElectronics::Feed(const AliMUONVTriggerStore& triggerStore)
 {
   //
   /// Fill inputs from reconstructed local trigger store