fixing a lot of coding violations

diff --git a/PWG2/FORWARD/analysis/AliFMDAnaParameters.cxx b/PWG2/FORWARD/analysis/AliFMDAnaParameters.cxx
index 8f6fbbd309fa88258fd02218bc133b2c6140f052..959add7baab43cc025d9b3e0080965218bbf224b 100644 (file)
--- a/PWG2/FORWARD/analysis/AliFMDAnaParameters.cxx
+++ b/PWG2/FORWARD/analysis/AliFMDAnaParameters.cxx
@@ -88,6 +88,7 @@ AliFMDAnaParameters::AliFMDAnaParameters() :
   fSPDhighLimit(999999999),
   fCentralSelection(kFALSE)
 {
+  // Default constructor 
   fPhysicsSelection = new AliPhysicsSelection;
   //AliBackgroundSelection* backgroundSelection = new AliBackgroundSelection("bg","bg");
   
@@ -95,10 +96,11 @@ AliFMDAnaParameters::AliFMDAnaParameters() :
   //fPhysicsSelection->Initialize(104792);
   // Do not use this - it is only for IO 
   fgInstance = this;
-  // Default constructor 
+ 
 }
 //____________________________________________________________________
 char* AliFMDAnaParameters::GetPath(const char* species) {
+  // paths of correction and calibration objects
   
   char* path = "";
   
@@ -165,6 +167,7 @@ void AliFMDAnaParameters::Init(Bool_t forceReInit, UInt_t what)
 
 void AliFMDAnaParameters::InitBackground() {
   
+  // init background object
   //AliCDBEntry*   background = GetEntry(fgkBackgroundCorrection);
   
   TFile* fin = TFile::Open(GetPath(fgkBackgroundID));
@@ -180,6 +183,7 @@ void AliFMDAnaParameters::InitBackground() {
 
 void AliFMDAnaParameters::InitEnergyDists() {
   
+  //init energy dist object
   TFile* fin = TFile::Open(GetPath(fgkEnergyDistributionID));
   //AliCDBEntry*   edist = GetEntry(fgkEnergyDists);
   if (!fin) return;
@@ -194,6 +198,7 @@ void AliFMDAnaParameters::InitEnergyDists() {
 
 void AliFMDAnaParameters::InitEventSelectionEff() {
   
+  //init event selection object
   //AliCDBEntry*   background = GetEntry(fgkBackgroundCorrection);
   TFile* fin = TFile::Open(GetPath(fgkEventSelectionEffID));
                            
@@ -207,7 +212,7 @@ void AliFMDAnaParameters::InitEventSelectionEff() {
 
 void AliFMDAnaParameters::PrintStatus() const
 {
-  
+  // print status of object
   TString energystring;
   switch(fEnergy) {
   case k900:
@@ -278,6 +283,7 @@ void AliFMDAnaParameters::InitSharingEff() {
 }
 //____________________________________________________________________
 Float_t AliFMDAnaParameters::GetVtxCutZ() {
+  //get z vtx cut
   
   if(!fIsInit) {
     AliWarning("Not initialized yet. Call Init() to remedy");
@@ -289,7 +295,7 @@ Float_t AliFMDAnaParameters::GetVtxCutZ() {
 
 //____________________________________________________________________
 Int_t AliFMDAnaParameters::GetNvtxBins() {
-  
+  // get number of vtx bins in analysis
   if(!fIsInit) {
     AliWarning("Not initialized yet. Call Init() to remedy");
     return -1;
@@ -299,22 +305,22 @@ Int_t AliFMDAnaParameters::GetNvtxBins() {
 }
 //____________________________________________________________________
 TH1F* AliFMDAnaParameters::GetEnergyDistribution(Int_t det, Char_t ring, Float_t eta) {
-  
+  // get energy distribution
   return fEnergyDistribution->GetEnergyDistribution(det, ring, eta);
 }
 //____________________________________________________________________
 TH1F* AliFMDAnaParameters::GetEmptyEnergyDistribution(Int_t det, Char_t ring) {
-  
+  //get energy distribution for empty events
   return fEnergyDistribution->GetEmptyEnergyDistribution(det, ring);
 }
 //____________________________________________________________________
 TH1F* AliFMDAnaParameters::GetRingEnergyDistribution(Int_t det, Char_t ring) {
-  
+  //get the energy dist for a ring
   return fEnergyDistribution->GetRingEnergyDistribution(det, ring);
 }
 //____________________________________________________________________
 Float_t AliFMDAnaParameters::GetSigma(Int_t det, Char_t ring, Float_t eta) {
-  
+  //get sigma of energy dist
   if(!fIsInit) {
     AliWarning("Not initialized yet. Call Init() to remedy");
     return 0;
@@ -333,7 +339,7 @@ Float_t AliFMDAnaParameters::GetSigma(Int_t det, Char_t ring, Float_t eta) {
 
 //____________________________________________________________________
 Float_t AliFMDAnaParameters::GetMPV(Int_t det, Char_t ring, Float_t eta) {
-  
+  //Get MPV of energy dist
   if(!fIsInit) {
     AliWarning("Not initialized yet. Call Init() to remedy");
     return 0;
@@ -352,7 +358,7 @@ Float_t AliFMDAnaParameters::GetMPV(Int_t det, Char_t ring, Float_t eta) {
 }
 //____________________________________________________________________
 Float_t AliFMDAnaParameters::GetConstant(Int_t det, Char_t ring, Float_t eta) {
-  
+  //Get constant of energy dist
   if(!fIsInit) {
     AliWarning("Not initialized yet. Call Init() to remedy");
     return 0;
@@ -370,7 +376,7 @@ Float_t AliFMDAnaParameters::GetConstant(Int_t det, Char_t ring, Float_t eta) {
 }
 //____________________________________________________________________
 Float_t AliFMDAnaParameters::Get2MIPWeight(Int_t det, Char_t ring, Float_t eta) {
-  
+  //Get 2 mip weight of energy dist
   if(!fIsInit) {
     AliWarning("Not initialized yet. Call Init() to remedy");
     return 0;
@@ -390,7 +396,7 @@ Float_t AliFMDAnaParameters::Get2MIPWeight(Int_t det, Char_t ring, Float_t eta)
 }
 //____________________________________________________________________
 Float_t AliFMDAnaParameters::Get3MIPWeight(Int_t det, Char_t ring, Float_t eta) {
-  
+  //Get 3 mip weight of energy dist
   if(!fIsInit) {
     AliWarning("Not initialized yet. Call Init() to remedy");
     return 0;
@@ -440,7 +446,7 @@ Int_t AliFMDAnaParameters::GetEtaBin(Float_t eta) {
 TH2F* AliFMDAnaParameters::GetBackgroundCorrection(Int_t det, 
                                                   Char_t ring, 
                                                   Int_t vtxbin) {
-  
+  //get background correction
   if(!fIsInit) {
     AliWarning("Not initialized yet. Call Init() to remedy");
     return 0;
@@ -459,7 +465,7 @@ TH2F* AliFMDAnaParameters::GetBackgroundCorrection(Int_t det,
 
 TH1F* AliFMDAnaParameters::GetDoubleHitCorrection(Int_t det, 
                                                  Char_t ring) {
-  
+  // get correction for double hits in p+p
   if(!fIsInit) {
     AliWarning("Not initialized yet. Call Init() to remedy");
     return 0;
@@ -603,7 +609,7 @@ Float_t AliFMDAnaParameters::GetEtaFromStrip(UShort_t det, Char_t ring, UShort_t
 
 //_____________________________________________________________________
 
-Bool_t AliFMDAnaParameters::GetVertex(AliESDEvent* esd, Double_t* vertexXYZ) 
+Bool_t AliFMDAnaParameters::GetVertex(const AliESDEvent* esd, Double_t* vertexXYZ) 
 {
   const AliESDVertex* vertex = 0;
   vertex = esd->GetPrimaryVertexSPD();

diff --git a/PWG2/FORWARD/analysis/AliFMDAnaParameters.h b/PWG2/FORWARD/analysis/AliFMDAnaParameters.h
index ae49fc86da881495855c72cd9fc73660cf8dc884..0a1cbdb9497f30c8d4b8c0fd2bac948af95a51eb 100644 (file)
--- a/PWG2/FORWARD/analysis/AliFMDAnaParameters.h
+++ b/PWG2/FORWARD/analysis/AliFMDAnaParameters.h
@@ -114,7 +114,7 @@ public:
   void     SetProcessHits(Bool_t hits=kTRUE) {fProcessHits = hits;}
   Bool_t   GetProcessPrimary() const {return fProcessPrimary;} 
   Bool_t   GetProcessHits() const {return fProcessHits;}
-  Bool_t   GetVertex(AliESDEvent* esd, Double_t* vertexXYZ);
+  Bool_t   GetVertex(const AliESDEvent* esd, Double_t* vertexXYZ);
   void     SetTriggerDefinition(Trigger trigger) {fTrigger = trigger;}
   Trigger  GetTriggerDefinition() const {return fTrigger;}
   Bool_t   IsEventTriggered(const AliESDEvent *esd) const;
@@ -125,15 +125,15 @@ public:
   void     SetCollisionSystem(Species collsystem) {fSpecies = collsystem;}
   void     PrintStatus() const;
   void     Print(Option_t* /* option */) const { PrintStatus(); }
-  char*    GetDndetaAnalysisName() {return "PWG2forwardDnDeta";}
+  char*    GetDndetaAnalysisName() const {return "PWG2forwardDnDeta";}
   TH1F*    GetEnergyDistribution(Int_t det, Char_t ring, Float_t eta);
   TH1F*    GetEmptyEnergyDistribution(Int_t det, Char_t ring);
   TH1F*    GetRingEnergyDistribution(Int_t det, Char_t ring);
-  AliPhysicsSelection* GetPhysicsSelection() {return fPhysicsSelection;}
-  Bool_t   IsRealData() {return fRealData; }
+  AliPhysicsSelection* GetPhysicsSelection() const {return fPhysicsSelection;}
+  Bool_t   IsRealData() const {return fRealData; }
   void     SetRealData(Bool_t realdata) {fRealData = realdata;}
-  Float_t  GetLowSPDLimit() {return fSPDlowLimit;}
-  Float_t  GetHighSPDLimit() {return fSPDhighLimit;}
+  Float_t  GetLowSPDLimit() const {return fSPDlowLimit;}
+  Float_t  GetHighSPDLimit() const {return fSPDhighLimit;}
   void     SetLowSPDLimit(Float_t cut) {fSPDlowLimit = cut;}
   void     SetHighSPDLimit(Float_t cut) {fSPDhighLimit = cut;}
   void     SetCentralTriggerSelection(Bool_t selection) {fCentralSelection = selection;}
@@ -184,16 +184,16 @@ protected:
   Bool_t fIsInit;                      //Have we been init ?
   //TObjArray*  fBackgroundArray;
   // TObjArray*  fEdistArray;
-  AliFMDAnaCalibBackgroundCorrection*         fBackground;   
-  AliFMDAnaCalibEnergyDistribution*           fEnergyDistribution;
-  AliFMDAnaCalibEventSelectionEfficiency*     fEventSelectionEfficiency;
-  AliFMDAnaCalibSharingEfficiency*            fSharingEfficiency;
+  AliFMDAnaCalibBackgroundCorrection*         fBackground;   // background map object
+  AliFMDAnaCalibEnergyDistribution*           fEnergyDistribution; // energy distribution object
+  AliFMDAnaCalibEventSelectionEfficiency*     fEventSelectionEfficiency; // event selection distribution object
+  AliFMDAnaCalibSharingEfficiency*            fSharingEfficiency;  // sharing distribution object
   //static const char* fgkBackgroundCorrection;
   //static const char* fgkEnergyDists;
-  static const char* fgkBackgroundID;
-  static const char* fgkEnergyDistributionID ;
-  static const char* fgkEventSelectionEffID ;
-  static const char* fgkSharingEffID ;
+  static const char* fgkBackgroundID;  // background object
+  static const char* fgkEnergyDistributionID ;  //energy dist object
+  static const char* fgkEventSelectionEffID ;   // event selection object
+  static const char* fgkSharingEffID ;          // sharing efficiency object
   
   TVector2 fCorner1;                  //First corner of hybrid
   TVector2 fCorner2;                  //Second corner of hybrid
@@ -207,7 +207,7 @@ protected:
   Energy   fEnergy;                   // CM energy
   MagField fMagField;                 //Magnetic field
   Species  fSpecies;                  //PbPb or pp ?
-  AliPhysicsSelection* fPhysicsSelection; 
+  AliPhysicsSelection* fPhysicsSelection; // the physics selection
   Bool_t   fRealData;                 // real or simulated
   Float_t  fSPDlowLimit ;             // low limit of SPD tracklets
   Float_t  fSPDhighLimit ;             // high limit of SPD tracklets