Fixing previous change, empty argument macros not supported everywhere

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

diff --git a/MUON/AliMUONLocalTriggerBoard.cxx b/MUON/AliMUONLocalTriggerBoard.cxx
index 57b2b98eefa8190285ec750a33c5d31a38f5b4bd..9dc5583acde13d68ebc23b0fe574eb6019d6420e 100644 (file)
--- a/MUON/AliMUONLocalTriggerBoard.cxx
+++ b/MUON/AliMUONLocalTriggerBoard.cxx
@@ -272,8 +272,8 @@ void AliMUONLocalTriggerBoard::BP(Option_t *option) const
       printf("===============================================================\n");
       printf("                            5432109876543210");
 
-      char *x[4] = {"XMC11","XMC12","XMC21","XMC22"};
-      char *s[4] = {"                      ",
+      const char *x[4] = {"XMC11","XMC12","XMC21","XMC22"};
+      const char *s[4] = {"                      ",
                     "                      ",
                     "              ",
                     "              "};
@@ -1055,23 +1055,17 @@ void AliMUONLocalTriggerBoard::LocalTrigger()
     Int_t deviation=0;
     Int_t iStripY=0;
     Int_t iStripX=0;
-    Bool_t xOutput=kFALSE;
-    Bool_t yOutput=kFALSE;
-
-   for (Int_t i=0; i<4; i++) deviation += static_cast<int>( fMinDev[i] << i );
-   for (Int_t i=0; i<4; i++) iStripY   += static_cast<int>( fCoordY[i] << i );
-
-   if (fMinDev[4]==1 && !deviation) xOutput=kFALSE;  // no trigger in X
-   else xOutput=kTRUE;                               // trigger in X
-   if (fCoordY[4]==1 && iStripY==15) yOutput=kFALSE; // no trigger in Y
-   else yOutput=kTRUE;                               // trigger in Y
+    Bool_t xOutput = IsTrigX();
+    Bool_t yOutput = IsTrigY();
 
    if (xOutput) {
       for (Int_t i=0; i<5; i++) iStripX += static_cast<int>( fMinDevStrip[i] << i );
+      for (Int_t i=0; i<4; i++) deviation += static_cast<int>( fMinDev[i] << i );
       fDev      = deviation;
       fStripX11 = iStripX;
    }
    if (yOutput) {
+     for (Int_t i=0; i<4; i++) iStripY   += static_cast<int>( fCoordY[i] << i );
       fStripY11 = iStripY;
       fTrigY    = fCoordY[4];
    }
@@ -1129,7 +1123,7 @@ Int_t AliMUONLocalTriggerBoard::GetI() const
 
    Int_t lL = atoi(&l[4]), cC = atoi(&l[2]), sS = (copy=='R') ? +1 : -1;
 
-   char *b[4] = {"12", "34", "56", "78"};
+   const char *b[4] = {"12", "34", "56", "78"};
 
    Int_t ib = 0;
 
@@ -1318,3 +1312,33 @@ void AliMUONLocalTriggerBoard::Response()
    LocalTrigger();
 }
 
+//___________________________________________
+Bool_t AliMUONLocalTriggerBoard::IsTrigY() const
+{
+  /// Return the response of non-bending plane
+  Int_t iStripY = 0;
+  Bool_t output = kFALSE;
+
+  for (Int_t i=0; i<4; i++) iStripY   += static_cast<int>( fCoordY[i] << i );
+
+  if (fCoordY[4]==1 && iStripY==15) output=kFALSE; // no trigger in Y
+  else output=kTRUE;                               // trigger in Y
+   
+  return output;
+}
+
+//___________________________________________
+Bool_t AliMUONLocalTriggerBoard::IsTrigX() const
+{
+  /// Return the response of bending plane
+
+  Int_t deviation = 0;
+  Bool_t output = kFALSE;
+
+  for (Int_t i=0; i<4; i++) deviation += static_cast<int>( fMinDev[i] << i );
+
+  if (fMinDev[4]==1 && !deviation) output=kFALSE;  // no trigger in X
+  else output=kTRUE;                               // trigger in X
+
+  return output;
+}