code cleanup: renaming functions; adding prototype code for later development; no...

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

diff --git a/MUON/AliMUONGeometryDetElement.cxx b/MUON/AliMUONGeometryDetElement.cxx
index 75fbadffbd47e71937ae9f515a9625493425a116..d4d9e5663de8f318a71b7a94d299d4c65b0dee93 100644 (file)
--- a/MUON/AliMUONGeometryDetElement.cxx
+++ b/MUON/AliMUONGeometryDetElement.cxx
@@ -14,12 +14,13 @@
  **************************************************************************/
 
 // $Id$
-//
-// --------------------------------------
+
+//-----------------------------------------------------------------------------
 // Class AliMUONGeometryDetElement
 // --------------------------------------
 // The class defines the detection element.
 // Author: Ivana Hrivnacova, IPN Orsay
+//-----------------------------------------------------------------------------
 
 #include "AliMUONGeometryDetElement.h"
 
@@ -30,18 +31,54 @@
 
 #include <sstream>
 
+using std::cout;
+using std::endl;
+using std::string;
 /// \cond CLASSIMP
 ClassImp(AliMUONGeometryDetElement)
 /// \endcond
 
-const TString AliMUONGeometryDetElement::fgkDENamePrefix = "DE";
+//
+// static methods
+//
+
+//______________________________________________________________________________
+const TString& AliMUONGeometryDetElement::GetDENamePrefix()
+{
+  ///< Geometry DE name prefix
+  static const TString kDENamePrefix = "DE";
+  return kDENamePrefix;
+}  
+
+//______________________________________________________________________________
+TString AliMUONGeometryDetElement::GetDEName(Int_t detElemId)
+{
+/// Return the module name for given moduleId
+
+  TString deName(GetDENamePrefix());
+  deName += detElemId;
+  return deName;
+}   
+
+//______________________________________________________________________________
+AliMUONGeometryDetElement::AliMUONGeometryDetElement(Int_t detElemId)
+ : TObject(),
+   fDEName(GetDEName(detElemId)),
+   fVolumePath(),
+   fLocalTransformation(0),
+   fGlobalTransformation(0)
+{ 
+/// Standard constructor
+
+  SetUniqueID(detElemId);
+}
 
 //______________________________________________________________________________
 AliMUONGeometryDetElement::AliMUONGeometryDetElement(
                                         Int_t detElemId,
                                         const TString& volumePath)
  : TObject(),
-   fDEName(),
+   fDEName(GetDEName(detElemId)),
    fVolumePath(volumePath),
    fLocalTransformation(0),
    fGlobalTransformation(0)
@@ -49,19 +86,17 @@ AliMUONGeometryDetElement::AliMUONGeometryDetElement(
 /// Standard constructor
 
   SetUniqueID(detElemId);
-  
-  fDEName = fgkDENamePrefix;
-  fDEName += detElemId;
 }
 
 //______________________________________________________________________________
-AliMUONGeometryDetElement::AliMUONGeometryDetElement()
+AliMUONGeometryDetElement::AliMUONGeometryDetElement(TRootIOCtor* /*ioCtor*/)
  : TObject(),
+   fDEName(),
    fVolumePath(),
    fLocalTransformation(0),
    fGlobalTransformation(0)
 {
-/// Default constructor
+/// Root IO constructor
 }
 
 //______________________________________________________________________________
@@ -221,14 +256,17 @@ void  AliMUONGeometryDetElement::Local2Global(
 
 //______________________________________________________________________________
 void AliMUONGeometryDetElement::SetLocalTransformation(
-                                                const TGeoHMatrix& transform)
+                                                const TGeoHMatrix& transform, 
+                                                Bool_t warn)
 { 
 /// Set local transformation;
 /// give warning if the global transformation is already defined.
  
-  if (fLocalTransformation) {
+  if ( fLocalTransformation ) {
     delete fLocalTransformation;
-    AliWarning("Local transformation already defined was deleted.");
+    if ( warn ) {
+      AliWarning("Local transformation already defined was deleted.");
+    }  
   }  
 
   fLocalTransformation = new TGeoHMatrix(transform);
@@ -236,14 +274,17 @@ void AliMUONGeometryDetElement::SetLocalTransformation(
                                              
 //______________________________________________________________________________
 void AliMUONGeometryDetElement::SetGlobalTransformation(
-                                                const TGeoHMatrix& transform)
+                                                const TGeoHMatrix& transform,
+                                                Bool_t warn)
 { 
 /// Set global transformation;
 /// give warning if the global transformation is already defined.
  
   if (fGlobalTransformation) {
     delete fGlobalTransformation;
-    AliWarning("Global transformation already defined was deleted.");
+    if ( warn ) {
+      AliWarning("Global transformation already defined was deleted.");
+    }  
   }  
 
   fGlobalTransformation = new TGeoHMatrix(transform);