From c6bca3f24783d7f3722aa20388c811d3d21927eb Mon Sep 17 00:00:00 2001 From: ssakai Date: Mon, 14 Oct 2013 09:55:06 +0000 Subject: [PATCH] coverity fox and updates --- PWGHF/hfe/AliAnalysisTaskHFECal.cxx | 9 ++++----- PWGHF/hfe/macros/AddTaskHFECal.C | 8 ++++---- PWGHF/hfe/macros/AddTaskHFECalPbPbSys.C | 6 +++--- PWGHF/hfe/macros/configs/PbPb/ConfigHFECal.C | 4 +++- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/PWGHF/hfe/AliAnalysisTaskHFECal.cxx b/PWGHF/hfe/AliAnalysisTaskHFECal.cxx index 8e8a91c0ebe..056f30932df 100644 --- a/PWGHF/hfe/AliAnalysisTaskHFECal.cxx +++ b/PWGHF/hfe/AliAnalysisTaskHFECal.cxx @@ -95,7 +95,7 @@ AliAnalysisTaskHFECal::AliAnalysisTaskHFECal(const char *name) ,stack(0) ,fGeom(0) ,fOutputList(0) - ,fqahist(1) + ,fqahist(0) ,fTrackCuts(0) ,fCuts(0) ,fIdentifiedAsOutInz(kFALSE) @@ -238,7 +238,7 @@ AliAnalysisTaskHFECal::AliAnalysisTaskHFECal() ,stack(0) ,fGeom(0) ,fOutputList(0) - ,fqahist(1) + ,fqahist(0) ,fTrackCuts(0) ,fCuts(0) ,fIdentifiedAsOutInz(kFALSE) @@ -1205,7 +1205,7 @@ void AliAnalysisTaskHFECal::UserCreateOutputObjects() Double_t min[16] = {kMinP, -0.5, 1.0, -1.0, -5.0, 0, 0, 0, 0.0, 0.0, 0.0, 0, 0, 0, 80, -1.5}; Double_t max[16] = {kMaxP, 6.5, 4.0, 1.0, 4.0, 2.0, 0.05, 40, 10, 1.0, 20.0, 100, 100, 2.0, 180, 6.5}; fEleInfo = new THnSparseD("fEleInfo", "Electron Info; pT [GeV/c]; TPC signal;phi;eta;nSig; E/p;Rmatch;Ncell;clsF;M20;mcpT;Centrality;charge;opp;same;trigCond;MCele", 16, nBins, min, max); - fOutputList->Add(fEleInfo); + if(fqahist==1)fOutputList->Add(fEleInfo); // Make common binning Int_t nBinsEop[3] = { 10, 50, 100}; @@ -1475,7 +1475,7 @@ void AliAnalysisTaskHFECal::SelectPhotonicElectron(Int_t itrack, Double_t cent, fTrackCuts->SetMaxChi2PerClusterTPC(3.5); fTrackCuts->SetMinNClustersTPC(90); - const AliESDVertex *pVtx = fESD->GetPrimaryVertex(); + //const AliESDVertex *pVtx = fESD->GetPrimaryVertex(); Double_t bfield = fESD->GetMagneticField(); Double_t emass = 0.51*0.001; // (0.51 MeV) @@ -1685,7 +1685,6 @@ void AliAnalysisTaskHFECal::SelectPhotonicElectron2(Int_t itrack, Double_t cent, fTrackCuts->SetMaxChi2PerClusterTPC(3.5); fTrackCuts->SetMinNClustersTPC(90); - //const AliESDVertex *pVtx = fESD->GetPrimaryVertex(); Double_t eMass = TDatabasePDG::Instance()->GetParticle(11)->Mass(); //Electron mass in GeV Double_t bfield = fESD->GetMagneticField(); diff --git a/PWGHF/hfe/macros/AddTaskHFECal.C b/PWGHF/hfe/macros/AddTaskHFECal.C index 606b182e21d..3b9cf0e7424 100644 --- a/PWGHF/hfe/macros/AddTaskHFECal.C +++ b/PWGHF/hfe/macros/AddTaskHFECal.C @@ -29,9 +29,9 @@ AliAnalysisTask *AddTaskHFECal(Bool_t MassConst, Bool_t MassWidthCut, Bool_t Mas //analysis task gROOT->LoadMacro("$ALICE_ROOT/PWGHF/hfe/macros/configs/PbPb/ConfigHFECal.C"); - AliAnalysisTaskHFECal *hfetaskCent = ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,MassNonlinear,0.5,0.1,masscut,-5); - AliAnalysisTaskHFECal *hfetaskTrig= ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,MassNonlinear,0.5,0.1,masscut,-5); - AliAnalysisTaskHFECal *hfetaskTrig2= ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,MassNonlinear,0.5,0.1,masscut,-5); + AliAnalysisTaskHFECal *hfetaskCent = ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,MassNonlinear,0.5,0.1,masscut,-5,1); + AliAnalysisTaskHFECal *hfetaskTrig= ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,MassNonlinear,0.5,0.1,masscut,-5,1); + AliAnalysisTaskHFECal *hfetaskTrig2= ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,MassNonlinear,0.5,0.1,masscut,-5,1); mgr->AddTask(hfetaskCent); mgr->AddTask(hfetaskTrig); @@ -76,7 +76,7 @@ AliAnalysisTask *AddTaskHFECal(Bool_t MassConst, Bool_t MassWidthCut, Bool_t Mas //if(MCthere) //{ //MB trigger - AliAnalysisTaskHFECal *hfetaskMB = ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,MassNonlinear,0.5,0.1,masscut,-5); + AliAnalysisTaskHFECal *hfetaskMB = ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,MassNonlinear,0.5,0.1,masscut,-5,1); mgr->AddTask(hfetaskMB); hfetaskMB->SelectCollisionCandidates(AliVEvent::kMB); diff --git a/PWGHF/hfe/macros/AddTaskHFECalPbPbSys.C b/PWGHF/hfe/macros/AddTaskHFECalPbPbSys.C index 0c5b60cd28f..5a37ca2336f 100644 --- a/PWGHF/hfe/macros/AddTaskHFECalPbPbSys.C +++ b/PWGHF/hfe/macros/AddTaskHFECalPbPbSys.C @@ -25,7 +25,7 @@ AliAnalysisTask *AddTaskHFECalPbPbSys(Bool_t MassConst, Bool_t MassWidthCut, Boo //analysis task gROOT->LoadMacro("$ALICE_ROOT/PWGHF/hfe/macros/configs/PbPb/ConfigHFECal.C"); - AliAnalysisTaskHFECal *hfetask = ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,MassNonlinear,asspTCut,angleCut,MassCut,NsigCut); + AliAnalysisTaskHFECal *hfetask = ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,MassNonlinear,asspTCut,angleCut,MassCut,NsigCut,0); mgr->AddTask(hfetask); // semi-central hfetask->SelectCollisionCandidates(AliVEvent::kSemiCentral); @@ -38,7 +38,7 @@ AliAnalysisTask *AddTaskHFECalPbPbSys(Bool_t MassConst, Bool_t MassWidthCut, Boo mgr->ConnectOutput(hfetask, 1, coutput1); //trigger - AliAnalysisTaskHFECal *hfetaskTrig = ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,MassNonlinear,asspTCut,angleCut,MassCut,NsigCut); + AliAnalysisTaskHFECal *hfetaskTrig = ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,MassNonlinear,asspTCut,angleCut,MassCut,NsigCut,0); mgr->AddTask(hfetaskTrig); hfetaskTrig->SelectCollisionCandidates(AliVEvent::kEMCEGA); TString containerName2 = mgr->GetCommonFileName(); @@ -51,7 +51,7 @@ AliAnalysisTask *AddTaskHFECalPbPbSys(Bool_t MassConst, Bool_t MassWidthCut, Boo //MB trigger - AliAnalysisTaskHFECal *hfetaskMB = ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,MassNonlinear,asspTCut,angleCut,MassCut,NsigCut); + AliAnalysisTaskHFECal *hfetaskMB = ConfigHFECal(MCthere,MassConst,MassWidthCut,MassCal,MassNonlinear,asspTCut,angleCut,MassCut,NsigCut,0); mgr->AddTask(hfetaskMB); hfetaskMB->SelectCollisionCandidates(AliVEvent::kMB); TString containerName4 = mgr->GetCommonFileName(); diff --git a/PWGHF/hfe/macros/configs/PbPb/ConfigHFECal.C b/PWGHF/hfe/macros/configs/PbPb/ConfigHFECal.C index 4e9ab89c8dd..0d6ba35ca6c 100644 --- a/PWGHF/hfe/macros/configs/PbPb/ConfigHFECal.C +++ b/PWGHF/hfe/macros/configs/PbPb/ConfigHFECal.C @@ -1,4 +1,4 @@ -AliAnalysisTaskHFECal* ConfigHFECal(Bool_t useMC,Bool_t MassConst,Bool_t MassWidthCut,Bool_t MassCal,Bool_t MassNonlinear,Double_t asspTCut,Double_t angleCut,Double_t MassCut, Double_t NsigCut){ +AliAnalysisTaskHFECal* ConfigHFECal(Bool_t useMC,Bool_t MassConst,Bool_t MassWidthCut,Bool_t MassCal,Bool_t MassNonlinear,Double_t asspTCut,Double_t angleCut,Double_t MassCut, Double_t NsigCut, Int_t fqa){ // // HFE standard task configuration // @@ -11,6 +11,7 @@ AliAnalysisTaskHFECal* ConfigHFECal(Bool_t useMC,Bool_t MassConst,Bool_t MassWid printf("angleCut = %d/n",angleCut); printf("MassCut = %d/n",MassCut); printf("NsigCut = %d/n", NsigCut); + printf("qa = %d/n", fqa); Bool_t kAnalyseTaggedTracks = kTRUE; @@ -41,6 +42,7 @@ AliAnalysisTaskHFECal* ConfigHFECal(Bool_t useMC,Bool_t MassConst,Bool_t MassWid task->SetMimpTassCut(asspTCut); task->SetMimNsigassCut(NsigCut); task->SetMassCalMethod(MassCal); + task->SetQAHist(fqa); // Define PID AliHFEpid *pid = task->GetPID(); -- 2.43.0