- Coding conventions

- Get rid of AliMUONTriggerConstants
- Use of new LUT (generated by Pascal)
- Add methods to feed AliMUONTriggerCircuitNew
(Rachid, Laurent)

diff --git a/MUON/AliMUONLocalTriggerBoard.cxx b/MUON/AliMUONLocalTriggerBoard.cxx
index 84a23767bb9ba3ccee6baa4d8f9fd12d19c7475e..058981e0863d1db8f0f4b89b728e06a8bdfe04d7 100644 (file)
--- a/MUON/AliMUONLocalTriggerBoard.cxx
+++ b/MUON/AliMUONLocalTriggerBoard.cxx
@@ -32,6 +32,28 @@
 #include <TBits.h>
 #include <Riostream.h>
 
+const Int_t AliMUONLocalTriggerBoard::fgkCircuitId[234] = 
+{
+  111,  121,  131,  141,  151,  161,  171,
+  211,  212,  221,  222,  231,  232,  241,  242,  251,  252,  261,  262,  271,
+  311,  312,  321,  322,  331,  332,  341,  342,  351,  352,  361,  362,  371,
+  411,  412,  413,  421,  422,  423,  424,  431,  432,  433,  434,  441,  442,  451,  452,  461,  462,  471,
+  521,  522,  523,  524,  531,  532,  533,  534,  541,  542,  551,  552,  561,  562,  571, 
+  611,  612,  613,  621,  622,  623,  624,  631,  632,  633,  634,  641,  642,  651,  652,  661,  662,  671,
+  711,  712,  721,  722,  731,  732,  741,  742,  751,  752,  761,  762,  771,
+  811,  812,  821,  822,  831,  832,  841,  842,  851,  852,  861,  862,  871,
+  911,  921,  931,  941,  951,  961,  971,
+  -111, -121, -131, -141, -151, -161, -171,
+  -211, -212, -221, -222, -231, -232, -241, -242, -251, -252, -261, -262, -271,
+  -311, -312, -321, -322, -331, -332, -341, -342, -351, -352, -361, -362, -371,
+  -411, -412, -413, -421, -422, -423, -424, -431, -432, -433, -434, -441, -442, -451, -452, -461, -462, -471,
+  -521, -522, -523, -524, -531, -532, -533, -534, -541, -542, -551, -552, -561, -562, -571, 
+  -611, -612, -613, -621, -622, -623, -624, -631, -632, -633, -634, -641, -642, -651, -652, -661, -662, -671,
+  -711, -712, -721, -722, -731, -732, -741, -742, -751, -752, -761, -762, -771,
+  -811, -812, -821, -822, -831, -832, -841, -842, -851, -852, -861, -862, -871,
+  -911, -921, -931, -941, -951, -961, -971 
+};
+
 //___________________________________________
 AliMUONLocalTriggerBoard::AliMUONLocalTriggerBoard()
 : AliMUONTriggerBoard()
@@ -185,7 +207,7 @@ void AliMUONLocalTriggerBoard::SetbitM(Int_t strip, Int_t cathode, Int_t chamber
 }
 
 //___________________________________________
-void AliMUONLocalTriggerBoard::Pattern(Option_t *option)
+void AliMUONLocalTriggerBoard::Pattern(Option_t *option) const
 {
 //* print bit pattern
 //*
@@ -198,13 +220,53 @@ void AliMUONLocalTriggerBoard::Pattern(Option_t *option)
 
 
 //___________________________________________
-void AliMUONLocalTriggerBoard::BP(Option_t *option)
+void AliMUONLocalTriggerBoard::BP(Option_t *option) const
 {
 // RESPECT THE OLD PRINTOUT FORMAT
+  
+  const Int_t kModuleId[126] = 
+  {11,12,13,14,15,16,17,         // right side of the chamber
+  21,22,23,24,25,26,27,
+  31,32,33,34,35,36,37,
+  41,42,43,44,45,46,47,
+  51,52,53,54,55,56,57,
+  61,62,63,64,65,66,67,
+  71,72,73,74,75,76,77,
+  81,82,83,84,85,86,87,
+  91,92,93,94,95,96,97,   
+  -11,-12,-13,-14,-15,-16,-17,  // right side of chamber
+  -21,-22,-23,-24,-25,-26,-27,
+  -31,-32,-33,-34,-35,-36,-37,
+  -41,-42,-43,-44,-45,-46,-47,
+  -51,-52,-53,-54,-55,-56,-57,
+  -61,-62,-63,-64,-65,-66,-67,
+  -71,-72,-73,-74,-75,-76,-77,
+  -81,-82,-83,-84,-85,-86,-87,
+  -91,-92,-93,-94,-95,-96,-97};
+
+  const Int_t kNstripY[126]=
+  { 8, 8, 8, 8, 8, 8,16,  // right side of the chamber
+  8, 8, 8, 8, 8, 8,16,
+  16,16,16,16,16, 8,16,
+  16,16,16,16,16, 8,16,
+  0, 8,16,16,16, 8,16,
+  16,16,16,16,16, 8,16,
+  16,16,16,16,16, 8,16,
+  8, 8, 8, 8, 8, 8,16,
+  8, 8, 8, 8, 8, 8,16,  
+  8, 8, 8, 8, 8, 8,16,  // left side of the chamber
+  8, 8, 8, 8, 8, 8,16,
+  16,16,16,16,16, 8,16,
+  16,16,16,16,16, 8,16,
+  0, 8,16,16,16, 8,16,
+  16,16,16,16,16, 8,16,
+  16,16,16,16,16, 8,16,
+  8, 8, 8, 8, 8, 8,16,
+  8, 8, 8, 8, 8, 8,16};
 
    TString op = option;
-
-       TString nn = GetName();
+       
+   TString nn = GetName();
 
    if (op.Contains("X"))
    {
@@ -259,24 +321,24 @@ void AliMUONLocalTriggerBoard::BP(Option_t *option)
 /**/
       Int_t idCircuit = 0, absidModule = 0;
 
-               if (!(nn.Contains("Int"))) 
-               {
-                       idCircuit   = AliMUONTriggerConstants::CircuitId(GetI());
-                       absidModule = TMath::Abs(Int_t(idCircuit/10));
-               }
+      if (!(nn.Contains("Int"))) 
+      {        
+       idCircuit   = fgkCircuitId[GetI()];
+       absidModule = TMath::Abs(Int_t(idCircuit/10));
+      }
                
       Int_t iModule=0;
 
       for (Int_t i=0; i<63; i++) 
       {
-         if (AliMUONTriggerConstants::ModuleId(i)==absidModule) 
+       if (kModuleId[i]==absidModule) 
          { 
             iModule=i;
             break;
          }
       }
 
-      Int_t nStrip = AliMUONTriggerConstants::NstripY(iModule);
+      Int_t nStrip = kNstripY[iModule];
       for (Int_t istrip=nStrip-1; istrip>=0; istrip--) {
          if (istrip>9)  printf("%i",istrip-10*Int_t(istrip/10));
          if (istrip<10) printf("%i",istrip);
@@ -357,7 +419,7 @@ void AliMUONLocalTriggerBoard::BP(Option_t *option)
 }
 
 //___________________________________________
-void AliMUONLocalTriggerBoard::Conf()
+void AliMUONLocalTriggerBoard::Conf() const
 {
 //* board switches
 //*
@@ -1029,36 +1091,26 @@ void AliMUONLocalTriggerBoard::LocalTrigger()
 
       fDev      = deviation;
 
-               fStripY11 = iStripY;
-               
-               if ( fSwitch[1] && 
-                         (fSwitch[0] || fSwitch[2]) && 
-                         !(!fSwitch[0] && fSwitch[4]) && 
-                         !(!fSwitch[2] && fSwitch[3]) ) fStripY11 /= 2;
+      fStripY11 = iStripY;
 
       Int_t sign = 0;
 
       if ( !fMinDev[4] &&  deviation ) sign=-1;
       if ( !fMinDev[4] && !deviation ) sign= 0;
-      if (  fMinDev[4]==1)             sign=+1;    
+      if (  fMinDev[4] == 1 )          sign=+1;    
 
       fDev *= sign; 
 
 //    calculate deviation in [0;+30]
       fDev += 15;
 
-      Int_t icirc = GetI();
-
-//    LEFT SHIFT OF ZERO-ALLY-LSB BOARDS TO ACCESS TO LUT
-               if (GetSwitch(6)) fStripY11 -= 8;
-
 //    GET LUT OUTPUT FOR icirc/istripX1/deviation/istripY
-      fLUT->GetLutOutput(icirc, fStripX11, fDev, fStripY11, fLutLpt, fLutHpt, fLutApt);
+      fLUT->GetLutOutput(fNumber, fStripX11, fDev, fStripY11, fLutLpt, fLutHpt, fLutApt);
    }  
 }
 
 //___________________________________________
-Int_t AliMUONLocalTriggerBoard::GetI()
+Int_t AliMUONLocalTriggerBoard::GetI() const
 {
 //* old numbering
 //*
@@ -1097,7 +1149,7 @@ Int_t AliMUONLocalTriggerBoard::GetI()
 
    Int_t ic = 0;
 
-   for (Int_t i=0; i<234; i++) if (AliMUONTriggerConstants::CircuitId(i) == code) {ic = i; break;}
+   for (Int_t i=0; i<234; i++) if (fgkCircuitId[i] == code) {ic = i; break;}
 
    return ic;
 }
@@ -1120,7 +1172,7 @@ void AliMUONLocalTriggerBoard::Mask(Int_t index, UShort_t mask)
 }
 
 //___________________________________________
-void AliMUONLocalTriggerBoard::Scan(Option_t *option)
+void AliMUONLocalTriggerBoard::Scan(Option_t *option) const
 {
 //* full dump
 //*
@@ -1144,7 +1196,7 @@ void AliMUONLocalTriggerBoard::Scan(Option_t *option)
 }
 
 //___________________________________________
-void AliMUONLocalTriggerBoard::Resp(Option_t *option)
+void AliMUONLocalTriggerBoard::Resp(Option_t *option) const
 {
 //* board I/O
 //*
@@ -1167,7 +1219,7 @@ void AliMUONLocalTriggerBoard::Resp(Option_t *option)
    if (op.Contains("F"))
    {
       Int_t icirc = GetI();
-      Int_t idCircuit = AliMUONTriggerConstants::CircuitId(icirc);
+      Int_t idCircuit = fgkCircuitId[icirc];
 
       Int_t deviation = 0, iStripY = 0;
 

diff --git a/MUON/AliMUONLocalTriggerBoard.h b/MUON/AliMUONLocalTriggerBoard.h
index 65a6d392a7f2c08dbc20781f0a38aba9e1adf60b..8efecbef560f13eea28e09d7efee7097a205e77d 100644 (file)
--- a/MUON/AliMUONLocalTriggerBoard.h
+++ b/MUON/AliMUONLocalTriggerBoard.h
@@ -21,14 +21,31 @@ class AliMUONTriggerLut;
 class AliMUONLocalTriggerBoard : public AliMUONTriggerBoard 
 {
    public: 
+
+     enum ESwitch { 
+       kX2d = 0,
+       kX2m,
+       kX2u,
+       kOR0,
+       kOR1,
+       kENY,
+       kZeroAllYLSB,
+       kZeroDown,
+       kZeroMiddle,
+       kZeroUp };
+       
       AliMUONLocalTriggerBoard();
       AliMUONLocalTriggerBoard(const char *name, Int_t a, AliMUONTriggerLut* lut);
       virtual ~AliMUONLocalTriggerBoard() {;}
+      
+      Bool_t HasLUT() const { return (fLUT != 0); }
+      
+      void SetLUT(AliMUONTriggerLut* lut) { fLUT = lut; }
 
       virtual void     Setbit(Int_t strip, Int_t cathode, Int_t chamber);
       virtual void     SetbitM(Int_t strip, Int_t cathode, Int_t chamber);
 
-      virtual void     Pattern(Option_t *option = "X Y"); // default option displays X then Y bp
+      virtual void     Pattern(Option_t *option = "X Y") const; // default option displays X then Y bp
 
       virtual void     Reset();
 
@@ -40,9 +57,9 @@ class AliMUONLocalTriggerBoard : public AliMUONTriggerBoard
 
       virtual Bool_t   GetTC() const {return fTC;}
 
-               virtual void     SetNumber(Int_t nb) {fNumber = nb;}
+      virtual void     SetNumber(Int_t nb) {fNumber = nb;}
 
-               virtual Int_t    GetNumber() const {return fNumber;}
+      virtual Int_t    GetNumber() const {return fNumber;}
 
       virtual void     Module(char *mod);
 
@@ -60,7 +77,7 @@ class AliMUONLocalTriggerBoard : public AliMUONTriggerBoard
 
       virtual void     SetXY(UShort_t XY[2][4]) {for (Int_t i=0;i<2;i++) for (Int_t j=0;j<4;j++) fXY[i][j] = XY[i][j];}
 
-      virtual void     Conf();
+      virtual void     Conf() const;
 
       virtual void     Response();
 
@@ -80,9 +97,9 @@ class AliMUONLocalTriggerBoard : public AliMUONTriggerBoard
 
       virtual void     SetXYD(UShort_t V[2][4]) {for (Int_t i=0;i<2;i++) for (Int_t j=0;j<4;j++) fXYD[i][j] = V[i][j];}
 
-      virtual void     Scan(Option_t *option = "");
+      virtual void     Scan(Option_t *option = "") const;
 
-      virtual Int_t    GetI();
+      virtual Int_t    GetI() const;
 
       virtual void     LocalTrigger();
 
@@ -94,24 +111,25 @@ class AliMUONLocalTriggerBoard : public AliMUONTriggerBoard
 
       virtual Int_t    GetDev() const {return fDev;}
       
-               virtual void     SetCrate(TString crate) {fCrate = crate;}
+      virtual void     SetCrate(TString crate) {fCrate = crate;}
 
-               virtual TString  GetCrate() const {return fCrate;}
+      virtual TString  GetCrate() const {return fCrate;}
 
    protected:
       AliMUONLocalTriggerBoard(const AliMUONLocalTriggerBoard& right);
       AliMUONLocalTriggerBoard&  operator = (const AliMUONLocalTriggerBoard& right);
       
+      static const Int_t fgkCircuitId[234]; // old numbering (to be removed)
 
-      virtual void     Resp(Option_t *option); // local trigger info before ("I") and after ("F") LUT
+      virtual void     Resp(Option_t *option) const; // local trigger info before ("I") and after ("F") LUT
 
-      virtual void     BP(Option_t *option);   // display X/Y bp
+      virtual void     BP(Option_t *option) const;   // display X/Y bp
 
    private:
 
       Int_t    fNumber;           // Board number
 
-               TString  fCrate;            // Crate name
+      TString  fCrate;            // Crate name
 
       UShort_t fSwitch[10];       // Switch
       UShort_t fXY[2][4];         // Bit pattern