]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - FMD/AliFMD.cxx
Minor changes, mostly for debugging
[u/mrichter/AliRoot.git] / FMD / AliFMD.cxx
index 57277b7c59495d864b5d4519465fec78f42ae7d7..f07b1f9219f02225b30f93b767d7b52ea2c7af0f 100644 (file)
 //                                                                          
 // Forward Multiplicity Detector based on Silicon wafers. This class
 // contains the base procedures for the Forward Multiplicity detector
-// Detector consists of 5 Si volumes covered pseudorapidity interval
-// from 1.7 to 5.1.
+// Detector consists of 3 sub-detectors FMD1, FMD2, and FMD3, each of
+// which has 1 or 2 rings of silicon sensors. 
 //                                                       
 // This is the base class for all FMD manager classes. 
 //                    
 // The actual code is done by various separate classes.   Below is
 // diagram showing the relationship between the various FMD classes
-// that handles the geometry 
+// that handles the simulation
 //
 //
 //       +----------+   +----------+   
-//       | AliFMDv1 |  | AliFMDv1 |   
+//       | AliFMDv1 |  | AliFMDv0 |   
 //       +----------+   +----------+   
-//            |              |
-//       +----+--------------+
-//       |
-//       |           +------------+ 1  +---------------+
-//       |        +- | AliFMDRing |<>--| AliFMDPolygon | 
-//       V     2  |  +------------+    +---------------+   
-//  +--------+<>--+        |
-//  | AliFMD |             ^                       
-//  +--------+<>--+        V 1..2                     
-//            3  | +-------------------+ 
-//               +-| AliFMDSubDetector | 
-//                 +-------------------+
-//                           ^              
-//                           |
-//             +-------------+-------------+
-//             |             |             |         
-//        +---------+   +---------+   +---------+
-//        | AliFMD1 |   | AliFMD2 |   | AliFMD3 |
-//        +---------+   +---------+   +---------+
+//            |              |                    +-----------------+
+//       +----+--------------+                 +--| AliFMDDigitizer |
+//       |                                     |  +-----------------+
+//       |           +---------------------+   |
+//       |        +--| AliFMDBaseDigitizer |<--+
+//       V     1  |  +---------------------+   |
+//  +--------+<>--+                            |  +------------------+
+//  | AliFMD |                                 +--| AliFMDSDigitizer |    
+//  +--------+<>--+                               +------------------+       
+//            1  |  +-----------------+ 
+//               +--| AliFMDSimulator |
+//                  +-----------------+
+//                            ^              
+//                            |
+//              +-------------+-------------+
+//              |                           |        
+//     +--------------------+   +-------------------+
+//     | AliFMDGeoSimulator |   | AliFMDG3Simulator | 
+//     +--------------------+   +-------------------+
+//               ^                        ^
+//               |                        |
+//  +-----------------------+   +----------------------+
+//  | AliFMDGeoOldSimulator |   | AliFMDG3OldSimulator |
+//  +-----------------------+   +----------------------+
 //      
 //
 // *  AliFMD 
 //    This defines the interface for the various parts of AliROOT that
-//    uses the FMD, like AliFMDDigitizer, AliFMDReconstructor, and so
-//    on. 
+//    uses the FMD, like AliFMDSimulator, AliFMDDigitizer, 
+//    AliFMDReconstructor, and so on. 
+//
+// *  AliFMDv0
+//    This is a concrete implementation of the AliFMD interface. 
+//    It is the responsibility of this class to create the FMD
+//    geometry.
 //
 // *  AliFMDv1 
 //    This is a concrete implementation of the AliFMD interface. 
 //    geometry, process hits in the FMD, and serve hits and digits to
 //    the various clients. 
 //  
-//    It uses the objects of class AliFMDSubDetector to do the various
-//    stuff for FMD1, 2, and 3 
-//
-// *  AliFMDRing 
-//    This class contains all stuff needed to do with a ring.  It's
-//    used by the AliFMDSubDetector objects to instantise inner and
-//    outer rings.  The AliFMDRing objects are shared by the
-//    AliFMDSubDetector objects, and owned by the AliFMDv1 object. 
-//
-// *  AliFMDPolygon 
-//    The code I lifted from TGeoPolygon to help with the geometry of
-//    the modules, as well as to decide wether a hit is actually with
-//    in the real module shape.  The point is, that the shape of the
-//    various ring modules are really polygons (much like the lid of a
-//    coffin), but it's segmented at constant radius.  That is very
-//    hard to implement using GEANT 3.21 shapes, so instead the
-//    modules are implemented as TUBS (tube sections), and in the step
-//    procedure we do the test whether the track was inside the real
-//    shape of the module.  
-//
-// *  AliFMD1, AliFMD2, and AliFMD3 
-//    These are specialisation of AliFMDSubDetector, that contains the
-//    particularities of each of the sub-detector system.  It is
-//    envisioned that the classes should also define the support
-//    volumes and material for each of the detectors.                          
+// *  AliFMDSimulator
+//    This is the base class for the FMD simulation tasks.   The
+//    simulator tasks are responsible to implment the geoemtry, and
+//    process hits. 
 //                                                                          
-// The responsible person for this module is Alla Maevskaia
-// <Alla.Maevskaia@cern.ch>.
+// *  AliFMDGeoSimulator
+//    This is a concrete implementation of the AliFMDSimulator that
+//    uses the TGeo classes directly only. 
 //
-// Many modifications by Christian Holm Christensen <cholm@nbi.dk>
+// *  AliFMDG3Simulator
+//    This is a concrete implementation of the AliFMDSimulator that
+//    uses the TVirtualMC interface with GEANT 3.21-like messages.
 //
 
-#include "TClonesArray.h"      // ROOT_TClonesArray
-#include "TGeometry.h"         // ROOT_TGeomtry
-#include "TNode.h"             // ROOT_TNode
-#include "TTUBE.h"             // ROOT_TTUBE
-#include "TTree.h"             // ROOT_TTree
-#include "TVirtualMC.h"                // ROOT_TVirtualMC
-#include "TBrowser.h"          // ROOT_TBrowser
-#include "TMath.h"             // ROOT_TMath
-
-#include "AliRunDigitizer.h"   // ALIRUNDIGITIZER_H
-#include "AliLoader.h"         // ALILOADER_H
-#include "AliRun.h"            // ALIRUN_H
-#include "AliMC.h"             // ALIMC_H
-#include "AliLog.h"            // ALILOG_H
-#include "AliMagF.h"           // ALIMAGF_H
+// These files are not in the same directory, so there's no reason to
+// ask the preprocessor to search in the current directory for these
+// files by including them with `#include "..."' 
+#include <math.h>               // __CMATH__
+#include <TClonesArray.h>      // ROOT_TClonesArray
+#include <TGeometry.h>         // ROOT_TGeomtry
+#include <TNode.h>             // ROOT_TNode
+#include <TXTRU.h>             // ROOT_TXTRU
+#include <TRotMatrix.h>                // ROOT_TRotMatrix
+#include <TTUBE.h>             // ROOT_TTUBE
+#include <TTree.h>             // ROOT_TTree
+#include <TBrowser.h>          // ROOT_TBrowser
+#include <TMath.h>             // ROOT_TMath
+#include <TVirtualMC.h>                // ROOT_TVirtualMC
+
+#include <AliRunDigitizer.h>   // ALIRUNDIGITIZER_H
+#include <AliLoader.h>         // ALILOADER_H
+#include <AliRun.h>            // ALIRUN_H
+#include <AliMC.h>             // ALIMC_H
+#include <AliLog.h>            // ALILOG_H
 #include "AliFMD.h"            // ALIFMD_H
 #include "AliFMDDigit.h"       // ALIFMDDIGIG_H
 #include "AliFMDHit.h"         // ALIFMDHIT_H
+#include "AliFMDGeometry.h"    // ALIFMDGEOMETRY_H
+#include "AliFMDDetector.h"    // ALIFMDDETECTOR_H
+#include "AliFMDRing.h"                // ALIFMDRING_H
 #include "AliFMDDigitizer.h"   // ALIFMDDIGITIZER_H
-#include "AliFMD1.h"           // ALIFMD1_H
-#include "AliFMD2.h"           // ALIFMD2_H
-#include "AliFMD3.h"           // ALIFMD3_H
+#include "AliFMDSimulator.h"   // ALIFMDSIMULATOR_H
+#include "AliFMDG3Simulator.h" // ALIFMDG3SIMULATOR_H
+#include "AliFMDGeoSimulator.h"        // ALIFMDGEOSIMULATOR_H
+#include "AliFMDG3OldSimulator.h"      // ALIFMDG3OLDSIMULATOR_H
+#include "AliFMDGeoOldSimulator.h"     // ALIFMDGEOOLDSIMULATOR_H
 #include "AliFMDRawWriter.h"   // ALIFMDRAWWRITER_H
 
 //____________________________________________________________________
-ClassImp(AliFMD);
+ClassImp(AliFMD)
+#if 0
+  ; // This is to keep Emacs from indenting the next line 
+#endif 
 
 //____________________________________________________________________
 AliFMD::AliFMD()
-  : fInner(0), 
-    fOuter(0),
-    fFMD1(0),
-    fFMD2(0), 
-    fFMD3(0), 
+  : AliDetector(),
     fSDigits(0), 
     fNsdigits(0),
-    fSiDensity(0),
-    fPrintboardRotationId(0),
-    fIdentityRotationId(0),
-    fShortLegId(0),
-    fLongLegId(0),
-    fLegLength(0),
-    fLegRadius(0),
-    fModuleSpacing(0)
+    fDetailed(kTRUE),
+    fSimulator(0)
 {
   //
   // Default constructor for class AliFMD
   //
-  AliDebug(0, "Default CTOR");
-  fHits     = 0;
-  fDigits   = 0;
-  fIshunt   = 0;
+  AliDebug(10, "\tDefault CTOR");
+  fHits        = 0;
+  fDigits      = 0;
+  fIshunt      = 0;
+  fUseOld      = kFALSE;
+  fUseDivided  = kFALSE;
+  fUseAssembly = kFALSE;
+  fUseGeo      = kTRUE;
+}
+
+//____________________________________________________________________
+AliFMD::AliFMD(const AliFMD& other)
+  : AliDetector(other),
+    fSDigits(other.fSDigits), 
+    fNsdigits(other.fNsdigits),
+    fDetailed(other.fDetailed),
+    fSimulator(other.fSimulator)
+{
+  // Copy constructor 
+  fUseOld      = other.fUseOld;
+  fUseDivided  = other.fUseDivided;
+  fUseAssembly = other.fUseAssembly;
+  fUseGeo      = other.fUseGeo;
 }
 
 //____________________________________________________________________
-AliFMD::AliFMD(const char *name, const char *title, bool detailed)
+AliFMD::AliFMD(const char *name, const char *title)
   : AliDetector (name, title),
-    fInner(0), 
-    fOuter(0),
-    fFMD1(0),
-    fFMD2(0), 
-    fFMD3(0),
     fSDigits(0),
     fNsdigits(0),
-    fSiDensity(0),
-    fPrintboardRotationId(0),
-    fIdentityRotationId(0),
-    fShortLegId(0),
-    fLongLegId(0),
-    fLegLength(0),
-    fLegRadius(0),
-    fModuleSpacing(0)
+    fDetailed(kTRUE),
+    fSimulator(0)
 {
   //
   // Standard constructor for Forward Multiplicity Detector
   //
-  AliDebug(0, "Standard CTOR");
-
+  AliDebug(10, "\tStandard CTOR");
+  fUseOld      = kFALSE;
+  fUseDivided  = kFALSE;
+  fUseAssembly = kFALSE;
+  fUseGeo      = kTRUE;
+  
   // Initialise Hit array
   HitsArray();
   gAlice->GetMCApp()->AddHitList(fHits);
@@ -186,59 +193,6 @@ AliFMD::AliFMD(const char *name, const char *title, bool detailed)
   fIshunt = 0;
   SetMarkerColor(kRed);
   SetLineColor(kYellow);
-  SetSiDensity();
-
-  // Create sub-volume managers 
-  fInner = new AliFMDRing('I', detailed);
-  fOuter = new AliFMDRing('O', detailed);
-  fFMD1  = new AliFMD1();
-  fFMD2  = new AliFMD2();
-  fFMD3  = new AliFMD3();
-
-  // Specify parameters of sub-volume managers 
-  fFMD1->SetInner(fInner);
-  fFMD1->SetOuter(0);
-
-  fFMD2->SetInner(fInner);
-  fFMD2->SetOuter(fOuter);
-  
-  fFMD3->SetInner(fInner);
-  fFMD3->SetOuter(fOuter);
-
-  SetLegLength();
-  SetLegRadius();
-  SetLegOffset();
-  SetModuleSpacing();
-  
-  fInner->SetLowR(4.3);
-  fInner->SetHighR(17.2);
-  fInner->SetWaferRadius(13.4/2);
-  fInner->SetTheta(36/2);
-  fInner->SetNStrips(512);
-  fInner->SetSiThickness(.03);
-  fInner->SetPrintboardThickness(.11);
-  fInner->SetBondingWidth(.5);
-
-  fOuter->SetLowR(15.6);
-  fOuter->SetHighR(28.0);
-  fOuter->SetWaferRadius(13.4/2);
-  fOuter->SetTheta(18/2);
-  fOuter->SetNStrips( 256);
-  fOuter->SetSiThickness(.03);
-  fOuter->SetPrintboardThickness(.1);
-  fOuter->SetBondingWidth(.5);
-  
-  
-  fFMD1->SetHoneycombThickness(1);
-  fFMD1->SetInnerZ(340.0);
-  
-  fFMD2->SetHoneycombThickness(1);
-  fFMD2->SetInnerZ(83.4);
-  fFMD2->SetOuterZ(75.2);
-
-  fFMD3->SetHoneycombThickness(1);
-  fFMD3->SetInnerZ(-62.8);
-  fFMD3->SetOuterZ(-75.2);
 }
 
 //____________________________________________________________________
@@ -262,6 +216,19 @@ AliFMD::~AliFMD ()
   }
 }
 
+//____________________________________________________________________
+AliFMD&
+AliFMD::operator=(const AliFMD& other)
+{
+  AliDetector::operator=(other);
+  fSDigits             = other.fSDigits; 
+  fNsdigits            = other.fNsdigits;
+  fDetailed            = other.fDetailed;
+  fSimulator            = other.fSimulator;
+  
+  return *this;
+}
+
 //====================================================================
 //
 // GEometry ANd Traking
@@ -294,45 +261,12 @@ AliFMD::CreateGeometry()
   //   FOR subdetectors fFMD1, fFMD2, and fFMD3 DO 
   //     AliFMDSubDetector::Geomtry();
   //   END FOR
-  //   
-
-  // DebugGuard guard("AliFMD::CreateGeometry");
-  AliDebug(10, "Creating geometry");
-
-  fInner->Init();
-  fOuter->Init();
-
-  TString name;
-  Double_t par[3];
-
-  par[0]      =  fLegRadius - .1;
-  par[1]      =  fLegRadius;
-  par[2]      =  fLegLength / 2;
-  name        =  "FSL";
-  fShortLegId =  gMC->Gsvolu(name.Data(),"TUBE",(*fIdtmed)[kPlasticId],par,3);
-  
-  par[2]      += fModuleSpacing / 2;
-  name        = "FLL";
-  fLongLegId  =  gMC->Gsvolu(name.Data(),"TUBE",(*fIdtmed)[kPlasticId],par,3);
-
-  fInner->SetupGeometry((*fIdtmed)[kAirId], 
-                       (*fIdtmed)[kSiId], 
-                       (*fIdtmed)[kPcbId], 
-                       fPrintboardRotationId, 
-                       fIdentityRotationId);
-  fOuter->SetupGeometry((*fIdtmed)[kAirId], 
-                       (*fIdtmed)[kSiId], 
-                       (*fIdtmed)[kPcbId], 
-                       fPrintboardRotationId, 
-                       fIdentityRotationId);
-
-  fFMD1->SetupGeometry((*fIdtmed)[kAirId], (*fIdtmed)[kKaptionId]);
-  fFMD2->SetupGeometry((*fIdtmed)[kAirId], (*fIdtmed)[kKaptionId]);
-  fFMD3->SetupGeometry((*fIdtmed)[kAirId], (*fIdtmed)[kKaptionId]);
-  
-  fFMD1->Geometry("ALIC", fPrintboardRotationId, fIdentityRotationId);
-  fFMD2->Geometry("ALIC", fPrintboardRotationId, fIdentityRotationId);
-  fFMD3->Geometry("ALIC", fPrintboardRotationId, fIdentityRotationId);    
+  //
+  if (!fSimulator) {
+    AliFatal("Simulator object not made yet!");
+    return;
+  }
+  fSimulator->DefineGeometry();
 }    
 
 //____________________________________________________________________
@@ -341,157 +275,33 @@ void AliFMD::CreateMaterials()
   // Register various materials and tracking mediums with the
   // backend.   
   // 
-  // Currently defined materials and mediums are 
-  // 
-  //    FMD Air                Normal air 
-  //    FMD Si          Active silicon of sensors 
-  //    FMD Carbon      Normal carbon used in support, etc. 
-  //    FMD Kapton      Carbon used in Honeycomb
-  //    FMD PCB         Printed circuit board material 
-  //    FMD Plastic     Material for support legs 
-  // 
-  // Also defined are two rotation matricies. 
-  //
-  // DebugGuard guard("AliFMD::CreateMaterials");
-  AliDebug(10, "Creating materials");
-  Int_t    id;
-  Double_t a                = 0;
-  Double_t z                = 0;
-  Double_t density          = 0;
-  Double_t radiationLength  = 0;
-  Double_t absorbtionLength = 999;
-  Int_t    fieldType        = gAlice->Field()->Integ();     // Field type 
-  Double_t maxField         = gAlice->Field()->Max();     // Field max.
-  Double_t maxBending       = 0;     // Max Angle
-  Double_t maxStepSize      = 0.001; // Max step size 
-  Double_t maxEnergyLoss    = 1;     // Max Delta E
-  Double_t precision        = 0.001; // Precision
-  Double_t minStepSize      = 0.001; // Minimum step size 
-  // Silicon 
-  a                = 28.0855;
-  z                = 14.;
-  density          = fSiDensity;
-  radiationLength  = 9.36;
-  maxBending       = 1;
-  maxStepSize      = .001;
-  precision        = .001;
-  minStepSize      = .001;
-  id               = kSiId;
-  AliMaterial(id, "FMD Si$", a, z, density, radiationLength, absorbtionLength);
-  AliMedium(kSiId, "FMD Si$",id,1,fieldType,maxField,maxBending,
-           maxStepSize,maxEnergyLoss,precision,minStepSize);
-
+  AliDebug(10, "\tCreating materials");
 
-  // Carbon 
-  a                = 12.011;
-  z                = 6.;
-  density          = 2.265;
-  radiationLength  = 18.8;
-  maxBending       = 10;
-  maxStepSize      = .01;
-  precision        = .003;
-  minStepSize      = .003;
-  id               = kCarbonId;
-  AliMaterial(id, "FMD Carbon$", a, z, density, radiationLength, 
-             absorbtionLength);
-  AliMedium(kCarbonId, "FMD Carbon$",id,0,fieldType,maxField,maxBending,
-           maxStepSize,maxEnergyLoss,precision,minStepSize);
-
-  // Silicon chip 
-  {
-    Float_t as[] = { 12.0107,      14.0067,      15.9994,
-                    1.00794,      28.0855,     107.8682 };
-    Float_t zs[] = {  6.,           7.,           8.,
-                     1.,          14.,          47. };
-    Float_t ws[] = {  0.039730642,  0.001396798,  0.01169634,
-                     0.004367771,  0.844665,     0.09814344903 };
-    density = 2.36436;
-    maxBending       = 10;
-    maxStepSize      = .01;
-    precision        = .003;
-    minStepSize      = .003;
-    id = kSiChipId;
-    AliMixture(id, "FMD Si Chip$", as, zs, density, 6, ws);
-    AliMedium(kSiChipId, "FMD Si Chip$", id, 0, fieldType, maxField, 
-             maxBending, maxStepSize, maxEnergyLoss, precision, minStepSize);
-  }
-  
-
-  // Kaption 
-  {
-    Float_t as[] = { 1.00794,  12.0107,  14.010,   15.9994};
-    Float_t zs[] = { 1.,        6.,       7.,       8.};
-    Float_t ws[] = { 0.026362,  0.69113,  0.07327,  0.209235};
-    density          = 1.42;
-    maxBending       = 1;
-    maxStepSize      = .001;
-    precision        = .001;
-    minStepSize      = .001;
-    id               = kKaptionId;
-    AliMixture(id, "FMD Kaption$", as, zs, density, 4, ws);
-    AliMedium(kKaptionId, "FMD Kaption$",id,0,fieldType,maxField,maxBending,
-             maxStepSize,maxEnergyLoss,precision,minStepSize);
-  }
-  
-  // Air
-  {
-    Float_t as[] = { 12.0107, 14.0067,   15.9994,  39.948 };
-    Float_t zs[] = {  6.,      7.,       8.,       18. };
-    Float_t ws[] = { 0.000124, 0.755267, 0.231781, 0.012827 }; 
-    density      = .00120479;
-    maxBending   = 1;
-    maxStepSize  = .001;
-    precision    = .001;
-    minStepSize  = .001;
-    id           = kAirId;
-    AliMixture(id, "FMD Air$", as, zs, density, 4, ws);
-    AliMedium(kAirId, "FMD Air$", id,0,fieldType,maxField,maxBending,
-             maxStepSize,maxEnergyLoss,precision,minStepSize);
+  if (fSimulator) {
+    AliFatal("Simulator object already instantised!");
+    return;
   }
-  
-  // PCB
-  {
-    Float_t zs[] = { 14.,         20.,         13.,         12.,
-                     5.,         22.,         11.,         19.,
-                    26.,          9.,          8.,          6.,
-                     7.,          1.};
-    Float_t as[] = { 28.0855,     40.078,      26.981538,   24.305, 
-                    10.811,      47.867,      22.98977,    39.0983,
-                    55.845,      18.9984,     15.9994,     12.0107,
-                    14.0067,      1.00794};
-    Float_t ws[] = {  0.15144894,  0.08147477,  0.04128158,  0.00904554, 
-                     0.01397570,  0.00287685,  0.00445114,  0.00498089,
-                     0.00209828,  0.00420000,  0.36043788,  0.27529426,
-                     0.01415852,  0.03427566};
-    density      = 1.8;
-    maxBending   = 1;
-    maxStepSize  = .001;
-    precision    = .001;
-    minStepSize  = .001;
-    id           = kPcbId;
-    AliMixture(id, "FMD PCB$", as, zs, density, 14, ws);
-    AliMedium(kPcbId, "FMD PCB$", id,1,fieldType,maxField,maxBending,
-             maxStepSize,maxEnergyLoss,precision,minStepSize);
+  AliFMDGeometry* geometry = AliFMDGeometry::Instance();
+  geometry->Init();
+  TVirtualMC* mc = TVirtualMC::GetMC();
+  Bool_t geo = mc->IsRootGeometrySupported();
+  if (geo && fUseGeo) {
+    if (fUseOld) 
+      fSimulator = new AliFMDGeoOldSimulator(this, fDetailed);
+    else 
+      fSimulator = new AliFMDGeoSimulator(this, fDetailed);
   }
-  
-  // Plastic 
-  {
-    Float_t as[] = { 1.01, 12.01 };
-    Float_t zs[] = { 1.,   6.    };
-    Float_t ws[] = { 1.,   1.    };
-    density      = 1.03;
-    maxBending   = 10;
-    maxStepSize  = .01;
-    precision    = .003;
-    minStepSize  = .003;
-    id           = kPlasticId;
-    AliMixture(id, "FMD Plastic$", as, zs, density, -2, ws);
-    AliMedium(kPlasticId, "FMD Plastic$", id,0,fieldType,maxField,maxBending,
-               maxStepSize,maxEnergyLoss,precision,minStepSize);
+  else {
+    if (fUseOld) 
+      fSimulator = new AliFMDG3OldSimulator(this, fDetailed);
+    else    
+      fSimulator = new AliFMDG3Simulator(this, fDetailed);
   }
-  AliMatrix(fPrintboardRotationId, 90, 90, 0, 90, 90, 0);
-  AliMatrix(fIdentityRotationId, 90, 0, 90, 90, 0, 0);
+  AliDebug(1, Form("using a %s as simulation backend", 
+                  fSimulator->IsA()->GetName()));
+  fSimulator->UseDivided(fUseDivided);
+  fSimulator->UseAssembly(fUseAssembly);
+  fSimulator->DefineMaterials();
 }
 
 //____________________________________________________________________
@@ -502,7 +312,7 @@ AliFMD::Init()
   // Initialis the FMD after it has been built
   Int_t i;
   //
-  if (fDebug) {
+  if (AliLog::GetGlobalDebugLevel()) {
     cout << "\n" << ClassName() << ": " << flush;
     for (i = 0; i < 35; i++) cout << "*";
     cout << " FMD_INIT ";
@@ -517,6 +327,14 @@ AliFMD::Init()
   //
 }
 
+//____________________________________________________________________
+void
+AliFMD::FinishEvent()
+{
+  if (fSimulator) fSimulator->EndEvent();
+}
+
+
 //====================================================================
 //
 // Graphics and event display
@@ -532,13 +350,119 @@ AliFMD::BuildGeometry()
   // 
   // The actual building of the TNodes is done by
   // AliFMDSubDetector::SimpleGeometry. 
-  AliDebug(10, "Creating a simplified geometry");
+  AliDebug(10, "\tCreating a simplified geometry");
 
+  AliFMDGeometry* fmd = AliFMDGeometry::Instance();
+  
+  static TXTRU*     innerShape = 0;
+  static TXTRU*     outerShape = 0;
+  static TObjArray* innerRot   = 0;
+  static TObjArray* outerRot   = 0;
+
+  if (!innerShape || !outerShape) {
+    // Make the shapes for the modules 
+    for (Int_t i = 0; i < 2; i++) {
+      AliFMDRing* r = 0;
+      switch (i) {
+      case 0: r = fmd->GetRing('I'); break;
+      case 1: r = fmd->GetRing('O'); break;
+      }
+      if (!r) {
+       AliError(Form("no ring found for i=%d", i));
+       return;
+      }
+      Double_t    siThick  = r->GetSiThickness();
+      const Int_t nv       = r->GetNVerticies();
+      Double_t    theta    = r->GetTheta();
+      Int_t       nmod     = r->GetNModules();
+      
+      TXTRU* shape = new TXTRU(r->GetName(), r->GetTitle(), "void", nv, 2);
+      for (Int_t j = 0; j < nv; j++) {
+       TVector2* vv = r->GetVertex(nv - 1 - j);
+       shape->DefineVertex(j, vv->X(), vv->Y());
+      }
+      shape->DefineSection(0, -siThick / 2, 1, 0, 0);
+      shape->DefineSection(1, +siThick / 2, 1, 0, 0);
+      shape->SetLineColor(GetLineColor());
+      
+      TObjArray* rots = new TObjArray(nmod);
+      for (Int_t j = 0; j < nmod; j++) {
+       Double_t th = (j + .5) * theta * 2;
+       TString name(Form("FMD_ring_%c_rot_%02d", r->GetId(), j));
+       TString title(Form("FMD Ring %c Rotation # %d", r->GetId(), j));
+       TRotMatrix* rot = new TRotMatrix(name.Data(), title.Data(),
+                                        90, th, 90, fmod(90+th,360), 0, 0);
+       rots->AddAt(rot, j);
+      }
+      
+      switch (r->GetId()) {
+      case 'i':
+      case 'I': innerShape = shape; innerRot = rots; break;
+      case 'o':
+      case 'O': outerShape = shape; outerRot = rots; break;
+      }
+    }
+  }
+  
   TNode* top = gAlice->GetGeometry()->GetNode("alice");
   
-  fFMD1->SimpleGeometry(fNodes, top, GetLineColor(), 0);
-  fFMD2->SimpleGeometry(fNodes, top, GetLineColor(), 0);
-  fFMD3->SimpleGeometry(fNodes, top, GetLineColor(), 0);
+  for (Int_t i = 1; i <= 3; i++) {
+    AliFMDDetector* det = fmd->GetDetector(i);
+    if (!det) {
+      Warning("BuildGeometry", "FMD%d seems to be disabled", i);
+      continue;
+    }
+    Double_t w  = 0;
+    Double_t rh = det->GetRing('I')->GetHighR();
+    Char_t   id = 'I';
+    if (det->GetRing('O')) {
+      w  = TMath::Abs(det->GetRingZ('O') - det->GetRingZ('I'));
+      id = (TMath::Abs(det->GetRingZ('O')) 
+           > TMath::Abs(det->GetRingZ('I')) ? 'O' : 'I');
+      rh = det->GetRing('O')->GetHighR();
+    }
+    w += (det->GetRing(id)->GetModuleSpacing() +
+         det->GetRing(id)->GetSiThickness());
+    TShape* shape = new TTUBE(det->GetName(), det->GetTitle(), "void",
+                             det->GetRing('I')->GetLowR(), rh, w / 2);
+    Double_t z = (det->GetRingZ('I') - w / 2);
+    if (z > 0) z += det->GetRing(id)->GetModuleSpacing();
+    top->cd();
+    TNode* node = new TNode(det->GetName(), det->GetTitle(), shape, 
+                           0, 0, z, 0);
+    fNodes->Add(node);
+    
+    for (Int_t j = 0; j < 2; j++) {
+      AliFMDRing* r      = 0;
+      TShape*     rshape = 0;
+      TObjArray*  rots   = 0;
+      switch (j) {
+      case 0: 
+       r = det->GetRing('I'); rshape = innerShape; rots = innerRot; break;
+      case 1: 
+       r = det->GetRing('O'); rshape = outerShape; rots = outerRot; break;
+      }
+      if (!r) continue;
+      
+      Double_t    siThick  = r->GetSiThickness();
+      Int_t       nmod     = r->GetNModules();
+      Double_t    modspace = r->GetModuleSpacing();
+      Double_t    rz       = - (z - det->GetRingZ(r->GetId()));
+      
+      for (Int_t k = 0; k < nmod; k++) {
+       node->cd();
+       Double_t    offz    = (k % 2 == 1 ? modspace : 0);
+       TRotMatrix* rot     = static_cast<TRotMatrix*>(rots->At(k));
+       TString name(Form("%s%c_module_%02d", det->GetName(), r->GetId(),k));
+       TString title(Form("%s%c Module %d", det->GetName(), r->GetId(),k));
+       TNode* mnod = new TNode(name.Data(), title.Data(), rshape, 
+                               0, 0, rz - siThick / 2 
+                               + TMath::Sign(offz,z), rot);
+       mnod->SetLineColor(GetLineColor());
+       fNodes->Add(mnod);
+      } // for (Int_t k = 0 ; ...)
+    } // for (Int_t j = 0 ; ...)
+  } // for (Int_t i = 1 ; ...)
 }
 
 //____________________________________________________________________
@@ -549,18 +473,11 @@ AliFMD::DrawDetector()
   // Draw a shaded view of the Forward multiplicity detector
   //
   // DebugGuard guard("AliFMD::DrawDetector");
-  AliDebug(10, "Draw detector");
+  AliDebug(10, "\tDraw detector");
   
+#if 0
   //Set ALIC mother transparent
   gMC->Gsatt("ALIC","SEEN",0);
-
-  //Set volumes visible
-  fFMD1->Gsatt();
-  fFMD2->Gsatt();
-  fFMD3->Gsatt();
-  fInner->Gsatt();
-  fOuter->Gsatt();
-
   //
   gMC->Gdopt("hide", "on");
   gMC->Gdopt("shad", "on");
@@ -572,10 +489,11 @@ AliFMD::DrawDetector()
   gMC->Gdhead(1111, "Forward Multiplicity Detector");
   gMC->Gdman(16, 10, "MAN");
   gMC->Gdopt("hide", "off");
+#endif
 }
 
 //____________________________________________________________________
-const Int_t 
+Int_t 
 AliFMD::DistanceToPrimitive(Int_t, Int_t)
 {
   //
@@ -679,38 +597,38 @@ AliFMD::AddHit(Int_t track, Int_t *vol, Float_t *hits)
   //    hits[9]         [Float_t  ] Time when the track hit
   // 
   // 
-  AddHit(track, 
-        UShort_t(vol[0]),  // Detector # 
-        Char_t(vol[1]),    // Ring ID
-        UShort_t(vol[2]),  // Sector # 
-        UShort_t(vol[3]),  // Strip # 
-        hits[0],           // X
-        hits[1],           // Y
-        hits[2],           // Z
-        hits[3],           // Px
-        hits[4],           // Py
-        hits[5],           // Pz
-        hits[6],           // Energy loss 
-        Int_t(hits[7]),    // PDG 
-        hits[8]);          // Time
+  AddHitByFields(track, 
+                UShort_t(vol[0]),  // Detector # 
+                Char_t(vol[1]),    // Ring ID
+                UShort_t(vol[2]),  // Sector # 
+                UShort_t(vol[3]),  // Strip # 
+                hits[0],           // X
+                hits[1],           // Y
+                hits[2],           // Z
+                hits[3],           // Px
+                hits[4],           // Py
+                hits[5],           // Pz
+                hits[6],           // Energy loss 
+                Int_t(hits[7]),    // PDG 
+                hits[8]);          // Time
 }
 
 //____________________________________________________________________
-void 
-AliFMD::AddHit(Int_t    track, 
-              UShort_t detector, 
-              Char_t   ring, 
-              UShort_t sector, 
-              UShort_t strip, 
-              Float_t  x, 
-              Float_t  y, 
-              Float_t  z,
-              Float_t  px, 
-              Float_t  py, 
-              Float_t  pz,
-              Float_t  edep,
-              Int_t    pdg,
-              Float_t  t)
+AliFMDHit*
+AliFMD::AddHitByFields(Int_t    track, 
+                      UShort_t detector, 
+                      Char_t   ring, 
+                      UShort_t sector, 
+                      UShort_t strip, 
+                      Float_t  x, 
+                      Float_t  y, 
+                      Float_t  z,
+                      Float_t  px, 
+                      Float_t  py, 
+                      Float_t  pz,
+                      Float_t  edep,
+                      Int_t    pdg,
+                      Float_t  t)
 {
   //
   // Add a hit to the list
@@ -738,9 +656,10 @@ AliFMD::AddHit(Int_t    track,
   // a new hit, but rather update the energy deposited in the hit.
   // This is done, so that a FLUKA based simulation will get the
   // number of hits right, not just the enerrgy deposition. 
+  AliFMDHit* hit = 0;
   for (Int_t i = 0; i < fNhits; i++) {
     if (!a.At(i)) continue;
-    AliFMDHit* hit = static_cast<AliFMDHit*>(a.At(i));
+    hit = static_cast<AliFMDHit*>(a.At(i));
     if (hit->Detector() == detector 
        && hit->Ring() == ring
        && hit->Sector() == sector 
@@ -751,18 +670,19 @@ AliFMD::AddHit(Int_t    track,
              detector, ring, sector, strip, track, edep, hit->Edep(),
              hit->Edep() + edep);
       hit->SetEdep(hit->Edep() + edep);
-      return;
+      return hit;
     }
   }
   // If hit wasn't already registered, do so know. 
-  new (a[fNhits]) AliFMDHit(fIshunt, track, detector, ring, sector, strip
-                           x, y, z, px, py, pz, edep, pdg, t);
+  hit = new (a[fNhits]) AliFMDHit(fIshunt, track, detector, ring, sector
+                                 strip, x, y, z, px, py, pz, edep, pdg, t);
   fNhits++;
+  return hit;
 }
 
 //____________________________________________________________________
 void 
-AliFMD::AddDigit(Int_t* digits)
+AliFMD::AddDigit(Int_t* digits, Int_t*)
 {
   // Add a digit to the Digit tree 
   // 
@@ -776,24 +696,24 @@ AliFMD::AddDigit(Int_t* digits)
   //    digits[5]  [Short_t]  ADC Count, -1 if not used
   //    digits[6]  [Short_t]  ADC Count, -1 if not used 
   // 
-  AddDigit(UShort_t(digits[0]),  // Detector #
-          Char_t(digits[1]),    // Ring ID
-          UShort_t(digits[2]),  // Sector #
-          UShort_t(digits[3]),  // Strip #
-          UShort_t(digits[4]),  // ADC Count1 
-          Short_t(digits[5]),   // ADC Count2 
-          Short_t(digits[6]));  // ADC Count3 
+  AddDigitByFields(UShort_t(digits[0]),  // Detector #
+                  Char_t(digits[1]),    // Ring ID
+                  UShort_t(digits[2]),  // Sector #
+                  UShort_t(digits[3]),  // Strip #
+                  UShort_t(digits[4]),  // ADC Count1 
+                  Short_t(digits[5]),   // ADC Count2 
+                  Short_t(digits[6]));  // ADC Count3 
 }
 
 //____________________________________________________________________
 void 
-AliFMD::AddDigit(UShort_t detector, 
-                Char_t   ring, 
-                UShort_t sector, 
-                UShort_t strip, 
-                UShort_t count1, 
-                Short_t  count2,
-                Short_t  count3)
+AliFMD::AddDigitByFields(UShort_t detector, 
+                        Char_t   ring, 
+                        UShort_t sector, 
+                        UShort_t strip, 
+                        UShort_t count1, 
+                        Short_t  count2,
+                        Short_t  count3)
 {
   // add a real digit - as coming from data
   // 
@@ -829,26 +749,26 @@ AliFMD::AddSDigit(Int_t* digits)
   //    digits[6]  [Short_t]  ADC Count, -1 if not used
   //    digits[7]  [Short_t]  ADC Count, -1 if not used 
   // 
-  AddSDigit(UShort_t(digits[0]),  // Detector #
-           Char_t(digits[1]),    // Ring ID
-           UShort_t(digits[2]),  // Sector #
-           UShort_t(digits[3]),  // Strip #
-           Float_t(digits[4]),   // Edep
-           UShort_t(digits[5]),  // ADC Count1 
-           Short_t(digits[6]),   // ADC Count2 
-           Short_t(digits[7]));  // ADC Count3 
+  AddSDigitByFields(UShort_t(digits[0]),  // Detector #
+                   Char_t(digits[1]),    // Ring ID
+                   UShort_t(digits[2]),  // Sector #
+                   UShort_t(digits[3]),  // Strip #
+                   Float_t(digits[4]),   // Edep
+                   UShort_t(digits[5]),  // ADC Count1 
+                   Short_t(digits[6]),   // ADC Count2 
+                   Short_t(digits[7]));  // ADC Count3 
 }
 
 //____________________________________________________________________
 void 
-AliFMD::AddSDigit(UShort_t detector, 
-                 Char_t   ring, 
-                 UShort_t sector, 
-                 UShort_t strip, 
-                 Float_t  edep,
-                 UShort_t count1, 
-                 Short_t  count2,
-                 Short_t  count3)
+AliFMD::AddSDigitByFields(UShort_t detector, 
+                         Char_t   ring, 
+                         UShort_t sector, 
+                         UShort_t strip, 
+                         Float_t  edep,
+                         UShort_t count1, 
+                         Short_t  count2,
+                         Short_t  count3)
 {
   // add a summable digit
   // 
@@ -928,12 +848,15 @@ AliFMD::Hits2Digits()
   // Create AliFMDDigit's from AliFMDHit's.  This is done by making a
   // AliFMDDigitizer, and executing that code.
   // 
+  Warning("Hits2Digits", "Try not to use this method.\n"
+         "Instead, use AliSimulator");
   AliRunDigitizer* manager = new AliRunDigitizer(1, 1);
   manager->SetInputStream(0, "galice.root");
   manager->SetOutputFile("H2Dfile");
   
   /* AliDigitizer* dig =*/ CreateDigitizer(manager);
   manager->Exec("");
+  delete manager;
 }
 
 //____________________________________________________________________
@@ -943,8 +866,9 @@ AliFMD::Hits2SDigits()
   // Create AliFMDSDigit's from AliFMDHit's.  This is done by creating
   // an AliFMDSDigitizer object, and executing it. 
   // 
-  AliDigitizer* sdig = new AliFMDSDigitizer("galice.root");
-  sdig->Exec("");
+  AliFMDSDigitizer* digitizer = new AliFMDSDigitizer("galice.root");
+  digitizer->Exec("");
+  delete digitizer;
 }
 
   
@@ -953,7 +877,8 @@ AliDigitizer*
 AliFMD::CreateDigitizer(AliRunDigitizer* manager) const
 {
   // Create a digitizer object 
-  return new AliFMDDigitizer(manager);
+  AliFMDDigitizer* digitizer = new AliFMDDigitizer(manager);
+  return digitizer;
 }
 
 //====================================================================
@@ -970,280 +895,8 @@ AliFMD::Digits2Raw()
   // to that class for more information. 
   AliFMDRawWriter writer(this);
   writer.Exec();
-  
-#if 0
-  // Digits are read from the Digit branch, and processed to make
-  // three DDL files, one for each of the sub-detectors FMD1, FMD2,
-  // and FMD3. 
-  //
-  // The raw data files consists of a header, followed by ALTRO
-  // formatted blocks.  
-  // 
-  //          +-------------+
-  //          | Header      |
-  //          +-------------+
-  //          | ALTRO Block |
-  //          | ...         |
-  //          +-------------+
-  //          DDL file 
-  // 
-  // An ALTRO formatted block, in the FMD context, consists of a
-  // number of counts followed by a trailer. 
-  // 
-  //          +------------------+
-  //          | Count            |
-  //          | ...              |
-  //          | possible fillers |
-  //          +------------------+
-  //          | Trailer          |
-  //          +------------------+
-  //          ALTRO block 
-  // 
-  // The counts are listed backwards, that is, starting with the
-  // latest count, and ending in the first. 
-  // 
-  // Each count consist of 1 or more ADC samples of the VA1_ALICE
-  // pre-amp. signal.  Just how many samples are used depends on
-  // whether the ALTRO over samples the pre-amp.  Each sample is a
-  // 10-bit word, and the samples are grouped into 40-bit blocks 
-  //
-  //          +------------------------------------+
-  //          |  S(n)   | S(n-1) | S(n-2) | S(n-3) |
-  //          |  ...    | ...    | ...    | ...    |
-  //          |  S(2)   | S(1)   | AA     | AA     |
-  //          +------------------------------------+
-  //          Counts + possible filler 
-  //
-  // The trailer of the number of words of signales, the starting
-  // strip number, the sector number, and the ring ID; each 10-bit
-  // words,  packed into 40-bits. 
-  // 
-  //          +------------------------------------+
-  //          | # words | start  | sector | ring   |
-  //          +------------------------------------+
-  //          Trailer
-  // 
-  // Note, that this method assumes that the digits are ordered. 
-  //
-  AliFMD* fmd = static_cast<AliFMD*>(gAlice->GetDetector(GetName()));
-  fLoader->LoadDigits();
-  TTree* digitTree = fLoader->TreeD();
-  if (!digitTree) {
-    Error("Digits2Raw", "no digit tree");
-    return;
-  }
-  
-  TClonesArray* digits = new TClonesArray("AliFMDDigit", 1000);
-  fmd->SetTreeAddress();
-  TBranch* digitBranch = digitTree->GetBranch(GetName());
-  if (!digitBranch) {
-    Error("Digits2Raw", "no branch for %s", GetName());
-    return;
-  }
-  digitBranch->SetAddress(&digits);
-  
-  Int_t nEvents = Int_t(digitTree->GetEntries());
-  for (Int_t event = 0; event < nEvents; event++) {
-    fmd->ResetDigits();
-    digitTree->GetEvent(event);
-    
-    Int_t nDigits = digits->GetEntries();
-    if (nDigits < 1) continue;
-
-
-    UShort_t prevDetector = 0;
-    Char_t   prevRing     = '\0';
-    UShort_t prevSector   = 0;
-    // UShort_t prevStrip    = 0;
-
-    // The first seen strip number for a channel 
-    UShort_t startStrip   = 0;
-    
-    // Which channel number in the ALTRO channel we're at 
-    UShort_t offset       = 0;
-
-    // How many times the ALTRO Samples one VA1_ALICE channel 
-    Int_t sampleRate = 1;
-
-    // A buffer to hold 1 ALTRO channel - Normally, one ALTRO channel
-    // holds 128 VA1_ALICE channels, sampled at a rate of `sampleRate' 
-    TArrayI channel(128 * sampleRate);
-    
-    // The Altro buffer 
-    AliAltroBuffer* altro = 0;
-    
-    // Loop over the digits in the event.  Note, that we assume the
-    // the digits are in order in the branch.   If they were not, we'd
-    // have to cache all channels before we could write the data to
-    // the ALTRO buffer, or we'd have to set up a map of the digits. 
-    for (Int_t i = 0; i < nDigits; i++) {
-      // Get the digit
-      AliFMDDigit* digit = static_cast<AliFMDDigit*>(digits->At(i));
-
-      UShort_t det    = digit->Detector();
-      Char_t   ring   = digit->Ring();
-      UShort_t sector = digit->Sector();
-      UShort_t strip  = digit->Strip();
-      if (det != prevDetector) {
-       AliDebug(10, Form("FMD: New DDL, was %d, now %d",
-                         kBaseDDL + prevDetector - 1,
-                         kBaseDDL + det - 1));
-       // If an altro exists, delete the object, flushing the data to
-       // disk, and closing the file. 
-       if (altro) { 
-         // When the first argument is false, we write the real
-         // header. 
-         AliDebug(10, Form("New altro: Write channel at %d Strip: %d "
-                           "Sector: %d  Ring: %d", 
-                           i, startStrip, prevSector, prevRing));
-         // TPC to FMD translations 
-         // 
-         //    TPC                FMD
-         //    ----------+-----------
-         //    pad       |      strip
-         //    row       |     sector
-         //    sector    |       ring
-         // 
-         altro->WriteChannel(Int_t(startStrip), 
-                             Int_t(prevSector), 
-                             Int_t((prevRing == 'I' ? 0 : 1)), 
-                             channel.fN, channel.fArray, 0);
-         altro->Flush();
-         altro->WriteDataHeader(kFALSE, kFALSE);
-         delete altro;
-         altro = 0;
-       }
-
-       prevDetector = det;
-       // Need to open a new DDL! 
-       Int_t ddlId = kBaseDDL + det - 1;
-       TString filename(Form("%s_%d.ddl", GetName(),  ddlId));
-
-       AliDebug(10, Form("New altro buffer with DDL file %s", 
-                         filename.Data()));
-       AliDebug(10, Form("New altro at %d", i));
-       // Create a new altro buffer - a `1' as the second argument
-       // means `write mode' 
-       altro = new AliAltroBuffer(filename.Data(), 1);
-       
-       // Write a dummy (first argument is true) header to the DDL
-       // file - later on, when we close the file, we write the real
-       // header
-       altro->WriteDataHeader(kTRUE, kFALSE);
-
-       // Figure out the sample rate 
-       if (digit->Count2() > 0) sampleRate = 2;
-       if (digit->Count3() > 0) sampleRate = 3;
-
-       channel.Set(128 * sampleRate);
-       offset     = 0;
-       prevRing   = ring;
-       prevSector = sector;
-       startStrip = strip;
-      }
-      else if (offset == 128                        
-              || digit->Ring() != prevRing 
-              || digit->Sector() != prevSector) {
-       // Force a new Altro channel
-       AliDebug(10, Form("Flushing channel to disk because %s",
-                         (offset == 128 ? "channel is full" :
-                          (ring != prevRing ? "new ring up" :
-                           "new sector up"))));
-       AliDebug(10, Form("New Channel: Write channel at %d Strip: %d "
-                         "Sector: %d  Ring: %d", 
-                         i, startStrip, prevSector, prevRing));
-       altro->WriteChannel(Int_t(startStrip), 
-                           Int_t(prevSector), 
-                           Int_t((prevRing == 'I' ? 0 : 1)), 
-                           channel.fN, channel.fArray, 0);
-       // Reset and update channel variables 
-       channel.Reset(0);
-       offset     = 0; 
-       startStrip = strip;
-       prevRing   = ring;
-       prevSector = sector;
-      }
-
-      // Store the counts of the ADC in the channel buffer 
-      channel[offset * sampleRate] = digit->Count1();
-      if (sampleRate > 1) 
-       channel[offset * sampleRate + 1] = digit->Count2();
-      if (sampleRate > 2) 
-       channel[offset * sampleRate + 2] = digit->Count3();
-      offset++;
-    }
-    // Finally, we need to close the final ALTRO buffer if it wasn't
-    // already 
-    if (altro) {
-      altro->Flush();
-      altro->WriteDataHeader(kFALSE, kFALSE);
-      delete altro;
-    }
-  }
-  fLoader->UnloadDigits();
-#endif
-}
-
-//==================================================================
-//
-// Various setter functions for the common paramters 
-//
-
-//__________________________________________________________________
-void 
-AliFMD::SetLegLength(Double_t length) 
-{
-  // Set lenght of plastic legs that hold the hybrid (print board and
-  // silicon sensor) onto the honeycomp support
-  //
-  // DebugGuard guard("AliFMD::SetLegLength");
-  AliDebug(10, "AliFMD::SetLegLength");
-  fLegLength = length;
-  fInner->SetLegLength(fLegLength);
-  fOuter->SetLegLength(fLegLength);
 }
 
-//__________________________________________________________________
-void 
-AliFMD::SetLegOffset(Double_t offset) 
-{
-  // Set offset from edge of hybrid to plastic legs that hold the
-  // hybrid (print board and silicon sensor) onto the honeycomp
-  // support 
-  //
-  // DebugGuard guard("AliFMD::SetLegOffset");
-  AliDebug(10, "AliFMD::SetLegOffset");
-  fInner->SetLegOffset(offset);
-  fOuter->SetLegOffset(offset);
-}
-
-//__________________________________________________________________
-void 
-AliFMD::SetLegRadius(Double_t radius) 
-{
-  // Set the diameter of the plastic legs that hold the hybrid (print
-  // board and silicon sensor) onto the honeycomp support
-  //
-  // DebugGuard guard("AliFMD::SetLegRadius");
-  AliDebug(10, "AliFMD::SetLegRadius");
-  fLegRadius = radius;
-  fInner->SetLegRadius(fLegRadius);
-  fOuter->SetLegRadius(fLegRadius);
-}
-
-//__________________________________________________________________
-void 
-AliFMD::SetModuleSpacing(Double_t spacing) 
-{
-  // Set the distance between the front and back sensor modules
-  // (module staggering). 
-  //
-  // DebugGuard guard("AliFMD::SetModuleSpacing");
-  AliDebug(10, "AliFMD::SetModuleSpacing");  
-  fModuleSpacing = spacing;
-  fInner->SetModuleSpacing(fModuleSpacing);
-  fOuter->SetModuleSpacing(fModuleSpacing);
-}
 
 //====================================================================
 //
@@ -1255,16 +908,12 @@ AliFMD::Browse(TBrowser* b)
 {
   // Browse this object. 
   //
-  AliDebug(10, "AliFMD::Browse");
+  AliDebug(30, "\tBrowsing the FMD");
   AliDetector::Browse(b);
-  if (fInner) b->Add(fInner, "Inner Ring");
-  if (fOuter) b->Add(fOuter, "Outer Ring");
-  if (fFMD1)  b->Add(fFMD1,  "FMD1 SubDetector");
-  if (fFMD2)  b->Add(fFMD2,  "FMD2 SubDetector");
-  if (fFMD3)  b->Add(fFMD3,  "FMD3 SubDetector");
+  if (fSimulator) b->Add(fSimulator);
+  b->Add(AliFMDGeometry::Instance());
 }
 
-
 //___________________________________________________________________
 //
 // EOF