From 8a993eac84c16d3eb62fae24456acf447f74a023 Mon Sep 17 00:00:00 2001 From: bhippoly Date: Tue, 24 Nov 2009 01:50:30 +0000 Subject: [PATCH] Protection from C.Andrei plus some cosmetics and coding conventions --- PWG2/SPECTRA/AliAnalysisCentralCutESD.cxx | 26 +++++------ PWG2/SPECTRA/AliAnalysisCentralCutESD.h | 21 ++++----- PWG2/SPECTRA/AliAnalysisCentralCutEvtESD.cxx | 25 ++++------- PWG2/SPECTRA/AliAnalysisCentralCutEvtESD.h | 16 +++---- PWG2/SPECTRA/AliAnalysisCentralCutEvtMC.cxx | 15 +++---- PWG2/SPECTRA/AliAnalysisCentralCutEvtMC.h | 18 +++----- PWG2/SPECTRA/AliAnalysisCentralCutMC.cxx | 15 +++---- PWG2/SPECTRA/AliAnalysisCentralCutMC.h | 20 ++++----- .../SPECTRA/AliAnalysisCentralExtrapolate.cxx | 45 +++++++++++++------ PWG2/SPECTRA/AliAnalysisCentralExtrapolate.h | 16 +++---- PWG2/SPECTRA/AliAnalysisTaskCentral.cxx | 22 ++++----- PWG2/SPECTRA/AliAnalysisTaskCentral.h | 18 ++++---- 12 files changed, 119 insertions(+), 138 deletions(-) diff --git a/PWG2/SPECTRA/AliAnalysisCentralCutESD.cxx b/PWG2/SPECTRA/AliAnalysisCentralCutESD.cxx index 5c378ffd020..63a0d9c6406 100644 --- a/PWG2/SPECTRA/AliAnalysisCentralCutESD.cxx +++ b/PWG2/SPECTRA/AliAnalysisCentralCutESD.cxx @@ -13,23 +13,19 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -// ******************************************* -// * particle level cuts for azimuthal isotropic * +// *************************************************** +// * particle level cuts for azimuthal isotropic * // * expansion in highly central collisions analysis * -// * author: Cristian Andrei * -// * acristian@niham.nipne.ro * -// * ***************************************** +// * author: Cristian Andrei * +// * acristian@niham.nipne.ro * +// *************************************************** -#include #include +#include -#include "AliAnalysisCentralCutESD.h" #include "AliESDtrack.h" - -class TObject; -class TParticle; - +#include "AliAnalysisCentralCutESD.h" //____________________________________________________________________ ClassImp(AliAnalysisCentralCutESD) @@ -61,7 +57,7 @@ AliAnalysisCentralCutESD::AliAnalysisCentralCutESD(const Char_t* name, const Cha TFile *f = TFile::Open("$ALICE_ROOT/PWG2/data/PriorProbabilities.root "); if(!f){ printf("Can't open PWG2 prior probabilities file!\n Exiting ...\n"); - exit(1); + return; } fElectronFunction = (TF1 *)f->Get("fitElectrons"); fMuonFunction = (TF1 *)f->Get("fitMuons"); @@ -93,7 +89,7 @@ Bool_t AliAnalysisCentralCutESD::IsSelected(TObject *obj){ if(!track){ printf("AliAnalysisCentralCutESD:IsSelected ->Can't get track!\n"); - exit(1); + return kFALSE; } if(fReqCharge){ @@ -101,7 +97,7 @@ Bool_t AliAnalysisCentralCutESD::IsSelected(TObject *obj){ } if(fReqPID){ - if(!IsA(track, fPartType)) return kFALSE; + if(!IsA(track, fPartType)) return kFALSE; } return kTRUE; @@ -168,7 +164,7 @@ Bool_t AliAnalysisCentralCutESD::IsA(AliESDtrack *track, PDG_t fPartType){ else{ printf("Unknown PID method!\n"); - exit(1); + return kFALSE; } if((AliPID::ParticleCode(partType)) != fPartType){ diff --git a/PWG2/SPECTRA/AliAnalysisCentralCutESD.h b/PWG2/SPECTRA/AliAnalysisCentralCutESD.h index 757100dc3af..09a74643d2f 100644 --- a/PWG2/SPECTRA/AliAnalysisCentralCutESD.h +++ b/PWG2/SPECTRA/AliAnalysisCentralCutESD.h @@ -1,29 +1,26 @@ +#ifndef ALIANALYSISCENTRALCUTESD_H +#define ALIANALYSISCENTRALCUTESD_H /* * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * See cxx source for full Copyright notice * $Id$ */ -// ********************************************* -// * ESD particle level cuts for azimuthal isotropic * -// * expansion in highly central collisions analysis * -// * author: Cristian Andrei * -// * acristian@niham.nipne.ro * -// * ******************************************** +// *************************************************** +// * ESD particle level cuts for azimuthal isotropic * +// * expansion in highly central collisions analysis * +// * author: Cristian Andrei * +// * acristian@niham.nipne.ro * +// *************************************************** - -#ifndef ALI_ANALYSIS_CENTRAL_CUT_ESD_H -#define ALI_ANALYSIS_CENTRAL_CUT_ESD_H - -#include #include #include "AliAnalysisCuts.h" - class TObject; class TList; class TF1; +class TString; class AliESDtrack; diff --git a/PWG2/SPECTRA/AliAnalysisCentralCutEvtESD.cxx b/PWG2/SPECTRA/AliAnalysisCentralCutEvtESD.cxx index 49a5115742c..b3fab4e98bf 100644 --- a/PWG2/SPECTRA/AliAnalysisCentralCutEvtESD.cxx +++ b/PWG2/SPECTRA/AliAnalysisCentralCutEvtESD.cxx @@ -13,27 +13,23 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -// ******************************************* -// * ESD event level cuts for azimuthal isotropic * +// *************************************************** +// * ESD event level cuts for azimuthal isotropic * // * expansion in highly central collisions analysis * -// * author: Cristian Andrei * -// * acristian@niham.nipne.ro * -// * ***************************************** +// * author: Cristian Andrei * +// * acristian@niham.nipne.ro * +// *************************************************** #include "TMath.h" #include -#include #include "AliESDEvent.h" #include "AliESDtrack.h" #include "AliESDtrackCuts.h" - #include "AliMultiplicity.h" - +#include "AliMultiplicity.h" #include "AliAnalysisCentralCutESD.h" -#include "AliAnalysisCentralCutEvtESD.h" - -class TObject; +#include "AliAnalysisCentralCutEvtESD.h" //____________________________________________________________________ ClassImp(AliAnalysisCentralCutEvtESD) @@ -77,11 +73,10 @@ Bool_t AliAnalysisCentralCutEvtESD::IsSelected(TObject *obj){ AliESDEvent *esdEvent = dynamic_cast(obj); if(!esdEvent){ - printf("AliAnalysisCentralCutEvtESD:IsSelected ->Can't get ESD event!\n"); - exit(1); + printf("AliAnalysisCentralCutEvtESD:IsSelected ->Can't get ESD event!\n"); + return kFALSE; } - if(fReqMult){ Int_t mult = CalcMult(esdEvent); if((multfMultMax)){ @@ -89,8 +84,6 @@ Bool_t AliAnalysisCentralCutEvtESD::IsSelected(TObject *obj){ } } - - if(fReqDir){ Double_t dir = CalcDir(esdEvent); if((dirfDirMax)){ diff --git a/PWG2/SPECTRA/AliAnalysisCentralCutEvtESD.h b/PWG2/SPECTRA/AliAnalysisCentralCutEvtESD.h index 2fa5d6b220e..c474e03503f 100644 --- a/PWG2/SPECTRA/AliAnalysisCentralCutEvtESD.h +++ b/PWG2/SPECTRA/AliAnalysisCentralCutEvtESD.h @@ -1,30 +1,26 @@ +#ifndef ALIANALYSISCENTRALCUTEVTESD_H +#define ALIANALYSISCENTRALCUTEVTESD_H /* * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * See cxx source for full Copyright notice * $Id$ */ -// ******************************************** +// ***************************************************** // * ESD event level cuts for azimuthal isotropic * // * expansion in highly central collisions analysis * -// * author: Cristian Andrei * -// * acristian@niham.nipne.ro * -// * ****************************************** - -#ifndef ALIANALYSISCENTRALCUTEVTESD_H -#define ALIANALYSISCENTRALCUTEVTESD_H - +// * author: Cristian Andrei * +// * acristian@niham.nipne.ro * +// ***************************************************** #include "AliAnalysisCuts.h" - class TObject; class TObjArray; class TList; class AliESDEvent; - class AliAnalysisCentralCutEvtESD: public AliAnalysisCuts { public: AliAnalysisCentralCutEvtESD(const char *name="AliAnalysisCentralCutEvtESD", const char *title="ESD_Event_cuts"); diff --git a/PWG2/SPECTRA/AliAnalysisCentralCutEvtMC.cxx b/PWG2/SPECTRA/AliAnalysisCentralCutEvtMC.cxx index f34be1b6458..9ca9e36520d 100644 --- a/PWG2/SPECTRA/AliAnalysisCentralCutEvtMC.cxx +++ b/PWG2/SPECTRA/AliAnalysisCentralCutEvtMC.cxx @@ -13,13 +13,12 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -// ******************************************* +// *************************************************** // * MC event level cuts for azimuthal isotropic * -// * expansion in highly central collisions analysis * -// * author: Cristian ANDREI * -// * acristian@niham.nipne.ro * -// * ****************************************** - +// * expansion in highly central collisions analysis * +// * author: Cristian ANDREI * +// * acristian@niham.nipne.ro * +// *************************************************** #include @@ -27,10 +26,6 @@ #include "AliStack.h" #include "AliAnalysisCentralCutEvtMC.h" - - -class TObject; - //____________________________________________________________________ ClassImp(AliAnalysisCentralCutEvtMC) diff --git a/PWG2/SPECTRA/AliAnalysisCentralCutEvtMC.h b/PWG2/SPECTRA/AliAnalysisCentralCutEvtMC.h index 31838c3bcb6..b388a034ce4 100644 --- a/PWG2/SPECTRA/AliAnalysisCentralCutEvtMC.h +++ b/PWG2/SPECTRA/AliAnalysisCentralCutEvtMC.h @@ -1,28 +1,24 @@ +#ifndef ALIANALYSISCENTRALCUTEVTMC_H +#define ALIANALYSISCENTRALCUTEVTMC_H /* * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * See cxx source for full Copyright notice * $Id$ */ -// ******************************************** +// *************************************************** // * MC event level cuts for azimuthal isotropic * -// * expansion in highly central collisions analysis * -// * author: Cristian Andrei * -// * acristian@niham.nipne.ro * -// * ****************************************** - -#ifndef ALI_ANALYSIS_CENTRAL_CUT_EVT_MC_H -#define ALI_ANALYSIS_CENTRAL_CUT_EVT_MC_H - +// * expansion in highly central collisions analysis * +// * author: Cristian Andrei * +// * acristian@niham.nipne.ro * +// *************************************************** #include "AliAnalysisCuts.h" - class TObject; class AliMCEvent; class AliStack; - class AliAnalysisCentralCutEvtMC: public AliAnalysisCuts { public: AliAnalysisCentralCutEvtMC(const char *name="AliAnalysisCentralCutEvtMC", const char *title="MC_cuts"); diff --git a/PWG2/SPECTRA/AliAnalysisCentralCutMC.cxx b/PWG2/SPECTRA/AliAnalysisCentralCutMC.cxx index f3d9d53283d..8e3486f41f6 100644 --- a/PWG2/SPECTRA/AliAnalysisCentralCutMC.cxx +++ b/PWG2/SPECTRA/AliAnalysisCentralCutMC.cxx @@ -13,12 +13,12 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -// ********************************************* -// * MC particle level cuts for azimuthal isotropic * -// * expansion in highly central collisions analysis * -// * author: Cristian Andrei * -// * acristian@niham.nipne.ro * -// * ******************************************** +// *************************************************** +// * MC particle level cuts for azimuthal isotropic * +// * expansion in highly central collisions analysis * +// * author: Cristian Andrei * +// * acristian@niham.nipne.ro * +// * ************************************************* #include @@ -27,9 +27,6 @@ #include "AliMCParticle.h" #include "AliAnalysisCentralCutMC.h" - -class TObject; - //____________________________________________________________________ ClassImp(AliAnalysisCentralCutMC) diff --git a/PWG2/SPECTRA/AliAnalysisCentralCutMC.h b/PWG2/SPECTRA/AliAnalysisCentralCutMC.h index 1dee0b457c1..79532ef5344 100644 --- a/PWG2/SPECTRA/AliAnalysisCentralCutMC.h +++ b/PWG2/SPECTRA/AliAnalysisCentralCutMC.h @@ -1,23 +1,20 @@ +#ifndef ALIANALYSISCENTRALCUTMC_H +#define ALIANALYSISCENTRALCUTMC_H /* * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * See cxx source for full Copyright notice * $Id$ */ -// ********************************************* -// * MC particle level cuts for azimuthal isotropic * -// * expansion in highly central collisions analysis * -// * author: Cristian Andrei * -// * acristian@niham.nipne.ro * -// * ******************************************* - -#ifndef ALI_ANALYSIS_CENTRAL_CUT_MC_H -#define ALI_ANALYSIS_CENTRAL_CUT_MC_H - +// *************************************************** +// * MC particle level cuts for azimuthal isotropic * +// * expansion in highly central collisions analysis * +// * author: Cristian Andrei * +// * acristian@niham.nipne.ro * +// * ************************************************* #include "AliAnalysisCuts.h" - class TObject; class TList; @@ -25,7 +22,6 @@ class AliStack; class AliMCEvent; class AliMCParticle; - class AliAnalysisCentralCutMC: public AliAnalysisCuts{ public: AliAnalysisCentralCutMC(const char *name="AliAnalysisCentralCutMC", const char *title="MC_cuts"); diff --git a/PWG2/SPECTRA/AliAnalysisCentralExtrapolate.cxx b/PWG2/SPECTRA/AliAnalysisCentralExtrapolate.cxx index af6d48979ae..6465eee46c2 100644 --- a/PWG2/SPECTRA/AliAnalysisCentralExtrapolate.cxx +++ b/PWG2/SPECTRA/AliAnalysisCentralExtrapolate.cxx @@ -13,15 +13,14 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -// ************************************************** -// * pt spectra extrapolation in the 0. - 0.2 region using * +// ********************************************************* +// * pt spectra extrapolation in the 0. - 0.2 region using * // * Boltzmann-Gibbs Blast Wave model or Tsallis Blast * // * Wave model for azimuthal isotropic expansion in * -// * highly central collisions analysis * -// * author: Cristian Andrei * -// * acristian@niham.nipne.ro * -// * ************************************************* - +// * highly central collisions analysis * +// * author: Cristian Andrei * +// * acristian@niham.nipne.ro * +// * ******************************************************* #include "TH1D.h" #include "TFile.h" @@ -125,17 +124,17 @@ void AliAnalysisCentralExtrapolate::ApplyEff(){ if(!data){ printf("Unable to get CFContainer! \n"); - exit(1); + return; } if(!eff){ printf("No Eff Grid found! \n"); - exit(1); + return; } // ccorrdata->Divide(1,2); // ccorrdata->cd(1); -// ccorrdata->cd(1)->SetLogy(); +// ccorrdata->cd(1)->SetLogy(); AliCFDataGrid *corrdata = new AliCFDataGrid("corrdata","corrected data",*data); @@ -183,15 +182,15 @@ void AliAnalysisCentralExtrapolate::ApplyEff(){ TH1F *hNoEvt = dynamic_cast(fInputList->FindObject("AliAnalysisCentral_NoEvt")); if(!hNoEvt){ printf("Unable to get the number of events! \n"); - exit(1); + return; } Int_t noEvt = (Int_t)(hNoEvt->GetEntries()); printf("\n** No of processed events = %i **\n",noEvt); - + Double_t scale = 1.0/noEvt; - + TH1D *hPtESDCorrNorm = (TH1D*)hPtESDCorr->Clone("hPtESDCorrNorm"); hPtESDCorrNorm->Scale(scale); @@ -274,6 +273,15 @@ void AliAnalysisCentralExtrapolate::TsallisFit(){ timer.Start(); TH1D *ptSpectra = dynamic_cast(fResultsList->FindObject("hPtESDCorrNorm")); + if(!ptSpectra){ + printf("BoltzmannFit: Can't get the normalized spectrum\n"); + return; + } + + if(!ptSpectra->GetEntries()){ + printf("BoltzmannFit: The fit data is empty!\n"); + return; + } TVirtualFitter::SetDefaultFitter("Minuit2");//options Minuit, Minuit2, Fumili, Fumili2 @@ -403,11 +411,20 @@ void AliAnalysisCentralExtrapolate::BoltzmannFit(){ TH1::SetDefaultSumw2(); TH1::AddDirectory(0); - + timer.Start(); TH1D *ptSpectra = dynamic_cast(fResultsList->FindObject("hPtESDCorrNorm")); + if(!ptSpectra){ + printf("BoltzmannFit: Can't get the normalized spectrum\n"); + return; + } + + if(!ptSpectra->GetEntries()){ + printf("BoltzmannFit: The fit data is empty!\n"); + return; + } gStyle->SetOptStat("neRM"); diff --git a/PWG2/SPECTRA/AliAnalysisCentralExtrapolate.h b/PWG2/SPECTRA/AliAnalysisCentralExtrapolate.h index f6d4e0de7be..839880cee82 100644 --- a/PWG2/SPECTRA/AliAnalysisCentralExtrapolate.h +++ b/PWG2/SPECTRA/AliAnalysisCentralExtrapolate.h @@ -1,20 +1,20 @@ +#ifndef ALIANALYSISCENTRALEXTRAPOLATE_H +#define ALIANALYSISCENTRALEXTRAPOLATE_H /* * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * See cxx source for full Copyright notice * $Id$ */ -// ************************************************** -// * pt spectra extrapolation in the 0. - 0.2 region using * +// ********************************************************* +// * pt spectra extrapolation in the 0. - 0.2 region using * // * Boltzmann-Gibbs Blast Wave model or Tsallis Blast * // * Wave model for azimuthal isotropic expansion in * -// * highly central collisions analysis * -// * author: Cristian Andrei * -// * acristian@niham.nipne.ro * -// * ************************************************* +// * highly central collisions analysis * +// * author: Cristian Andrei * +// * acristian@niham.nipne.ro * +// * ******************************************************* -#ifndef ALI_ANALYSIS_CENTRAL_EXTRAPOLATE_H -#define ALI_ANALYSIS_CENTRAL_EXTRAPOLATE_H #include "TObject.h" diff --git a/PWG2/SPECTRA/AliAnalysisTaskCentral.cxx b/PWG2/SPECTRA/AliAnalysisTaskCentral.cxx index 991b4856eca..ad24e506f24 100644 --- a/PWG2/SPECTRA/AliAnalysisTaskCentral.cxx +++ b/PWG2/SPECTRA/AliAnalysisTaskCentral.cxx @@ -13,12 +13,12 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -// ************************************* -// * analysis task for azimuthal isotropic * -// * expansion in highly central collisions * -// * author: Cristian Andrei * -// * acristian@niham.nipne.ro * -// * *********************************** +// ****************************************** +// * analysis task for azimuthal isotropic * +// * expansion in highly central collisions * +// * author: Cristian Andrei * +// * acristian@niham.nipne.ro * +// ****************************************** #include "TChain.h" #include "TTree.h" @@ -307,12 +307,12 @@ void AliAnalysisTaskCentral::SendEvent(TObject *obj) const{ // Some cuts (ie MC IsPrimary) need the MC Event info if (!fCutsList) { - printf("No particle cut list found!\n\n"); - exit(1); + printf("No particle cut list found!\n\n"); + return; } else { for(Int_t isel=0;isel< 10; isel++){ - if(!fCutsList[isel])continue; + if(!fCutsList[isel]) continue; TObjArrayIter iter(fCutsList[isel]); AliAnalysisCuts *cut = 0; @@ -321,7 +321,7 @@ void AliAnalysisTaskCentral::SendEvent(TObject *obj) const{ TString cutName=cut->GetName(); if(!cutName){ printf("No cutname!\n"); - exit(1); + return; } Bool_t checkCut=cutName.Contains("AliAnalysisCentralCutMC"); @@ -492,7 +492,7 @@ void AliAnalysisTaskCentral::Terminate(Option_t *) { TList *outList = dynamic_cast(GetOutputData(0)); if(!outList){ printf("Unable to get output list! \n"); - exit(1); + return; } AliAnalysisCentralExtrapolate *extPi = new AliAnalysisCentralExtrapolate("extrapolationpi"); diff --git a/PWG2/SPECTRA/AliAnalysisTaskCentral.h b/PWG2/SPECTRA/AliAnalysisTaskCentral.h index c9b819709e0..1fde3aaa3a4 100644 --- a/PWG2/SPECTRA/AliAnalysisTaskCentral.h +++ b/PWG2/SPECTRA/AliAnalysisTaskCentral.h @@ -1,19 +1,17 @@ +#ifndef ALI_ANALYSIS_TASK_CENTRAL_H +#define ALI_ANALYSIS_TASK_CENTRAL_H /* * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * See cxx source for full Copyright notice * $Id$ */ -// ************************************* -// * analysis task for azimuthal isotropic * -// * expansion in highly central collisions * -// * author: Cristian Andrei * -// * acristian@niham.nipne.ro * -// * ************************************ - - -#ifndef ALI_ANALYSIS_TASK_CENTRAL_H -#define ALI_ANALYSIS_TASK_CENTRAL_H +// ****************************************** +// * analysis task for azimuthal isotropic * +// * expansion in highly central collisions * +// * author: Cristian Andrei * +// * acristian@niham.nipne.ro * +// ****************************************** #include "AliAnalysisTask.h" -- 2.43.0