]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Protection from C.Andrei plus some cosmetics and coding conventions
authorbhippoly <bhippoly@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 24 Nov 2009 01:50:30 +0000 (01:50 +0000)
committerbhippoly <bhippoly@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 24 Nov 2009 01:50:30 +0000 (01:50 +0000)
12 files changed:
PWG2/SPECTRA/AliAnalysisCentralCutESD.cxx
PWG2/SPECTRA/AliAnalysisCentralCutESD.h
PWG2/SPECTRA/AliAnalysisCentralCutEvtESD.cxx
PWG2/SPECTRA/AliAnalysisCentralCutEvtESD.h
PWG2/SPECTRA/AliAnalysisCentralCutEvtMC.cxx
PWG2/SPECTRA/AliAnalysisCentralCutEvtMC.h
PWG2/SPECTRA/AliAnalysisCentralCutMC.cxx
PWG2/SPECTRA/AliAnalysisCentralCutMC.h
PWG2/SPECTRA/AliAnalysisCentralExtrapolate.cxx
PWG2/SPECTRA/AliAnalysisCentralExtrapolate.h
PWG2/SPECTRA/AliAnalysisTaskCentral.cxx
PWG2/SPECTRA/AliAnalysisTaskCentral.h

index 5c378ffd020bdde90d894b73cd5fae1e1c2d3cba..63a0d9c64061fd0e74fcd9f2ea2c08fbaabcda68 100644 (file)
 * 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 <TF1.h>
 #include <TFile.h>
+#include <TF1.h>
 
-#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){
index 757100dc3af5703a3c30949c9767bccefa86dbf7..09a74643d2f3c51dfdee5833485a6c80c24a47b2 100644 (file)
@@ -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 <TString.h>
 #include <TPDGCode.h>
 
 #include "AliAnalysisCuts.h"
 
-
 class TObject;
 class TList;
 class TF1;
+class TString;
 
 class AliESDtrack;
 
index 49a5115742c1cc6bd4703296ea9e655bc5614cd0..b3fab4e98bffa6652b6082a11a3256a960407f0e 100644 (file)
 * 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 <TObjArray.h>
-#include <TList.h>
 
 #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<AliESDEvent *>(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((mult<fMultMin)||(mult>fMultMax)){
@@ -89,8 +84,6 @@ Bool_t AliAnalysisCentralCutEvtESD::IsSelected(TObject *obj){
                }
     }
 
-
-
     if(fReqDir){
                Double_t dir = CalcDir(esdEvent);
                if((dir<fDirMin)||(dir>fDirMax)){
index 2fa5d6b220e27c259a59e2d674746899d3708457..c474e03503f134dca3ffb43b8a89b039bffa7a20 100644 (file)
@@ -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");
index f34be1b6458766726a395defaa0e79c1827cb25f..9ca9e36520daaac5fe059d2c07181f8f536d6053 100644 (file)
 * 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 <TParticle.h>
 
 #include "AliStack.h"
 
 #include "AliAnalysisCentralCutEvtMC.h"
-
-
-class TObject;
-
 //____________________________________________________________________
 ClassImp(AliAnalysisCentralCutEvtMC)
 
index 31838c3bcb6ab74c263d86b4a9d7921539fc44bb..b388a034ce4977facc9c67e1cb5c377c134bbdce 100644 (file)
@@ -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");
index f3d9d53283d5ce3f622e352335bd1078e0755ea0..8e3486f41f6a9d4a5a182780c008e99b423a9dc5 100644 (file)
 * 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 <TParticle.h>
 
@@ -27,9 +27,6 @@
 #include "AliMCParticle.h"
 
 #include "AliAnalysisCentralCutMC.h"
-
-class TObject;
-
 //____________________________________________________________________
 ClassImp(AliAnalysisCentralCutMC)
 
index 1dee0b457c187ad3990f494ed9abf65313443fa3..79532ef5344f6eb6b73dc38c91b3b7ff24d89737 100644 (file)
@@ -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");
index af6d48979aee246600726d3b15e2b2aafc1104d0..6465eee46c28ee1b65bf8b61579bd4dd3a49c63c 100644 (file)
 * 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<TH1F*>(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<TH1D*>(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<TH1D*>(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");
 
index f6d4e0de7bedeaf8e6e55577144000d95ca2df2b..839880cee82fb77603937e6e992e0e45a60a0c1a 100644 (file)
@@ -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"
 
index 991b4856eca9cff9b55f0b24614536c290e049bf..ad24e506f243de6c70bd7c9acf55350d458e7a2c 100644 (file)
 * 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<TList*>(GetOutputData(0));
        if(!outList){
                printf("Unable to get output list! \n");
-               exit(1);
+               return;
        }
  
        AliAnalysisCentralExtrapolate *extPi = new AliAnalysisCentralExtrapolate("extrapolationpi");
index c9b819709e084aaa1de116bde6200cdc32ded3d2..1fde3aaa3a4fb649840cd33fd0c1e9b4fd830727 100644 (file)
@@ -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"