From: rbailhac Date: Wed, 7 Mar 2012 11:30:01 +0000 (+0000) Subject: Try to reduce coverity defects X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=dcef324e2fe099fda4eec8237803edec6c601a3d Try to reduce coverity defects --- diff --git a/PWGHF/hfe/AliHFEVZEROEventPlane.cxx b/PWGHF/hfe/AliHFEVZEROEventPlane.cxx index 3580da9438a..11f4418651c 100644 --- a/PWGHF/hfe/AliHFEVZEROEventPlane.cxx +++ b/PWGHF/hfe/AliHFEVZEROEventPlane.cxx @@ -76,8 +76,8 @@ AliHFEVZEROEventPlane::AliHFEVZEROEventPlane(const char *name, const Char_t *tit // Constructor // - char namelist[100]; - sprintf(namelist,"QA_hist_%s",name); + TString namelist("QA_hist_"); + namelist += name; fOutputList = new TList(); fOutputList->SetName((const char*)namelist); fOutputList->SetOwner(kTRUE); @@ -91,30 +91,50 @@ AliHFEVZEROEventPlane::AliHFEVZEROEventPlane(const char *name, const Char_t *tit fOutputList->Add(fMultV0After); // Recentering - char namecontbefore[100]; - char namecontafter[100]; for(Int_t k = 0; k < fgknCentrBin; k++) { for(Int_t iside = 0; iside < 2; iside++) { for(Int_t icoord = 0; icoord < 2; icoord++) { - if(iside==0 && icoord==0) - sprintf(namecontbefore,"hQxc2_%i",k); - else if(iside==1 && icoord==0) - sprintf(namecontbefore,"hQxa2_%i",k); - else if(iside==0 && icoord==1) - sprintf(namecontbefore,"hQyc2_%i",k); - else if(iside==1 && icoord==1) - sprintf(namecontbefore,"hQya2_%i",k); - // - if(iside==0 && icoord==0) - sprintf(namecontafter,"hQxc2_%i_after",k); - else if(iside==1 && icoord==0) - sprintf(namecontafter,"hQxa2_%i_after",k); - else if(iside==0 && icoord==1) - sprintf(namecontafter,"hQyc2_%i_after",k); - else if(iside==1 && icoord==1) - sprintf(namecontafter,"hQya2_%i_after",k); + TString namecontbefore(""); + TString namecontafter(""); + if(iside==0 && icoord==0) { + namecontbefore += "hQxc2_"; + namecontbefore += k; + } + else if(iside==1 && icoord==0){ + namecontbefore += "hQxa2_"; + namecontbefore += k; + } + else if(iside==0 && icoord==1){ + namecontbefore += "hQyc2_"; + namecontbefore += k; + } + else if(iside==1 && icoord==1) { + namecontbefore += "hQya2_"; + namecontbefore += k; + } + // + if(iside==0 && icoord==0){ + namecontafter += "hQxc2_"; + namecontafter += k; + namecontafter += "_after"; + } + else if(iside==1 && icoord==0){ + namecontafter += "hQxa2_"; + namecontafter += k; + namecontafter += "_after"; + } + else if(iside==0 && icoord==1) { + namecontafter += "hQyc2_"; + namecontafter += k; + namecontafter += "_after"; + } + else if(iside==1 && icoord==1) { + namecontafter += "hQya2_"; + namecontafter += k; + namecontafter += "_after"; + } // fQBefore[k][iside][icoord] = new TH1F(((const char*)namecontbefore),"",800,-400.0,400.0); fQBefore[k][iside][icoord]->Sumw2(); @@ -371,25 +391,34 @@ Bool_t AliHFEVZEROEventPlane::OpenInfoCalbration(Int_t run) for(Int_t iside=0;iside<2;iside++){ for(Int_t icoord=0;icoord<2;icoord++){ for(Int_t i=0;i < fgknCentrBin;i++){ - char namecont[100]; - if(iside==0 && icoord==0) - sprintf(namecont,"hQxc2_%i",i); - else if(iside==1 && icoord==0) - sprintf(namecont,"hQxa2_%i",i); - else if(iside==0 && icoord==1) - sprintf(namecont,"hQyc2_%i",i); - else if(iside==1 && icoord==1) - sprintf(namecont,"hQya2_%i",i); + + TString namecont(""); + if(iside==0 && icoord==0) { + namecont += "hQxc2_"; + namecont += i; + } + else if(iside==1 && icoord==0){ + namecont += "hQxa2_"; + namecont += i; + } + else if(iside==0 && icoord==1){ + namecont += "hQyc2_"; + namecont += i; + } + else if(iside==1 && icoord==1) { + namecont += "hQya2_"; + namecont += i; + } cont = (AliOADBContainer*) foadb->Get(namecont); if(!cont){ - printf("OADB object %s is not available in the file\n",namecont); + printf("OADB object %s is not available in the file\n",(const char*)namecont); delete fpol0; return kFALSE; } if(!(cont->GetObject(run))){ - printf("OADB object %s is not available for run %i\n",namecont,run); + printf("OADB object %s is not available for run %i\n",(const char*)namecont,run); delete fpol0; return kFALSE; } diff --git a/PWGHF/hfe/AliHFEspectrum.cxx b/PWGHF/hfe/AliHFEspectrum.cxx index 61af42b2a48..105a477e3c0 100644 --- a/PWGHF/hfe/AliHFEspectrum.cxx +++ b/PWGHF/hfe/AliHFEspectrum.cxx @@ -261,7 +261,7 @@ Bool_t AliHFEspectrum::Init(const AliHFEcontainer *datahfecontainer, const AliHF fConvSourceContainer[iSource][iLevel][icentr] = GetSlicedContainer(convtempContainer, fNbDimensions, dims, -1, fChargeChoosen,icentr); fNonHFESourceContainer[iSource][iLevel][icentr] = GetSlicedContainer(nonHFEtempContainer, fNbDimensions, dims, -1, fChargeChoosen,icentr); } - if((!fConvSourceContainer[iSource][iLevel][icentr])||(!fNonHFESourceContainer[iSource][iLevel])) return kFALSE; + //if((!fConvSourceContainer[iSource][iLevel][icentr])||(!fNonHFESourceContainer[iSource][iLevel])) return kFALSE; } } } @@ -877,8 +877,10 @@ Bool_t AliHFEspectrum::CorrectBeauty(Bool_t subtractcontamination){ alltogetherCorrection->SetName("AlltogetherCorrectedNotNormalizedSpectrum"); alltogetherCorrection->Write(); // - unnormalizedRawSpectrum->SetName("beautyAfterIP"); - unnormalizedRawSpectrum->Write(); + if(unnormalizedRawSpectrum) { + unnormalizedRawSpectrum->SetName("beautyAfterIP"); + unnormalizedRawSpectrum->Write(); + } if(gNormalizedRawSpectrum){ gNormalizedRawSpectrum->SetName("normalizedBeautyAfterIP"); @@ -1005,7 +1007,7 @@ AliCFDataGrid* AliHFEspectrum::SubtractBackground(Bool_t setBackground){ measuredTH1Draw->Draw(); lRaw->AddEntry(measuredTH1Draw,"measured raw spectrum"); TH1D* htemp; - Int_t* bins=new Int_t[1]; + Int_t* bins=new Int_t[2]; if(fIPanaHadronBgSubtract){ // Hadron background printf("Hadron background for IP analysis subtracted!\n"); @@ -1017,7 +1019,6 @@ AliCFDataGrid* AliHFEspectrum::SubtractBackground(Bool_t setBackground){ } if(fBeamType==1) { - bins=new Int_t[2]; htemp = (TH1D *) fHadronEffbyIPcut->Projection(0); bins[0]=htemp->GetNbinsX(); htemp = (TH1D *) fHadronEffbyIPcut->Projection(1); @@ -1089,6 +1090,9 @@ AliCFDataGrid* AliHFEspectrum::SubtractBackground(Bool_t setBackground){ lRaw->AddEntry(rawbgsubtracted,"subtracted raw spectrum"); rawbgsubtracted->Draw("samep"); lRaw->Draw("SAME"); + + delete[] bins; + } else{ // Subtract @@ -1298,13 +1302,12 @@ AliCFDataGrid* AliHFEspectrum::GetCharmBackground(){ charmBackgroundGrid = new AliCFDataGrid("charmBackgroundGrid","charmBackgroundGrid",*mcContainer, fStepMC-1); // use MC eff. up to right before PID TH1D *charmbgaftertofpid = (TH1D *) charmBackgroundGrid->Project(0); - Int_t* bins=new Int_t[1]; + Int_t* bins=new Int_t[2]; bins[0]=charmbgaftertofpid->GetNbinsX(); if(fBeamType==1) { charmbgaftertofpid = (TH1D *) charmBackgroundGrid->Project(0); - bins=new Int_t[2]; bins[0]=charmbgaftertofpid->GetNbinsX(); charmbgaftertofpid = (TH1D *) charmBackgroundGrid->Project(1); bins[1]=charmbgaftertofpid->GetNbinsX(); @@ -1424,6 +1427,8 @@ AliCFDataGrid* AliHFEspectrum::GetCharmBackground(){ CorrectStatErr(charmBackgroundGrid); if(fWriteToFile) cCharmBgEval->SaveAs("CharmBackground.eps"); + delete[] bins; + return charmBackgroundGrid; } @@ -1498,6 +1503,11 @@ AliCFDataGrid* AliHFEspectrum::GetConversionBackground(){ weightedConversionContainer->SetGrid(GetPIDxIPEff(2)); backgroundGrid->Multiply(weightedConversionContainer,1.0); + delete[] nBinpp; + delete[] binspp; + delete[] nBinPbPb; + delete[] binsPbPb; + return backgroundGrid; } @@ -1572,6 +1582,11 @@ AliCFDataGrid* AliHFEspectrum::GetNonHFEBackground(){ weightedNonHFEContainer->SetGrid(GetPIDxIPEff(3)); backgroundGrid->Multiply(weightedNonHFEContainer,1.0); + delete[] nBinpp; + delete[] binspp; + delete[] nBinPbPb; + delete[] binsPbPb; + return backgroundGrid; } @@ -2562,6 +2577,9 @@ THnSparse* AliHFEspectrum::GetCharmWeights(){ fWeightCharm->SetBinError(binfill,0.); // put 0 everywhere } + delete[] binsvar; + delete[] binfill; + return fWeightCharm; } @@ -2596,13 +2614,13 @@ void AliHFEspectrum::SetParameterizedEff(AliCFContainer *container, AliCFContain for(int icentr=0; icentrCalculateEfficiency(fStepMC,fStepMC-1); // TOF PID efficiencies // mb sample for double check if(fBeamType==0) mccontainermcD = GetSlicedContainer(containermb, fNbDimensions, dimensions, source, fChargeChoosen); - if(fBeamType==1) mccontainermcD = GetSlicedContainer(containermb, fNbDimensions, dimensions, source, fChargeChoosen,icentr+1); + else mccontainermcD = GetSlicedContainer(containermb, fNbDimensions, dimensions, source, fChargeChoosen,icentr+1); AliCFEffGrid* efficiencymcParamTOFPID= new AliCFEffGrid("efficiencymcParamTOFPID","",*mccontainermcD); efficiencymcParamTOFPID->CalculateEfficiency(fStepMC,fStepMC-1); // TOF PID efficiencies @@ -2641,37 +2659,37 @@ void AliHFEspectrum::SetParameterizedEff(AliCFContainer *container, AliCFContain for(int icentr=0; icentrCalculateEfficiency(AliHFEcuts::kNcutStepsMCTrack + fStepData,AliHFEcuts::kNcutStepsMCTrack + fStepData-1); // ip cut efficiency. source = 1; //beauty if(fBeamType==0) mccontainermcD = GetSlicedContainer(container, fNbDimensions, dimensions, source, fChargeChoosen); - if(fBeamType==1) mccontainermcD = GetSlicedContainer(container, fNbDimensions, dimensions, source, fChargeChoosen, icentr+1); + else mccontainermcD = GetSlicedContainer(container, fNbDimensions, dimensions, source, fChargeChoosen, icentr+1); AliCFEffGrid* efficiencyBeautySig = new AliCFEffGrid("efficiencyBeautySig","",*mccontainermcD); efficiencyBeautySig->CalculateEfficiency(AliHFEcuts::kNcutStepsMCTrack + fStepData,AliHFEcuts::kNcutStepsMCTrack + fStepData-1); // ip cut efficiency. source = 0; //charm if(fBeamType==0) mccontainermcD = GetSlicedContainer(containermb, fNbDimensions, dimensions, source, fChargeChoosen); - if(fBeamType==1) mccontainermcD = GetSlicedContainer(containermb, fNbDimensions, dimensions, source, fChargeChoosen, icentr+1); + else mccontainermcD = GetSlicedContainer(containermb, fNbDimensions, dimensions, source, fChargeChoosen, icentr+1); AliCFEffGrid* efficiencyCharm = new AliCFEffGrid("efficiencyCharm","",*mccontainermcD); efficiencyCharm->CalculateEfficiency(AliHFEcuts::kNcutStepsMCTrack + fStepData,AliHFEcuts::kNcutStepsMCTrack + fStepData-1); // ip cut efficiency. source = 1; //beauty if(fBeamType==0) mccontainermcD = GetSlicedContainer(containermb, fNbDimensions, dimensions, source, fChargeChoosen); - if(fBeamType==1) mccontainermcD = GetSlicedContainer(containermb, fNbDimensions, dimensions, source, fChargeChoosen, icentr+1); + else mccontainermcD = GetSlicedContainer(containermb, fNbDimensions, dimensions, source, fChargeChoosen, icentr+1); AliCFEffGrid* efficiencyBeauty = new AliCFEffGrid("efficiencyBeauty","",*mccontainermcD); efficiencyBeauty->CalculateEfficiency(AliHFEcuts::kNcutStepsMCTrack + fStepData,AliHFEcuts::kNcutStepsMCTrack + fStepData-1); // ip cut efficiency. source = 2; //conversion if(fBeamType==0) mccontainermcD = GetSlicedContainer(containermb, fNbDimensions, dimensions, source, fChargeChoosen); - if(fBeamType==1) mccontainermcD = GetSlicedContainer(containermb, fNbDimensions, dimensions, source, fChargeChoosen, icentr+1); + else mccontainermcD = GetSlicedContainer(containermb, fNbDimensions, dimensions, source, fChargeChoosen, icentr+1); AliCFEffGrid* efficiencyConv = new AliCFEffGrid("efficiencyConv","",*mccontainermcD); efficiencyConv->CalculateEfficiency(AliHFEcuts::kNcutStepsMCTrack + fStepData,AliHFEcuts::kNcutStepsMCTrack + fStepData-1); // ip cut efficiency. source = 3; //non HFE except for the conversion if(fBeamType==0) mccontainermcD = GetSlicedContainer(containermb, fNbDimensions, dimensions, source, fChargeChoosen); - if(fBeamType==1) mccontainermcD = GetSlicedContainer(containermb, fNbDimensions, dimensions, source, fChargeChoosen, icentr+1); + else mccontainermcD = GetSlicedContainer(containermb, fNbDimensions, dimensions, source, fChargeChoosen, icentr+1); AliCFEffGrid* efficiencyNonhfe= new AliCFEffGrid("efficiencyNonhfe","",*mccontainermcD); efficiencyNonhfe->CalculateEfficiency(AliHFEcuts::kNcutStepsMCTrack + fStepData,AliHFEcuts::kNcutStepsMCTrack + fStepData-1); // ip cut efficiency. @@ -2844,6 +2862,9 @@ THnSparse* AliHFEspectrum::GetBeautyIPEff(){ ipcut->SetBinError(binfill,0.); // put 0 everywhere } + delete[] binsvar; + delete[] binfill; + return ipcut; } @@ -2976,7 +2997,8 @@ THnSparse* AliHFEspectrum::GetPIDxIPEff(Int_t source){ } - + delete[] binsvar; + delete[] binfill; return pideff; } @@ -3085,6 +3107,9 @@ AliCFDataGrid *AliHFEspectrum::GetRawBspectra2ndMethod(){ fBSpectrum2ndMethod->Draw("p"); hRawBeautySpectra->SetMarkerStyle(25); hRawBeautySpectra->Draw("samep"); + + delete[] binfill; + delete[] binsvar; return rawBeautyContainer; } @@ -3100,7 +3125,7 @@ void AliHFEspectrum::CalculateNonHFEsyst(Int_t centrality){ return; Double_t evtnorm[1] = {0.0}; - if(fNMCbgEvents) evtnorm[0]= double(fNEvents[0])/double(fNMCbgEvents[0]); + if(fNMCbgEvents[0]>0) evtnorm[0]= double(fNEvents[0])/double(fNMCbgEvents[0]); AliCFDataGrid *convSourceGrid[kElecBgSources][kBgLevels]; AliCFDataGrid *nonHFESourceGrid[kElecBgSources][kBgLevels];