Trying to fix coverity fake-bug and tweaking resolution histogram settings

diff --git a/PWGLF/totEt/AliAnalysisHadEtMonteCarlo.cxx b/PWGLF/totEt/AliAnalysisHadEtMonteCarlo.cxx
index 3856787c362a1969b8f990eb0f9d5c920c875f64..de304a9852dffc4199f7aa958236fca1e7d53e75 100644 (file)
--- a/PWGLF/totEt/AliAnalysisHadEtMonteCarlo.cxx
+++ b/PWGLF/totEt/AliAnalysisHadEtMonteCarlo.cxx
@@ -1867,6 +1867,10 @@ void AliAnalysisHadEtMonteCarlo::CreateHistograms(){
   TString *sEMCAL = new TString("EMCAL");
   TString *sPHOS = new TString("PHOS");
   float etDiff = 1.5;
+  float etDiffLow = etDiff;
+  if(fDataSet!=20100){//If this is p+p
+    etDiffLow = 2.5;
+  }
 
   for(int tpc = 0;tpc<lastcutset;tpc++){
     TString *detector = NULL;
@@ -1904,17 +1908,27 @@ void AliAnalysisHadEtMonteCarlo::CreateHistograms(){
          TString *partidstring = NULL;
          if(pid==1){partid = sPID; partidstring = sPID;}
          else{partid = sNoPID; partidstring = sNoPIDString;}
+
          snprintf(histoname,200,"Sim%sMinusReco%s%sAcceptance%s%s",et->Data(),et->Data(),acceptance->Data(),detector->Data(),partid->Data());
          snprintf(histotitle,200,"(Simulated %s - reconstructed %s)/(Simulated %s) with %s acceptance for p_{T}>%s GeV/c%s",etstring->Data(),etstring->Data(),etstring->Data(),acceptance->Data(),ptstring->Data(),partidstring->Data());
          snprintf(ytitle,50,"(Simulated %s - reconstructed %s)/(Simulated %s)",etstring->Data(),etstring->Data(),etstring->Data());
          snprintf(xtitle,50,"Simulated %s",etstring->Data());
-         CreateHisto2D(histoname,histotitle,xtitle,ytitle,nbinsEt,minEt,maxEt,nbinsEt,-etDiff,etDiff);
+         CreateHisto2D(histoname,histotitle,xtitle,ytitle,nbinsEt,minEt,maxEt,nbinsEt,-etDiffLow,etDiff);
+
+         if(type==0){
+           snprintf(histoname,200,"Sim%sVsReco%s%sAcceptance%s%s",et->Data(),et->Data(),acceptance->Data(),detector->Data(),partid->Data());
+           snprintf(histotitle,200,"Simulated %s vs reconstructed %s with %s acceptance for p_{T}>%s GeV/c%s",etstring->Data(),etstring->Data(),acceptance->Data(),ptstring->Data(),partidstring->Data());
+           snprintf(ytitle,50,"Simulated %s - reconstructed %s",etstring->Data(),etstring->Data());
+           snprintf(xtitle,50,"Simulated %s",etstring->Data());
+           CreateHisto2D(histoname,histotitle,xtitle,ytitle,nbinsEt*4,minEt,maxEt,nbinsEt*4,minEt,maxEt);
+         }
+
          if(hadet==0 && type==0 && fInvestigatePiKP){//we only want to do this once...  not the most elegant way of coding but hey...
            snprintf(histoname,200,"SimPiKPMinusRecoPiKP%sAcceptance%s%s",acceptance->Data(),detector->Data(),partid->Data());
            snprintf(histotitle,200,"(Sim PiKP - reco PiKP)/(Sim PiKP) with %s acceptance for p_{T}>%s GeV/c%s",acceptance->Data(),ptstring->Data(),partidstring->Data());
            snprintf(ytitle,50,"(Sim PiKP - reco PiKP)/(Sim PiKP)");
            snprintf(xtitle,50,"Simulated E_{T}^{#pi,K,p}");
-           CreateHisto2D(histoname,histotitle,xtitle,ytitle,nbinsEt,minEt,maxEt,nbinsEt,-etDiff,etDiff);
+           CreateHisto2D(histoname,histotitle,xtitle,ytitle,nbinsEt,minEt,maxEt,nbinsEt,-etDiffLow,etDiff);
          }
        }
       }
@@ -2041,7 +2055,7 @@ void AliAnalysisHadEtMonteCarlo::CreateHistograms(){
     snprintf(histotitle,200,"Simulated (true-smeared)/true for efficiency smearing");
     snprintf(ytitle,50,"(true-smeared)/true");
     snprintf(xtitle,50,"true p, K, p E_{T}");
-    CreateHisto2D(histoname,histotitle,xtitle,ytitle,nbinsEt,minEt,maxEt,nbinsEt,-etDiff*5,etDiff*5);
+    CreateHisto2D(histoname,histotitle,xtitle,ytitle,nbinsEt,minEt,maxEt,nbinsEt,-etDiff*7,etDiff*7);
     snprintf(histoname,200,"SimPiKPEtEfficiencySmeared");
     snprintf(histotitle,200,"Simulated E_{T} for efficiency smearing");
     snprintf(ytitle,50,"Number of events");

diff --git a/PWGLF/totEt/AliAnalysisTaskHadEt.cxx b/PWGLF/totEt/AliAnalysisTaskHadEt.cxx
index ac5e8a2f05493d168de7719e91e05f2a7e7fa497..2f48809c5a752fe89eaef624f9bfbc6e43764e65 100644 (file)
--- a/PWGLF/totEt/AliAnalysisTaskHadEt.cxx
+++ b/PWGLF/totEt/AliAnalysisTaskHadEt.cxx
@@ -26,6 +26,7 @@
 #include "AliPWG0Helper.h"
 
 #include <iostream>
+#include "AliLog.h"
 
 using namespace std;
 
@@ -174,6 +175,10 @@ if(res == 0 && cent){
   //cout<<"New Event"<<endl;  
 
   AliMCEvent* mcEvent = MCEvent();
+  if(!mcEvent){  
+    AliFatal("ERROR: MC Event does not exist");
+    return;
+  }
   Int_t eventtype = (Int_t) AliPWG0Helper::GetEventProcessType(mcEvent->Header());
   fRecAnalysis->AnalyseEvent(fESDEvent,eventtype);
 
@@ -181,7 +186,9 @@ if(res == 0 && cent){
 //   Printf("ERROR: Could not retrieve MC event");
 //  }
   if (mcEvent && fESDEvent && fIsSim){
-      ((AliAnalysisHadEtMonteCarlo*)fMCAnalysis)->AnalyseEvent((AliVEvent*)mcEvent,(AliVEvent*)fESDEvent);
+    ((AliAnalysisHadEtMonteCarlo*)fMCAnalysis)->AnalyseEvent((AliVEvent*)mcEvent,(AliVEvent*)fESDEvent);
+
+    if(AliPWG0Helper::GetEventProcessType(mcEvent->Header()) == AliPWG0Helper::kND || fRecAnalysis->DataSet()==20100){//either non-diffractive or Pb+Pb
       if(fMCAnalysis->Full()){
        fMCAnalysis->FillSimTotEtMinusRecoTotEtFullAcceptanceTPC( fRecAnalysis->GetCorrectedTotEtFullAcceptanceTPC() );
        fMCAnalysis->FillSimTotEtMinusRecoTotEtFullAcceptanceITS( fRecAnalysis->GetCorrectedTotEtFullAcceptanceITS() );
@@ -191,6 +198,15 @@ if(res == 0 && cent){
        fMCAnalysis->FillSimHadEtMinusRecoHadEtFullAcceptanceITS( fRecAnalysis->GetCorrectedHadEtFullAcceptanceITS() );
        fMCAnalysis->FillSimHadEtMinusRecoHadEtFullAcceptanceTPCNoPID( fRecAnalysis->GetCorrectedHadEtFullAcceptanceTPCNoPID() );
        fMCAnalysis->FillSimHadEtMinusRecoHadEtFullAcceptanceITSNoPID( fRecAnalysis->GetCorrectedHadEtFullAcceptanceITSNoPID() );
+
+       fMCAnalysis->FillSimTotEtVsRecoTotEtFullAcceptanceTPC( fRecAnalysis->GetCorrectedTotEtFullAcceptanceTPC() );
+       fMCAnalysis->FillSimTotEtVsRecoTotEtFullAcceptanceITS( fRecAnalysis->GetCorrectedTotEtFullAcceptanceITS() );
+       fMCAnalysis->FillSimTotEtVsRecoTotEtFullAcceptanceTPCNoPID( fRecAnalysis->GetCorrectedTotEtFullAcceptanceTPCNoPID() );
+       fMCAnalysis->FillSimTotEtVsRecoTotEtFullAcceptanceITSNoPID( fRecAnalysis->GetCorrectedTotEtFullAcceptanceITSNoPID() );
+       fMCAnalysis->FillSimHadEtVsRecoHadEtFullAcceptanceTPC( fRecAnalysis->GetCorrectedHadEtFullAcceptanceTPC() );
+       fMCAnalysis->FillSimHadEtVsRecoHadEtFullAcceptanceITS( fRecAnalysis->GetCorrectedHadEtFullAcceptanceITS() );
+       fMCAnalysis->FillSimHadEtVsRecoHadEtFullAcceptanceTPCNoPID( fRecAnalysis->GetCorrectedHadEtFullAcceptanceTPCNoPID() );
+       fMCAnalysis->FillSimHadEtVsRecoHadEtFullAcceptanceITSNoPID( fRecAnalysis->GetCorrectedHadEtFullAcceptanceITSNoPID() );
       }
       if(fMCAnalysis->EMCAL()){
        fMCAnalysis->FillSimTotEtMinusRecoTotEtEMCALAcceptanceTPC( fRecAnalysis->GetCorrectedTotEtEMCALAcceptanceTPC() );
@@ -220,9 +236,10 @@ if(res == 0 && cent){
       }
     }
   }
+ }
 //cout<<"End Event"<<endl<<endl;
 // Post output data.
-PostData(1, fOutputList);
+ PostData(1, fOutputList);
 }
 
 //________________________________________________________________________