Solve RuleChecker violations

diff --git a/EMCAL/AliEMCALTriggerBoard.cxx b/EMCAL/AliEMCALTriggerBoard.cxx
index f7354e50a7e3be012faf434c289857d2c031b7ce..8cf02a8bf19f749ba168e0b42771f8cfdab6dd34 100644 (file)
--- a/EMCAL/AliEMCALTriggerBoard.cxx
+++ b/EMCAL/AliEMCALTriggerBoard.cxx
@@ -40,7 +40,7 @@ fMap(0x0),
 fRegionSize(0x0),
 fSubRegionSize(0x0),
 fPatchSize(0x0),
-fPatches( new TClonesArray("AliEMCALTriggerPatch",10) )
+fPatches(0x0)
 {
        
 }      
@@ -54,6 +54,8 @@ fSubRegionSize( new TVector2() ),
 fPatchSize(     new TVector2() ),
 fPatches( new TClonesArray("AliEMCALTriggerPatch",10) )
 {
+       // Ctor
+       
   fRegion = (int**)malloc( (int)fRegionSize->X() * sizeof( int* ) );  
   
   if (!fRegion) printf("Error: malloc could not allocate %d bytes for fRegion\n",
@@ -91,6 +93,8 @@ fPatches( new TClonesArray("AliEMCALTriggerPatch",10) )
 //_______________
 AliEMCALTriggerBoard::~AliEMCALTriggerBoard()
 {
+       // Dtor
+       
    for (Int_t i=0;i<fRegionSize->X();i++) 
    {
       if (fRegion[i]) {free(fRegion[i]); fRegion[i] = 0;}
@@ -122,7 +126,8 @@ void AliEMCALTriggerBoard::ZeroRegion()
 //_______________
 void AliEMCALTriggerBoard::SlidingWindow(TriggerType_t type, Int_t thres, Int_t time)
 {
-       //
+       // Sliding window
+       
        Int_t ipatch = 0;
        
        for (Int_t i=0; i<=int(fRegionSize->X()-fPatchSize->X()*fSubRegionSize->X()); i+=int(fSubRegionSize->X()))
@@ -155,7 +160,8 @@ void AliEMCALTriggerBoard::SlidingWindow(TriggerType_t type, Int_t thres, Int_t
 //__________
 void AliEMCALTriggerBoard::Scan()
 {
-       //
+       // Dump
+       
        cout << "     ";
        for (Int_t i=0; i<int(fRegionSize->X()); i++) printf("%8d ",i);
        cout << "\n";

diff --git a/EMCAL/AliEMCALTriggerBoard.h b/EMCAL/AliEMCALTriggerBoard.h
index 1ee16b76e0b693e67b4b4bacb7d19d68c40ab5b8..3d93c88bc836dcfabcaecd9570f50867415aa88c 100644 (file)
--- a/EMCAL/AliEMCALTriggerBoard.h
+++ b/EMCAL/AliEMCALTriggerBoard.h
@@ -10,7 +10,6 @@ Author: R. GUERNANE LPSC Grenoble CNRS/IN2P3
 */
 
 #include "AliEMCALTriggerTypes.h"
-
 #include "TVector2.h"
 
 class TClonesArray;
@@ -49,11 +48,6 @@ public:
        virtual Int_t**    Map() {return    fMap;}
        virtual void       Map(Int_t arr[][64], const TVector2& Size) {for (Int_t i = 0; i < Size.X(); i++) for (Int_t j = 0; j < Size.Y(); j++) arr[i][j] = fMap[i][j];}
 
-private:
-       
-    AliEMCALTriggerBoard(const AliEMCALTriggerBoard& rhs);            // NOT implemented
-       AliEMCALTriggerBoard& operator=(const AliEMCALTriggerBoard& rhs); // NOT implemented
-       
 protected:
        
        Int_t**       fRegion;        //! 
@@ -63,6 +57,11 @@ protected:
        TVector2*     fPatchSize;     //! in subregion unit
        TClonesArray* fPatches;       //!
        
+private:
+       
+    AliEMCALTriggerBoard(const AliEMCALTriggerBoard& rhs);            // NOT implemented
+       AliEMCALTriggerBoard& operator=(const AliEMCALTriggerBoard& rhs); // NOT implemented
+       
        ClassDef(AliEMCALTriggerBoard,1)
 };
  

diff --git a/EMCAL/AliEMCALTriggerDCSConfig.cxx b/EMCAL/AliEMCALTriggerDCSConfig.cxx
index 1fc440431311e062c82daa9f4729e0ad524e2d58..3aeb5f795db455d07898eefa9d65446bd0f25c96 100644 (file)
--- a/EMCAL/AliEMCALTriggerDCSConfig.cxx
+++ b/EMCAL/AliEMCALTriggerDCSConfig.cxx
@@ -29,7 +29,7 @@ Author: R. GUERNANE LPSC Grenoble CNRS/IN2P3
 ClassImp(AliEMCALTriggerDCSConfig)
 
 //_____________________________________________________________________________
-AliEMCALTriggerDCSConfig::AliEMCALTriggerDCSConfig() : TObject()
+AliEMCALTriggerDCSConfig::AliEMCALTriggerDCSConfig(const char *name) : TObject()
 ,fTRUArr(new TClonesArray("AliEMCALTriggerTRUDCSConfig",32))
 ,fSTUObj(new AliEMCALTriggerSTUDCSConfig())
 {
@@ -42,8 +42,9 @@ AliEMCALTriggerDCSConfig::AliEMCALTriggerDCSConfig() : TObject()
 AliEMCALTriggerDCSConfig::~AliEMCALTriggerDCSConfig()
 {
        //
+       // Dtor
        //
-       //
+       
        delete fTRUArr; fTRUArr = 0x0;
        delete fSTUObj; fSTUObj = 0x0;
 }

diff --git a/EMCAL/AliEMCALTriggerDCSConfig.h b/EMCAL/AliEMCALTriggerDCSConfig.h
index 837fb025a255009c156ee8fb2c4d4343a31313bd..0becb0d9f38fb1aab48d3a2ab8e0a285933fba9b 100644 (file)
--- a/EMCAL/AliEMCALTriggerDCSConfig.h
+++ b/EMCAL/AliEMCALTriggerDCSConfig.h
@@ -21,7 +21,7 @@ class AliEMCALTriggerDCSConfig : public TObject
 {
 public:
        
-                AliEMCALTriggerDCSConfig();
+                AliEMCALTriggerDCSConfig(const char *name = "");
        virtual ~AliEMCALTriggerDCSConfig();
        
        void                         SetTRUArr(TClonesArray* const ta)             { fTRUArr    = ta; }
@@ -36,8 +36,8 @@ private:
        AliEMCALTriggerDCSConfig(const AliEMCALTriggerDCSConfig &cd);            // Not implemented
        AliEMCALTriggerDCSConfig &operator=(const AliEMCALTriggerDCSConfig &cd); // Not implemented
 
-       TClonesArray*                fTRUArr; //
-       AliEMCALTriggerSTUDCSConfig* fSTUObj; //
+       TClonesArray*                fTRUArr; // TRU array
+       AliEMCALTriggerSTUDCSConfig* fSTUObj; // STU
 
        ClassDef(AliEMCALTriggerDCSConfig,1)  //
 };

diff --git a/EMCAL/AliEMCALTriggerDCSConfigDB.cxx b/EMCAL/AliEMCALTriggerDCSConfigDB.cxx
index 525adfa8b0c76dd3114493b0ec0577c25ea5cce2..60717ee9141ba11522cc0970cd0e8d625abebe16 100644 (file)
--- a/EMCAL/AliEMCALTriggerDCSConfigDB.cxx
+++ b/EMCAL/AliEMCALTriggerDCSConfigDB.cxx
@@ -233,7 +233,7 @@ void AliEMCALTriggerDCSConfigDB::Invalidate()
 const AliEMCALTriggerDCSConfig* AliEMCALTriggerDCSConfigDB::GetTriggerDCSConfig()
 {
        //
-       //
+       // Get DCS config
        //
        const AliEMCALTriggerDCSConfig* dcsConf = dynamic_cast<const AliEMCALTriggerDCSConfig*>(GetCachedCDBObject(kIDTriggerConfig));
        
@@ -250,7 +250,7 @@ const AliEMCALTriggerDCSConfig* AliEMCALTriggerDCSConfigDB::GetTriggerDCSConfig(
 void AliEMCALTriggerDCSConfigDB::GetSTUSegmentation(Int_t ssg[], Int_t spg[], Int_t ssj[], Int_t spj[])
 {
        //
-       //
+       // Get STU segmentation
        //
        const AliEMCALTriggerDCSConfig* dcsConf = dynamic_cast<const AliEMCALTriggerDCSConfig*>(GetCachedCDBObject(kIDTriggerConfig));
   if(dcsConf){
@@ -289,7 +289,8 @@ void AliEMCALTriggerDCSConfigDB::GetSTUSegmentation(Int_t ssg[], Int_t spg[], In
 //_____________________________________________________________________________
 Int_t AliEMCALTriggerDCSConfigDB::GetTRUSegmentation(Int_t iTRU)
 {
-       //
+       // Get TRU segmentation
+       
        const AliEMCALTriggerDCSConfig* dcsConf = dynamic_cast<const AliEMCALTriggerDCSConfig*>(GetCachedCDBObject(kIDTriggerConfig));
   if(dcsConf){ 
     AliEMCALTriggerTRUDCSConfig* truConf = dcsConf->GetTRUDCSConfig(iTRU);
@@ -310,7 +311,7 @@ Int_t AliEMCALTriggerDCSConfigDB::GetTRUSegmentation(Int_t iTRU)
 Int_t AliEMCALTriggerDCSConfigDB::GetTRUGTHRL0(Int_t iTRU)
 {
        //
-       //
+       // Get TRU L0 threshold
        //
        const AliEMCALTriggerDCSConfig* dcsConf = dynamic_cast<const AliEMCALTriggerDCSConfig*>(GetCachedCDBObject(kIDTriggerConfig));
   if(dcsConf){ 

diff --git a/EMCAL/AliEMCALTriggerData.cxx b/EMCAL/AliEMCALTriggerData.cxx
index 31f3577130a5e1242471bcd1c12466f04790e750..149c3a07a4ba52358cc399e5af4b1af9f0317af5 100644 (file)
--- a/EMCAL/AliEMCALTriggerData.cxx
+++ b/EMCAL/AliEMCALTriggerData.cxx
@@ -44,7 +44,8 @@ fL1FrameMask(0),
 fL1TriggerType(),
 fL1DataDecoded(0)
 {  
-       //
+       // Ctor
+       
        for (Int_t i = 0; i < 2; i++)
        {
                       fL0Patches[i] = new TClonesArray("AliEMCALTriggerPatch");
@@ -62,7 +63,8 @@ fL1DataDecoded(0)
 //_____________
 AliEMCALTriggerData::~AliEMCALTriggerData()
 {
-       //
+       // Dtor
+       
        for (Int_t i = 0; i < 2; i++)
        {
                if (     fL0Patches[i])      fL0Patches[i]->Delete();
@@ -74,7 +76,8 @@ AliEMCALTriggerData::~AliEMCALTriggerData()
 //_____________
 void AliEMCALTriggerData::SetL0Region(Int_t i, const Int_t**& region)
 {
-       //
+       // L0 region
+       
        if (i < 0 || i > 31) 
        {
                AliError("Bad index!");
@@ -88,7 +91,8 @@ void AliEMCALTriggerData::SetL0Region(Int_t i, const Int_t**& region)
 //_____________
 void AliEMCALTriggerData::GetPatches(TriggerType_t type, Int_t i, TClonesArray& patches) const
 {
-       //
+       // List of patches
+       
        if (i < 0 || i > 1) 
        {
                AliError("Bad index!");
@@ -115,7 +119,8 @@ void AliEMCALTriggerData::GetPatches(TriggerType_t type, Int_t i, TClonesArray&
 //_____________
 TClonesArray* AliEMCALTriggerData::GetPatches(TriggerType_t type, Int_t i) const
 {
-       //
+       // List of patches
+       
        if (i < 0 || i > 1) 
        {
                AliError("Bad index!");
@@ -144,7 +149,8 @@ TClonesArray* AliEMCALTriggerData::GetPatches(TriggerType_t type, Int_t i) const
 //_____________
 void AliEMCALTriggerData::SetPatches(TriggerType_t type, Int_t i, const TClonesArray& patches)
 {
-       //
+       // Set list of patches
+       
        if (i < 0 || i > 1) 
        {
                AliError("Bad index!");
@@ -193,7 +199,8 @@ void AliEMCALTriggerData::SetPatches(TriggerType_t type, Int_t i, const TClonesA
 //_____________
 void AliEMCALTriggerData::SetL1Region(Int_t i, Int_t**& region)
 {
-       //
+       // Set L1 region
+       
        if (i < 0 || i > 1) 
        {
                AliError("Bad index!");
@@ -207,7 +214,8 @@ void AliEMCALTriggerData::SetL1Region(Int_t i, Int_t**& region)
 //_____________
 void AliEMCALTriggerData::GetL1Region(Int_t i, Int_t arr[][64]) const 
 { 
-       //
+       // Get L1 region
+       
        if (i < 0 || i > 1) 
        {
                AliError("Bad index!");
@@ -221,7 +229,8 @@ void AliEMCALTriggerData::GetL1Region(Int_t i, Int_t arr[][64]) const
 //_____________
 void AliEMCALTriggerData::Scan() const
 {
-       //
+       // Dump
+       
        TIterator* nP;
 
        printf("L0:\n");
@@ -252,7 +261,8 @@ void AliEMCALTriggerData::Scan() const
 //_____________
 void AliEMCALTriggerData::Reset()
 {
-       //
+       // Reset
+       
        for (Int_t i = 0; i < 2; i++)
        {
                if (     fL0Patches[i])      fL0Patches[i]->Delete();

diff --git a/EMCAL/AliEMCALTriggerData.h b/EMCAL/AliEMCALTriggerData.h
index ab33d75a15b4be16097ca0744bf6b6fd290233a2..98b87155e627b77dde8bc6196295c6828c813dac 100644 (file)
--- a/EMCAL/AliEMCALTriggerData.h
+++ b/EMCAL/AliEMCALTriggerData.h
@@ -64,9 +64,9 @@ private:
     AliEMCALTriggerData(const AliEMCALTriggerData& rhs);            // NOT implemented
        AliEMCALTriggerData& operator=(const AliEMCALTriggerData& rhs); // NOT implemented
        
-       Int_t                      fMode;          //
+       Int_t                      fMode;           // Simulation/Raw
        
-       Int_t               fL0Trigger[2][32];      //
+       Int_t               fL0Trigger[2][32];      // Triggering TRU
        
        TClonesArray*       fL0Patches[2];          // array of patches  
        
@@ -77,14 +77,14 @@ private:
        
        Int_t                fL1Region[2][48][64];  // STU FastOR
 
-       Int_t        fL1GammaThreshold;             //
-       Int_t          fL1JetThreshold;             //  
+       Int_t        fL1GammaThreshold;             // L1-g threshold
+       Int_t          fL1JetThreshold;             // L1-j threshold
        
-       Int_t                    fL1V0[2];          //
-       Int_t             fL1FrameMask;             //
-       Int_t           fL1TriggerType[8];          //
+       Int_t                    fL1V0[2];          // V0 charges
+       Int_t             fL1FrameMask;             // Frame mask
+       Int_t           fL1TriggerType[8];          // Trigger type
        
-       Int_t           fL1DataDecoded;
+       Int_t           fL1DataDecoded;             // Raw data decoded
        
        ClassDef(AliEMCALTriggerData,2)
 };

diff --git a/EMCAL/AliEMCALTriggerElectronics.cxx b/EMCAL/AliEMCALTriggerElectronics.cxx
index 2b552ca0a66b4a5f658f00ad613c71dbe4ae38d3..2bb9bd776fa4c84d4e8420ed4ffea5f19a3e4aea 100644 (file)
--- a/EMCAL/AliEMCALTriggerElectronics.cxx
+++ b/EMCAL/AliEMCALTriggerElectronics.cxx
@@ -38,7 +38,6 @@ Author: R. GUERNANE LPSC Grenoble CNRS/IN2P3
 #include "AliEMCALTriggerPatch.h"
 
 #include <TVector2.h>
-#include <TClonesArray.h>
 
 namespace
 {
@@ -52,6 +51,8 @@ AliEMCALTriggerElectronics::AliEMCALTriggerElectronics(const AliEMCALTriggerDCSC
 fTRU(new TClonesArray("AliEMCALTriggerTRU",32)),
 fSTU(0x0)
 {
+       // Ctor
+       
        TVector2 rSize;
        
        rSize.Set( 24.,  4. );
@@ -80,7 +81,8 @@ fSTU(0x0)
 //________________
 AliEMCALTriggerElectronics::~AliEMCALTriggerElectronics()
 {
-       //
+       // Dtor
+       
        fTRU->Delete();
        delete fSTU;
 }
@@ -88,7 +90,8 @@ AliEMCALTriggerElectronics::~AliEMCALTriggerElectronics()
 //__________________
 void AliEMCALTriggerElectronics::Digits2Trigger(TClonesArray* digits, const Int_t V0M[], AliEMCALTriggerData* data)
 {
-       //
+       // Digits to trigger
+       
        AliEMCALGeometry* geom = 0x0;
        
        AliRunLoader *rl = AliRunLoader::Instance();
@@ -361,7 +364,8 @@ void AliEMCALTriggerElectronics::Digits2Trigger(TClonesArray* digits, const Int_
 //__________________
 void AliEMCALTriggerElectronics::Reset()
 {
-       //
+       // Reset
+       
        TIter NextTRU(fTRU);
        while ( AliEMCALTriggerTRU *TRU = (AliEMCALTriggerTRU*)NextTRU() ) TRU->Reset();
        

diff --git a/EMCAL/AliEMCALTriggerElectronics.h b/EMCAL/AliEMCALTriggerElectronics.h
index b94e748e69fc0b5ecf2747d52e7afdc2cd25aa03..a486f881f2751153decb4cc8669e8dc6a06c085e 100644 (file)
--- a/EMCAL/AliEMCALTriggerElectronics.h
+++ b/EMCAL/AliEMCALTriggerElectronics.h
@@ -16,11 +16,11 @@ Author: R. GUERNANE LPSC Grenoble CNRS/IN2P3
 
 class AliRawReader;
 class AliEMCALTriggerDCSConfig;
-class TTree;
 class AliEMCALTriggerData;
 class AliEMCALTriggerSTU;
 class AliESDVZERO;
 class AliEMCALTriggerTRU;
+class TTree;
 
 class AliEMCALTriggerElectronics : public TObject 
 {

diff --git a/EMCAL/AliEMCALTriggerPatch.h b/EMCAL/AliEMCALTriggerPatch.h
index 05c6c1d2371593a2c69dea6f7088659c5a1096c6..62817eaa2ae74d1411ab11ee1b36d1196cb84da0 100644 (file)
--- a/EMCAL/AliEMCALTriggerPatch.h
+++ b/EMCAL/AliEMCALTriggerPatch.h
@@ -11,7 +11,6 @@ Author: R. GUERNANE LPSC Grenoble CNRS/IN2P3
 #ifndef ROOT_TObject
 #  include "TObject.h"
 #endif
-
 #include "TVector2.h"
 
 class TArrayI;
@@ -43,10 +42,10 @@ private:
        
        AliEMCALTriggerPatch& operator=(const AliEMCALTriggerPatch& other); // Not implemented
        
-       TVector2*         fPosition;
-       Int_t             fSum;
-       Int_t             fTime;
-       Int_t             fPeaks;
+       TVector2*         fPosition; // Position
+       Int_t             fSum;      // Amplitude
+       Int_t             fTime;     // Time
+       Int_t             fPeaks;    // Peaks (L0 only)
        
        ClassDef(AliEMCALTriggerPatch,1)
 };

diff --git a/EMCAL/AliEMCALTriggerRawDigit.cxx b/EMCAL/AliEMCALTriggerRawDigit.cxx
index 916c6f93688958910a8f4757460a4f8f965de261..de54e78cb005ac620b5ec4e1c1cbe79f5132d498 100644 (file)
--- a/EMCAL/AliEMCALTriggerRawDigit.cxx
+++ b/EMCAL/AliEMCALTriggerRawDigit.cxx
@@ -47,21 +47,24 @@ fNL0Times(0),
 fL0Times(),
 fL1TimeSum(-1)
 {
-       //
+       // Ctor
+       
        for (Int_t i = 0; i < 10; i++) fL0Times[i] = -1;
 }
 
 //____________________________________________________________________________
 AliEMCALTriggerRawDigit::~AliEMCALTriggerRawDigit() 
 {
-       //
+       // Dtor
+       
        //delete [] fL0Times;
 }
 
 //____________________________________________________________________________
 Bool_t AliEMCALTriggerRawDigit::SetL0Time(const Int_t i)
 {
-       //
+       // Set L0 times
+       
        for (Int_t j = 0; j < fNL0Times; j++)
        {
                if (i == fL0Times[j]) 
@@ -87,7 +90,8 @@ Bool_t AliEMCALTriggerRawDigit::SetL0Time(const Int_t i)
 //____________________________________________________________________________
 Bool_t AliEMCALTriggerRawDigit::GetL0Time(const Int_t i, Int_t& time) const
 {
-       //
+       // Get L0 times
+       
        if (i < 0 || i > fNL0Times)
        {
                AliError("Bad index!");
@@ -102,7 +106,8 @@ Bool_t AliEMCALTriggerRawDigit::GetL0Time(const Int_t i, Int_t& time) const
 //____________________________________________________________________________
 Bool_t AliEMCALTriggerRawDigit::GetL0Times(Int_t times[]) const
 {
-       //
+       // Get L0 times
+       
        for (Int_t i = 0; i < fNL0Times; i++) times[i] = fL0Times[i];
        
        return kTRUE;
@@ -111,7 +116,7 @@ Bool_t AliEMCALTriggerRawDigit::GetL0Times(Int_t times[]) const
 //____________________________________________________________________________
 Int_t AliEMCALTriggerRawDigit::GetL0TimeSum(const Int_t time) const
 {
-       //
+       // Get L0 time sum
        
        Int_t value = 0;
        
@@ -129,7 +134,8 @@ Int_t AliEMCALTriggerRawDigit::GetL0TimeSum(const Int_t time) const
 //____________________________________________________________________________
 Int_t AliEMCALTriggerRawDigit::GetTriggerBit(const TriggerType_t type, const Int_t mode) const
 {
-       //
+       // Get trigger bit
+       
        Int_t shift = kTriggerTypeEnd * mode;
        Int_t mask  = 1 << type;
        
@@ -139,7 +145,8 @@ Int_t AliEMCALTriggerRawDigit::GetTriggerBit(const TriggerType_t type, const Int
 //____________________________________________________________________________
 void AliEMCALTriggerRawDigit::Print(const Option_t* /*opt*/) const
 {
-       //
+       // Dump
+       
        printf("===\n| Digit id: %4d / %d Time Samples: \n",fId,fNSamples);
        for (Int_t i=0; i < fNSamples; i++) 
        {

diff --git a/EMCAL/AliEMCALTriggerRawDigit.h b/EMCAL/AliEMCALTriggerRawDigit.h
index 808621e7b922b511d21b9444ffa350b4ae0b8002..e9eb2655a72509806366e057f40b23c2eaae049d 100644 (file)
--- a/EMCAL/AliEMCALTriggerRawDigit.h
+++ b/EMCAL/AliEMCALTriggerRawDigit.h
@@ -45,11 +45,11 @@ private:
        AliEMCALTriggerRawDigit(const AliEMCALTriggerRawDigit &cd);            // Not implemented
        AliEMCALTriggerRawDigit &operator=(const AliEMCALTriggerRawDigit &cd); // Not implemented
 
-       Int_t   fTriggerBits;
-       Int_t   fNL0Times;
-       Int_t   fL0Times[10];
+       Int_t   fTriggerBits; // Trigger bits
+       Int_t   fNL0Times;    // N L0 times
+       Int_t   fL0Times[10]; // L0 times
        
-       Int_t   fL1TimeSum;
+       Int_t   fL1TimeSum;   // L1 time sum
        
        ClassDef(AliEMCALTriggerRawDigit,1)
 };

diff --git a/EMCAL/AliEMCALTriggerRawDigitMaker.cxx b/EMCAL/AliEMCALTriggerRawDigitMaker.cxx
index 8ac45bca79e9a24cd39834ea8bae9f4506baf5d5..df469f8506d9d64c3b47bd48582d1c8049eb728d 100644 (file)
--- a/EMCAL/AliEMCALTriggerRawDigitMaker.cxx
+++ b/EMCAL/AliEMCALTriggerRawDigitMaker.cxx
@@ -97,7 +97,8 @@ AliEMCALTriggerRawDigitMaker::~AliEMCALTriggerRawDigitMaker()
 //_______________
 void AliEMCALTriggerRawDigitMaker::SetIO(AliRawReader* reader, AliCaloRawStreamV3& in, AliEMCALTriggerSTURawStream& inSTU, TClonesArray* digits, AliEMCALTriggerData* data)
 {
-       //
+       // Connect I/O
+       
        fRawReader     = reader;
        fCaloRawStream = ∈
        fRawDigits     = digits;
@@ -108,7 +109,8 @@ void AliEMCALTriggerRawDigitMaker::SetIO(AliRawReader* reader, AliCaloRawStreamV
 //_______________
 void AliEMCALTriggerRawDigitMaker::Add(const std::vector<AliCaloBunchInfo> &bunchlist)
 {
-       //
+       // Add bunch list
+       
        Int_t    hwAdd   = fCaloRawStream->GetHWAddress();
        UShort_t iRCU    = fCaloRawStream->GetDDLNumber() % 2; // 0/1
        UShort_t iBranch = ( hwAdd >> 11 ) & 0x1;              // 0/1
@@ -277,7 +279,8 @@ void AliEMCALTriggerRawDigitMaker::Add(const std::vector<AliCaloBunchInfo> &bunc
 //_______________
 void AliEMCALTriggerRawDigitMaker::PostProcess()
 {      
-       //
+       // Post process digits
+       
         AliDebug(2,"Start post processing the raw digit maker");
        Int_t idx;
        
@@ -290,26 +293,26 @@ void AliEMCALTriggerRawDigitMaker::PostProcess()
        fRawReader->Reset();
        fRawReader->Select("EMCAL",44); 
 
-       Bool_t STUin = kFALSE;
+       Bool_t isSTUin = kFALSE;
        
        Int_t nSubEv = fRawReader->GetEvent()->GetNSubEvents();
        
        for ( Int_t iSubEv=0; iSubEv<nSubEv; iSubEv++)
        {
-               AliRawVEvent *SubEv = ((AliRawEvent*)fRawReader->GetEvent())->GetSubEvent(iSubEv);
-               if ( !SubEv ) continue;
+               AliRawVEvent *subEv = ((AliRawEvent*)fRawReader->GetEvent())->GetSubEvent(iSubEv);
+               if ( !subEv ) continue;
                
-               for (Int_t iEquip = 0; iEquip < SubEv->GetNEquipments(); iEquip++)
+               for (Int_t iEquip = 0; iEquip < subEv->GetNEquipments(); iEquip++)
                {
-                       Int_t eqId = SubEv->GetEquipment(iEquip)->GetEquipmentHeader()->GetId();
+                       Int_t eqId = subEv->GetEquipment(iEquip)->GetEquipmentHeader()->GetId();
                        
-                       if (eqId == kSTUEqId) STUin = kTRUE;
+                       if (eqId == kSTUEqId) isSTUin = kTRUE;
                }
        }
        
        fRawReader->Reset();
        
-       if (STUin && fSTURawStream && fSTURawStream->ReadPayLoad())
+       if (isSTUin && fSTURawStream && fSTURawStream->ReadPayLoad())
        {
                fTriggerData->SetL1DataDecoded(1);
                
@@ -506,7 +509,8 @@ void AliEMCALTriggerRawDigitMaker::PostProcess()
 //_______________
 void AliEMCALTriggerRawDigitMaker::Reset()
 {
-       //      
+       // Reset
+       
        for (Int_t i = 0; i < 3072; i++) fRawDigitIndex[i] = -1;
 }
 

diff --git a/EMCAL/AliEMCALTriggerRawDigitMaker.h b/EMCAL/AliEMCALTriggerRawDigitMaker.h
index b451998760b12e7bdcb8b8ce21034a347eee2507..8b4d17c36506cb1804422aed9086b27eb2cd0395 100644 (file)
--- a/EMCAL/AliEMCALTriggerRawDigitMaker.h
+++ b/EMCAL/AliEMCALTriggerRawDigitMaker.h
@@ -34,23 +34,23 @@ public:
        virtual void PostProcess();
        virtual void Reset();
        
-private:
-       
-    AliEMCALTriggerRawDigitMaker(const AliEMCALTriggerRawDigitMaker& rhs);            // NOT implemented
-       AliEMCALTriggerRawDigitMaker& operator=(const AliEMCALTriggerRawDigitMaker& rhs); // NOT implemented
-       
 protected:
        
-       AliEMCALGeometry*            fGeometry;
-       AliRawReader*                fRawReader;
-       AliCaloRawStreamV3*          fCaloRawStream;
-       AliEMCALTriggerSTURawStream* fSTURawStream;
-       TClonesArray*                fRawDigits;
-       AliCaloRawAnalyzerFakeALTRO* fRawAnalyzer;
-       AliEMCALTriggerDCSConfigDB*  fDCSConfig;
-       AliEMCALTriggerData*         fTriggerData;
+       AliEMCALGeometry*            fGeometry;      // Geometry
+       AliRawReader*                fRawReader;     // Raw reader
+       AliCaloRawStreamV3*          fCaloRawStream; // Calo raw stream
+       AliEMCALTriggerSTURawStream* fSTURawStream;  // STU raw stream
+       TClonesArray*                fRawDigits;     // Raw digits
+       AliCaloRawAnalyzerFakeALTRO* fRawAnalyzer;   // Raw analyzer
+       AliEMCALTriggerDCSConfigDB*  fDCSConfig;     // DCS config
+       AliEMCALTriggerData*         fTriggerData;   // Trigger data
        
-       Int_t                                            fRawDigitIndex[3072];
+       Int_t                                            fRawDigitIndex[3072]; // Raw digit indexes
+
+private:
+       
+    AliEMCALTriggerRawDigitMaker(const AliEMCALTriggerRawDigitMaker& rhs);            // NOT implemented
+       AliEMCALTriggerRawDigitMaker& operator=(const AliEMCALTriggerRawDigitMaker& rhs); // NOT implemented    
        
        ClassDef(AliEMCALTriggerRawDigitMaker,1)
 };

diff --git a/EMCAL/AliEMCALTriggerSTU.cxx b/EMCAL/AliEMCALTriggerSTU.cxx
index 405c07ccfab42f5f3ac03da4b76c42e65df37dce..c5077700138deedff5e51a7c5a086d8d139a2b93 100644 (file)
--- a/EMCAL/AliEMCALTriggerSTU.cxx
+++ b/EMCAL/AliEMCALTriggerSTU.cxx
@@ -49,7 +49,7 @@ AliEMCALTriggerSTU::AliEMCALTriggerSTU() : AliEMCALTriggerBoard()
 ,fJetTh(0)
 ,fDCSConfig(0x0)
 {
-       //
+       // Ctor
 }
 
 //_______________
@@ -58,26 +58,28 @@ AliEMCALTriggerSTU::AliEMCALTriggerSTU(AliEMCALTriggerSTUDCSConfig *dcsConf, con
 ,fJetTh(0)
 ,fDCSConfig(dcsConf)
 {
-       //
+       // Ctor
 }
 
 //_______________
 AliEMCALTriggerSTU::~AliEMCALTriggerSTU()
 {
-       //
+       // Dtor
 }
 
 //_______________
 Int_t AliEMCALTriggerSTU::GetRawData() const
 {
-       //
+       // Get raw data
+       
        return fDCSConfig->GetRawData();
 }
 
 //_______________
 void AliEMCALTriggerSTU::Build( TString& str, Int_t iTRU, Int_t** M, const TVector2* rSize )
 {
-       //
+       // Build
+       
        str.ToLower();
        
        Int_t ix = (iTRU % 2) ? 24 : 0;
@@ -108,7 +110,8 @@ void AliEMCALTriggerSTU::Build( TString& str, Int_t iTRU, Int_t** M, const TVect
 //_______________
 void AliEMCALTriggerSTU::L1(TriggerType_t type)
 {
-       //
+       // L1
+       
        TVector2 s1, s2, s3, s4;
        fDCSConfig->GetSegmentation(s1, s2, s3, s4);
        
@@ -134,7 +137,8 @@ void AliEMCALTriggerSTU::L1(TriggerType_t type)
 //________________
 void AliEMCALTriggerSTU::PrintADC( TriggerType_t type, TVector2& pos, TVector2& idx )
 {
-       //
+       // Dump
+       
        Int_t ix = (Int_t) (( pos.X() + fPatchSize->X() ) * fSubRegionSize->X());
        
        Int_t iy = (Int_t) (( pos.Y() + fPatchSize->Y() ) * fSubRegionSize->Y());
@@ -213,6 +217,8 @@ void AliEMCALTriggerSTU::PrintADC( TriggerType_t type, TVector2& pos, TVector2&
 //___________
 void AliEMCALTriggerSTU::PatchGenerator(const TClonesArray* lpos, Int_t val)
 {
+       // Patch generator
+       
        ZeroRegion();
        
        Int_t vTRU[32][24][4] ;//= {0};
@@ -283,7 +289,8 @@ void AliEMCALTriggerSTU::PatchGenerator(const TClonesArray* lpos, Int_t val)
 //___________
 void AliEMCALTriggerSTU::ComputeThFromV0(const Int_t M[])
 {
-       //
+       // Compute threshold from V0
+       
        if (!(M[0] + M[1])) AliWarning("V0A + V0C is null!"); // 0/1: V0C/V0A
 
        
@@ -295,6 +302,8 @@ void AliEMCALTriggerSTU::ComputeThFromV0(const Int_t M[])
 //___________
 void AliEMCALTriggerSTU::SetThreshold(TriggerType_t type, Int_t v)
 {
+       // Set threshold
+       
        switch (type)
        {
                case kL1Gamma:
@@ -333,5 +342,7 @@ Int_t AliEMCALTriggerSTU::GetThreshold(TriggerType_t type)
 //__________
 void AliEMCALTriggerSTU::Reset()
 {
+       // Reset
+       
        fPatches->Delete();
 }

diff --git a/EMCAL/AliEMCALTriggerSTU.h b/EMCAL/AliEMCALTriggerSTU.h
index a2d2e15f6cf32034db8b21c07edfcbef6bc020e6..ca883b79fc7fbb4236ab63f91c2a75dc0a091cb9 100644 (file)
--- a/EMCAL/AliEMCALTriggerSTU.h
+++ b/EMCAL/AliEMCALTriggerSTU.h
@@ -43,10 +43,10 @@ protected:
 
 private:
        
-                 Int_t   fGammaTh;
-                 Int_t   fJetTh;
+                 Int_t   fGammaTh; // Gamma threshold
+                 Int_t   fJetTh;   // Jet threshold
        
-       AliEMCALTriggerSTUDCSConfig* fDCSConfig;
+       AliEMCALTriggerSTUDCSConfig* fDCSConfig; // DCS config
 
        ClassDef(AliEMCALTriggerSTU,1)
 };

diff --git a/EMCAL/AliEMCALTriggerSTUDCSConfig.cxx b/EMCAL/AliEMCALTriggerSTUDCSConfig.cxx
index f2b820f3d384acf4ccc84fc989cdcde6e52deea0..d95af40723294d299491a929c1ee85bbb5f619ea 100644 (file)
--- a/EMCAL/AliEMCALTriggerSTUDCSConfig.cxx
+++ b/EMCAL/AliEMCALTriggerSTUDCSConfig.cxx
@@ -23,6 +23,7 @@ Author: R. GUERNANE LPSC Grenoble CNRS/IN2P3
 */
 
 #include "AliEMCALTriggerSTUDCSConfig.h"
+#include "TVector2.h"
 
 ClassImp(AliEMCALTriggerSTUDCSConfig)
   
@@ -46,7 +47,8 @@ AliEMCALTriggerSTUDCSConfig::AliEMCALTriggerSTUDCSConfig() : TObject()
 //_____________________________________________________________________________
 void AliEMCALTriggerSTUDCSConfig::GetSegmentation(TVector2& v1, TVector2& v2, TVector2& v3, TVector2& v4) const
 {
-       //
+       // Get Segmentation
+       
        switch (fFw)
        {
                case 2223:

diff --git a/EMCAL/AliEMCALTriggerSTUDCSConfig.h b/EMCAL/AliEMCALTriggerSTUDCSConfig.h
index e544194a079aa08483bce36b71639e736cd2c0ee..af86b073626c9f2638e17498992e51c6b9ac6136 100644 (file)
--- a/EMCAL/AliEMCALTriggerSTUDCSConfig.h
+++ b/EMCAL/AliEMCALTriggerSTUDCSConfig.h
@@ -11,7 +11,8 @@ Author: R. GUERNANE LPSC Grenoble CNRS/IN2P3
 */
 
 #include "TObject.h"
-#include "TVector2.h"
+
+class TVector2;
 
 class AliEMCALTriggerSTUDCSConfig : public TObject 
 {
@@ -49,15 +50,15 @@ protected:
 
 private:
        
-  Int_t   fGA;         //
-  Int_t   fGB;         //
-  Int_t   fGC;         //
-  Int_t   fJA;         //
-  Int_t   fJB;         //
-  Int_t   fJC;         //
-  Int_t   fGetRawData; //
-  Int_t   fRegion;     //
-  Int_t   fFw;         //
+  Int_t   fGA;         // GA
+  Int_t   fGB;         // GB
+  Int_t   fGC;         // GC
+  Int_t   fJA;         // JA
+  Int_t   fJB;         // JB
+  Int_t   fJC;         // JC
+  Int_t   fGetRawData; // GetRawData
+  Int_t   fRegion;     // Region
+  Int_t   fFw;         // Fw
   
   ClassDef(AliEMCALTriggerSTUDCSConfig,1) //
 };

diff --git a/EMCAL/AliEMCALTriggerSTURawStream.cxx b/EMCAL/AliEMCALTriggerSTURawStream.cxx
index 1d9a51262b3d6dc584706c83502c0cff6af051a2..da1df99b6fe186be361a36ae238cb9f8ed6a8c07 100644 (file)
--- a/EMCAL/AliEMCALTriggerSTURawStream.cxx
+++ b/EMCAL/AliEMCALTriggerSTURawStream.cxx
@@ -450,19 +450,20 @@ void AliEMCALTriggerSTURawStream::DumpPayLoad(const Option_t *option) const
 }
 
 //_____________________________________________________________________________
-UShort_t AliEMCALTriggerSTURawStream::GetThreshold(Short_t A, Short_t B, Short_t C, UShort_t V0A, UShort_t V0C)
+UShort_t AliEMCALTriggerSTURawStream::GetThreshold(Short_t A, Short_t B, Short_t C, UShort_t V0A, UShort_t V0C) const
 {
-  ULong64_t V0sum = V0A + V0C;
+       // Get threshold 
+  ULong64_t v0sum = V0A + V0C;
   
-  ULong64_t sqrV0 = V0sum * V0sum;                                     
+  ULong64_t sqrV0 = v0sum * v0sum;                                     
                                        
   sqrV0 *= A;
                                        
   sqrV0 >>= 32;
                                
-  V0sum *= B;
+  v0sum *= B;
                                        
-  V0sum >>= 16;
+  v0sum >>= 16;
                                        
-  return (UShort_t)(sqrV0 + V0sum + C);
+  return (UShort_t)(sqrV0 + v0sum + C);
 }

diff --git a/EMCAL/AliEMCALTriggerSTURawStream.h b/EMCAL/AliEMCALTriggerSTURawStream.h
index 52c3993ba258896292cad56166826340c18aec2b..b81fb0d5f871a0a32ec22c56502769d1e258f10e 100644 (file)
--- a/EMCAL/AliEMCALTriggerSTURawStream.h
+++ b/EMCAL/AliEMCALTriggerSTURawStream.h
@@ -57,7 +57,7 @@ private:
        AliEMCALTriggerSTURawStream(const AliEMCALTriggerSTURawStream& rhs);
     AliEMCALTriggerSTURawStream& operator = (const AliEMCALTriggerSTURawStream& rhs);
 
-    UShort_t GetThreshold(Short_t A, Short_t B, Short_t C, UShort_t V0A, UShort_t V0C);
+    UShort_t GetThreshold(Short_t A, Short_t B, Short_t C, UShort_t V0A, UShort_t V0C) const;
 
     AliRawReader* fRawReader;   // object for reading the raw data
 

diff --git a/EMCAL/AliEMCALTriggerTRU.cxx b/EMCAL/AliEMCALTriggerTRU.cxx
index db1d829b9f50823663708606a9feef4f9a151e18..d34a59558e4a59c4b532d3d3f8ef24fed1b1db6a 100644 (file)
--- a/EMCAL/AliEMCALTriggerTRU.cxx
+++ b/EMCAL/AliEMCALTriggerTRU.cxx
@@ -45,7 +45,8 @@ ClassImp(AliEMCALTriggerTRU)
 AliEMCALTriggerTRU::AliEMCALTriggerTRU() : AliEMCALTriggerBoard(),
 fDCSConfig(0x0)
 {
-       //
+       // Ctor
+       
        for (Int_t i=0;i<96;i++) for (Int_t j=0;j<256;j++) fADC[i][j] = 0;
 }
 
@@ -54,7 +55,8 @@ AliEMCALTriggerTRU::AliEMCALTriggerTRU(AliEMCALTriggerTRUDCSConfig* dcsConf, con
 AliEMCALTriggerBoard(rSize),
 fDCSConfig(dcsConf)
 {
-       //
+       // Ctor
+       
        for (Int_t i=0;i<96;i++) for (Int_t j=0;j<256;j++) fADC[i][j] = 0;
 
        TVector2 size;
@@ -92,13 +94,14 @@ fDCSConfig(dcsConf)
 //________________
 AliEMCALTriggerTRU::~AliEMCALTriggerTRU()
 {
-       //
+       // Dtor
 }
 
 //________________
 void AliEMCALTriggerTRU::ShowFastOR(Int_t iTimeWindow, Int_t iChannel)
 {
-       //
+       // Dump
+       
        Int_t iChanF, iChanL;
        
        if (iChannel != -1) iChanF = iChanL = iChannel;
@@ -369,7 +372,8 @@ void AliEMCALTriggerTRU::SaveRegionADC(Int_t iTRU, Int_t iEvent)
 //________________
 void AliEMCALTriggerTRU::Reset()
 {
-       //
+       // Reset
+       
        fPatches->Delete();
        
        ZeroRegion();

diff --git a/EMCAL/AliEMCALTriggerTRU.h b/EMCAL/AliEMCALTriggerTRU.h
index 4ccb3405b44c68d760fae3b85b5409354aa19ef1..bf3fd2ec0d94248f2348b7c689e176835eb329db 100644 (file)
--- a/EMCAL/AliEMCALTriggerTRU.h
+++ b/EMCAL/AliEMCALTriggerTRU.h
@@ -33,7 +33,7 @@ private:
                            AliEMCALTriggerTRU(const AliEMCALTriggerTRU& rhs);
                 AliEMCALTriggerTRU& operator=(const AliEMCALTriggerTRU& rhs);
        
-       AliEMCALTriggerTRUDCSConfig* fDCSConfig;
+       AliEMCALTriggerTRUDCSConfig* fDCSConfig; // DCS config
 
        Int_t         fADC[96][256]; //! FIXME: Check the maximum number of samples
        

diff --git a/EMCAL/AliEMCALTriggerTypes.h b/EMCAL/AliEMCALTriggerTypes.h
index 4bddef9e4240ed5b43877034a99906b3d6be455b..9134b28de76701882fd18ca540d56599c4f36a6a 100644 (file)
--- a/EMCAL/AliEMCALTriggerTypes.h
+++ b/EMCAL/AliEMCALTriggerTypes.h
@@ -1,5 +1,13 @@
 #ifndef ALIEMCALTRIGGERTYPES_H
 #define ALIEMCALTRIGGERTYPES_H
+/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ * See cxx source for full Copyright notice                               */
+
+/*
+ 
+ 
+ Author: R. GUERNANE LPSC Grenoble CNRS/IN2P3
+ */
 
 typedef enum {kL0 = 0, kL1Gamma, kL1Jet, kTriggerTypeEnd} TriggerType_t;