coverity fix + updates from xzhu

diff --git a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALCaloTrackCorr.cxx b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALCaloTrackCorr.cxx
index 3e9fee8c397ee8488063a5a78e43d728e4a51698..0af5fe6124634b6393729d89686495242091bfc8 100644 (file)
--- a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALCaloTrackCorr.cxx
+++ b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALCaloTrackCorr.cxx
@@ -49,7 +49,7 @@ AliAnalysisTaskEMCALCaloTrackCorr::AliAnalysisTaskEMCALCaloTrackCorr(const char
 
   fEMCALGeomName("EMCAL_COMPLETEV1"),
   fCentralityClass(""),  fCentralityBinMin(0), fCentralityBinMax(0),
-  fEventPlaneMethod(""), fEventTriggerMaks(0), 
+  fEventPlaneMethod(""), fEventTriggerMaks(0), fNCentralityBins(0),      fNEventPlaneBins(0), 
   fHistoPtBins(0),       fHistoPtMax(0.),      fHistoPtMin(0.),
   fHistoPhiBins(0),      fHistoPhiMax(0.),     fHistoPhiMin(0.),
   fHistoEtaBins(0),      fHistoEtaMax(0.),     fHistoEtaMin(0.),
@@ -882,7 +882,7 @@ void AliAnalysisTaskEMCALCaloTrackCorr::UserExec(Option_t *)
    replane = 0;
   }
   else{///for PbPb
-   Float_t fCentralityPerBin = (fCentralityBinMax -fCentralityBinMin)/10.;
+   Float_t fCentralityPerBin = (fCentralityBinMax -fCentralityBinMin)/fNCentralityBins;
    Float_t fcentrality = 0; 
   
    if(fDataType == "ESD")fCentrality->GetCentralityPercentile(fCentralityClass);
@@ -915,8 +915,8 @@ void AliAnalysisTaskEMCALCaloTrackCorr::UserExec(Option_t *)
     if(feventplane<0)feventplane+=TMath::Pi();
     if(feventplane>TMath::Pi())feventplane-=TMath::Pi();
 
-    replane = Int_t((10*feventplane)/TMath::Pi());
-    if(replane>9) replane =9;
+    replane = Int_t((fNEventPlaneBins*feventplane)/TMath::Pi());
+    if(replane>(fNEventPlaneBins -1)) replane = fNEventPlaneBins -1;
    }
    else{
     replane = 0;
@@ -998,7 +998,9 @@ void AliAnalysisTaskEMCALCaloTrackCorr::InitParameters()
   fCentralityClass  = "V0M";
   fCentralityBinMin = fCentralityBinMax=-1;
   fEventPlaneMethod = "Q";
-  fEventTriggerMaks  = AliVEvent::kAny;
+  fEventTriggerMaks = AliVEvent::kAny;
+  fNCentralityBins  = 5;
+  fNEventPlaneBins  = 5;
 
   kMC = kFALSE ;
   kDoMixEventsAna    = kTRUE  ;
@@ -1030,7 +1032,7 @@ void AliAnalysisTaskEMCALCaloTrackCorr::InitParameters()
 
   fMinNCells = 1 ;
   fMinE = 0.5;
-  fMinDistBad = 2 ;
+  fMinDistBad = 2. ;
   
   fL0CutMin = 0.1;
   fL0CutMax = 0.27;
@@ -1099,11 +1101,11 @@ Bool_t AliAnalysisTaskEMCALCaloTrackCorr::FillInputEvent()
     if(!fEvent) {
      Printf("ERROR: Could not retrieve event");
      return kFALSE;
-   
-     fcentrality = ((AliAODHeader*)fEvent->GetHeader())->GetCentrality();
-     if((fcentrality < fCentralityBinMin) || (fcentrality>fCentralityBinMax)) return kFALSE;
-
     }
+    
+    fcentrality = ((AliAODHeader*)fEvent->GetHeader())->GetCentrality();
+    if((fcentrality < fCentralityBinMin) || (fcentrality>fCentralityBinMax)) return kFALSE;
+
    }
    else return kFALSE;
 
@@ -1424,7 +1426,7 @@ Bool_t AliAnalysisTaskEMCALCaloTrackCorr::SelectPair(AliAODParticle *mesonCandid
   Float_t invmassRightBandMaxCut = fRightBandMaxCut;
 
   //for EMCAL, pi0s, mass depends strongly with energy for e > 6, loose max cut
-  if(e > 8.){
+  if(e > 10.){
    invmassmaxcut = (fInvMassMaxCutParam[0]+fInvMassMaxCut)+fInvMassMaxCutParam[1]*e+fInvMassMaxCutParam[2]*e*e;
    invmassRightBandMinCut = (fInvMassMaxCutParam[0]+fRightBandMinCut)+fInvMassMaxCutParam[1]*e+fInvMassMaxCutParam[2]*e*e;
    invmassRightBandMaxCut = (fInvMassMaxCutParam[0]+fRightBandMaxCut)+fInvMassMaxCutParam[1]*e+fInvMassMaxCutParam[2]*e*e;

diff --git a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALCaloTrackCorr.h b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALCaloTrackCorr.h
index 671c109d578617a992d7735f199ec05c97c6a374..163ec32d2d579e8751520aab0ae34891aa2eaab9 100644 (file)
--- a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALCaloTrackCorr.h
+++ b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALCaloTrackCorr.h
@@ -43,7 +43,7 @@ public:
 \r
   Int_t    GetMinNCells()           const { return fMinNCells  ; }\r
   Double_t GetMinE()                const { return fMinE       ; }\r
-  Int_t    GetMinDistBad()          const { return fMinDistBad ; }  \r
+  Double_t GetMinDistBad()          const { return fMinDistBad ; }  \r
 \r
   Int_t    GetDebug()               const { return fDebug ; }\r
   void     SetDebug(Int_t deb)            { fDebug = deb  ; }\r
@@ -86,7 +86,7 @@ public:
   \r
   void   SetMinNCells(Int_t n)                { fMinNCells   = n  ; }\r
   void   SetMinE(Double_t pt)                 { fMinE        = pt ; }\r
-  void   SetMinDistBad(Int_t fn)              { fMinDistBad = fn ; }\r
+  void   SetMinDistBad(Double_t fn)           { fMinDistBad = fn ; }\r
   \r
   void   SetConeR(Float_t r)              { fSetConeR          = r       ; }\r
   void   SetPtThreshold(Float_t pt)       { fSetPtThreshold    = pt      ; }\r
@@ -200,7 +200,8 @@ public:
   void    SwitchOffAODHybridTrackSelection() { kDoSelectHybridTracks = kFALSE;}  \r
   void    SetAnaMesonType(TString fmesontype){ fAnaMesonType = fmesontype ; }\r
 \r
-  void    SetCentralityBin(Int_t min, Int_t max)                                                       { fCentralityBinMin = min; fCentralityBinMax = max ; }\r
+  void    SetCentralityBin(Int_t min, Int_t max)\r
+                       { fCentralityBinMin = min; fCentralityBinMax = max ; }\r
   void    SetCentralityClass(TString name)   { fCentralityClass   = name  ; }\r
   \r
   void    SetEventPlaneMethod(TString m)     { fEventPlaneMethod = m      ; }\r
@@ -208,6 +209,8 @@ public:
   UInt_t  GetEventTriggerMask()        const { return fEventTriggerMaks   ; }\r
   void    SetEventTriggerMask(UInt_t evtTrig = AliVEvent::kAny)\r
                                         { fEventTriggerMaks = evtTrig     ; }\r
+  void    SetNCentralityBins(Int_t fcenbins) { fNCentralityBins = fcenbins; }\r
+  void    SetNEventPlaneBins(Int_t fevbins)  { fNEventPlaneBins = fevbins ; }\r
 \r
   void    SetEMCALLambda0Cut(Float_t l0min, Float_t l0max)\r
                                    { fL0CutMin = l0min, fL0CutMax = l0max ; }\r
@@ -283,6 +286,8 @@ private:
   Int_t    fCentralityBinMax;\r
   TString  fEventPlaneMethod;\r
   UInt_t   fEventTriggerMaks;\r
+  Int_t    fNCentralityBins;\r
+  Int_t    fNEventPlaneBins;\r
  \r
   Int_t    fHistoPtBins ; \r
   Float_t  fHistoPtMax  ; \r
@@ -296,7 +301,7 @@ private:
  \r
   Int_t    fMinNCells;\r
   Float_t  fMinE;\r
-  Int_t    fMinDistBad;\r
+  Double_t fMinDistBad;\r
   Float_t  fL0CutMin;\r
   Float_t  fL0CutMax;\r
   Float_t  fTimeCutMin;\r