coding violations corrected

diff --git a/EMCAL/AliEMCALTrigger.cxx b/EMCAL/AliEMCALTrigger.cxx
index 3f7a62a0d6aaf4001b57094ef7e0738539f5c282..2844166817ea7e8e94b7ba3b9ad2ea2add5e3037 100644 (file)
--- a/EMCAL/AliEMCALTrigger.cxx
+++ b/EMCAL/AliEMCALTrigger.cxx
@@ -177,6 +177,9 @@ AliEMCALTrigger::AliEMCALTrigger(const AliEMCALTrigger & trig)
 
 //____________________________________________________________________________
 AliEMCALTrigger::~AliEMCALTrigger() {
+       
+  //dtor
+       
   if(GetTimeKey()) {
     delete [] fADCValuesHighnxn; 
     delete [] fADCValuesLownxn;
@@ -867,8 +870,9 @@ void AliEMCALTrigger::FillTRU(const TClonesArray * digits, TClonesArray * ampmat
 //____________________________________________________________________________
 void AliEMCALTrigger::Trigger() 
 {
-  TH1::AddDirectory(0);
   //Main Method to select triggers.
+  TH1::AddDirectory(0);
+
   AliRunLoader *runLoader = AliRunLoader::Instance();
   AliEMCALLoader *emcalLoader = 0;
   if(runLoader) {
@@ -965,7 +969,7 @@ void AliEMCALTrigger::Trigger()
 }
 
 //____________________________________________________________________________
-void AliEMCALTrigger::GetTriggerInfo(TArrayF &triggerPosition, TArrayF &triggerAmplitudes)
+void AliEMCALTrigger::GetTriggerInfo(TArrayF &triggerPosition, TArrayF &triggerAmplitudes) const
 {
   // Template - should be defined; Nov 5, 2007
   triggerPosition[0]   = 0.; 
@@ -1110,6 +1114,7 @@ void AliEMCALTrigger::PrintJetMatrix() const
 //____________________________________________________________________________
 void AliEMCALTrigger::PrintAmpTruMatrix(Int_t ind) const
 {
+ // Print matrix with TRU patches
   TMatrixD * tru = dynamic_cast<TMatrixD *>(fAmpTrus->At(ind));
   if(tru == 0) return;
   AliInfo(Form("\n ####  Amp TRU matrix(%i) : (%i,%i) ##### \n ", 
@@ -1120,7 +1125,8 @@ void AliEMCALTrigger::PrintAmpTruMatrix(Int_t ind) const
 //____________________________________________________________________________
 void AliEMCALTrigger::PrintAmpSmMatrix(Int_t ind) const
 {
-  TMatrixD * sm = dynamic_cast<TMatrixD *>(fAmpSMods->At(ind));
+       // Print matrix with SM amplitudes
+       TMatrixD * sm = dynamic_cast<TMatrixD *>(fAmpSMods->At(ind));
   if(sm == 0) return;
   AliInfo(Form("\n ####  Amp SM matrix(%i) : (%i,%i) ##### \n ", 
         ind, sm->GetNrows(), sm->GetNcols()));
@@ -1130,6 +1136,7 @@ void AliEMCALTrigger::PrintAmpSmMatrix(Int_t ind) const
 //____________________________________________________________________________
 void AliEMCALTrigger::PrintMatrix(const TMatrixD &mat) const
 {
+  //Print matrix object
   for(Int_t col=0; col<mat.GetNcols(); col++) AliInfo(Form(" %3i ", col));
   AliInfo(Form("\n -- \n"));
   for(Int_t row=0; row<mat.GetNrows(); row++) {
@@ -1144,6 +1151,7 @@ void AliEMCALTrigger::PrintMatrix(const TMatrixD &mat) const
 //____________________________________________________________________________
 Bool_t AliEMCALTrigger::CheckConsistentOfMatrixes(const Int_t pri)
 {
+  // Check consitency of matrices
   Double_t sumSM = 0.0, smCur=0.0;
   Double_t sumTru=0.0,  sumTruInSM = 0.0, truSum=0.0;
   //  Bool_t key = kTRUE;
@@ -1172,15 +1180,16 @@ Bool_t AliEMCALTrigger::CheckConsistentOfMatrixes(const Int_t pri)
     }
   }
   Double_t sumJetMat = fAmpJetMatrix->Sum();
-  if(pri || sumSM != sumTru || sumSM !=  sumJetMat) 
+       if(pri || TMath::Abs(sumSM-sumTru)>0.0001 || TMath::Abs(sumSM-sumJetMat) > 0.0001) 
    AliDebug(1,Form(" sumSM %f : sumTru %f : sumJetMat %f \n", sumSM, sumTru, sumJetMat)); 
-  if(sumSM != sumTru || sumSM !=  sumJetMat) return kFALSE; 
+       if(TMath::Abs(sumSM - sumTru)>0.0001 || TMath::Abs(sumSM-sumJetMat) > 0.0001) return kFALSE; 
   else                                       return kTRUE; 
 }
 
 //____________________________________________________________________________
 void AliEMCALTrigger::Browse(TBrowser* b)
 {
+  //Browse.
   if(&fInputs)      b->Add(&fInputs);
   if(fAmpTrus)      b->Add(fAmpTrus);
   if(fTimeRtrus)    b->Add(fTimeRtrus);

diff --git a/EMCAL/AliEMCALTrigger.h b/EMCAL/AliEMCALTrigger.h
index c256036e13e1d2167dd1c493c6c5148672e98cf5..760e649081f054a576930114e1f323f59f935cef 100644 (file)
--- a/EMCAL/AliEMCALTrigger.h
+++ b/EMCAL/AliEMCALTrigger.h
@@ -1,5 +1,5 @@
-#ifndef ALIEMCALTrigger_H
-#define ALIEMCALTrigger_H
+#ifndef ALIEMCALTRIGGER_H
+#define ALIEMCALTRIGGER_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
@@ -79,12 +79,12 @@ class AliEMCALTrigger : public AliTriggerDetector {
   Int_t    Get2x2SuperModule()   const { return f2x2SM ; }
   Int_t    GetnxnSuperModule()   const { return fnxnSM ; }
 
-  Int_t *  GetADCValuesLowGainMax2x2Sum()  { return fADCValuesLow2x2; }
-  Int_t *  GetADCValuesHighGainMax2x2Sum() { return fADCValuesHigh2x2; }
-  Int_t *  GetADCValuesLowGainMaxnxnSum()  { return fADCValuesLownxn; }
-  Int_t *  GetADCValuesHighGainMaxnxnSum() { return fADCValuesHighnxn; }
+  Int_t *  GetADCValuesLowGainMax2x2Sum()  const { return fADCValuesLow2x2; }
+  Int_t *  GetADCValuesHighGainMax2x2Sum() const { return fADCValuesHigh2x2; }
+  Int_t *  GetADCValuesLowGainMaxnxnSum()  const { return fADCValuesLownxn; }
+  Int_t *  GetADCValuesHighGainMaxnxnSum() const { return fADCValuesHighnxn; }
 
-  Float_t  GetL0Threshold() const            { return fL0Threshold ; } 
+  Float_t  GetL0Threshold()              const { return fL0Threshold ; } 
   Float_t  GetL1GammaLowPtThreshold()    const { return fL1GammaLowPtThreshold ; }
   Float_t  GetL1GammaMediumPtThreshold() const { return fL1GammaMediumPtThreshold ; }
   Float_t  GetL1GammaHighPtThreshold()   const { return fL1GammaHighPtThreshold ; }
@@ -106,9 +106,9 @@ class AliEMCALTrigger : public AliTriggerDetector {
   TH2F*     GetJetMatrixE()             const { return fJetMatrixE;}
   Double_t  GetEmcalSumAmp()            const;
   
-  Int_t     GetNJetThreshold()  const {return fNJetThreshold;}
-  Double_t* GetL1JetThresholds() {return  fL1JetThreshold;}
-  TMatrixD  GetAmpJetMax() const {return fAmpJetMax;}
+  Int_t     GetNJetThreshold()   const {return fNJetThreshold;}
+  Double_t* GetL1JetThresholds() const {return fL1JetThreshold;}
+  TMatrixD  GetAmpJetMax()       const {return fAmpJetMax;}
 
   void PrintJetMatrix() const;                  // *MENU*
   void PrintAmpTruMatrix(Int_t ind) const;      // *MENU*
@@ -152,7 +152,7 @@ class AliEMCALTrigger : public AliTriggerDetector {
   // Name of Jet trigger(s)
   Char_t* GetNameOfJetTrigger(const Int_t i) {return Form("%s_Th_%2.2i",fgNameOfJetTriggers.Data(),i);}
   static TString GetNameOfJetTriggers() {return fgNameOfJetTriggers;}
-  static TString fgNameOfJetTriggers;
+  static TString fgNameOfJetTriggers; //Name of jet triggers
   // Estimation on EMCal energy from VZERO multiplicity
   // 0.0153 is coefficient from adc to energy
   // Dec 4, 2007
@@ -170,9 +170,9 @@ class AliEMCALTrigger : public AliTriggerDetector {
   const Int_t supermod, TMatrixD &ampmax2, TMatrixD &ampmaxn) ; 
   
   void SetTriggers(const TClonesArray * amptrus,const Int_t iSM, const TMatrixD &ampmax2, const TMatrixD &ampmaxn) ;
-  void GetTriggerInfo(TArrayF &triggerPosition, TArrayF &triggerAmplitudes); 
+  void GetTriggerInfo(TArrayF &triggerPosition, TArrayF &triggerAmplitudes) const; 
   // Jet staff
-  void FillJetMatrixFromSMs(TClonesArray *ampmatrixsmod, TMatrixD* jetMat, AliEMCALGeometry *g); 
+  void FillJetMatrixFromSMs(TClonesArray *ampmatrixsmod, TMatrixD * const jetMat, AliEMCALGeometry * const g); 
   // no timing information here
   void MakeSlidingPatch(const TMatrixD &jm, const Int_t nPatchSize, TMatrixD &ampJetMax);
 
@@ -207,12 +207,13 @@ class AliEMCALTrigger : public AliTriggerDetector {
                              //  1 means a patch around max amplitude of 2x2 of 4x4 and around         
                              //  max ampl patch of 4x4 of 8x8 
     
-  Float_t f2x2AmpOutOfPatch;      //  Amplitude in isolation cone minus maximum amplitude of the reference patch
-  Float_t fnxnAmpOutOfPatch; 
+  Float_t f2x2AmpOutOfPatch;      //  Amplitude in isolation cone minus maximum amplitude of the reference 2x2 patch
+  Float_t fnxnAmpOutOfPatch;      //  Amplitude in isolation cone minus maximum amplitude of the reference nxn patch
   Float_t f2x2AmpOutOfPatchThres; //  Threshold to select a trigger as isolated on f2x2AmpOutOfPatch value
-  Float_t fnxnAmpOutOfPatchThres; 
-  Float_t fIs2x2Isol;             //  Patch is isolated if f2x2AmpOutOfPatchThres threshold is passed
-  Float_t fIsnxnIsol ; 
+  Float_t fnxnAmpOutOfPatchThres; //  Threshold to select a trigger as isolated on fnxnAmpOutOfPatch value
+  Float_t fIs2x2Isol;             //  2x2 Patch is isolated if f2x2AmpOutOfPatchThres threshold is passed
+  Float_t fIsnxnIsol ;            //  nxn Patch is isolated if fnxnAmpOutOfPatchThres threshold is passed
+
 
   Bool_t  fSimulation ;           // Flag to do the trigger during simulation or reconstruction
   Bool_t  fIsolateInSuperModule;  // Flag to isolate trigger patch in SuperModule or in TRU acceptance
@@ -222,8 +223,8 @@ class AliEMCALTrigger : public AliTriggerDetector {
   TClonesArray *fTimeRtrus;       //! Array of recent times  (unused now)
   TClonesArray *fAmpSMods;        //! Array of amplides of SM  matrixes
   // Information for EMCAL ESD
-  TArrayF fTriggerPosition;    // 
-  TArrayF fTriggerAmplitudes;  //
+  TArrayF fTriggerPosition;       // Triggered patch position
+  TArrayF fTriggerAmplitudes;     // Triggered patch amplitude
   // Jet staf
   Int_t     fNJetPatchPhi;       // size of jet pathch in phi(row)   direction  (nJetPatchPhi*4 module) 
   Int_t     fNJetPatchEta;       // size of jet pathch in eta(column) direction (nJetPatchEta*4 module)
@@ -240,5 +241,5 @@ class AliEMCALTrigger : public AliTriggerDetector {
 } ;
     
     
-#endif //ALIEMCALTrigger_H
+#endif //ALIEMCALTRIGGER_H