coverity fix, plus adding some debug info to the analysis macro

diff --git a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliAnalysisTaskSpectraBoth.cxx b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliAnalysisTaskSpectraBoth.cxx
index acf9433498ce04a02bcf0f39caf8c6cf292dab71..fb507015e35f68964431bcd685e4bedcd3f1393e 100644 (file)
--- a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliAnalysisTaskSpectraBoth.cxx
+++ b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliAnalysisTaskSpectraBoth.cxx
@@ -124,6 +124,10 @@ void AliAnalysisTaskSpectraBoth::UserExec(Option_t *)
                TArrayF mcVertex(3);\r
                mcVertex[0]=9999.; mcVertex[1]=9999.; mcVertex[2]=9999.;\r
                AliMCEvent* mcEvent=(AliMCEvent*)MCEvent();\r
+               if (!mcEvent) \r
+               {\r
+                       AliFatal("Error: MC particles branch not found!\n");\r
+               }\r
                AliHeader* header = mcEvent->Header();\r
                if (!header) \r
                {\r
@@ -169,12 +173,6 @@ void AliAnalysisTaskSpectraBoth::UserExec(Option_t *)
                  }\r
                  if(ifAODEvent==AliSpectraBothTrackCuts::kESDobject)\r
                  {\r
-                       //AliMCEvent* mcEvent  = (AliMCEvent*) MCEvent();\r
-                       //Printf("MC particles: %d", mcEvent->GetNumberOfTracks());             \r
-                       if (!mcEvent) \r
-                       {\r
-                               AliFatal("Error: MC particles branch not found!\n");\r
-                       }\r
                        stack = mcEvent->Stack();\r
                        Int_t nMC = stack->GetNtrack();\r
                        for (Int_t iMC = 0; iMC < nMC; iMC++)\r
@@ -238,8 +236,8 @@ void AliAnalysisTaskSpectraBoth::UserExec(Option_t *)
                        continue;\r
                ntracks++;\r
                fPID->FillQAHistos(fHistMan, track, fTrackCuts);\r
-    \r
-               //calculate DCA for AOD track\r
+               \r
+               //calculate DCA for AOD track\r
                if(dca==-999.)\r
                {// track->DCA() does not work in old AOD production\r
                        Double_t d[2], covd[3];\r

diff --git a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraBothPID.cxx b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraBothPID.cxx
index 76a89b225a0f38f1322c01a11871a789ddf83dd8..42753eb98f08e1d1fece0589d516c59952508a8e 100644 (file)
--- a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraBothPID.cxx
+++ b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraBothPID.cxx
@@ -171,7 +171,6 @@ Int_t AliSpectraBothPID::GetParticleSpecie(AliSpectraBothHistoManager * hman,Ali
   // Get PID response object, if needed
 
          // guess the particle based on the smaller nsigma
-  
        rec[kSpPion]=false;
         rec[kSpKaon]=false;
        rec[kSpProton]=false;

diff --git a/PWGLF/SPECTRA/PiKaPr/TestAOD/AnalysisBoth.C b/PWGLF/SPECTRA/PiKaPr/TestAOD/AnalysisBoth.C
index fe1196bd917496c1dad1b83bd86f7c4834631329..9d4d59f3ee0f4d14fe78bf88c03fb1a601eab617 100644 (file)
--- a/PWGLF/SPECTRA/PiKaPr/TestAOD/AnalysisBoth.C
+++ b/PWGLF/SPECTRA/PiKaPr/TestAOD/AnalysisBoth.C
@@ -28,7 +28,8 @@ enum {
  kgeantflukaProton=0x4,
  knormalizationtoeventspassingPhySel=0x8,
  kveretxcorrectionandbadchunkscorr=0x10,
- kmcisusedasdata=0x20  
+ kmcisusedasdata=0x20,
+ kdonotusedcacuts=0x40         
 };     
 
 Bool_t OpenFile(TString dirname, TString outputname, Bool_t mcflag,Bool_t mcasdata=false);
@@ -56,11 +57,15 @@ void AnalysisBoth (UInt_t options=0xF,TString outdate, TString outnamedata, TStr
        mass[1]   = TDatabasePDG::Instance()->GetParticle("K+")->Mass();
        mass[2] = TDatabasePDG::Instance()->GetParticle("proton")->Mass();
 
-       AliESDtrackCuts* esdtrackcuts= AliESDtrackCuts::GetStandardITSTPCTrackCuts2011(kTRUE);
-       TString formulastring(esdtrackcuts->GetMaxDCAToVertexXYPtDep());
-       formulastring.ReplaceAll("pt","x");
-       TFormula* dcacutxy=new TFormula("dcacutxy",formulastring.Data());
-
+       TFormula* dcacutxy=0x0;
+       if(!(options&kdonotusedcacuts))
+       {
+       
+               AliESDtrackCuts* esdtrackcuts= AliESDtrackCuts::GetStandardITSTPCTrackCuts2011(kTRUE);
+               TString formulastring(esdtrackcuts->GetMaxDCAToVertexXYPtDep());
+               formulastring.ReplaceAll("pt","x");
+               dcacutxy=new TFormula("dcacutxy",formulastring.Data());
+       }
        TList* lout=new TList();
 
 
@@ -483,7 +488,7 @@ void DCACorrectionMarek(AliSpectraBothHistoManager* hman_data, AliSpectraBothHis
 {
   printf("\n\n-> DCA Correction");  
   Double_t FitRange[2]={-2.0,2.0};
-  Double_t CutRange[2]={-1.0,1.0};
+  Double_t CutRange[2]={-3.0,3.0};
   Double_t minptformaterial[6]={0.0,100.0,0.0,0.0,100.0,0.0};
   Double_t maxptformaterial[6]={0.0,-100.0,1.3,0.0,-100.0,0.0};
   Bool_t usefit[3]={true,false,true};
@@ -512,9 +517,12 @@ void DCACorrectionMarek(AliSpectraBothHistoManager* hman_data, AliSpectraBothHis
                                                
                                        Double_t lowedge=hcon[index]->GetBinLowEdge(ibin_data);
                                        Double_t binwidth=hcon[index]->GetBinWidth(ibin_data);
-                                       debug<<"NEW "<<Particle[ipart].Data()<<" "<<Sign[icharge].Data()<<" "<<lowedge<<endl;                                           
-                                       CutRange[1]=fun->Eval(lowedge);
-                                       CutRange[0]=-1.0*CutRange[1];
+                                       debug<<"NEW "<<Particle[ipart].Data()<<" "<<Sign[icharge].Data()<<" "<<lowedge<<endl;
+                                       if(fun)
+                                       {                                               
+                                               CutRange[1]=fun->Eval(lowedge);
+                                               CutRange[0]=-1.0*CutRange[1];
+                                       }       
                                        debug<<"cut  "<<CutRange[1]<<" "<<CutRange[0]<<endl;            
                                        Bool_t useMaterial=kFALSE;
                                        cout<<"try to fit "<<lowedge<<" "<<maxbinforfit[index]<<endl;
@@ -640,6 +648,36 @@ void DCACorrectionMarek(AliSpectraBothHistoManager* hman_data, AliSpectraBothHis
                                                debug<<"After Nor"<<endl;
                                                debug<<v1*normalizationmc1<<" "<<ev1*normalizationmc1<<" "<<v2*normalizationmc2<<" "<<ev2*normalizationmc2<<" "<<v3*normalizationmc3<<" "<<ev3*normalizationmc3<<" "<<endl;
                                                debug<<1.0-v1*normalizationmc1<<" "<<ev1*normalizationmc1<<" "<<v2*normalizationmc2+v3*normalizationmc3<<" "<<TMath::Sqrt(ev2*ev2*normalizationmc2*normalizationmc2+ev3*ev3*normalizationmc3*normalizationmc3+cov*normalizationmc3*normalizationmc2)<<endl;
+                                               debug<<"addtional info"<<endl;
+                                               Float_t normalizationmc1b=(hmc1->Integral(hmc1->GetXaxis()->FindBin(CutRange[0]),hmc1->GetXaxis()->FindBin(CutRange[1]))/hmc1->Integral(hmc1->GetXaxis()->FindBin(FitRange[0]),hmc1->GetXaxis()->FindBin(FitRange[1])))/normalizationdata;
+
+                                               debug<<normalizationmc1<<" "<<normalizationmc1b<<endl;
+                                               debug<<hmc1->Integral(hmc1->GetXaxis()->FindBin(CutRange[0]),hmc1->GetXaxis()->FindBin(CutRange[1]))/hmc1->Integral(hmc1->GetXaxis()->FindBin(FitRange[0]),hmc1->GetXaxis()->FindBin(FitRange[1]))<<" "<<secStMCPred->Integral(hmc1->GetXaxis()->FindBin(CutRange[0]),hmc1->GetXaxis()->FindBin(CutRange[1]))/secStMCPred->Integral(hmc1->GetXaxis()->FindBin(FitRange[0]),hmc1->GetXaxis()->FindBin(FitRange[1]))<<endl;
+                                               //debug<<hmc1->Integral(hmc1->GetXaxis()->FindBin(FitRange[0]),hmc1->GetXaxis()->FindBin(FitRange[1]))<<" "<<secStMCPred->Integral(hmc1->GetXaxis()->FindBin(FitRange[0]),hmc1->GetXaxis()->FindBin(FitRange[1]))<<endl;
+                                               debug<<hmc2->Integral(hmc1->GetXaxis()->FindBin(CutRange[0]),hmc1->GetXaxis()->FindBin(CutRange[1]))/hmc2->Integral(hmc1->GetXaxis()->FindBin(FitRange[0]),hmc1->GetXaxis()->FindBin(FitRange[1]))<<" "<<PrimMCPred->Integral(hmc1->GetXaxis()->FindBin(CutRange[0]),hmc1->GetXaxis()->FindBin(CutRange[1]))/PrimMCPred->Integral(hmc1->GetXaxis()->FindBin(FitRange[0]),hmc1->GetXaxis()->FindBin(FitRange[1]))<<endl;
+                                               //debug<<hmc2->Integral(hmc1->GetXaxis()->FindBin(FitRange[0]),hmc1->GetXaxis()->FindBin(FitRange[1]))<<" "<<PrimMCPred->Integral(hmc1->GetXaxis()->FindBin(FitRange[0]),hmc1->GetXaxis()->FindBin(FitRange[1]))<<endl;
+                                               if(PrimMCPred->Integral(hmc1->GetXaxis()->FindBin(CutRange[0]),hmc1->GetXaxis()->FindBin(CutRange[1]))>0.0)
+                                               {
+                                               if(useMaterial)
+                                               {
+                                                       debug<<" ITSsa "<<endl;
+                                                       debug<<PrimMCPred->Integral(hmc1->GetXaxis()->FindBin(CutRange[0]),hmc1->GetXaxis()->FindBin(CutRange[1]))/(PrimMCPred->Integral(hmc1->GetXaxis()->FindBin(CutRange[0]),hmc1->GetXaxis()->FindBin(CutRange[1]))+secStMCPred->Integral(hmc1->GetXaxis()->FindBin(FitRange[0]),hmc1->GetXaxis()->FindBin(FitRange[1]))+secMCPred->Integral(hmc1->GetXaxis()->FindBin(FitRange[0]),hmc1->GetXaxis()->FindBin(FitRange[1])))<<endl;
+                                               }                       
+                                               else
+                                               {
+                                                       debug<<" ITSsa "<<endl;
+                                                       debug<<PrimMCPred->Integral(hmc1->GetXaxis()->FindBin(CutRange[0]),hmc1->GetXaxis()->FindBin(CutRange[1]))/(PrimMCPred->Integral(hmc1->GetXaxis()->FindBin(CutRange[0]),hmc1->GetXaxis()->FindBin(CutRange[1]))+secStMCPred->Integral(hmc1->GetXaxis()->FindBin(FitRange[0]),hmc1->GetXaxis()->FindBin(FitRange[1])))<<endl;
+               
+                                               }
+                                               }
+                                               else 
+                                               {
+                                                       debug<<" ITSsa "<<endl;
+                                                       debug<<" NO "<<endl;
+                                               }
+
+
+
                                                Float_t normalizationdata1=result->Integral(result->GetXaxis()->FindBin(CutRange[0]),result->GetXaxis()->FindBin(CutRange[1]))/result->Integral(result->GetXaxis()->FindBin(FitRange[0]),result->GetXaxis()->FindBin(FitRange[1]));