- Fixed compiler warnings/errors
authorbhess <bhess@cern.ch>
Thu, 12 Jun 2014 07:37:02 +0000 (09:37 +0200)
committershahoian <ruben.shahoyan@cern.ch>
Mon, 16 Jun 2014 21:49:47 +0000 (23:49 +0200)
PWGPP/TPC/AliTPCPIDBase.h
PWGPP/TPC/AliTPCPIDEtaQA.cxx
PWGPP/TPC/AliTPCPIDEtaQA.h
PWGPP/TPC/AliTPCPIDEtaTree.cxx
PWGPP/TPC/AliTPCcalibResidualPID.h

index 0a653c5..8b7764e 100644 (file)
@@ -93,6 +93,9 @@ class AliTPCPIDBase : public AliAnalysisTaskSE {
   static Bool_t TPCnclCut(const AliVTrack* track);
   
  protected:
+  void FillV0PIDlist(AliESDEvent* esdEvent = 0x0);
+  void ClearV0PIDlist();
+  
   static Double_t fgCutGeo;   // Cut variable for TPCCutMIGeo concerning geometry
   static Double_t fgCutNcr; // Cut variable for TPCCutMIGeo concerning num crossed rows
   static Double_t fgCutNcl;  // Cut variable for TPCCutMIGeo concerning num clusters
@@ -127,8 +130,6 @@ class AliTPCPIDBase : public AliAnalysisTaskSE {
   Int_t* fV0motherIndex; //! Pointer to array with index of the mother V0
   
  private:
-  void FillV0PIDlist(AliESDEvent* esdEvent = 0x0);
-  void ClearV0PIDlist();
   
   AliTPCPIDBase(const AliTPCPIDBase&); // not implemented
   AliTPCPIDBase& operator=(const AliTPCPIDBase&); // not implemented
index e5fd1db..f47f1d7 100644 (file)
@@ -39,7 +39,7 @@ ClassImp(AliTPCPIDEtaQA)
 
 //________________________________________________________________________
 AliTPCPIDEtaQA::AliTPCPIDEtaQA()
-  : AliAnalysisTaskPIDV0base()
+  : AliTPCPIDBase()
   , fPtThresholdForPhiCut(2.0)
   , fPhiCutSecondBranchLow(0x0)
   , fPhiCutSecondBranchHigh(0x0)
@@ -66,7 +66,7 @@ AliTPCPIDEtaQA::AliTPCPIDEtaQA()
 
 //________________________________________________________________________
 AliTPCPIDEtaQA::AliTPCPIDEtaQA(const char *name)
-  : AliAnalysisTaskPIDV0base(name)
+  : AliTPCPIDBase(name)
   , fPtThresholdForPhiCut(2.0)
   , fPhiCutSecondBranchLow(0x0)
   , fPhiCutSecondBranchHigh(0x0)
@@ -120,7 +120,7 @@ void AliTPCPIDEtaQA::UserCreateOutputObjects()
   // Create histograms
   // Called once
 
-  AliAnalysisTaskPIDV0base::UserCreateOutputObjects();
+  AliTPCPIDBase::UserCreateOutputObjects();
 
   OpenFile(1);
   
index 5c38181..8509afb 100644 (file)
@@ -33,9 +33,10 @@ class AliTPCPIDEtaQA : public AliTPCPIDBase {
   Double_t GetPtThresholdForPhiCut() const { return fPtThresholdForPhiCut; };     
   virtual void  SetPtThresholdForPhiCut(Double_t threshold) { fPtThresholdForPhiCut = threshold; };
   
- private:
+ protected:
   virtual void   SetUpHist(THnSparse* hist, Double_t* binsPt) const;
-
+  
+ private:
   Double_t fPtThresholdForPhiCut; // Only apply phi cut on tracks with pT larger equal this threshold
   
   TF1* fPhiCutSecondBranchLow; // phi prime cut, low, second branch (very low pT)
index a1f62ba..4017c9c 100644 (file)
@@ -41,7 +41,7 @@ ClassImp(AliTPCPIDEtaTree)
 
 //________________________________________________________________________
 AliTPCPIDEtaTree::AliTPCPIDEtaTree()
-  : AliAnalysisTaskPIDV0base()
+  : AliTPCPIDBase()
   , fStoreMultiplicity(kFALSE)
   , fStoreNumOfSubthresholdclusters(kFALSE)
   , fStoreNumClustersInActiveVolume(kFALSE)
@@ -73,7 +73,7 @@ AliTPCPIDEtaTree::AliTPCPIDEtaTree()
 
 //________________________________________________________________________
 AliTPCPIDEtaTree::AliTPCPIDEtaTree(const char *name)
-  : AliAnalysisTaskPIDV0base(name)
+  : AliTPCPIDBase(name)
   , fStoreMultiplicity(kFALSE)
   , fStoreNumOfSubthresholdclusters(kFALSE)
   , fStoreNumClustersInActiveVolume(kFALSE)
@@ -129,7 +129,7 @@ void AliTPCPIDEtaTree::UserCreateOutputObjects()
   // Create histograms
   // Called once
   
-  AliAnalysisTaskPIDV0base::UserCreateOutputObjects();
+  AliTPCPIDBase::UserCreateOutputObjects();
   
   if (fDoAdditionalQA) {
     OpenFile(3);
index 02b2eb7..86d85ae 100644 (file)
@@ -58,6 +58,7 @@ class TObjArray;
 class AliTPCcalibResidualPID : public AliAnalysisTaskSE {
  public:
   enum FitType { kAleph = 0, kLund = 1, kSaturatedLund = 2, kAlephWithAdditionalParam = 3 };
+  enum kParticle { kElectron = 0, kPion, kKaon, kProton };
   AliTPCcalibResidualPID();
   AliTPCcalibResidualPID(const char *name);
   virtual ~AliTPCcalibResidualPID();
@@ -140,18 +141,17 @@ class AliTPCcalibResidualPID : public AliAnalysisTaskSE {
   static Double_t fgCutNcr;  // Cut variable for TPCCutMIGeo concerning num crossed rows
   static Double_t fgCutNcl;  // Cut variable for TPCCutMIGeo concerning num clusters
   
-  private:
   static Double_t Lund(Double_t* xx, Double_t* par);
   static Double_t SaturatedLund(Double_t* xx, Double_t* par);
   
   void  BinLogAxis(const THnSparseF *h, Int_t axisNumber);
-  enum {kElectron=0, kPion, kKaon, kProton} kParticle ;
 
   static void FitSlicesY(TH2 *hist, Double_t heightFractionForRange, Int_t cutThreshold, TString fitOption, TObjArray *arr);
 
   void FillV0PIDlist(AliESDEvent* esdEvent = 0x0);
   void ClearV0PIDlist();
-
+  
+  private:
   //
   //
   AliESDEvent *fESD;                   //! ESD object