- Coverity fixes

- Added switch for leading jets/inclusive jets

diff --git a/PWGJE/UserTasks/AliAnalysisTaskIDFragmentationFunction.cxx b/PWGJE/UserTasks/AliAnalysisTaskIDFragmentationFunction.cxx
index 5d624a4fcb35d989100c97d3491322932cdebfcf..0802103e27dc7d012017dfa1158ef1526988dfa1 100644 (file)
--- a/PWGJE/UserTasks/AliAnalysisTaskIDFragmentationFunction.cxx
+++ b/PWGJE/UserTasks/AliAnalysisTaskIDFragmentationFunction.cxx
@@ -244,6 +244,8 @@ AliAnalysisTaskIDFragmentationFunction::AliAnalysisTaskIDFragmentationFunction()
 
    ,fRandom(0)
    
+   ,fOnlyLeadingJets(kFALSE)
+   
    // PID framework
    ,fNumInclusivePIDtasks(0)
    ,fNumJetPIDtasks(0)
@@ -460,6 +462,7 @@ AliAnalysisTaskIDFragmentationFunction::AliAnalysisTaskIDFragmentationFunction(c
   ,fProNtracksLeadingJetRecSecS(0)  
   ,fProNtracksLeadingJetRecSecSsc(0)
   ,fRandom(0)
+  ,fOnlyLeadingJets(kFALSE)
   // PID framework
   ,fNumInclusivePIDtasks(0)
   ,fNumJetPIDtasks(0)
@@ -678,6 +681,7 @@ AliAnalysisTaskIDFragmentationFunction::AliAnalysisTaskIDFragmentationFunction(c
   ,fProNtracksLeadingJetRecSecS(copy.fProNtracksLeadingJetRecSecS)  
   ,fProNtracksLeadingJetRecSecSsc(copy.fProNtracksLeadingJetRecSecSsc)
   ,fRandom(copy.fRandom)
+  ,fOnlyLeadingJets(copy.fOnlyLeadingJets)
   // PID framework
   ,fNumInclusivePIDtasks(copy.fNumInclusivePIDtasks)
   ,fNumJetPIDtasks(copy.fNumJetPIDtasks)
@@ -939,6 +943,7 @@ AliAnalysisTaskIDFragmentationFunction& AliAnalysisTaskIDFragmentationFunction::
     fProNtracksLeadingJetRecSecS   = o.fProNtracksLeadingJetRecSecS;  
     fProNtracksLeadingJetRecSecSsc = o.fProNtracksLeadingJetRecSecSsc;
     fRandom                        = o.fRandom;
+    fOnlyLeadingJets               = o.fOnlyLeadingJets;
     
     // PID framework
    fUseInclusivePIDtask            = o.fUseInclusivePIDtask;
@@ -2639,13 +2644,17 @@ void AliAnalysisTaskIDFragmentationFunction::UserExec(Option_t *)
   
   AliPIDResponse* pidResponse = 0x0;
   if (fUseJetPIDtask || fUseInclusivePIDtask) {
-    if (!inputHandler)
+    if (!inputHandler) {
       AliFatal("Input handler needed");
+      return;
+    }
     else {
       // PID response object
       pidResponse = inputHandler->GetPIDResponse();
-      if (!pidResponse)
+      if (!pidResponse) {
         AliFatal("PIDResponse object was not created");
+        return;
+      }
     }
   }
   
@@ -2847,7 +2856,7 @@ void AliAnalysisTaskIDFragmentationFunction::UserExec(Option_t *)
       
       if(fQAMode&2 && (ij==0)) fQAJetHistosGenLeading->FillJetQA( jet->Eta(), TVector2::Phi_0_2pi(jet->Phi()), jet->Pt() );
 
-      if((ij==0) || 1){ // leading jet //TODO all jets
+      if((ij==0) || !fOnlyLeadingJets){ // leading jets or all jets
         TList* jettracklist = new TList();
         Double_t sumPt      = 0.;
         Bool_t isBadJet     = kFALSE;
@@ -2990,7 +2999,7 @@ void AliAnalysisTaskIDFragmentationFunction::UserExec(Option_t *)
       if(fQAMode&2) fQAJetHistosRecCuts->FillJetQA( jet->Eta(), TVector2::Phi_0_2pi(jet->Phi()), jet->Pt());
       if(fQAMode&2 && (ij==0)) fQAJetHistosRecCutsLeading->FillJetQA( jet->Eta(), TVector2::Phi_0_2pi(jet->Phi()), jet->Pt() );
       
-      if((ij==0) || 1){ // leading jet //TODO all jets
+      if((ij==0) || !fOnlyLeadingJets){ // leading jets or all jets
        
        Double_t ptFractionEmbedded = 0; 
        AliAODJet* embeddedJet = 0; 
@@ -3195,7 +3204,7 @@ void AliAnalysisTaskIDFragmentationFunction::UserExec(Option_t *)
          delete jettracklist;  
 
        } // end: cut embedded ratio
-      } // end: leading jet
+      } // end: leading jet or all jets
     } // end: rec. jets after cuts
   } // end: QA, FF and intra-jet
 
@@ -3260,7 +3269,7 @@ void AliAnalysisTaskIDFragmentationFunction::UserExec(Option_t *)
       Bool_t isBadJetRec     = kFALSE;
     
 
-      if((ij==0) || 1){ // leading jet //TODO all jets
+      if((ij==0) || !fOnlyLeadingJets){ // leading jets or all jets
        
        // for efficiency: gen tracks from pointing with gen/rec jet
        TList* jettracklistGenPrim = new TList();
@@ -4640,7 +4649,7 @@ void AliAnalysisTaskIDFragmentationFunction::GetClusterTracksMedian(TList* outpu
   
   normFactor = 0;
 
-  Int_t nBckgClusters = fBckgJetsRec->GetEntries(); // not 'recCuts': use all clusters in full eta range
+  const Int_t nBckgClusters = fBckgJetsRec->GetEntries(); // not 'recCuts': use all clusters in full eta range
 
   if(nBckgClusters<3) return; // need at least 3 clusters (skipping 2 highest)
 

diff --git a/PWGJE/UserTasks/AliAnalysisTaskIDFragmentationFunction.h b/PWGJE/UserTasks/AliAnalysisTaskIDFragmentationFunction.h
index d2c56e709df4675f5926e1410dd63fecc6ef30e2..ce8064c5153a540504b7db3099e028e2cd2c58f6 100644 (file)
--- a/PWGJE/UserTasks/AliAnalysisTaskIDFragmentationFunction.h
+++ b/PWGJE/UserTasks/AliAnalysisTaskIDFragmentationFunction.h
@@ -303,6 +303,9 @@ class AliAnalysisTaskIDFragmentationFunction : public AliAnalysisTaskSE {
        Bool_t GetIsPP() const { return fIsPP; };
        void SetIsPP(Bool_t flag) { fIsPP = flag; };
   
+  Bool_t GetOnlyLeadingJets() const { return fOnlyLeadingJets; }
+  void SetOnlyLeadingJets(Bool_t onlyLeadingJets) { fOnlyLeadingJets = onlyLeadingJets; }
+  
   // Consts
   enum {kTrackUndef=0, kTrackAOD, kTrackAODQualityCuts, kTrackAODCuts, 
        kTrackAODExtra, kTrackAODExtraonly, kTrackAODExtraCuts, kTrackAODExtraonlyCuts, 
@@ -566,7 +569,9 @@ class AliAnalysisTaskIDFragmentationFunction : public AliAnalysisTaskSE {
   TProfile* fProDelRPtSumRecSecSsc[5];      //! jet shape 
   
 
-  TRandom3*                   fRandom;          // TRandom3 for background estimation 
+  TRandom3* fRandom;                        // TRandom3 for background estimation 
+  
+  Bool_t fOnlyLeadingJets;                  // Flag indicating whether some histos are filled with leading jets only or all jets
   
   // PID framework
   Int_t fNumInclusivePIDtasks;              // Number of inclusive PID tasks used 
@@ -586,7 +591,7 @@ class AliAnalysisTaskIDFragmentationFunction : public AliAnalysisTaskSE {
   AliFragFuncHistos* fIDFFHistosRecCuts[AliPID::kSPECIES];    //! Identified FF reconstructed tracks after cuts 
   AliFragFuncHistos* fIDFFHistosGen[AliPID::kSPECIES];    //! Identified FF generated tracks after cuts 
 
-  ClassDef(AliAnalysisTaskIDFragmentationFunction, 17);
+  ClassDef(AliAnalysisTaskIDFragmentationFunction, 18);
 };
 
 

diff --git a/PWGJE/UserTasks/AliAnalysisTaskPID.cxx b/PWGJE/UserTasks/AliAnalysisTaskPID.cxx
index 3506b881b5bcce2c8e6eaf48009bba13616e59c9..35979edd2ef61eea74126d134a7441cc3fabb646 100644 (file)
--- a/PWGJE/UserTasks/AliAnalysisTaskPID.cxx
+++ b/PWGJE/UserTasks/AliAnalysisTaskPID.cxx
@@ -617,7 +617,7 @@ void AliAnalysisTaskPID::UserCreateOutputObjects()
   const Int_t nMCIDbins = AliPID::kSPECIES;
   Double_t binsMCID[nMCIDbins];
   
-  for(Int_t i = 0; i <= nMCIDbins; i++) {
+  for(Int_t i = 0; i < nMCIDbins; i++) {
     binsMCID[i]= i; 
   }
   
@@ -782,8 +782,8 @@ void AliAnalysisTaskPID::UserExec(Option_t *)
     
     
     // Apply detector level track cuts
-    //TODO NOW if (track->GetTPCsignalN() < 60)
-    //TODO NOW  continue;//TODO was removed for a while
+    //if (track->GetTPCsignalN() < 60)
+    //  continue;//TODO was removed for a while
     
     
     if(fTrackFilter && !fTrackFilter->IsSelected(track))
@@ -2541,7 +2541,7 @@ Bool_t AliAnalysisTaskPID::SetConvolutedGaussLambdaParameter(Double_t lambda)
     fConvolutedGausDeltaPrime->SetRange(oldFuncRangeLow, oldFuncRangeUp);
     
     delete hInput;
-    delete oldFuncParams;
+    delete [] oldFuncParams;
     
     return kFALSE; 
   }
@@ -2553,7 +2553,7 @@ Bool_t AliAnalysisTaskPID::SetConvolutedGaussLambdaParameter(Double_t lambda)
     fConvolutedGausDeltaPrime->SetRange(oldFuncRangeLow, oldFuncRangeUp);
     
     delete hInput;
-    delete oldFuncParams;
+    delete [] oldFuncParams;
     
     return kFALSE;
   }
@@ -2603,7 +2603,7 @@ Bool_t AliAnalysisTaskPID::SetConvolutedGaussLambdaParameter(Double_t lambda)
     fConvolutedGausDeltaPrime->SetRange(oldFuncRangeLow, oldFuncRangeUp);
     
     delete hInput;
-    delete oldFuncParams;
+    delete [] oldFuncParams;
     
     return kFALSE;
   }
@@ -2620,7 +2620,7 @@ Bool_t AliAnalysisTaskPID::SetConvolutedGaussLambdaParameter(Double_t lambda)
   fConvolutedGausDeltaPrime->SetRange(oldFuncRangeLow, oldFuncRangeUp);
   
   delete hInput;
-  delete oldFuncParams;
+  delete [] oldFuncParams;
 
   return kTRUE;
 }

diff --git a/PWGJE/UserTasks/AliAnalysisTaskPIDV0base.cxx b/PWGJE/UserTasks/AliAnalysisTaskPIDV0base.cxx
index 70b470e03724e768a1845cac074f2a12e8712946..798742040250ba6d59ae01c8dff9b49588b66136 100644 (file)
--- a/PWGJE/UserTasks/AliAnalysisTaskPIDV0base.cxx
+++ b/PWGJE/UserTasks/AliAnalysisTaskPIDV0base.cxx
@@ -144,8 +144,12 @@ void AliAnalysisTaskPIDV0base::UserCreateOutputObjects()
   AliAnalysisManager* man = AliAnalysisManager::GetAnalysisManager();
   AliInputEventHandler* inputHandler = dynamic_cast<AliInputEventHandler*>(man->GetInputEventHandler());
   
-  if (!inputHandler)
+  if (!inputHandler) {
     AliFatal("Input handler needed");
+    fPIDResponse = 0x0;
+    
+    return;
+  }
 
   // PID response object
   fPIDResponse = inputHandler->GetPIDResponse();

diff --git a/PWGJE/macros/AddTaskIDFragmentationFunction.C b/PWGJE/macros/AddTaskIDFragmentationFunction.C
index f3c7b9b8b5e228318a78eddd396ad281766d56f3..48ffcb63cdf7a70d92f5937a11b5c2f28d9af6a2 100644 (file)
--- a/PWGJE/macros/AddTaskIDFragmentationFunction.C
+++ b/PWGJE/macros/AddTaskIDFragmentationFunction.C
@@ -20,7 +20,7 @@ Or it runs on delta-AODs filled with filtered tracks and jets before.
 
 Typical parameters to run on 11a1* (MC_pp@7TeV):
 "clustersAOD_ANTIKT", "", "clustersAODMC2_ANTIKT", "AODMCb", "AODMC2b", AliAnalysisManager::GetGlobalInt("kHighPtFilterMask", gDebug), 
--0.4, 0, 1000*AliAnalysisManager::GetGlobalDbl("kTrackPtCut", gDebug), 0, "_Skip00", "", "_Skip00", 0.4, -1, 0, 0,
+-0.4, 0, 1000*AliAnalysisManager::GetGlobalDbl("kTrackPtCut", gDebug), 0, "_Skip00", "", "_Skip00", 0.4, -1, 0, 0, kFALSE,
 "PWGJE_taskPID_Jets", "", "PWGJE_taskPID_Jets_Inclusive", "" 
 
 ***************************************************************************************************/
@@ -196,17 +196,18 @@ AliAnalysisTaskIDFragmentationFunction *AddTaskIDFragmentationFunction(
   const char* jetType,
   const char* trackType,
   UInt_t filterMask,
-        Float_t radius,
-        int kBackgroundMode,
-        Int_t PtTrackMin,
-        Int_t eventClass=0,
-        TString BrOpt="",
-        TString BrOpt2="",
-        TString BrOpt3="",
-        Float_t radiusBckg=0.4,
+  Float_t radius,
+  Int_t kBackgroundMode,
+  Int_t PtTrackMin,
+  Int_t eventClass=0,
+  TString BrOpt="",
+  TString BrOpt2="",
+  TString BrOpt3="",
+  Float_t radiusBckg=0.4,
   Int_t FFMaxTrackPt = -1,
   Int_t FFMinNTracks = 0,
   UInt_t filterMaskTracks = 0,
+  Bool_t onlyConsiderLeadingJets = kFALSE,
   TString suffixPIDtaskJets1 = "",
   TString suffixPIDtaskJets2 = "",
   TString suffixPIDtaskInclusive1 = "",
@@ -371,6 +372,8 @@ AliAnalysisTaskIDFragmentationFunction *AddTaskIDFragmentationFunction(
    task->SetBckgType();
    task->SetBranchRecBackClusters(Form("clustersAOD_KT04_B0_Filter%05d_Cut00150_Skip00",filterMask));
    
+   task->SetOnlyLeadingJets(onlyConsiderLeadingJets); // default: kFALSE
+   
    // Define histo bins
    task->SetFFHistoBins(23, 5, 120, 480, 0., 120.,70,  0., 7.,22,  0.,  1.1);