Coding conventions (Rachid)

diff --git a/MUON/AliMUONLocalTriggerBoard.cxx b/MUON/AliMUONLocalTriggerBoard.cxx
index a5d05a43e810f336b405a7af69805ed920cac514..84a23767bb9ba3ccee6baa4d8f9fd12d19c7475e 100644 (file)
--- a/MUON/AliMUONLocalTriggerBoard.cxx
+++ b/MUON/AliMUONLocalTriggerBoard.cxx
@@ -19,22 +19,25 @@
 // Implementation of local trigger board objects
 // A local trigger board has as input a bit pattern and returns 
 // the local trigger response after comparison w/ a LUT
 // Implementation of local trigger board objects
 // A local trigger board has as input a bit pattern and returns 
 // the local trigger response after comparison w/ a LUT

-//

 //*-- Author: Rachid Guernane (LPCCFd)
 //*-- Author: Rachid Guernane (LPCCFd)

+//*
+//*

 
 #include "AliMUONLocalTriggerBoard.h"
 #include "AliMUONTriggerLut.h"
 #include "AliMUONTriggerConstants.h"
 
 #include "AliMUONLocalTriggerBoard.h"
 #include "AliMUONTriggerLut.h"
 #include "AliMUONTriggerConstants.h"

+

 #include "AliLog.h"
 
 #include <TBits.h>
 #include "AliLog.h"
 
 #include <TBits.h>

-

 #include <Riostream.h>
 
 //___________________________________________
 AliMUONLocalTriggerBoard::AliMUONLocalTriggerBoard()
 : AliMUONTriggerBoard()
 {
 #include <Riostream.h>
 
 //___________________________________________
 AliMUONLocalTriggerBoard::AliMUONLocalTriggerBoard()
 : AliMUONTriggerBoard()
 {

+//* constructor
+//*

    fNumber = 0;
 
    for (Int_t i=0; i<2; i++) 
    fNumber = 0;
 
    for (Int_t i=0; i<2; i++) 


@@ -65,6 +68,8 @@ AliMUONLocalTriggerBoard::AliMUONLocalTriggerBoard(const char *name, Int_t a,
                                                    AliMUONTriggerLut* lut) 
 : AliMUONTriggerBoard(name, a)
 {
                                                    AliMUONTriggerLut* lut) 
 : AliMUONTriggerBoard(name, a)
 {

+//* constructor
+//*

    fNumber = 0;
    
    for (Int_t i=0; i<2; i++) 
    fNumber = 0;
    
    for (Int_t i=0; i<2; i++) 


@@ -116,6 +121,8 @@ AliMUONLocalTriggerBoard::operator=(const AliMUONLocalTriggerBoard& right)
 //___________________________________________
 void AliMUONLocalTriggerBoard::Reset()
 {
 //___________________________________________
 void AliMUONLocalTriggerBoard::Reset()
 {

+//* reset board
+//*

    for (Int_t i=0; i<2; i++) 
       for (Int_t j=0; j<4; j++) 
          fXY[i][j] = fXYU[i][j] = fXYD[i][j] = 0;
    for (Int_t i=0; i<2; i++) 
       for (Int_t j=0; j<4; j++) 
          fXY[i][j] = fXYU[i][j] = fXYD[i][j] = 0;


@@ -166,8 +173,6 @@ void AliMUONLocalTriggerBoard::SetbitM(Int_t strip, Int_t cathode, Int_t chamber
    w.Set(16,&xy);
    m.Set(16,&mask);
 
    w.Set(16,&xy);
    m.Set(16,&mask);
 

-//    Int_t s = strip - int(strip / 16) * 16;
-

    w.SetBitNumber(strip);
    
    w &= m;
    w.SetBitNumber(strip);
    
    w &= m;


@@ -182,6 +187,8 @@ void AliMUONLocalTriggerBoard::SetbitM(Int_t strip, Int_t cathode, Int_t chamber
 //___________________________________________
 void AliMUONLocalTriggerBoard::Pattern(Option_t *option)
 {
 //___________________________________________
 void AliMUONLocalTriggerBoard::Pattern(Option_t *option)
 {

+//* print bit pattern
+//*

    TString op = option;
    
    if (op.Contains("X")) BP("X");
    TString op = option;
    
    if (op.Contains("X")) BP("X");


@@ -352,6 +359,8 @@ void AliMUONLocalTriggerBoard::BP(Option_t *option)
 //___________________________________________
 void AliMUONLocalTriggerBoard::Conf()
 {
 //___________________________________________
 void AliMUONLocalTriggerBoard::Conf()
 {

+//* board switches
+//*

    cout << "Switch(" << GetName() << ")" 
         << " x2d = "           << fSwitch[0] 
         << " x2m = "           << fSwitch[1] 
    cout << "Switch(" << GetName() << ")" 
         << " x2d = "           << fSwitch[0] 
         << " x2m = "           << fSwitch[1] 


@@ -371,7 +380,9 @@ void AliMUONLocalTriggerBoard::Conf()
 //___________________________________________
 void AliMUONLocalTriggerBoard::Module(char *mod)
 {
 //___________________________________________
 void AliMUONLocalTriggerBoard::Module(char *mod)
 {

-   const Int_t maxfields = 2; char **fields = new char*[maxfields];
+//* get module from name
+//*
+   const Int_t kMaxfields = 2; char **fields = new char*[kMaxfields];

 
    char s[100]; strcpy(s, GetName());
 
 
    char s[100]; strcpy(s, GetName());
 


@@ -997,6 +1008,8 @@ void AliMUONLocalTriggerBoard::TrigY(Int_t y1[16], Int_t y2[16], Int_t y3[16], I
 //___________________________________________
 void AliMUONLocalTriggerBoard::LocalTrigger()
 {
 //___________________________________________
 void AliMUONLocalTriggerBoard::LocalTrigger()
 {

+//* L0 trigger after LUT
+//*

    Int_t deviation=0, iStripY=0;
 
    for (Int_t i=0; i<4; i++) deviation += static_cast<int>( fMinDev[i] << i );
    Int_t deviation=0, iStripY=0;
 
    for (Int_t i=0; i<4; i++) deviation += static_cast<int>( fMinDev[i] << i );


@@ -1047,7 +1060,9 @@ void AliMUONLocalTriggerBoard::LocalTrigger()
 //___________________________________________
 Int_t AliMUONLocalTriggerBoard::GetI()
 {
 //___________________________________________
 Int_t AliMUONLocalTriggerBoard::GetI()
 {

-   const Int_t maxfields = 2; char **fields = new char*[maxfields];
+//* old numbering
+//*
+   const Int_t kMaxfields = 2; char **fields = new char*[kMaxfields];

 
    char s[100]; strcpy(s, GetName());
 
 
    char s[100]; strcpy(s, GetName());
 


@@ -1065,7 +1080,7 @@ Int_t AliMUONLocalTriggerBoard::GetI()
 
    char copy = l[0];
 
 
    char copy = l[0];
 

-   Int_t L = atoi(&l[4]), C = atoi(&l[2]), S = (copy=='R') ? +1 : -1;
+   Int_t lL = atoi(&l[4]), cC = atoi(&l[2]), sS = (copy=='R') ? +1 : -1;

 
    char *b[4] = {"12", "34", "56", "78"};
 
 
    char *b[4] = {"12", "34", "56", "78"};
 


@@ -1073,12 +1088,12 @@ Int_t AliMUONLocalTriggerBoard::GetI()
 
    for (Int_t i=0; i<4; i++) if (!strcmp(fields[1],b[i])) {ib = i; break;} ib++;
 
 
    for (Int_t i=0; i<4; i++) if (!strcmp(fields[1],b[i])) {ib = i; break;} ib++;
 

-// L=1 ON TOP
-   L -= 9; L = abs(L); L++;
+// lL=1 ON TOP
+   lL -= 9; lL = abs(lL); lL++;

 
 

-   Int_t code = 100 * L + 10 * C + ib;
+   Int_t code = 100 * lL + 10 * cC + ib;

 
 

-   code *= S;
+   code *= sS;

 
    Int_t ic = 0;
 
 
    Int_t ic = 0;
 


@@ -1090,6 +1105,8 @@ Int_t AliMUONLocalTriggerBoard::GetI()
 //___________________________________________
 void AliMUONLocalTriggerBoard::Mask(Int_t index, UShort_t mask)
 {
 //___________________________________________
 void AliMUONLocalTriggerBoard::Mask(Int_t index, UShort_t mask)
 {

+//* set mask
+//*

   if ( index >= 0 && index < 2*4 )
   {
     Int_t i = index/4;
   if ( index >= 0 && index < 2*4 )
   {
     Int_t i = index/4;


@@ -1105,6 +1122,8 @@ void AliMUONLocalTriggerBoard::Mask(Int_t index, UShort_t mask)
 //___________________________________________
 void AliMUONLocalTriggerBoard::Scan(Option_t *option)
 {
 //___________________________________________
 void AliMUONLocalTriggerBoard::Scan(Option_t *option)
 {

+//* full dump
+//*

    TString op = option;
 
    if (op.Contains("CONF")) Conf();
    TString op = option;
 
    if (op.Contains("CONF")) Conf();


@@ -1127,6 +1146,8 @@ void AliMUONLocalTriggerBoard::Scan(Option_t *option)
 //___________________________________________
 void AliMUONLocalTriggerBoard::Resp(Option_t *option)
 {
 //___________________________________________
 void AliMUONLocalTriggerBoard::Resp(Option_t *option)
 {

+//* board I/O
+//*

    TString op = option;
 
    if (op.Contains("I"))
    TString op = option;
 
    if (op.Contains("I"))


@@ -1169,16 +1190,14 @@ void AliMUONLocalTriggerBoard::Resp(Option_t *option)
       printf("\n");
       printf("-------------------------------------------\n");
    }      
       printf("\n");
       printf("-------------------------------------------\n");
    }      

-//    else
-//    {
-      
-//    }

 }
 
 //___________________________________________
 void AliMUONLocalTriggerBoard::Response()
 {
 }
 
 //___________________________________________
 void AliMUONLocalTriggerBoard::Response()
 {

-   Int_t X1[16], X2[16], XX3[32], XX4[32];
+//* algo
+//*
+   Int_t xX1[16], xX2[16], xXX3[32], xXX4[32];

 
    TBits x1(16), x2(16), x3(16), x4(16);
 
 
    TBits x1(16), x2(16), x3(16), x4(16);
 


@@ -1199,29 +1218,29 @@ void AliMUONLocalTriggerBoard::Response()
 
    for (Int_t i=0;i<16;i++)
    {
 
    for (Int_t i=0;i<16;i++)
    {

-      X1[i] = x1[i];
-      X2[i] = x2[i];
+      xX1[i] = x1[i];
+      xX2[i] = x2[i];

       
       

-      XX3[i+8] = x3[i];
-      XX4[i+8] = x4[i];  
+      xXX3[i+8] = x3[i];
+      xXX4[i+8] = x4[i];  

    }
 
    for (Int_t i=0;i<8;i++)
    {
    }
 
    for (Int_t i=0;i<8;i++)
    {

-      XX3[i] = x3d[i+8];
-      XX4[i] = x4d[i+8];
+      xXX3[i] = x3d[i+8];
+      xXX4[i] = x4d[i+8];

 
 

-      XX3[i+24] = x3u[i];
-      XX4[i+24] = x4u[i];
+      xXX3[i+24] = x3u[i];
+      xXX4[i+24] = x4u[i];

    }
    
    Int_t coinc44 = 0;
    
    }
    
    Int_t coinc44 = 0;
    

-   TrigX(X1, X2, XX3, XX4, coinc44);   
+   TrigX(xX1, xX2, xXX3, xXX4, coinc44);   

 
 

-   Int_t Y1[16], Y2[16], Y3[16], Y4[16];
+   Int_t yY1[16], yY2[16], yY3[16], yY4[16];

    
    

-   Int_t Y3U[16], Y3D[16], Y4U[16], Y4D[16];
+   Int_t yY3U[16], yY3D[16], yY4U[16], yY4D[16];

 
    TBits y1(16), y2(16), y3(16), y4(16);
 
 
    TBits y1(16), y2(16), y3(16), y4(16);
 


@@ -1239,19 +1258,19 @@ void AliMUONLocalTriggerBoard::Response()
 
    for (Int_t i=0;i<16;i++)
    {
 
    for (Int_t i=0;i<16;i++)
    {

-      Y1[i] = y1[i];
-      Y2[i] = y2[i];
-      Y3[i] = y3[i];
-      Y4[i] = y4[i];
+      yY1[i] = y1[i];
+      yY2[i] = y2[i];
+      yY3[i] = y3[i];
+      yY4[i] = y4[i];

       
       

-      Y3U[i] = y3u[i];
-      Y3D[i] = y3d[i];
+      yY3U[i] = y3u[i];
+      yY3D[i] = y3d[i];

       
       

-      Y4U[i] = y4u[i];
-      Y4D[i] = y4d[i];
+      yY4U[i] = y4u[i];
+      yY4D[i] = y4d[i];

    }
 
    }
 

-   TrigY(Y1, Y2, Y3, Y4, Y3U, Y3D, Y4U, Y4D, coinc44);
+   TrigY(yY1, yY2, yY3, yY4, yY3U, yY3D, yY4U, yY4D, coinc44);

    
 // ASIGN fLutLpt, fLutHpt, fLutApt
    LocalTrigger(); 
    
 // ASIGN fLutLpt, fLutHpt, fLutApt
    LocalTrigger(); 

diff --git a/MUON/AliMUONLocalTriggerBoard.h b/MUON/AliMUONLocalTriggerBoard.h
index b67fdad0116035f47e1f1f9478e5f2761b8d0f61..65a6d392a7f2c08dbc20781f0a38aba9e1adf60b 100644 (file)
--- a/MUON/AliMUONLocalTriggerBoard.h
+++ b/MUON/AliMUONLocalTriggerBoard.h
@@ -5,7 +5,14 @@
 
 /* $Id$ */
 
 
 /* $Id$ */
 

-//*-- Author: Rachid Guernane (LPCCFd)
+/// \ingroup sim 
+/// \class AliMUONLocalTriggerBoard
+/// \brief Implementation of local trigger board objects
+///
+/// A local trigger board has as input a bit pattern and returns 
+/// the local trigger response after comparison w/ a LUT
+///
+/// \author Rachid Guernane (LPCCFd)

 
 #include "AliMUONTriggerBoard.h"
 
 
 #include "AliMUONTriggerBoard.h"
 


@@ -27,29 +34,29 @@ class AliMUONLocalTriggerBoard : public AliMUONTriggerBoard
 
       virtual void     SetSwitch(Int_t i, Int_t value) {fSwitch[i] = value;}
 
 
       virtual void     SetSwitch(Int_t i, Int_t value) {fSwitch[i] = value;}
 

-      virtual UShort_t GetSwitch(Int_t i) {return fSwitch[i];}
+      virtual UShort_t GetSwitch(Int_t i) const {return fSwitch[i];}

 
       virtual void     SetTC(Bool_t con) {fTC = con;}
 
 
       virtual void     SetTC(Bool_t con) {fTC = con;}
 

-      virtual Bool_t   GetTC() {return fTC;}
+      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() {return fNumber;}
+               virtual Int_t    GetNumber() const {return fNumber;}

 
       virtual void     Module(char *mod);
 
 
       virtual void     Module(char *mod);
 

-      virtual void     GetX34(UShort_t *X) {for (Int_t i=0;i<2;i++) X[i] = fXY[0][i+2];}
+      virtual void     GetX34(UShort_t *X) const {for (Int_t i=0;i<2;i++) X[i] = fXY[0][i+2];}

 
       virtual void     SetX34(UShort_t *X) {for (Int_t i=0;i<2;i++) fXY[0][i+2] = X[i];}
 
 
       virtual void     SetX34(UShort_t *X) {for (Int_t i=0;i<2;i++) fXY[0][i+2] = X[i];}
 

-      virtual void     GetY(UShort_t *Y) {for (Int_t i=0;i<4;i++) Y[i] = fXY[1][i];}
+      virtual void     GetY(UShort_t *Y) const {for (Int_t i=0;i<4;i++) Y[i] = fXY[1][i];}

 
       virtual void     SetY(UShort_t *Y) {for (Int_t i=0;i<4;i++) fXY[1][i] = Y[i];}
 
 
       virtual void     SetY(UShort_t *Y) {for (Int_t i=0;i<4;i++) fXY[1][i] = Y[i];}
 

-      virtual void     GetXY(UShort_t XY[2][4]) {for (Int_t i=0;i<2;i++) for (Int_t j=0;j<4;j++) XY[i][j] = fXY[i][j];}
+      virtual void     GetXY(UShort_t XY[2][4]) const {for (Int_t i=0;i<2;i++) for (Int_t j=0;j<4;j++) XY[i][j] = fXY[i][j];}

 
 

-      virtual UShort_t GetXY(Int_t i, Int_t j) {return fXY[i][j];} 
+      virtual UShort_t GetXY(Int_t i, Int_t j) const {return fXY[i][j];} 

 
       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     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];}
 


@@ -79,16 +86,17 @@ class AliMUONLocalTriggerBoard : public AliMUONTriggerBoard
 
       virtual void     LocalTrigger();
 
 
       virtual void     LocalTrigger();
 

-      virtual Int_t    Triggered() {return fOutput;}
+      virtual Int_t    Triggered() const {return fOutput;}

 
 

-      virtual Int_t    GetStripX11() {return fStripX11;}
+      virtual Int_t    GetStripX11() const {return fStripX11;}

 
 

-      virtual Int_t    GetStripY11() {return fStripY11;}
+      virtual Int_t    GetStripY11() const {return fStripY11;}

 
 

-      virtual Int_t    GetDev() {return fDev;}
+      virtual Int_t    GetDev() const {return fDev;}

       
                virtual void     SetCrate(TString crate) {fCrate = crate;}
       
                virtual void     SetCrate(TString crate) {fCrate = crate;}

-               virtual TString  GetCrate() {return fCrate;}
+
+               virtual TString  GetCrate() const {return fCrate;}

 
    protected:
       AliMUONLocalTriggerBoard(const AliMUONLocalTriggerBoard& right);
 
    protected:
       AliMUONLocalTriggerBoard(const AliMUONLocalTriggerBoard& right);


@@ -101,36 +109,35 @@ class AliMUONLocalTriggerBoard : public AliMUONTriggerBoard
 
    private:
 
 
    private:
 

-      Int_t    fNumber;
+      Int_t    fNumber;           // Board number

 
 

-               TString  fCrate;
+               TString  fCrate;            // Crate name

 
 

-      UShort_t fSwitch[10], fXY[2][4], fXYU[2][4], fXYD[2][4], fMask[2][4];
+      UShort_t fSwitch[10];       // Switch
+      UShort_t fXY[2][4];         // Bit pattern
+      UShort_t fXYU[2][4];        // Bit pattern UP
+      UShort_t fXYD[2][4];        // Bit pattern DOWN
+      UShort_t fMask[2][4];       // Mask

 
 

-//    Transverse connector
-      Bool_t   fTC;
+      Bool_t   fTC;               // Transverse connector

 
 

-//    MT1 X position of the valid road 
-      Int_t    fStripX11;
+      Int_t    fStripX11;         // MT1 X position of the valid road 

 
 

-//    MT1 Y position of the valid road
-      Int_t    fStripY11;
+      Int_t    fStripY11;         // MT1 Y position of the valid road

 
 

-//    Deviation in [0;+30]
-      Int_t    fDev;
+      Int_t    fDev;              // Deviation in [0;+30]

 
 

-//    Pt cuts estimated from LUT
-      Int_t    fLutLpt[2];        
-      Int_t    fLutHpt[2];
-      Int_t    fLutApt[2];
+      Int_t    fLutLpt[2];        // Low Pt cuts estimated from LUT
+      Int_t    fLutHpt[2];        // High Pt cuts estimated from LUT
+      Int_t    fLutApt[2];        // All Pt cuts estimated from LUT

 
 //    Outputs of the local logic
 
 //    Outputs of the local logic

-      Int_t    fOutput;
-      Int_t    fMinDevStrip[5];
-      Int_t    fMinDev[5];
-      Int_t    fCoordY[5];
+      Int_t    fOutput;           // Board has triggered
+      Int_t    fMinDevStrip[5];   // X (from algo)
+      Int_t    fMinDev[5];        // Dev (from algo)
+      Int_t    fCoordY[5];        // Y (from algo)

 
 

-      AliMUONTriggerLut *fLUT; //! Pointer to trigger LUT, that we do not own.
+      AliMUONTriggerLut *fLUT;    //! Pointer to trigger LUT, that we do not own.

       
       ClassDef(AliMUONLocalTriggerBoard,1) 
 };
       
       ClassDef(AliMUONLocalTriggerBoard,1) 
 };

diff --git a/MUON/AliMUONTriggerElectronics.cxx b/MUON/AliMUONTriggerElectronics.cxx
index d17a8451cc279bb41028d262a30f16e48e517797..4963af193f67a54f916cdb02be9ad9093f1fabfe 100644 (file)
--- a/MUON/AliMUONTriggerElectronics.cxx
+++ b/MUON/AliMUONTriggerElectronics.cxx
@@ -16,6 +16,10 @@
 /* $Id$ */
 
 //*-- Author: Rachid Guernane (LPCCFd)
 /* $Id$ */
 
 //*-- Author: Rachid Guernane (LPCCFd)

+//*   Manager class for muon trigger electronics
+//*   Client of trigger board classes
+//*
+//*

 
 #include "AliMUONTriggerElectronics.h"
 #include "AliMUONTriggerCrate.h"
 
 #include "AliMUONTriggerElectronics.h"
 #include "AliMUONTriggerCrate.h"


@@ -25,22 +29,22 @@
 #include "AliMUONGlobalTriggerBoard.h"
 #include "AliMUONLocalTrigger.h"
 #include "AliMUONGlobalTrigger.h"
 #include "AliMUONGlobalTriggerBoard.h"
 #include "AliMUONLocalTrigger.h"
 #include "AliMUONGlobalTrigger.h"

-#include "AliLoader.h"
-#include "AliRun.h"

 #include "AliMUON.h" 
 #include "AliMUONData.h" 
 #include "AliMUONDigit.h"
 #include "AliMUON.h" 
 #include "AliMUONData.h" 
 #include "AliMUONDigit.h"

-#include "AliLog.h"
-#include "AliLoader.h"

 #include "AliMUONTriggerConstants.h"
 #include "AliMUONTriggerConstants.h"

-#include "AliMpTriggerSegmentation.h"

 #include "AliMUONSegmentation.h"
 #include "AliMUONSegmentation.h"

-#include "AliMpVSegmentation.h"

 #include "AliMUONCalibrationData.h"
 #include "AliMUONVCalibParam.h"
 #include "AliMUONCalibrationData.h"
 #include "AliMUONVCalibParam.h"

-#include "TBits.h"

 
 

-#include "Riostream.h"
+#include "AliMpVSegmentation.h"
+
+#include "AliLog.h"
+#include "AliLoader.h"
+#include "AliRun.h"
+
+//#include "Riostream.h"
+#include "TBits.h"

 #include "TSystem.h"
 
 ClassImp(AliMUONTriggerElectronics)
 #include "TSystem.h"
 
 ClassImp(AliMUONTriggerElectronics)


@@ -56,6 +60,8 @@ AliMUONTriggerElectronics::AliMUONTriggerElectronics(AliMUONData *Data, AliMUONC
   fNCrates(0),
   fMUONData(Data)
 {
   fNCrates(0),
   fMUONData(Data)
 {

+//* CONSTRUCTOR
+//*

   if (!fMUONData)
   {  
     AliFatal("NO MUON TRIGGER DATA");
   if (!fMUONData)
   {  
     AliFatal("NO MUON TRIGGER DATA");


@@ -92,6 +98,8 @@ AliMUONTriggerElectronics::AliMUONTriggerElectronics(const AliMUONTriggerElectro
 //___________________________________________
 AliMUONTriggerElectronics::~AliMUONTriggerElectronics()
 {
 //___________________________________________
 AliMUONTriggerElectronics::~AliMUONTriggerElectronics()
 {

+//* DESTRUCTOR
+//*

   delete fGlobalTriggerBoard;
   delete fCrates;
 
   delete fGlobalTriggerBoard;
   delete fCrates;
 


@@ -115,6 +123,8 @@ AliMUONTriggerElectronics::operator=(const AliMUONTriggerElectronics& right)
 //___________________________________________
 void AliMUONTriggerElectronics::Factory(AliMUONCalibrationData* calibData)
 {  
 //___________________________________________
 void AliMUONTriggerElectronics::Factory(AliMUONCalibrationData* calibData)
 {  

+//* BUILD ALL ELECTRONICS
+//*

    ifstream myInputFile(gSystem->ExpandPathName(fSourceFileName.Data()), ios::in);
 
    string sLine, sValue;
    ifstream myInputFile(gSystem->ExpandPathName(fSourceFileName.Data()), ios::in);
 
    string sLine, sValue;


@@ -130,7 +140,7 @@ void AliMUONTriggerElectronics::Factory(AliMUONCalibrationData* calibData)
          if (sLine.empty()) continue; // Ignore empty lines
          else
          {
          if (sLine.empty()) continue; // Ignore empty lines
          else
          {

-            const Int_t maxfields = 15; char **fields = new char*[maxfields];
+            const Int_t kMaxfields = 15; char **fields = new char*[kMaxfields];

             
             char s[100]; 
          
             
             char s[100]; 
          


@@ -216,14 +226,16 @@ void AliMUONTriggerElectronics::Factory(AliMUONCalibrationData* calibData)
 //___________________________________________
 void AliMUONTriggerElectronics::Feed()
 {
 //___________________________________________
 void AliMUONTriggerElectronics::Feed()
 {

+//* FILL INPUTS
+//*

        for (Int_t ichamber=10; ichamber<14; ichamber++) 
        {
        for (Int_t ichamber=10; ichamber<14; ichamber++) 
        {

-      TClonesArray *MuonDigits = fMUONData->Digits(ichamber);
-      Int_t ndigits = MuonDigits->GetEntriesFast();
+      TClonesArray *muonDigits = fMUONData->Digits(ichamber);
+      Int_t ndigits = muonDigits->GetEntriesFast();

 
       for (Int_t digit=0; digit<ndigits; digit++)
                {
 
       for (Int_t digit=0; digit<ndigits; digit++)
                {

-                       AliMUONDigit *mdig = static_cast<AliMUONDigit*>(MuonDigits->UncheckedAt(digit));
+                       AliMUONDigit *mdig = static_cast<AliMUONDigit*>(muonDigits->UncheckedAt(digit));

 
                        Int_t ix = mdig->PadX(), iy = mdig->PadY();
 
 
                        Int_t ix = mdig->PadX(), iy = mdig->PadY();
 


@@ -259,7 +271,7 @@ void AliMUONTriggerElectronics::Feed()
                                                {       
                                                        if (b->GetSwitch(6)) iy += 8;
 
                                                {       
                                                        if (b->GetSwitch(6)) iy += 8;
 

-                                                       char M1[20]; b->Module(M1);
+                                                       char mM1[20]; b->Module(mM1);

 
                                                        for (Int_t j=0;j<fgkNCrates;j++)
                                                        {            
 
                                                        for (Int_t j=0;j<fgkNCrates;j++)
                                                        {            


@@ -273,9 +285,9 @@ void AliMUONTriggerElectronics::Feed()
 
                                                                        if (h)
                                                                        {
 
                                                                        if (h)
                                                                        {

-                                                                               char M2[20]; h->Module(M2);
+                                                                               char mM2[20]; h->Module(mM2);

                                                                                
                                                                                

-                                                                               if (!strcmp(M1,M2)) h->Setbit(iy,cathode,ichamber-10);
+                                                                               if (!strcmp(mM1,mM2)) h->Setbit(iy,cathode,ichamber-10);

                                                                        }
                                                                }
                                                        }
                                                                        }
                                                                }
                                                        }


@@ -364,14 +376,16 @@ void AliMUONTriggerElectronics::Feed()
 //___________________________________________
 void AliMUONTriggerElectronics::FeedM()
 {
 //___________________________________________
 void AliMUONTriggerElectronics::FeedM()
 {

+//* FILL INPUTS
+//*

        for (Int_t ichamber=10; ichamber<14; ichamber++) 
        {
        for (Int_t ichamber=10; ichamber<14; ichamber++) 
        {

-      TClonesArray *MuonDigits = fMUONData->Digits(ichamber);
-      Int_t ndigits = MuonDigits->GetEntriesFast();
+      TClonesArray *muonDigits = fMUONData->Digits(ichamber);
+      Int_t ndigits = muonDigits->GetEntriesFast();

 
       for (Int_t digit=0; digit<ndigits; digit++)
                {
 
       for (Int_t digit=0; digit<ndigits; digit++)
                {

-                       AliMUONDigit *mdig = static_cast<AliMUONDigit*>(MuonDigits->UncheckedAt(digit));
+                       AliMUONDigit *mdig = static_cast<AliMUONDigit*>(muonDigits->UncheckedAt(digit));

 
 //       CHECKME ! The TrackCharge is not ok with new digitizerV3 !
 //                     for (Int_t ichg=0; ichg<10; ichg++) schg += mdig->TrackCharge(ichg);
 
 //       CHECKME ! The TrackCharge is not ok with new digitizerV3 !
 //                     for (Int_t ichg=0; ichg<10; ichg++) schg += mdig->TrackCharge(ichg);


@@ -503,6 +517,8 @@ void AliMUONTriggerElectronics::FeedM()
 //___________________________________________
 void AliMUONTriggerElectronics::Feed(UShort_t pattern[2][4])
 {
 //___________________________________________
 void AliMUONTriggerElectronics::Feed(UShort_t pattern[2][4])
 {

+//* FILL INPUTS
+//*

    for (Int_t i=0; i<fgkNCrates; i++)
    {            
       AliMUONTriggerCrate *cr = (AliMUONTriggerCrate*)fCrates->UncheckedAt(i);
    for (Int_t i=0; i<fgkNCrates; i++)
    {            
       AliMUONTriggerCrate *cr = (AliMUONTriggerCrate*)fCrates->UncheckedAt(i);


@@ -525,6 +541,8 @@ void AliMUONTriggerElectronics::Feed(UShort_t pattern[2][4])
 //___________________________________________
 void AliMUONTriggerElectronics::DumpOS()
 {
 //___________________________________________
 void AliMUONTriggerElectronics::DumpOS()
 {

+//* DUMP IN THE OLD WAY
+//*

    for (Int_t i=0;i<234;i++)
    {
       char name[20];
    for (Int_t i=0;i<234;i++)
    {
       char name[20];


@@ -546,6 +564,8 @@ void AliMUONTriggerElectronics::DumpOS()
 //___________________________________________
 void AliMUONTriggerElectronics::Scan(Option_t *option)
 {
 //___________________________________________
 void AliMUONTriggerElectronics::Scan(Option_t *option)
 {

+//* SCAN
+//*

    for (Int_t i=0; i<fgkNCrates; i++)
    {            
       AliMUONTriggerCrate *cr = (AliMUONTriggerCrate*)fCrates->UncheckedAt(i);
    for (Int_t i=0; i<fgkNCrates; i++)
    {            
       AliMUONTriggerCrate *cr = (AliMUONTriggerCrate*)fCrates->UncheckedAt(i);


@@ -576,6 +596,8 @@ void AliMUONTriggerElectronics::Scan(Option_t *option)
 //___________________________________________
 void AliMUONTriggerElectronics::Reset()
 {
 //___________________________________________
 void AliMUONTriggerElectronics::Reset()
 {

+//* RESET
+//*

    for (Int_t i=0; i<fgkNCrates; i++)
    {            
       AliMUONTriggerCrate *cr = (AliMUONTriggerCrate*)fCrates->UncheckedAt(i);
    for (Int_t i=0; i<fgkNCrates; i++)
    {            
       AliMUONTriggerCrate *cr = (AliMUONTriggerCrate*)fCrates->UncheckedAt(i);


@@ -729,6 +751,8 @@ void AliMUONTriggerElectronics::LocalResponse()
 //___________________________________________
 void AliMUONTriggerElectronics::RegionalResponse()
 {
 //___________________________________________
 void AliMUONTriggerElectronics::RegionalResponse()
 {

+//*
+//*

    for (Int_t i=0; i<fgkNCrates; i++)
    {            
       AliMUONTriggerCrate *cr = (AliMUONTriggerCrate*)fCrates->UncheckedAt(i);
    for (Int_t i=0; i<fgkNCrates; i++)
    {            
       AliMUONTriggerCrate *cr = (AliMUONTriggerCrate*)fCrates->UncheckedAt(i);


@@ -749,6 +773,8 @@ void AliMUONTriggerElectronics::RegionalResponse()
 //___________________________________________
 void AliMUONTriggerElectronics::GlobalResponse()
 {
 //___________________________________________
 void AliMUONTriggerElectronics::GlobalResponse()
 {

+//*
+//*

    fGlobalTriggerBoard->SetRegionalResponse(fRegional);
 
    fGlobalTriggerBoard->Response();
    fGlobalTriggerBoard->SetRegionalResponse(fRegional);
 
    fGlobalTriggerBoard->Response();


@@ -759,6 +785,8 @@ void AliMUONTriggerElectronics::GlobalResponse()
 //___________________________________________
 void AliMUONTriggerElectronics::BoardName(Int_t ix, Int_t iy, char *name)
 {
 //___________________________________________
 void AliMUONTriggerElectronics::BoardName(Int_t ix, Int_t iy, char *name)
 {

+//* BOARD NAME FROM PAD INFO (OLD MAPPING)
+//*

    TString s = (ix>0) ? "R" : "L"; 
 
    Int_t board = iy / 16, bid[4] = {12,34,56,78}; 
    TString s = (ix>0) ? "R" : "L"; 
 
    Int_t board = iy / 16, bid[4] = {12,34,56,78}; 


@@ -778,6 +806,8 @@ void AliMUONTriggerElectronics::BoardName(Int_t ix, Int_t iy, char *name)
 //___________________________________________
 void AliMUONTriggerElectronics::AddCrate(char *name)
 {
 //___________________________________________
 void AliMUONTriggerElectronics::AddCrate(char *name)
 {

+//*
+//*

    TClonesArray &lcrates = *fCrates;
    new(lcrates[fNCrates++]) AliMUONTriggerCrate(name,17);
 }
    TClonesArray &lcrates = *fCrates;
    new(lcrates[fNCrates++]) AliMUONTriggerCrate(name,17);
 }


@@ -785,13 +815,17 @@ void AliMUONTriggerElectronics::AddCrate(char *name)
 //___________________________________________
 AliMUONTriggerCrate* AliMUONTriggerElectronics::Crate(char *name)
 {
 //___________________________________________
 AliMUONTriggerCrate* AliMUONTriggerElectronics::Crate(char *name)
 {

+//*
+//*

    return (AliMUONTriggerCrate*)fCrates->FindObject(name);
 }
 
 //___________________________________________
 void AliMUONTriggerElectronics::BuildName(Int_t icirc, char name[20])
 {
    return (AliMUONTriggerCrate*)fCrates->FindObject(name);
 }
 
 //___________________________________________
 void AliMUONTriggerElectronics::BuildName(Int_t icirc, char name[20])
 {

-   const Int_t CircuitId[234] = 
+//* GET BOARD NAME FROM OLD NUMBERING
+//*
+   const Int_t kCircuitId[234] = 

       {
           111,  121,  131,  141,  151,  161,  171,
           211,  212,  221,  222,  231,  232,  241,  242,  251,  252,  261,  262,  271,
       {
           111,  121,  131,  141,  151,  161,  171,
           211,  212,  221,  222,  231,  232,  241,  242,  251,  252,  261,  262,  271,


@@ -815,74 +849,47 @@ void AliMUONTriggerElectronics::BuildName(Int_t icirc, char name[20])
 
    Int_t b[4] = {12, 34, 56, 78};
 
 
    Int_t b[4] = {12, 34, 56, 78};
 

-   Int_t code = TMath::Abs(CircuitId[icirc]);
+   Int_t code = TMath::Abs(kCircuitId[icirc]);

 
 

-   Int_t L = code / 100;
+   Int_t lL = code / 100;

 
 

-   Int_t C = ( code - 100 * L ) / 10;
+   Int_t cC = ( code - 100 * lL ) / 10;

    
    

-   Int_t B = code - 100 * L - 10 * C;
+   Int_t bB = code - 100 * lL - 10 * cC;

    
    

-   const char *Side = (CircuitId[icirc]>0) ? "R" : "L";
+   const char *side = (kCircuitId[icirc]>0) ? "R" : "L";

 
 

-// L=1 AT TOP
-   L -= 9; L = abs(L); L++;
+// lL=1 AT TOP
+   lL -= 9; lL = abs(lL); lL++;

 
 

-   sprintf(name,"%sC%dL%dB%d",Side,C,L,b[B-1]);
+   sprintf(name,"%sC%dL%dB%d",side,cC,lL,b[bB-1]);

 }
 
 //_______________________________________________________________________
 void 
 AliMUONTriggerElectronics::Exec(Option_t*)
 {
 }
 
 //_______________________________________________________________________
 void 
 AliMUONTriggerElectronics::Exec(Option_t*)
 {

+//*
+//*

   Digits2Trigger();
 }
 
 //_______________________________________________________________________
 void AliMUONTriggerElectronics::Trigger()
 {
   Digits2Trigger();
 }
 
 //_______________________________________________________________________
 void AliMUONTriggerElectronics::Trigger()
 {

+//*
+//*

    FeedM();
    LocalResponse();
    RegionalResponse();      
    GlobalResponse();
 }
    FeedM();
    LocalResponse();
    RegionalResponse();      
    GlobalResponse();
 }

-/*
-//_______________________________________________________________________
-void AliMUONTriggerElectronics::DisableCrate(Int_t icrate)
-{
-   fRegional[icrate] = 0;
-}

 
 

-//_______________________________________________________________________
-void AliMUONTriggerElectronics::DisableCrate(char *Name)
-{
-   Int_t icrate;
-   
-   for (Int_t i=0; i<fgkNCrates; i++)
-   {
-      AliMUONTriggerCrate *cr = (AliMUONTriggerCrate*)fCrates->UncheckedAt(i);
-      if (strcmp(cr->GetName(),Name) )
-         continue;
-      else
-      {
-         icrate = i;
-         break;
-      }
-   }
-
-   fRegional[icrate] = 0;
-}
-
-//_______________________________________________________________________
-void AliMUONTriggerElectronics::DisableBoardInCrate(Int_t icrate, Int_t islot)
-{
-// BEWARE, REGIONAL BOARD IS IN SLOT 0
-   fLocal[icrate][islot] = 0;
-}
-*/

 //_______________________________________________________________________
 void AliMUONTriggerElectronics::Digits2Trigger()
 {
 //_______________________________________________________________________
 void AliMUONTriggerElectronics::Digits2Trigger()
 {

+//*
+//*

    ClearDigitNumbers();
 
    fMUONData->ResetTrigger();
    ClearDigitNumbers();
 
    fMUONData->ResetTrigger();


@@ -950,32 +957,32 @@ void AliMUONTriggerElectronics::Digits2Trigger()
 // GLOBAL TRIGGER INFORMATION: [0] -> LOW PT 
 //                             [1] -> HIGH PT
 //                             [2] -> ALL PT 
 // GLOBAL TRIGGER INFORMATION: [0] -> LOW PT 
 //                             [1] -> HIGH PT
 //                             [2] -> ALL PT 

-   Int_t GlobalSinglePlus[3], GlobalSingleMinus[3], GlobalSingleUndef[3]; 
-   Int_t GlobalPairUnlike[3], GlobalPairLike[3];   
+   Int_t globalSinglePlus[3], globalSingleMinus[3], globalSingleUndef[3]; 
+   Int_t globalPairUnlike[3], globalPairLike[3];   

 
 

-   GlobalPairUnlike[0] = (fGlobal &  16) >> 4;
-   GlobalPairUnlike[1] = (fGlobal & 256) >> 8;
-   GlobalPairUnlike[2] = (fGlobal &   1);
+   globalPairUnlike[0] = (fGlobal &  16) >> 4;
+   globalPairUnlike[1] = (fGlobal & 256) >> 8;
+   globalPairUnlike[2] = (fGlobal &   1);

    
    

-   GlobalPairLike[0] = (fGlobal &  32) >> 5;
-   GlobalPairLike[1] = (fGlobal & 512) >> 9;
-   GlobalPairLike[2] = (fGlobal &   2) >> 1;
+   globalPairLike[0] = (fGlobal &  32) >> 5;
+   globalPairLike[1] = (fGlobal & 512) >> 9;
+   globalPairLike[2] = (fGlobal &   2) >> 1;

    
    

-   GlobalSinglePlus[0] = ((fGlobal &  192) >>  6) == 2;
-   GlobalSinglePlus[1] = ((fGlobal & 3072) >> 10) == 2;
-   GlobalSinglePlus[2] = ((fGlobal &   12) >>  2) == 2;
+   globalSinglePlus[0] = ((fGlobal &  192) >>  6) == 2;
+   globalSinglePlus[1] = ((fGlobal & 3072) >> 10) == 2;
+   globalSinglePlus[2] = ((fGlobal &   12) >>  2) == 2;

 
 

-   GlobalSingleMinus[0] = ((fGlobal &  192) >>  6) == 1;
-   GlobalSingleMinus[1] = ((fGlobal & 3072) >> 10) == 1;
-   GlobalSingleMinus[2] = ((fGlobal &   12) >>  2) == 1;
+   globalSingleMinus[0] = ((fGlobal &  192) >>  6) == 1;
+   globalSingleMinus[1] = ((fGlobal & 3072) >> 10) == 1;
+   globalSingleMinus[2] = ((fGlobal &   12) >>  2) == 1;

    
    

-   GlobalSingleUndef[0] = ((fGlobal &  192) >>  6) == 3;
-   GlobalSingleUndef[1] = ((fGlobal & 3072) >> 10) == 3;
-   GlobalSingleUndef[2] = ((fGlobal &   12) >>  2) == 3;
+   globalSingleUndef[0] = ((fGlobal &  192) >>  6) == 3;
+   globalSingleUndef[1] = ((fGlobal & 3072) >> 10) == 3;
+   globalSingleUndef[2] = ((fGlobal &   12) >>  2) == 3;

 
 

-   AliMUONGlobalTrigger *pGloTrig = new AliMUONGlobalTrigger(GlobalSinglePlus, GlobalSingleMinus,
-                                                             GlobalSingleUndef, GlobalPairUnlike, 
-                                                             GlobalPairLike);
+   AliMUONGlobalTrigger *pGloTrig = new AliMUONGlobalTrigger(globalSinglePlus, globalSingleMinus,
+                                                             globalSingleUndef, globalPairUnlike, 
+                                                             globalPairLike);

 
 // ADD A LOCAL TRIGGER IN THE LIST 
    fMUONData->AddGlobalTrigger(*pGloTrig);
 
 // ADD A LOCAL TRIGGER IN THE LIST 
    fMUONData->AddGlobalTrigger(*pGloTrig);