Compilation warnings

[u/mrichter/AliRoot.git] / FMD / AliFMDGeometry.cxx

diff --git a/FMD/AliFMDGeometry.cxx b/FMD/AliFMDGeometry.cxx
index b001ceb7ec4c9376065ebbd1b656d5475f0e7423..2be2bcf867430cdc334d9436a573bef6b49cdc90 100644 (file)
--- a/FMD/AliFMDGeometry.cxx
+++ b/FMD/AliFMDGeometry.cxx
@@ -66,7 +66,7 @@
 #include "AliFMD2.h"           // ALIFMD2_H
 #include "AliFMD3.h"           // ALIFMD2_H
 #include "AliRecPoint.h"       // ALIRECPOINT_H
-#include "AliLog.h"            // ALIRECPOINT_H
+#include "AliFMDDebug.h"                  // ALILOG_H
 #include <TVector3.h>           // ROOT_TVector3
 // #include <TMatrix.h>            // ROOT_TMatrix
 // #include <TParticle.h>          // ROOT_TParticle
@@ -100,7 +100,23 @@ AliFMDGeometry::Instance()
 //____________________________________________________________________
 AliFMDGeometry::AliFMDGeometry() 
   : AliGeometry("FMD", "Forward multiplicity"), 
-    fBuilder(0)
+    fIsInitialized(kFALSE), 
+    fInner(0),
+    fOuter(0),
+    fFMD1(0),
+    fFMD2(0),
+    fFMD3(0),
+    fUseFMD1(kFALSE),
+    fUseFMD2(kFALSE),
+    fUseFMD3(kFALSE),
+    fBuilder(0),
+    fDetectorOff(0),
+    fModuleOff(0),  
+    fRingOff(0),
+    fSectorOff(0),
+    fActive(2),
+    fDetailed(kFALSE),       
+    fUseAssembly(kFALSE)
 {
   // PROTECTED
   // Default constructor 
@@ -130,6 +146,11 @@ AliFMDGeometry::AliFMDGeometry(const AliFMDGeometry& other)
     fUseFMD1(other.fUseFMD1), 
     fUseFMD2(other.fUseFMD2), 
     fUseFMD3(other.fUseFMD3), 
+    fBuilder(other.fBuilder),
+    fDetectorOff(other.fDetectorOff),
+    fModuleOff(other.fModuleOff),  
+    fRingOff(other.fRingOff),
+    fSectorOff(other.fSectorOff),
     fActive(other.fActive),
     fDetailed(other.fDetailed),
     fUseAssembly(other.fUseAssembly)
@@ -180,7 +201,7 @@ AliFMDGeometry::InitTransformations()
     AliError("No TGeoManager defined");
     return;
   }
-  AliDebug(0, "Initialising transforms for FMD geometry");
+  AliFMDDebug(0, ("Initialising transforms for FMD geometry"));
   if (fFMD1) fFMD1->InitTransformations();
   if (fFMD2) fFMD2->InitTransformations();
   if (fFMD3) fFMD3->InitTransformations();
@@ -204,7 +225,7 @@ AliFMDGeometry::SetActive(Int_t* active, Int_t n)
   // Set active volumes 
   fActive.Set(n);
   for (Int_t i = 0; i < n; i++) { 
-    AliDebug(1, Form("Active vol id # %d: %d", i, active[i]));
+    AliFMDDebug(1, ("Active vol id # %d: %d", i, active[i]));
     fActive[i] = active[i];
   }
 }
@@ -379,6 +400,16 @@ AliFMDGeometry::Impact(const TParticle* /* particle */) const
   return kFALSE; 
 }
 
+//____________________________________________________________________ 
+void  
+AliFMDGeometry::SetAlignableVolumes() const
+{
+  // Declare alignable volumes
+  for (Int_t d = 1; d <= 3; d++) 
+    if (GetDetector(d)) GetDetector(d)->SetAlignableVolumes();
+}
+
+
 //____________________________________________________________________ 
 void  
 AliFMDGeometry::ExtractGeomInfo()
@@ -397,7 +428,7 @@ AliFMDGeometry::ExtractGeomInfo()
   Int_t moduleDepth   = FindNodeDepth("FIFV_0", "ALIC");
   Int_t sectorDepth   = FindNodeDepth("FISE_1", "ALIC");
   fActive.Reset(-1);
-  AliDebug(1, Form("Geometry depths:\n"
+  AliFMDDebug(1, ("Geometry depths:\n"
                   "   Sector:     %d\n"
                   "   Module:     %d\n"
                   "   Ring:       %d\n"
@@ -437,7 +468,7 @@ AliFMDGeometry::ExtractGeomInfo()
     if (striVol) AddActive(striVol->GetNumber());
     if (stroVol) AddActive(stroVol->GetNumber());
   }    
-  AliDebug(1, Form("Geometry offsets:\n"
+  AliFMDDebug(1, ("Geometry offsets:\n"
                   "   Sector:     %d\n"
                   "   Module:     %d\n"
                   "   Ring:       %d\n"