From 61d982d31417a912be72526837094c1fe44a673d Mon Sep 17 00:00:00 2001 From: aszostak Date: Fri, 30 May 2008 17:53:22 +0000 Subject: [PATCH] Fix: Only loading geometry if not already loaded. --- .../AliHLTMUONHitReconstructorComponent.cxx | 6 +++++- .../AliHLTMUONTriggerReconstructorComponent.cxx | 10 +++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/HLT/MUON/OnlineAnalysis/AliHLTMUONHitReconstructorComponent.cxx b/HLT/MUON/OnlineAnalysis/AliHLTMUONHitReconstructorComponent.cxx index 05662229c47..b0eb06ef83f 100644 --- a/HLT/MUON/OnlineAnalysis/AliHLTMUONHitReconstructorComponent.cxx +++ b/HLT/MUON/OnlineAnalysis/AliHLTMUONHitReconstructorComponent.cxx @@ -591,7 +591,11 @@ int AliHLTMUONHitReconstructorComponent::ReadCDB(const char* cdbPath, Int_t run) return -EIO; } - AliGeomManager::LoadGeometry(); + // Only load geometry if not already loaded. + if (AliGeomManager::GetGeometry() == NULL) + { + AliGeomManager::LoadGeometry(); + } AliMUONGeometryTransformer chamberGeometryTransformer; if (not chamberGeometryTransformer.LoadGeometryData()) { diff --git a/HLT/MUON/OnlineAnalysis/AliHLTMUONTriggerReconstructorComponent.cxx b/HLT/MUON/OnlineAnalysis/AliHLTMUONTriggerReconstructorComponent.cxx index 6b48282ab2c..4aa837708f7 100644 --- a/HLT/MUON/OnlineAnalysis/AliHLTMUONTriggerReconstructorComponent.cxx +++ b/HLT/MUON/OnlineAnalysis/AliHLTMUONTriggerReconstructorComponent.cxx @@ -20,7 +20,7 @@ /// /// @file AliHLTMUONTriggerReconstructorComponent.cxx /// @author Indranil Das , Artur Szostak -/// @date +/// @date 18 Sep 2007 /// @brief Implementation of the trigger DDL reconstructor component. /// @@ -532,7 +532,11 @@ int AliHLTMUONTriggerReconstructorComponent::ReadCDB(const char* cdbPath, Int_t return -EIO; } - AliGeomManager::LoadGeometry(); + // Only load geometry if not already loaded. + if (AliGeomManager::GetGeometry() == NULL) + { + AliGeomManager::LoadGeometry(); + } AliMUONGeometryTransformer transformer; if (not transformer.LoadGeometryData()) { @@ -625,7 +629,7 @@ int AliHLTMUONTriggerReconstructorComponent::ReadCDB(const char* cdbPath, Int_t } } } - + return 0; } -- 2.43.5