Merge branch 'master' of https://git.cern.ch/reps/AliRoot

[u/mrichter/AliRoot.git] / MUON / AliMUONGeometryTransformer.cxx

diff --git a/MUON/AliMUONGeometryTransformer.cxx b/MUON/AliMUONGeometryTransformer.cxx
index a26dea381a1e176d6a942d3793e4c1fbdf025565..5dad62cc0bae8a57a0db9b554267a0e58e132312 100644 (file)
--- a/MUON/AliMUONGeometryTransformer.cxx
+++ b/MUON/AliMUONGeometryTransformer.cxx
@@ -54,17 +54,36 @@
 
 #include <sstream>
 
+using std::endl;
+using std::ios;
+using std::cerr;
+using std::setw;
+using std::setprecision;
 /// \cond CLASSIMP
 ClassImp(AliMUONGeometryTransformer)
 /// \endcond
 
-const TString  AliMUONGeometryTransformer::fgkDefaultDetectorName = "MUON";
+//
+// static private methods
+//
+
+//______________________________________________________________________________
+const TString& AliMUONGeometryTransformer::GetDefaultDetectorName()
+{ 
+  /// Default detector name
+  static const TString kDefaultDetectorName = "MUON";
+  return kDefaultDetectorName;
+}  
  
+//
+// ctor, dtor
+//
+
 //______________________________________________________________________________
 AliMUONGeometryTransformer::AliMUONGeometryTransformer()
 
   : TObject(),
-    fDetectorName(fgkDefaultDetectorName),
+    fDetectorName(GetDefaultDetectorName()),
     fModuleTransformers(0),
     fMisAlignArray(0),
     fDEAreas(0x0)
@@ -253,6 +272,7 @@ void AliMUONGeometryTransformer::FillModuleTransform(Int_t moduleId,
   if ( !moduleTransformer) {
     AliErrorStream() 
       << "Module " << moduleId << " has not volume path defined." << endl;
+    return;  
   }  
       
   // Build the transformation from the parameters