]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TRD/AliTRD.cxx
Correct z-position of slat planes.
[u/mrichter/AliRoot.git] / TRD / AliTRD.cxx
index d895d250603e38fc47b14bdf9791e65524140594..9105866f6ae25a045271a1894f3a4337bd904293 100644 (file)
@@ -1,16 +1,69 @@
+/**************************************************************************
+ * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ *                                                                        *
+ * Author: The ALICE Off-line Project.                                    *
+ * Contributors are mentioned in the code where appropriate.              *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
+
+/*
+$Log$
+Revision 1.21  2000/06/09 11:10:07  cblume
+Compiler warnings and coding conventions, next round
+
+Revision 1.20  2000/06/08 18:32:57  cblume
+Make code compliant to coding conventions
+
+Revision 1.19  2000/06/07 16:25:37  cblume
+Try to remove compiler warnings on Sun and HP
+
+Revision 1.18  2000/05/08 16:17:27  cblume
+Merge TRD-develop
+
+Revision 1.17.2.1  2000/05/08 14:28:59  cblume
+Introduced SetPHOShole() and SetRICHhole(). AliTRDrecPoint container is now a TObjArray
+
+Revision 1.17  2000/02/28 19:10:26  cblume
+Include the new TRD classes
+
+Revision 1.16.2.2  2000/02/28 17:53:24  cblume
+Introduce TRD geometry classes
+
+Revision 1.16.2.1  2000/02/28 17:04:19  cblume
+Include functions and data members for AliTRDrecPoint
+
+Revision 1.16  2000/01/19 17:17:35  fca
+Introducing a list of lists of hits -- more hits allowed for detector now
+
+Revision 1.15  1999/11/02 17:04:25  fca
+Small syntax change for HP compiler
+
+Revision 1.14  1999/11/02 16:57:02  fca
+Avoid non ansi warnings on HP compilers
+
+Revision 1.13  1999/11/02 16:35:56  fca
+New version of TRD introduced
+
+Revision 1.12  1999/11/01 20:41:51  fca
+Added protections against using the wrong version of FRAME
+
+Revision 1.11  1999/09/29 09:24:34  fca
+Introduction of the Copyright and cvs Log
+
+*/
+
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
 //  Transition Radiation Detector                                            //
 //  This class contains the basic functions for the Transition Radiation     //
-//  detector. Functions specific to one particular geometry are              //
-//  contained in the derived classes                                         //
-//                                                                           //
-//Begin_Html
-/*
-<img src="picts/AliTRDClass.gif">
-*/
-//End_Html
-//                                                                           //
+//  Detector.                                                                //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <TMath.h>
 #include <TNode.h>
 #include <TPGON.h> 
+#include <TGeometry.h>
+#include <TTree.h>
 
 #include "AliTRD.h"
 #include "AliRun.h"
-
 #include "AliConst.h"
+#include "AliTRDdigitizer.h"
+#include "AliTRDclusterizer.h"
+#include "AliTRDgeometryHole.h"
+#include "AliTRDgeometryFull.h"
+#include "AliTRDrecPoint.h"
+#include "AliMagF.h"
+#include "AliMC.h"
  
 ClassImp(AliTRD)
  
@@ -36,13 +97,13 @@ AliTRD::AliTRD()
 
   fIshunt      = 0;
   fGasMix      = 0;
+  fHits        = 0;
+  fDigits      = 0;
 
-  // The chamber dimensions
-  for (Int_t iplan = 0; iplan < kNplan; iplan++) {
-    fClengthI[iplan] = 0.;
-    fClengthM[iplan] = 0.;
-    fClengthO[iplan] = 0.;
-  }
+  fRecPoints   = 0;
+  fNRecPoints  = 0;
+
+  fGeometry    = 0;
 
 }
  
@@ -54,41 +115,113 @@ AliTRD::AliTRD(const char *name, const char *title)
   // Standard constructor for the TRD
   //
 
+  // Check that FRAME is there otherwise we have no place where to
+  // put TRD
+  AliModule* frame = gAlice->GetModule("FRAME");
+  if (!frame) {
+    Error("Ctor","TRD needs FRAME to be present\n");
+    exit(1);
+  } 
 
-  // Check that FRAME is there otherwise we have no place where to put the TRD
-  AliModule* FRAME = gAlice->GetModule("FRAME");
-  if (!FRAME) {
-    Error("AliTRD","TRD needs FRAME to be present\n");
+  // Define the TRD geometry according to the FRAME geometry
+  if      (frame->IsVersion() == 0) {
+    // Geometry with hole
+    fGeometry = new AliTRDgeometryHole();
+  }
+  else if (frame->IsVersion() == 1) {
+    // Geometry without hole
+    fGeometry = new AliTRDgeometryFull();
+  }
+  else {
+    Error("Ctor","Could not find valid FRAME version\n");
     exit(1);
   }
 
   // Allocate the hit array
-  fHits   = new TClonesArray("AliTRDhit",  405);
-  
+  fHits       = new TClonesArray("AliTRDhit"     ,405);
+  gAlice->AddHitList(fHits);
+
+  // Allocate the digits array
+  fDigits     = 0;
+
+  // Allocate the rec point array
+  fRecPoints  = new TObjArray(400);
+  fNRecPoints = 0;
+   
   fIshunt = 0;
   fGasMix = 0;
 
-  // The chamber dimensions
-  for (Int_t iplan = 0; iplan < kNplan; iplan++) {
-    fClengthI[iplan] = 0.;
-    fClengthM[iplan] = 0.;
-    fClengthO[iplan] = 0.;
-    fCwidth[iplan]   = 0.;
-  }
-  
   SetMarkerColor(kWhite);   
 
 }
+
+//_____________________________________________________________________________
+AliTRD::AliTRD(const AliTRD &trd)
+{
+  //
+  // Copy constructor
+  //
+
+  ((AliTRD &) trd).Copy(*this);
+
+}
+
+//_____________________________________________________________________________
+AliTRD::~AliTRD()
+{
+  //
+  // TRD destructor
+  //
+
+  fIshunt = 0;
+
+  delete fGeometry;
+  delete fHits;
+  delete fRecPoints;
+
+}
+
+//_____________________________________________________________________________
+void AliTRD::AddRecPoint(Float_t *pos, Int_t *digits, Int_t det, Float_t amp)
+{
+  //
+  // Add a reconstructed point for the TRD
+  //
+  
+  AliTRDrecPoint *recPoint = new AliTRDrecPoint();
+  TVector3        posVec(pos[0],pos[1],pos[2]);
+  recPoint->SetLocalPosition(posVec);
+  recPoint->SetDetector(det);
+  recPoint->SetEnergy(amp);
+  for (Int_t iDigit = 0; iDigit < 3; iDigit++) {
+    recPoint->AddDigit(digits[iDigit]);
+  }
+
+  fRecPoints->Add(recPoint);
+
+}
+
 //_____________________________________________________________________________
-void AliTRD::AddHit(Int_t track, Int_t *vol, Float_t *hits)
+void AliTRD::AddDigit(Int_t *digits, Int_t *amp)
+{
+  //
+  // Add a digit for the TRD
+  //
+
+  TClonesArray &ldigits = *fDigits;
+  new(ldigits[fNdigits++]) AliTRDdigit(kFALSE,digits,amp);
+
+}
+
+//_____________________________________________________________________________
+void AliTRD::AddHit(Int_t track, Int_t *det, Float_t *hits)
 {
   //
   // Add a hit for the TRD
   //
 
   TClonesArray &lhits = *fHits;
-  new(lhits[fNhits++]) AliTRDhit(fIshunt,track,vol,hits);
+  new(lhits[fNhits++]) AliTRDhit(fIshunt,track,det,hits);
 
 }
 
@@ -99,12 +232,12 @@ void AliTRD::BuildGeometry()
   // Create the ROOT TNode geometry for the TRD
   //
 
-  TNode *Node, *Top;
+  TNode *node, *top;
   TPGON *pgon;
   const Int_t kColorTRD = 46;
   
   // Find the top node alice
-  Top = gAlice->GetGeometry()->GetNode("alice");
+  top = gAlice->GetGeometry()->GetNode("alice");
   
   pgon = new TPGON("S_TRD","TRD","void",0,360,kNsect,4);
   Float_t ff    = TMath::Cos(kDegrad * 180 / kNsect);
@@ -114,362 +247,45 @@ void AliTRD::BuildGeometry()
   pgon->DefineSection(1,-kZmax2,rrmin,rrmax);
   pgon->DefineSection(2, kZmax2,rrmin,rrmax);
   pgon->DefineSection(3, kZmax1,rrmax,rrmax);
-  Top->cd();
-  Node = new TNode("TRD","TRD","S_TRD",0,0,0,"");
-  Node->SetLineColor(kColorTRD);
-  fNodes->Add(Node);
+  top->cd();
+  node = new TNode("TRD","TRD","S_TRD",0,0,0,"");
+  node->SetLineColor(kColorTRD);
+  fNodes->Add(node);
 
 }
  
+//_____________________________________________________________________________
+void AliTRD::Copy(TObject &trd)
+{
+  //
+  // Copy function
+  //
+
+  ((AliTRD &) trd).fGasMix     = fGasMix;
+  ((AliTRD &) trd).fGeometry   = fGeometry;
+  ((AliTRD &) trd).fRecPoints  = fRecPoints;
+  ((AliTRD &) trd).fNRecPoints = fNRecPoints;
+
+  //AliDetector::Copy(trd);
+
+}
+
 //_____________________________________________________________________________
 void AliTRD::CreateGeometry()
 {
   //
   // Creates the volumes for the TRD chambers
   //
-  // Author: Christoph Blume (C.Blume@gsi.de) 20/07/99
-  //
-  // The volumes:
-  //    TRD        (Air)   --- The TRD mother volume for one sector. 
-  //                           To be placed into the spaceframe.
-  //
-  //    UAFI(/M/O) (Al)    --- The aluminum frame of the inner(/middle/outer) chambers (readout)
-  //    UCFI(/M/O) (C)     --- The carbon frame of the inner(/middle/outer) chambers 
-  //                           (driftchamber + radiator)
-  //    UAII(/M/O) (Air)   --- The inner part of the readout of the inner(/middle/outer) chambers
-  //    UFII(/M/O) (Air)   --- The inner part of the chamner and radiator of the 
-  //                           inner(/middle/outer) chambers
-  //
-  // The material layers in one chamber:
-  //    UL01       (G10)   --- The gas seal of the radiator
-  //    UL02       (CO2)   --- The gas in the radiator
-  //    UL03       (PE)    --- The foil stack
-  //    UL04       (Mylar) --- Entrance window to the driftvolume and HV-cathode
-  //    UL05       (Xe)    --- The driftvolume
-  //    UL06       (Xe)    --- The amplification region
-  //    
-  //    UL07       (Cu)    --- The pad plane
-  //    UL08       (G10)   --- The Nomex honeycomb support structure
-  //    UL09       (Cu)    --- FEE and signal lines
-  //    UL10       (PE)    --- The cooling devices
-  //    UL11       (Water) --- The cooling water
 
   // Check that FRAME is there otherwise we have no place where to put the TRD
-  AliModule* FRAME = gAlice->GetModule("FRAME");
-  if (!FRAME) return;
-
-  const Int_t npar_trd = 4;
-  const Int_t npar_cha = 3;
-
-  Float_t par_dum[3];
-  Float_t par_trd[npar_trd];
-  Float_t par_cha[npar_cha];
-  Int_t iplan;
-
-  Float_t xpos, ypos, zpos;
-
-  Int_t *idtmed = fIdtmed->GetArray()-1299;
-
-  // The length of the inner chambers
-  for (iplan = 0; iplan < kNplan; iplan++) fClengthI[iplan] = 110.0;
-  // The length of the middle chambers
-  fClengthM[0] = 123.5;
-  fClengthM[1] = 131.0;
-  fClengthM[2] = 138.5;
-  fClengthM[3] = 146.0;
-  fClengthM[4] = 153.0;
-  fClengthM[5] = 160.5;
-  // The length of the outer chambers
-  fClengthO[0] = 123.5;
-  fClengthO[1] = 131.0;
-  fClengthO[2] = 134.5;
-  fClengthO[3] = 142.0;
-  fClengthO[4] = 142.0;
-  fClengthO[5] = 134.5;
-
-  // The width of the chambers
-  fCwidth[0] =  99.6;
-  fCwidth[1] = 104.1;
-  fCwidth[2] = 108.5;
-  fCwidth[3] = 112.9;
-  fCwidth[4] = 117.4;
-  fCwidth[5] = 121.8;
-
-  // The TRD mother volume for one sector (Air) (dimensions identical to BTR1-3)
-  par_trd[0] = kSwidth1/2.;
-  par_trd[1] = kSwidth2/2.;
-  par_trd[2] = kSlength/2.;
-  par_trd[3] = kSheight/2.;
-  gMC->Gsvolu("TRD ","TRD1",idtmed[1302-1],par_trd,npar_trd);
-
-  // The aluminum frames - readout + electronics (Al)
-  // The inner chambers
-  gMC->Gsvolu("UAFI","BOX ",idtmed[1301-1],par_dum,0);
-  // The middle chambers
-  gMC->Gsvolu("UAFM","BOX ",idtmed[1301-1],par_dum,0);
-  // The outer chambers
-  gMC->Gsvolu("UAFO","BOX ",idtmed[1301-1],par_dum,0);
-
-  // The inner part of the aluminum frames (Air)
-  // The inner chambers
-  gMC->Gsvolu("UAII","BOX ",idtmed[1302-1],par_dum,0);
-  // The middle chambers
-  gMC->Gsvolu("UAIM","BOX ",idtmed[1302-1],par_dum,0);
-  // The outer chambers
-  gMC->Gsvolu("UAIO","BOX ",idtmed[1302-1],par_dum,0);
-
-  // The carbon frames - radiator + driftchamber (C)
-  // The inner chambers
-  gMC->Gsvolu("UCFI","BOX ",idtmed[1307-1],par_dum,0);
-  // The middle chambers
-  gMC->Gsvolu("UCFM","BOX ",idtmed[1307-1],par_dum,0);
-  // The outer chambers
-  gMC->Gsvolu("UCFO","BOX ",idtmed[1307-1],par_dum,0);
-
-  // The inner part of the carbon frames (Air)
-  // The inner chambers
-  gMC->Gsvolu("UCII","BOX ",idtmed[1302-1],par_dum,0);
-  // The middle chambers
-  gMC->Gsvolu("UCIM","BOX ",idtmed[1302-1],par_dum,0);
-  // The outer chambers
-  gMC->Gsvolu("UCIO","BOX ",idtmed[1302-1],par_dum,0);
-
-  // The material layers inside the chambers
-  par_cha[0] = -1.;
-  par_cha[1] = -1.;
-  // G10 layer (radiator seal)
-  par_cha[2] = kSeThick/2;
-  gMC->Gsvolu("UL01","BOX ",idtmed[1313-1],par_cha,npar_cha);
-  // CO2 layer (radiator)
-  par_cha[2] = kRaThick/2;
-  gMC->Gsvolu("UL02","BOX ",idtmed[1312-1],par_cha,npar_cha);
-  // PE layer (radiator)
-  par_cha[2] = kPeThick/2;
-  gMC->Gsvolu("UL03","BOX ",idtmed[1303-1],par_cha,npar_cha);
-  // Mylar layer (entrance window + HV cathode) 
-  par_cha[2] = kMyThick/2;
-  gMC->Gsvolu("UL04","BOX ",idtmed[1308-1],par_cha,npar_cha);
-  // Xe/Isobutane layer (drift volume, sensitive) 
-  par_cha[2] = kDrThick/2.;
-  gMC->Gsvolu("UL05","BOX ",idtmed[1309-1],par_cha,npar_cha);
-  // Xe/Isobutane layer (amplification volume, not sensitive)
-  par_cha[2] = kAmThick/2.;
-  gMC->Gsvolu("UL06","BOX ",idtmed[1309-1],par_cha,npar_cha);
-  
-  // Cu layer (pad plane)
-  par_cha[2] = kCuThick/2;
-  gMC->Gsvolu("UL07","BOX ",idtmed[1305-1],par_cha,npar_cha);
-  // G10 layer (support structure)
-  par_cha[2] = kSuThick/2;
-  gMC->Gsvolu("UL08","BOX ",idtmed[1313-1],par_cha,npar_cha);
-  // Cu layer (FEE + signal lines)
-  par_cha[2] = kFeThick/2;
-  gMC->Gsvolu("UL09","BOX ",idtmed[1305-1],par_cha,npar_cha);
-  // PE layer (cooling devices)
-  par_cha[2] = kCoThick/2;
-  gMC->Gsvolu("UL10","BOX ",idtmed[1303-1],par_cha,npar_cha);
-  // Water layer (cooling)
-  par_cha[2] = kWaThick/2;
-  gMC->Gsvolu("UL11","BOX ",idtmed[1314-1],par_cha,npar_cha);
-
-  // Position the layers in the chambers
-  xpos = 0;
-  ypos = 0;
-
-  // G10 layer (radiator seal)
-  zpos = kSeZpos;
-  gMC->Gspos("UL01",1,"UCII",xpos,ypos,zpos,0,"ONLY");
-  gMC->Gspos("UL01",2,"UCIM",xpos,ypos,zpos,0,"ONLY");
-  gMC->Gspos("UL01",3,"UCIO",xpos,ypos,zpos,0,"ONLY");
-  // CO2 layer (radiator)
-  zpos = kRaZpos;
-  gMC->Gspos("UL02",1,"UCII",xpos,ypos,zpos,0,"ONLY");
-  gMC->Gspos("UL02",2,"UCIM",xpos,ypos,zpos,0,"ONLY");
-  gMC->Gspos("UL02",3,"UCIO",xpos,ypos,zpos,0,"ONLY");
-  // PE layer (radiator)
-  zpos = 0;
-  gMC->Gspos("UL03",1,"UL02",xpos,ypos,zpos,0,"ONLY");
-  // Mylar layer (entrance window + HV cathode)   
-  zpos = kMyZpos;
-  gMC->Gspos("UL04",1,"UCII",xpos,ypos,zpos,0,"ONLY");
-  gMC->Gspos("UL04",2,"UCIM",xpos,ypos,zpos,0,"ONLY");
-  gMC->Gspos("UL04",3,"UCIO",xpos,ypos,zpos,0,"ONLY");
-  // Xe/Isobutane layer (drift volume) 
-  zpos = kDrZpos;
-  gMC->Gspos("UL05",1,"UCII",xpos,ypos,zpos,0,"ONLY");
-  gMC->Gspos("UL05",2,"UCIM",xpos,ypos,zpos,0,"ONLY");
-  gMC->Gspos("UL05",3,"UCIO",xpos,ypos,zpos,0,"ONLY");
-  // Xe/Isobutane layer (amplification volume)
-  zpos = kAmZpos;
-  gMC->Gspos("UL06",1,"UCII",xpos,ypos,zpos,0,"ONLY");
-  gMC->Gspos("UL06",2,"UCIM",xpos,ypos,zpos,0,"ONLY");
-  gMC->Gspos("UL06",3,"UCIO",xpos,ypos,zpos,0,"ONLY");
-
-  // Cu layer (pad plane)
-  zpos = kCuZpos;
-  gMC->Gspos("UL07",1,"UAII",xpos,ypos,zpos,0,"ONLY");
-  gMC->Gspos("UL07",2,"UAIM",xpos,ypos,zpos,0,"ONLY");
-  gMC->Gspos("UL07",3,"UAIO",xpos,ypos,zpos,0,"ONLY");
-  // G10 layer (support structure)
-  zpos = kSuZpos;
-  gMC->Gspos("UL08",1,"UAII",xpos,ypos,zpos,0,"ONLY");
-  gMC->Gspos("UL08",2,"UAIM",xpos,ypos,zpos,0,"ONLY");
-  gMC->Gspos("UL08",3,"UAIO",xpos,ypos,zpos,0,"ONLY");
-  // Cu layer (FEE + signal lines)
-  zpos = kFeZpos; 
-  gMC->Gspos("UL09",1,"UAII",xpos,ypos,zpos,0,"ONLY");
-  gMC->Gspos("UL09",2,"UAIM",xpos,ypos,zpos,0,"ONLY");
-  gMC->Gspos("UL09",3,"UAIO",xpos,ypos,zpos,0,"ONLY");
-  // PE layer (cooling devices)
-  zpos = kCoZpos;
-  gMC->Gspos("UL10",1,"UAII",xpos,ypos,zpos,0,"ONLY");
-  gMC->Gspos("UL10",2,"UAIM",xpos,ypos,zpos,0,"ONLY");
-  gMC->Gspos("UL10",3,"UAIO",xpos,ypos,zpos,0,"ONLY");
-  // Water layer (cooling)
-  zpos = kWaZpos;
-  gMC->Gspos("UL11",1,"UAII",xpos,ypos,zpos,0,"ONLY");
-  gMC->Gspos("UL11",1,"UAIM",xpos,ypos,zpos,0,"ONLY");
-  gMC->Gspos("UL11",1,"UAIO",xpos,ypos,zpos,0,"ONLY");
-
-  // Position the chambers in the TRD mother volume
-  for (iplan = 1; iplan <= kNplan; iplan++) {
-
-    // The inner chambers ---------------------------------------------------------------
-
-    // the aluminum frame
-    //par_cha[0] = kSwidth1/2. + (iplan-1) * kCwidcha/2.;
-    par_cha[0] = fCwidth[iplan-1]/2.;
-    par_cha[1] = fClengthI[iplan-1]/2.;
-    par_cha[2] = kCaframe/2.;
-    xpos       = 0.;
-    ypos       = 0.;
-    zpos       = kCheight - kCaframe/2. - kSheight/2. + (iplan-1) * (kCheight + kCspace);
-    gMC->Gsposp("UAFI",iplan       ,"TRD ",xpos,ypos,zpos,0,"MANY",par_cha,npar_cha);
-
-    // the inner part of the aluminum frame
-    //par_cha[0] = kSwidth1/2. + (iplan-1) * kCwidcha/2. - kCathick;
-    par_cha[0] = fCwidth[iplan-1]/2.   - kCathick;
-    par_cha[1] = fClengthI[iplan-1]/2. - kCathick;
-    par_cha[2] = kCaframe/2.;
-    xpos       = 0.;
-    ypos       = 0.;
-    zpos       = kCheight - kCaframe/2. - kSheight/2. + (iplan-1) * (kCheight + kCspace);
-    gMC->Gsposp("UAII",iplan       ,"TRD ",xpos,ypos,zpos,0,"ONLY",par_cha,npar_cha);
-
-    // the carbon frame
-    //par_cha[0] = kSwidth1/2. + (iplan-1) * kCwidcha/2.;
-    par_cha[0] = fCwidth[iplan-1]/2.;
-    par_cha[1] = fClengthI[iplan-1]/2.;
-    par_cha[2] = kCcframe/2.;
-    xpos       = 0.;
-    ypos       = 0.;
-    zpos       = kCcframe/2.            - kSheight/2. + (iplan-1) * (kCheight + kCspace);
-    gMC->Gsposp("UCFI",iplan       ,"TRD ",xpos,ypos,zpos,0,"MANY",par_cha,npar_cha);
-
-    // the inner part of the carbon frame
-    //par_cha[0] = kSwidth1/2. + (iplan-1) * kCwidcha/2. - kCcthick;
-    par_cha[0] = fCwidth[iplan-1]/2.   - kCcthick;
-    par_cha[1] = fClengthI[iplan-1]/2. - kCcthick;
-    par_cha[2] = kCcframe/2.;
-    xpos       = 0.;
-    ypos       = 0.;
-    zpos       = kCcframe/2.            - kSheight/2. + (iplan-1) * (kCheight + kCspace);
-    gMC->Gsposp("UCII",iplan       ,"TRD ",xpos,ypos,zpos,0,"ONLY",par_cha,npar_cha);
-
-    // The middle chambers --------------------------------------------------------------
-
-    // the aluminum frame
-    //par_cha[0] = kSwidth1/2. + (iplan-1) * kCwidcha/2.;
-    par_cha[0] = fCwidth[iplan-1]/2.;
-    par_cha[1] = fClengthM[iplan-1]/2.;
-    par_cha[2] = kCaframe/2.;
-    xpos       = 0.;
-    ypos       = fClengthI[iplan-1]/2. + fClengthM[iplan-1]/2.;
-    zpos       = kCheight - kCaframe/2. - kSheight/2. + (iplan-1) * (kCheight + kCspace);
-    gMC->Gsposp("UAFM",iplan       ,"TRD ",xpos, ypos,zpos,0,"MANY",par_cha,npar_cha);
-    gMC->Gsposp("UAFM",iplan+kNplan,"TRD ",xpos,-ypos,zpos,0,"MANY",par_cha,npar_cha);
-
-    // the inner part of the aluminum frame
-    //par_cha[0] = kSwidth1/2. + (iplan-1) * kCwidcha/2. - kCathick;
-    par_cha[0] = fCwidth[iplan-1]/2.   - kCathick;
-    par_cha[1] = fClengthM[iplan-1]/2. - kCathick;
-    par_cha[2] = kCaframe/2.;
-    xpos       = 0.;
-    ypos       = fClengthI[iplan-1]/2. + fClengthM[iplan-1]/2.;
-    zpos       = kCheight - kCaframe/2. - kSheight/2. + (iplan-1) * (kCheight + kCspace);
-    gMC->Gsposp("UAIM",iplan       ,"TRD ",xpos, ypos,zpos,0,"ONLY",par_cha,npar_cha);
-    gMC->Gsposp("UAIM",iplan+kNplan,"TRD ",xpos,-ypos,zpos,0,"ONLY",par_cha,npar_cha);
-
-    // the carbon frame
-    //par_cha[0] = kSwidth1/2. + (iplan-1) * kCwidcha/2.;
-    par_cha[0] = fCwidth[iplan-1]/2.;
-    par_cha[1] = fClengthM[iplan-1]/2.;
-    par_cha[2] = kCcframe/2.;
-    xpos       = 0.;
-    ypos       = fClengthI[iplan-1]/2. + fClengthM[iplan-1]/2.;
-    zpos       = kCcframe/2.            - kSheight/2. + (iplan-1) * (kCheight + kCspace);
-    gMC->Gsposp("UCFM",iplan,       "TRD ",xpos, ypos,zpos,0,"MANY",par_cha,npar_cha);
-    gMC->Gsposp("UCFM",iplan+kNplan,"TRD ",xpos,-ypos,zpos,0,"MANY",par_cha,npar_cha);
-
-    // the inner part of the carbon frame
-    //par_cha[0] = kSwidth1/2. + (iplan-1) * kCwidcha/2. - kCcthick;
-    par_cha[0] = fCwidth[iplan-1]/2.   - kCcthick;
-    par_cha[1] = fClengthM[iplan-1]/2. - kCcthick;
-    par_cha[2] = kCcframe/2.;
-    xpos       = 0.;
-    ypos       = fClengthI[iplan-1]/2. + fClengthM[iplan-1]/2.;
-    zpos       = kCcframe/2.            - kSheight/2. + (iplan-1) * (kCheight + kCspace);
-    gMC->Gsposp("UCIM",iplan       ,"TRD ",xpos, ypos,zpos,0,"ONLY",par_cha,npar_cha);
-    gMC->Gsposp("UCIM",iplan+kNplan,"TRD ",xpos,-ypos,zpos,0,"ONLY",par_cha,npar_cha);
-
-    // The outer chambers ---------------------------------------------------------------
-
-    // the aluminum frame
-    //par_cha[0] = kSwidth1/2. + (iplan-1) * kCwidcha/2.;
-    par_cha[0] = fCwidth[iplan-1]/2.;
-    par_cha[1] = fClengthO[iplan-1]/2.;
-    par_cha[2] = kCaframe/2.;
-    xpos       = 0.;
-    ypos       = fClengthI[iplan-1]/2. + fClengthM[iplan-1]    + fClengthO[iplan-1]/2.;
-    zpos       = kCheight - kCaframe/2. - kSheight/2. + (iplan-1) * (kCheight + kCspace);
-    gMC->Gsposp("UAFO",iplan       ,"TRD ",xpos, ypos,zpos,0,"MANY",par_cha,npar_cha);
-    gMC->Gsposp("UAFO",iplan+kNplan,"TRD ",xpos,-ypos,zpos,0,"MANY",par_cha,npar_cha);
-
-    // the inner part of the aluminum frame
-    //par_cha[0] = kSwidth1/2. + (iplan-1) * kCwidcha/2. - kCathick;
-    par_cha[0] = fCwidth[iplan-1]/2.   - kCathick;
-    par_cha[1] = fClengthO[iplan-1]/2.  - kCathick;
-    par_cha[2] = kCaframe/2.;
-    xpos       = 0.;
-    ypos       = fClengthI[iplan-1]/2. + fClengthM[iplan-1]    + fClengthO[iplan-1]/2.;
-    zpos       = kCheight - kCaframe/2. - kSheight/2. + (iplan-1) * (kCheight + kCspace);
-    gMC->Gsposp("UAIO",iplan       ,"TRD ",xpos, ypos,zpos,0,"ONLY",par_cha,npar_cha);
-    gMC->Gsposp("UAIO",iplan+kNplan,"TRD ",xpos,-ypos,zpos,0,"ONLY",par_cha,npar_cha);
-
-    // the carbon frame
-    //par_cha[0] = kSwidth1/2. + (iplan-1) * kCwidcha/2.;
-    par_cha[0] = fCwidth[iplan-1]/2.;
-    par_cha[1] = fClengthO[iplan-1]/2.;
-    par_cha[2] = kCcframe/2.;
-    xpos       = 0.;
-    ypos       = fClengthI[iplan-1]/2. + fClengthM[iplan-1]    + fClengthO[iplan-1]/2.;
-    zpos       = kCcframe/2.            - kSheight/2. + (iplan-1) * (kCheight + kCspace);
-    gMC->Gsposp("UCFO",iplan,       "TRD ",xpos, ypos,zpos,0,"MANY",par_cha,npar_cha);
-    gMC->Gsposp("UCFO",iplan+kNplan,"TRD ",xpos,-ypos,zpos,0,"MANY",par_cha,npar_cha);
-
-    // the inner part of the carbon frame
-    //par_cha[0] = kSwidth1/2. + (iplan-1) * kCwidcha/2. - kCcthick;
-    par_cha[0] = fCwidth[iplan-1]/2.   - kCcthick;
-    par_cha[1] = fClengthO[iplan-1]/2. - kCcthick;
-    par_cha[2] = kCcframe/2.;
-    xpos       = 0.;
-    ypos       = fClengthI[iplan-1]/2. + fClengthM[iplan-1]    + fClengthO[iplan-1]/2.;
-    zpos       = kCcframe/2.            - kSheight/2. + (iplan-1) * (kCheight + kCspace);
-    gMC->Gsposp("UCIO",iplan       ,"TRD ",xpos, ypos,zpos,0,"ONLY",par_cha,npar_cha);
-    gMC->Gsposp("UCIO",iplan+kNplan,"TRD ",xpos,-ypos,zpos,0,"ONLY",par_cha,npar_cha);
-
+  AliModule* frame = gAlice->GetModule("FRAME");
+  if (!frame) {
+    printf(" The TRD needs the FRAME to be defined first\n");
+    return;
   }
 
+  fGeometry->CreateGeometry(fIdtmed->GetArray() - 1299);
+
 }
  
 //_____________________________________________________________________________
@@ -480,8 +296,8 @@ void AliTRD::CreateMaterials()
   // Origin Y.Foka
   //
 
-  Int_t   ISXFLD = gAlice->Field()->Integ();
-  Float_t SXMGMX = gAlice->Field()->Max();
+  Int_t   isxfld = gAlice->Field()->Integ();
+  Float_t sxmgmx = gAlice->Field()->Max();
   
   // For polyethilene (CH2) 
   Float_t ape[2] = { 12., 1. };
@@ -577,53 +393,53 @@ void AliTRD::CreateMaterials()
   //////////////////////////////////////////////////////////////////////////
 
   // Al Frame 
-  AliMedium(1, "Al Frame$",   1, 0, ISXFLD, SXMGMX
+  AliMedium(1, "Al Frame$",   1, 0, isxfld, sxmgmx
                 , tmaxfd, stemax, deemax, epsil, stmin);
   // Air 
-  AliMedium(2, "Air$",        2, 0, ISXFLD, SXMGMX
+  AliMedium(2, "Air$",        2, 0, isxfld, sxmgmx
                 , tmaxfd, stemax, deemax, epsil, stmin);
   // Polyethilene 
-  AliMedium(3, "Radiator$",   3, 0, ISXFLD, SXMGMX
+  AliMedium(3, "Radiator$",   3, 0, isxfld, sxmgmx
                 , tmaxfd, stemax, deemax, epsil, stmin);
   // Xe 
-  AliMedium(4, "Xe$",         4, 1, ISXFLD, SXMGMX
+  AliMedium(4, "Xe$",         4, 1, isxfld, sxmgmx
                 , tmaxfd, stemax, deemax, epsil, stmin);
   // Cu pads 
-  AliMedium(5, "Padplane$",   5, 1, ISXFLD, SXMGMX
+  AliMedium(5, "Padplane$",   5, 1, isxfld, sxmgmx
                 , tmaxfd, stemax, deemax, epsil, stmin);
   // Fee + cables 
-  AliMedium(6, "Readout$",    1, 0, ISXFLD, SXMGMX
+  AliMedium(6, "Readout$",    1, 0, isxfld, sxmgmx
                 , tmaxfd, stemax, deemax, epsil, stmin);
   // C frame 
-  AliMedium(7, "C Frame$",    6, 0, ISXFLD, SXMGMX
+  AliMedium(7, "C Frame$",    6, 0, isxfld, sxmgmx
                 , tmaxfd, stemax, deemax, epsil, stmin);
   // Mylar foils 
-  AliMedium(8, "Mylar$",      7, 0, ISXFLD, SXMGMX
+  AliMedium(8, "Mylar$",      7, 0, isxfld, sxmgmx
                 , tmaxfd, stemax, deemax, epsil, stmin);
   if (fGasMix == 1) {
     // Gas-mixture (Xe/CO2) 
-    AliMedium(9, "Gas-mix$",   10, 1, ISXFLD, SXMGMX
+    AliMedium(9, "Gas-mix$",   10, 1, isxfld, sxmgmx
                   , tmaxfd, stemax, deemax, epsil, stmin);
   }
   else {
     // Gas-mixture (Xe/Isobutane) 
-    AliMedium(9, "Gas-mix$",   11, 1, ISXFLD, SXMGMX
+    AliMedium(9, "Gas-mix$",   11, 1, isxfld, sxmgmx
                   , tmaxfd, stemax, deemax, epsil, stmin);
   }
   // Nomex-honeycomb (use carbon for the time being) 
-  AliMedium(10, "Nomex$",      6, 0, ISXFLD, SXMGMX
+  AliMedium(10, "Nomex$",      6, 0, isxfld, sxmgmx
                 , tmaxfd, stemax, deemax, epsil, stmin);
   // Kapton foils (use Mylar for the time being) 
-  AliMedium(11, "Kapton$",     7, 0, ISXFLD, SXMGMX
+  AliMedium(11, "Kapton$",     7, 0, isxfld, sxmgmx
                 , tmaxfd, stemax, deemax, epsil, stmin);
   // Gas-filling of the radiator 
-  AliMedium(12, "CO2$",        8, 0, ISXFLD, SXMGMX
+  AliMedium(12, "CO2$",        8, 0, isxfld, sxmgmx
                 , tmaxfd, stemax, deemax, epsil, stmin);
   // G10-plates
-  AliMedium(13, "G10-plates$",12, 0, ISXFLD, SXMGMX
+  AliMedium(13, "G10-plates$",12, 0, isxfld, sxmgmx
                 , tmaxfd, stemax, deemax, epsil, stmin);
   // Cooling water
-  AliMedium(14, "Water$",     13, 0, ISXFLD, SXMGMX
+  AliMedium(14, "Water$",     13, 0, isxfld, sxmgmx
                 , tmaxfd, stemax, deemax, epsil, stmin);
 
 }
@@ -642,14 +458,32 @@ void AliTRD::DrawModule()
   gMC->Gsatt("ALIC","SEEN", 0);
   
   // Set the volumes visible
-  gMC->Gsatt("B032","SEEN", 0);
-  gMC->Gsatt("B028","SEEN", 0);
-  gMC->Gsatt("B029","SEEN", 0);
-  gMC->Gsatt("B030","SEEN", 0);
-  gMC->Gsatt("BTR1","SEEN", 0);
-  gMC->Gsatt("BTR2","SEEN", 0);
-  gMC->Gsatt("BTR3","SEEN", 0);
-  gMC->Gsatt("TRD" ,"SEEN", 0);
+  if (fGeometry->IsVersion() == 0) {
+    gMC->Gsatt("B071","SEEN", 0);
+    gMC->Gsatt("B074","SEEN", 0);
+    gMC->Gsatt("B075","SEEN", 0);
+    gMC->Gsatt("B077","SEEN", 0);
+    gMC->Gsatt("BTR1","SEEN", 0);
+    gMC->Gsatt("BTR2","SEEN", 0);
+    gMC->Gsatt("BTR3","SEEN", 0);
+    gMC->Gsatt("TRD1","SEEN", 0);
+    gMC->Gsatt("TRD2","SEEN", 0);
+    gMC->Gsatt("TRD3","SEEN", 0);
+  }
+  else {
+    gMC->Gsatt("B071","SEEN", 0);
+    gMC->Gsatt("B074","SEEN", 0);
+    gMC->Gsatt("B075","SEEN", 0);
+    gMC->Gsatt("B077","SEEN", 0);
+    gMC->Gsatt("BTR1","SEEN", 0);
+    gMC->Gsatt("BTR2","SEEN", 0);
+    gMC->Gsatt("BTR3","SEEN", 0);
+    gMC->Gsatt("TRD1","SEEN", 0);
+    if (fGeometry->GetPHOShole())
+      gMC->Gsatt("TRD2","SEEN", 0);
+    if (fGeometry->GetRICHhole())
+      gMC->Gsatt("TRD3","SEEN", 0);
+  }
   gMC->Gsatt("UCII","SEEN", 0);
   gMC->Gsatt("UCIM","SEEN", 0);
   gMC->Gsatt("UCIO","SEEN", 0);
@@ -684,22 +518,94 @@ Int_t AliTRD::DistancetoPrimitive(Int_t , Int_t )
 void AliTRD::Init()
 {
   //
-  // Initialise the TRD detector after the geometry has been created
+  // Initialize the TRD detector after the geometry has been created
   //
 
   Int_t i;
-  
+
   printf("\n");
-  for(i=0;i<35;i++) printf("*");
+  for (i = 0; i < 35; i++) printf("*");
   printf(" TRD_INIT ");
-  for(i=0;i<35;i++) printf("*");
+  for (i = 0; i < 35; i++) printf("*");
   printf("\n");
-  
-  // Here the TRD initialisation code (if any!)
-  if (fGasMix == 1) 
-    printf("          Gas Mixture: 90%% Xe + 10%% CO2\n");
+  printf("\n");
+
+  if      (fGeometry->IsVersion() == 0) {
+    printf("          Geometry for spaceframe with holes initialized.\n\n");
+  }
+  else if (fGeometry->IsVersion() == 1) {
+    printf("          Geometry for spaceframe without holes initialized.\n");
+    if (fGeometry->GetPHOShole())
+      printf("          Leave space in front of PHOS free.\n");
+    if (fGeometry->GetRICHhole())
+      printf("          Leave space in front of RICH free.\n");
+    printf("\n");
+  }
+
+  if (fGasMix == 1)
+    printf("          Gas Mixture: 90%% Xe + 10%% CO2\n\n");
   else
-    printf("          Gas Mixture: 97%% Xe + 3%% Isobutane\n");
+    printf("          Gas Mixture: 97%% Xe + 3%% Isobutane\n\n");
+
+}
+
+//_____________________________________________________________________________
+void AliTRD::MakeBranch(Option_t* option)
+{
+  //
+  // Create Tree branches for the TRD digits and cluster.
+  //
+
+  Int_t  buffersize = 4000;
+  Char_t branchname[15];
+
+  AliDetector::MakeBranch(option);
+
+  Char_t *r = strstr(option,"R");
+  sprintf(branchname,"%srecPoints",GetName());
+  if (fRecPoints && gAlice->TreeR() && r) {
+    gAlice->TreeR()->Branch(branchname,fRecPoints->IsA()->GetName()
+                           ,&fRecPoints,buffersize,0);
+    printf("* AliTRD::MakeBranch * Making Branch %s for points in TreeR\n",branchname);
+  }
+
+}
+
+//_____________________________________________________________________________
+void AliTRD::ResetRecPoints()
+{
+  //
+  // Reset number of reconstructed points and the point array
+  //
+
+  fNRecPoints = 0;
+  if (fRecPoints) fRecPoints->Delete();
+
+}
+
+//_____________________________________________________________________________
+void AliTRD::SetTreeAddress()
+{
+  //
+  // Set the branch addresses for the trees.
+  //
+
+  Char_t branchname[15];
+
+  AliDetector::SetTreeAddress();
+
+  TBranch *branch;
+  TTree   *treeR = gAlice->TreeR();
+
+  if (treeR) {
+    sprintf(branchname,"%srecPoints",GetName());
+    if (fRecPoints) {
+      branch = treeR->GetBranch(branchname);
+      if (branch) {
+        branch->SetAddress(&fRecPoints);
+      }
+    }
+  }
 
 }
 
@@ -721,25 +627,14 @@ void AliTRD::SetGasMix(Int_t imix)
 
 }
 
-ClassImp(AliTRDhit)
 //_____________________________________________________________________________
-AliTRDhit::AliTRDhit(Int_t shunt, Int_t track, Int_t *vol, Float_t *hits):
-  AliHit(shunt, track)
+AliTRD &AliTRD::operator=(const AliTRD &trd)
 {
   //
-  // Create a TRD hit
+  // Assignment operator
   //
 
-  // Store volume hierarchy
-  fSector  = vol[0]; 
-  fChamber = vol[1];
-  fPlane   = vol[2];
-  
-  // Store position and charge
-  fX       = hits[0];
-  fY       = hits[1];
-  fZ       = hits[2];
-  fQ       = hits[3];
+  if (this != &trd) ((AliTRD &) trd).Copy(*this);
+  return *this;
 
 }