addressing remaining current rulechecker violations that did not seem to be false...

diff --git a/PWG4/PWG4totEtLinkDef.h b/PWG4/PWG4totEtLinkDef.h
index 913ef7713104fdc6c54e5d6483b84f79e86721b9..80baf1ce61ef31804d44b77d9eb48662c45daa25 100644 (file)
--- a/PWG4/PWG4totEtLinkDef.h
+++ b/PWG4/PWG4totEtLinkDef.h
@@ -25,7 +25,4 @@
 #pragma link C++ class AliAnalysisTaskHadEt+;
 #pragma link C++ class AliAnalysisHadEtCorrections+;
 
-#pragma link C++ class AliAnalysisLevyPt+;
-
-      
 #endif

diff --git a/PWG4/totEt/AliAnalysisEtCommon.cxx b/PWG4/totEt/AliAnalysisEtCommon.cxx
index 139045644a9419875211a278a5010b3a415a7b4b..ed98df5d5caf9752a712530e3be2e990cd6ef8f3 100644 (file)
--- a/PWG4/totEt/AliAnalysisEtCommon.cxx
+++ b/PWG4/totEt/AliAnalysisEtCommon.cxx
@@ -118,9 +118,7 @@ Int_t AliAnalysisEtCommon::AnalyseEvent(AliVEvent */*event*/)
 
 void AliAnalysisEtCommon::Init()
 {// clear variables, set up cuts and PDG info
-  //MyFunction * fptr = new MyFunction(....);  // create the user function class
-  //TF1 * f = new TF1("f",fptr,&MyFunction::Evaluate,0,1,npar,"MyFunction","Evaluate");   // create TF1 class.
-  AliAnalysisLevyPt *function = new AliAnalysisLevyPt();
+  // LevyPt function described in LevyFitEvaluate below
   //parameter 0 = dNdy
   //parameter 1 = temp
   //parameter 2 = power
@@ -130,12 +128,14 @@ void AliAnalysisEtCommon::Init()
   if(fK0Data) delete fK0Data;
   if(fLambdaData) delete fLambdaData;
   if(fAntiLambdaData) delete fAntiLambdaData;
-  fK0PythiaD6T = new TF1("K0PythiaD6T",function, &AliAnalysisLevyPt::Evaluate,0,50,4,"AliAnalysisLevyPt","Evaluate");
-  fLambdaPythiaD6T = new TF1("LambdaPythiaD6T",function, &AliAnalysisLevyPt::Evaluate,0,50,4,"AliAnalysisLevyPt","Evaluate");
-  fAntiLambdaPythiaD6T = new TF1("LambdaPythiaD6T",function, &AliAnalysisLevyPt::Evaluate,0,50,4,"AliAnalysisLevyPt","Evaluate");
-  fK0Data = new TF1("K0Data",function, &AliAnalysisLevyPt::Evaluate,0,50,4,"AliAnalysisLevyPt","Evaluate");
-  fLambdaData = new TF1("LambdaData",function, &AliAnalysisLevyPt::Evaluate,0,50,4,"AliAnalysisLevyPt","Evaluate");
-  fAntiLambdaData = new TF1("LambdaData",function, &AliAnalysisLevyPt::Evaluate,0,50,4,"AliAnalysisLevyPt","Evaluate");
+
+  fK0PythiaD6T = new TF1("K0PythiaD6T", LevyPtEvaluate, 0,50,4);
+  fLambdaPythiaD6T = new TF1("LambdaPythiaD6T", LevyPtEvaluate,0,50,4);
+  fAntiLambdaPythiaD6T = new TF1("AntiLambdaPythiaD6T", LevyPtEvaluate,0,50,4);
+  fK0Data = new TF1("K0Data", LevyPtEvaluate,0,50,4);
+  fLambdaData = new TF1("LambdaData", LevyPtEvaluate,0,50,4);
+  fAntiLambdaData = new TF1("AntiLambdaData", LevyPtEvaluate,0,50,4);
+
   fK0PythiaD6T->FixParameter(3,0.493677);
   fK0Data->FixParameter(3,0.493677);
   fLambdaPythiaD6T->FixParameter(3,1.115683);
@@ -219,6 +219,22 @@ void AliAnalysisEtCommon::ResetEventValues()
   }
 }
 
+Double_t AliAnalysisEtCommon::LevyPtEvaluate(const Double_t *pt, 
+                                            const Double_t *par) 
+{//LevyPt function for TF1's
+  
+  Double_t lMass  = par[3];
+  Double_t ldNdy  = par[0];
+  Double_t l2pi   = 2*TMath::Pi();
+  Double_t lTemp = par[1];
+  Double_t lPower = par[2];
+  
+  Double_t lBigCoef = ((lPower-1)*(lPower-2)) / (l2pi*lPower*lTemp*(lPower*lTemp+lMass*(lPower-2)));
+  Double_t lInPower = 1 + (TMath::Sqrt(pt[0]*pt[0]+lMass*lMass)-lMass) / (lPower*lTemp);
+  
+  return ldNdy * pt[0] * lBigCoef * TMath::Power(lInPower,(-1)*lPower);
+}
+
 
 Float_t AliAnalysisEtCommon::Et(TParticle *part, float mass){//function to calculate et in the same way as it would be calculated in a calorimeter
   if(mass+1000<0.01){//if no mass given return default.  The default argument is -1000

diff --git a/PWG4/totEt/AliAnalysisEtCommon.h b/PWG4/totEt/AliAnalysisEtCommon.h
index 5d0958989c7197facd7852a4663917f7f74f38fa..0ddc5eb5366ec99fc48842f5e7a5f51336eb1628 100644 (file)
--- a/PWG4/totEt/AliAnalysisEtCommon.h
+++ b/PWG4/totEt/AliAnalysisEtCommon.h
@@ -9,7 +9,6 @@
 #define ALIANALYSISETCOMMON_H
 
 #include "TString.h"
-#include "TMath.h"
 #include "TObject.h"
 
 class TH2F;
@@ -23,29 +22,6 @@ class TParticle;
 class TDatabasePDG;
 class AliAnalysisEtCuts;
 
-#ifndef ALIANALYSISLEVYPT_H
-#define ALIANALYSISLEVYPT_H
-class AliAnalysisLevyPt{
- public:
-  virtual ~AliAnalysisLevyPt(){;};
-  Double_t Evaluate(const Double_t *pt, const Double_t *par) const
-  {
-    Double_t lMass  = par[3];
-    Double_t ldNdy  = par[0];
-    Double_t l2pi   = 2*TMath::Pi();
-    Double_t lTemp = par[1];
-    Double_t lPower = par[2];
-
-    Double_t lBigCoef = ((lPower-1)*(lPower-2)) / (l2pi*lPower*lTemp*(lPower*lTemp+lMass*(lPower-2)));
-    Double_t lInPower = 1 + (TMath::Sqrt(pt[0]*pt[0]+lMass*lMass)-lMass) / (lPower*lTemp);
-
-    return ldNdy * pt[0] * lBigCoef * TMath::Power(lInPower,(-1)*lPower);
-  };
-  ClassDef(AliAnalysisLevyPt, 1);
-};
-
-#endif // ALIANALYSISLEVYPT_H
-
 class AliAnalysisEtCommon  : public TObject
 {
 public:
@@ -64,6 +40,9 @@ public:
     /** Reset event specific values (Et etc.) */
     virtual void ResetEventValues();
 
+    /** LevyPtEvaluate function */
+    static Double_t LevyPtEvaluate(const Double_t *pt, const Double_t *par);
+
     /** Cuts info */
     AliAnalysisEtCuts * GetCuts() const { return fCuts; } 
     virtual void SetCuts(const AliAnalysisEtCuts *cuts) 

diff --git a/PWG4/totEt/AliAnalysisHadEtCorrections.cxx b/PWG4/totEt/AliAnalysisHadEtCorrections.cxx
index f3f69ba6a46a7301e955e5c98dacc177e1d25ce0..c2604418b957e678dd7adb0e7ec964bdd2f665a3 100644 (file)
--- a/PWG4/totEt/AliAnalysisHadEtCorrections.cxx
+++ b/PWG4/totEt/AliAnalysisHadEtCorrections.cxx
@@ -74,12 +74,16 @@ AliAnalysisHadEtCorrections::AliAnalysisHadEtCorrections() : TNamed(),
                                                           ,fProduction("ProductionName")
                                                           ,fProductionDescription("Long production description")
 {//default constructor
-  //This seems to solve a compiler error
+  Init();
+}
+
+void AliAnalysisHadEtCorrections::Init() 
+{  //This seems to solve a compiler error
   cout<<"Creating new AliAnalysisHadEtCorrections"<<endl;
   fEfficiencyTPC = new TObjArray();
   fEfficiencyITS = new TObjArray();
-
 }
+
 AliAnalysisHadEtCorrections::~AliAnalysisHadEtCorrections()
 {//destructor
   //Clear();

diff --git a/PWG4/totEt/AliAnalysisHadEtCorrections.h b/PWG4/totEt/AliAnalysisHadEtCorrections.h
index 4f1342a0784c46b0f58e5ef4d1be58862c3c5eed..574e9a2b79ec5edd786c802f6ecb43354d4b347a 100644 (file)
--- a/PWG4/totEt/AliAnalysisHadEtCorrections.h
+++ b/PWG4/totEt/AliAnalysisHadEtCorrections.h
@@ -21,6 +21,7 @@ class AliAnalysisHadEtCorrections : public TNamed
 public:
    
   AliAnalysisHadEtCorrections();
+  virtual void Init();
     virtual ~AliAnalysisHadEtCorrections();
 
     Float_t GetEtaCut() const {return fEtaCut;}