- Add loading of GeomManager

- fix of handling of empty blocks

diff --git a/HLT/VZERO/AliHLTVZERORecoComponent.cxx b/HLT/VZERO/AliHLTVZERORecoComponent.cxx
index 1d1387a12959ed27ed73e0480b9ff0e851af6bfe..f5eca8b0b62fbdd6e40c51046d21b9b26bcc4cfb 100644 (file)
--- a/HLT/VZERO/AliHLTVZERORecoComponent.cxx
+++ b/HLT/VZERO/AliHLTVZERORecoComponent.cxx
@@ -33,6 +33,7 @@ using namespace std;
 #include "AliRunInfo.h"
 #include "AliGRPObject.h"
 #include "AliRawReaderMemory.h"
+#include "AliGeomManager.h"
 
 #include "AliVZERORecoParam.h"
 #include "AliVZEROReconstructor.h"
@@ -154,6 +155,11 @@ Int_t AliHLTVZERORecoComponent::DoInit( Int_t argc, const Char_t** argv ) {
 
   Int_t iResult=0;
 
+  // -- Load GeomManager
+  if(AliGeomManager::GetGeometry()==NULL){
+    AliGeomManager::LoadGeometry();
+  }
+  
   // -- Read configuration object : HLT/ConfigVZERO/VZEROReconstruction
   TString cdbPath="HLT/ConfigVZERO/";
   cdbPath+=GetComponentID();
@@ -320,8 +326,8 @@ Int_t AliHLTVZERORecoComponent::DoEvent(const AliHLTComponentEventData& /*evtDat
   // -- Get VZERO raw dat a input block and set up the rawreader
   const AliHLTComponentBlockData* pBlock = GetFirstInputBlock(kAliHLTDataTypeDDLRaw|kAliHLTDataOriginVZERO);
   if (!pBlock) {
-    HLTError("No VZERO input block !!!");
-    return -1;
+    HLTInfo("No VZERO input block !!!");
+    return 0;
   }
   
   // -- Add input block to raw reader

diff --git a/HLT/ZDC/AliHLTZDCESDRecoComponent.cxx b/HLT/ZDC/AliHLTZDCESDRecoComponent.cxx
index 19479e9773d334933e5e9eff868d9a02b73e500d..fe901537df3a527116ca49cad2cda8450429b37a 100644 (file)
--- a/HLT/ZDC/AliHLTZDCESDRecoComponent.cxx
+++ b/HLT/ZDC/AliHLTZDCESDRecoComponent.cxx
@@ -30,6 +30,7 @@ using namespace std;
 #include "AliHLTZDCESDRecoComponent.h"
 #include "AliHLTDefinitions.h"
 #include "AliRawReaderMemory.h"
+#include "AliGeomManager.h"
 #include "AliGRPObject.h"
 #include "AliZDCReconstructor.h"
 #include "AliZDCRecoParam.h"
@@ -100,6 +101,11 @@ int AliHLTZDCESDRecoComponent::DoInit( int argc, const char** argv )
   // see header file for class documentation
   int iResult=0;
 
+  // -- Load GeomManager
+  if(AliGeomManager::GetGeometry()==NULL){
+    AliGeomManager::LoadGeometry();
+  }
+  
   // read configuration object : HLT/ConfigZDC/
   TString cdbPath="HLT/ConfigZDC/";
   cdbPath+=GetComponentID();
@@ -116,6 +122,7 @@ int AliHLTZDCESDRecoComponent::DoInit( int argc, const char** argv )
   AliGRPObject* pGRP = pOCDBEntry?dynamic_cast<AliGRPObject*>(pOCDBEntry):NULL;
   Float_t  beamEnergy=0.;
   if(pGRP) beamEnergy = pGRP->GetBeamEnergy(); 
+
   TString beamType="";
   if(pGRP) beamType = pGRP->GetBeamType();
 
@@ -162,6 +169,9 @@ int AliHLTZDCESDRecoComponent::DoInit( int argc, const char** argv )
     else if((beamType.CompareTo("A-A"))==0) fReconstructor->SetRecoParam(AliZDCRecoParamPbPb::GetHighFluxParam(2*beamEnergy));
     else HLTWarning(" Beam type not known by ZDC!");
   
+    if((beamType.CompareTo("A-A"))==0)
+      beamEnergy = 2760.;
+
     fReconstructor->Init(beamType, beamEnergy);
   }
 
@@ -210,8 +220,8 @@ int AliHLTZDCESDRecoComponent::DoEvent(const AliHLTComponentEventData& /*evtData
   // get ZDC raw input data block and set up the rawreader
   const AliHLTComponentBlockData* pBlock = GetFirstInputBlock(kAliHLTDataTypeDDLRaw|kAliHLTDataOriginZDC);
   if (!pBlock) {
-    HLTError("No ZDC input block !!!");
-    return -1;
+    HLTInfo("No ZDC input block !!!");
+    return 0;
   }
 
   // add input block to raw reader