fixing rule violations

diff --git a/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPhotonJet.cxx b/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPhotonJet.cxx
index 32e12657955b8636ee3889571af60fc42b8516e0..357fa0bab13e8d58a7b4f587bae79050c08dd331 100644 (file)
--- a/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPhotonJet.cxx
+++ b/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPhotonJet.cxx
@@ -58,7 +58,7 @@ AliAnaConvCorrPhotonJet::~AliAnaConvCorrPhotonJet() {
 
 
 void AliAnaConvCorrPhotonJet::CreateHistograms() {
-  
+  //Create histo
   CreateBaseHistograms();
   fhPtFracGamma = new TH1F("fhPtFracGamma", "fhPtFracGamma", 100, 0, 10);
   GetHistograms()->Add(fhPtFracGamma);
@@ -101,7 +101,7 @@ void AliAnaConvCorrPhotonJet::DoJetAnalysisGamma(AliAODJet * jet, const TClonesA
 }
 
 //________________________________________________________________________________
-Bool_t AliAnaConvCorrPhotonJet::IsParticleInJet(AliAODJet * jet, Int_t nTracks, Int_t * trackIds) const {
+Bool_t AliAnaConvCorrPhotonJet::IsParticleInJet(const AliAODJet * jet, const Int_t nTracks, const Int_t * trackIds) const {
   //See header file for documetation
 
   Int_t mTracks = 0;
@@ -123,7 +123,7 @@ Bool_t AliAnaConvCorrPhotonJet::IsParticleInJet(AliAODJet * jet, Int_t nTracks,
 
 
 //________________________________________________________________________________
-Double_t AliAnaConvCorrPhotonJet::ExtractFromJet(AliAODJet * jet, const AliAODConversionParticle * const particle) const {
+Double_t AliAnaConvCorrPhotonJet::ExtractFromJet(const AliAODJet * jet, const AliAODConversionParticle * const particle) const {
   //See header file for documetation
   
   Float_t jetPt = jet->Pt();

diff --git a/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPhotonJet.h b/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPhotonJet.h
index 4f6e09b5ba050901ee883ad2ef966caa058bf476..f6280aef58e3727f6d3d784ba1c52b7fae8c9885 100644 (file)
--- a/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPhotonJet.h
+++ b/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPhotonJet.h
@@ -26,8 +26,8 @@ public:
   \r
   //Correlate photon with jets\r
   virtual void CorrelateWithHadrons(const AliAODConversionParticle * const photon, const TClonesArray * const jets, const Bool_t isolated);\r
-  Double_t ExtractFromJet(AliAODJet * jet, const AliAODConversionParticle * const particle)  const;\r
-  Bool_t IsParticleInJet(AliAODJet * jet, Int_t nTracks, Int_t * trackIds) const;\r
+  Double_t ExtractFromJet(const AliAODJet * jet, const AliAODConversionParticle * const particle)  const;\r
+  Bool_t IsParticleInJet(const AliAODJet * jet, const Int_t nTracks, const Int_t * trackIds) const;\r
   void DoJetAnalysisGamma(AliAODJet * jet, const TClonesArray * const photons, const  TClonesArray *const pions ) const;\r
   void CreateHistograms();\r
 \r

diff --git a/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPion.cxx b/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPion.cxx
index 7265ce057daee4632bc76f9cd8faf79599db694b..d129bf27ae4ee294cdddaec12a745b23eb609498 100644 (file)
--- a/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPion.cxx
+++ b/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPion.cxx
@@ -62,6 +62,8 @@ AliAnaConvCorrPion::~AliAnaConvCorrPion() {
 
 //________________________________________________________________________________
 void AliAnaConvCorrPion::InitMassAxis() {
+  //Init mass axis
+  
   Double_t mbins[7] = {0.1, 0.11, 0.12, 0.15, 0.16, 0.18, 0.2};
   fAxisM.Set(6, mbins);
   fAxisM.SetNameTitle("InvMass", "invariant mass");

diff --git a/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPionJet.cxx b/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPionJet.cxx
index b9bedd433d42f516615e4d5d8167b55c239f9d0b..cce7ffaeb687bcda7d078926b55d0978315f0c5d 100644 (file)
--- a/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPionJet.cxx
+++ b/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPionJet.cxx
@@ -50,7 +50,7 @@ AliAnaConvCorrPionJet::~AliAnaConvCorrPionJet() {
 
 ///_______________________________________________________________________________
 void AliAnaConvCorrPionJet::CorrelateWithHadrons(const AliAODConversionParticle * const pion, const TClonesArray * const jets, const Bool_t isolated) {
-
+  //Do it
   FillTriggerCounters(pion, isolated);
 
   //See header file for documentation

diff --git a/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPionJet.h b/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPionJet.h
index d5e654eb71432799dd769ecb4cc3af6dbcfea375..27a5151772d544bbe5ea4b61325237c680ba6fc7 100644 (file)
--- a/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPionJet.h
+++ b/PWGGA/GammaConv/ConvCorrelations/AliAnaConvCorrPionJet.h
@@ -6,8 +6,8 @@
 /// @author Svein Lindal\r
 /// @brief  Class used to find correlations between photons and jets\r
 \r
-#ifndef ALIANACONVCORRPIONJET_CXX\r
-#define ALIANACONVCORRPIONJET_CXX\r
+#ifndef ALIANACONVCORRPIONJET_H\r
+#define ALIANACONVCORRPIONJET_H\r
 \r
 #include "AliAnaConvCorrBase.h"\r
 \r

diff --git a/PWGGA/GammaConv/ConvCorrelations/AliAnaConvIsolation.cxx b/PWGGA/GammaConv/ConvCorrelations/AliAnaConvIsolation.cxx
index 4a4d2757f567770c4ac006da92d45313a0041805..9381742a281e282e5590cd9097ada899177be53d 100644 (file)
--- a/PWGGA/GammaConv/ConvCorrelations/AliAnaConvIsolation.cxx
+++ b/PWGGA/GammaConv/ConvCorrelations/AliAnaConvIsolation.cxx
@@ -198,7 +198,7 @@ Bool_t AliAnaConvIsolation::IsLeading(AliAODConversionParticle * particle, const
 
 ///________________________________________________________________________
 Int_t AliAnaConvIsolation::IsLeading(const AliAODConversionParticle * particle, const TObjArray * tracks, const Int_t tIDs[4]) const {
-
+  //is it leading
   Bool_t leadingEvent = kTRUE;
 
   //Is there a higher pt particle within cone ?

diff --git a/PWGGA/GammaConv/ConvCorrelations/AliAnaConvIsolation.h b/PWGGA/GammaConv/ConvCorrelations/AliAnaConvIsolation.h
index 6af68db94f4030d4507ce8af235add4cb5ef6a3f..2dbfaf1c960d5c6c796428d571d734840ddccce7 100644 (file)
--- a/PWGGA/GammaConv/ConvCorrelations/AliAnaConvIsolation.h
+++ b/PWGGA/GammaConv/ConvCorrelations/AliAnaConvIsolation.h
@@ -7,15 +7,16 @@
 /// @brief  Class used to run isolation studies of conversion gamma/pions\r
  \r
 \r
-#ifndef ALIANACONVISOLATION_CXX\r
-#define ALIANACONVISOLATION_CXX\r
+#ifndef ALIANACONVISOLATION_H\r
+#define ALIANACONVISOLATION_H\r
 \r
 #include <iostream>\r
 #include "TObject.h"\r
 #include "Rtypes.h"\r
-#include "TF1.h"\r
 #include <TMath.h>\r
+#include "TString.h"\r
 class TH2F;\r
+class TF1;\r
 class TH1F;\r
 class AliAODConversionPhoton;\r
 class AliAODConversionParticle;\r