X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ZDC%2FAliZDCRecoParamPbPb.cxx;h=da718d0199de3de971410d10c487de0b34a802ee;hb=590dea9c105f1acd0935d6ef69feb5047ff35c4a;hp=f41a157b2f07cf7686c3d25599ab2e95502a3f5b;hpb=82dffa484e4f6f19a3619c22bdb83adf293e9ef6;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ZDC/AliZDCRecoParamPbPb.cxx b/ZDC/AliZDCRecoParamPbPb.cxx
index f41a157b2f0..da718d0199d 100644
--- a/ZDC/AliZDCRecoParamPbPb.cxx
+++ b/ZDC/AliZDCRecoParamPbPb.cxx
@@ -134,29 +134,34 @@ AliZDCRecoParamPbPb *AliZDCRecoParamPbPb::GetHighFluxParam(Float_t beamEnergy)
   // Create high flux reco parameter
   TH1::AddDirectory(0);
   TH2::AddDirectory(0);
-  //
+  
   TFile *fileGlauberMC =  TFile::Open("$ALICE_ROOT/ZDC/GlauberMCDist.root");
-  if(!fileGlauberMC) printf(" AliZDCRecoParamPbPb::GetHighFluxParam() ERROR opening file $ALICE_ROOT/ZDC/SpectatorSignal.root\n");
+  if(!fileGlauberMC) {
+    printf(" Opening file $ALICE_ROOT/ZDC/GlauberMCDist.root failed\n");
+    return NULL;
+  }
+  
+  Float_t sqrtS = 2*beamEnergy;
   
   TH1D *hNpartDist=0x0, *hbDist=0x0;
-  if(TMath::Abs(beamEnergy-5500)<100.){
+  if(TMath::Abs(sqrtS-5500)<100.){
     fileGlauberMC->cd("energy5500");
     fileGlauberMC->GetObject("energy5500/hNpartGlauber;1", hNpartDist);
     if(!hNpartDist) printf("  AliZDCRecoParamPbPb::GetHighFluxParam() PROBLEM!!! Can't get Glauber MC Npart distribution from file GlauberMCDist.root\n");
     fileGlauberMC->GetObject("energy5500/hbGlauber;1", hbDist);
     if(!hbDist) printf("  AliZDCRecoParamPbPb::GetHighFluxParam() PROBLEM!!! Can't get Glauber MC b distribution from file GlauberMCDist.root\n");
   }
-  else if(TMath::Abs(beamEnergy-2760)<100.){
+  else if(TMath::Abs(sqrtS-2760)<100.){
     fileGlauberMC->cd("energy2760");
     fileGlauberMC->GetObject("energy2760/hNpartGlauber;1", hNpartDist);
     if(!hNpartDist) printf("  PROBLEM!!! Can't get Glauber MC Npart distribution from file GlauberMCDist.root\n");
     fileGlauberMC->GetObject("energy2760/hbGlauber;1", hbDist);
     if(!hbDist) printf("  AliZDCRecoParamPbPb::GetHighFluxParam() PROBLEM!!! Can't get Glauber MC b distribution from file GlauberMCDist.root\n");
   }
-  else printf(" No AliZDCRecoParam provided for Pb-Pb @ sqrt(s) = %1.0f GeV\n", beamEnergy);
+  else printf(" No AliZDCRecoParam provided for Pb-Pb @ sqrt(s) = %1.0f GeV\n", sqrtS);
   //
-  hNpartDist->SetDirectory(0);
-  hbDist->SetDirectory(0);
+  if(hNpartDist) hNpartDist->SetDirectory(0);
+  if(hbDist) hbDist->SetDirectory(0);
 
   AliZDCRecoParamPbPb* zdcRecoParam = new AliZDCRecoParamPbPb(hNpartDist, hbDist, 0.1);
   //