]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TRD/AliTRD.cxx
Major upgrade of AliRoot code
[u/mrichter/AliRoot.git] / TRD / AliTRD.cxx
index 06ce4d69657e6c88ddc8d7ac19105e037a2a177f..ec84e956c036453d2fc17f4fd9ba55846da8e109 100644 (file)
 
 /*
 $Log$
+Revision 1.23  2000/11/01 14:53:20  cblume
+Merge with TRD-develop
+
+
+Revision 1.17.2.6  2000/10/15 23:29:08  cblume
+Introduced more detailed geometry for the display
+
+Revision 1.17.2.5  2000/10/06 16:49:46  cblume
+Made Getters const
+
+Revision 1.17.2.4  2000/10/04 16:34:57  cblume
+Replace include files by forward declarations
+
+Revision 1.17.2.3  2000/09/22 14:45:17  cblume
+Included changes for the tracking
+
+Revision 1.17.2.2  2000/09/18 13:25:13  cblume
+Included LoadPoints() method to display the TR photons
+
+Revision 1.22  2000/10/02 21:28:19  fca
+Removal of useless dependecies via forward declarations
+
+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.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
 
@@ -24,27 +97,36 @@ 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 <stdlib.h>
+#include <iostream.h>
+
 #include <TMath.h>
 #include <TNode.h>
+#include <TGeometry.h>
+#include <TTree.h>                                                              
 #include <TPGON.h> 
 
-#include "AliTRD.h"
 #include "AliRun.h"
-
 #include "AliConst.h"
+#include "AliDigit.h"
+#include "AliMagF.h"
+#include "AliMC.h"                                                              
  
+#include "AliTRD.h"
+#include "AliTRDhit.h"
+#include "AliTRDpoints.h"
+#include "AliTRDdigit.h"
+#include "AliTRDdigitizer.h"
+#include "AliTRDclusterizer.h"
+#include "AliTRDgeometryHole.h"
+#include "AliTRDgeometryFull.h"
+#include "AliTRDrecPoint.h"
+#include "AliTRDdigitsManager.h"
+
 ClassImp(AliTRD)
  
 //_____________________________________________________________________________
@@ -59,12 +141,16 @@ AliTRD::AliTRD()
   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;
+
+  fGasDensity  = 0;
+  fFoilDensity = 0;
+
+  fDrawTR      = 0;
+  fDisplayType = 0; 
 
 }
  
@@ -76,27 +162,63 @@ 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);
+  } 
+
+  // 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 = new TClonesArray("AliTRDdigit",10000);
+  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.;
-  }
-  
+  fIshunt      = 0;
+  fGasMix      = 0;
+
+  fGasDensity  = 0;
+  fFoilDensity = 0;
+
+  fDrawTR      = 0;
+  fDisplayType = 0;
+
   SetMarkerColor(kWhite);   
 
 }
 
+//_____________________________________________________________________________
+AliTRD::AliTRD(const AliTRD &trd)
+{
+  //
+  // Copy constructor
+  //
+
+  ((AliTRD &) trd).Copy(*this);
+
+}
+
 //_____________________________________________________________________________
 AliTRD::~AliTRD()
 {
@@ -106,32 +228,90 @@ AliTRD::~AliTRD()
 
   fIshunt = 0;
 
+  delete fGeometry;
   delete fHits;
-  delete fDigits;
+  delete fRecPoints;
+
+}
+
+//_____________________________________________________________________________
+void AliTRD::AddRecPoint(Float_t *pos, Int_t *digits, Int_t det, Float_t amp
+                       , Int_t *tracks)
+{
+  //
+  // 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]);
+  }
 
+  recPoint->AddTrackIndex(tracks);
+
+  recPoint->SetTrackingYZ(0.,0.);  // variance values set inside
+  fRecPoints->Add(recPoint);
+
+}
+//___________________________________________
+void AliTRD::SDigits2Digits()
+{
+  //
+  // Create digits
+  //
+  AliTRDdigitizer *Digitizer = new AliTRDdigitizer("digitizer","TRD digitizer class");
+
+  // Set the parameter
+  Digitizer->SetDiffusion();
+  Digitizer->SetVerbose(1);
+  
+  //Digitizer->SetExB();
+  //Digitizer->SetElAttach();
+  //Digitizer->SetAttachProb();
+
+  Digitizer->InitDetector();
+    
+  // Create the digits
+  Digitizer->MakeDigits();
+  cout<<"After MakeDigits"<<endl;
+  
+  // Write the digits into the input file
+  if (Digitizer->Digits()->MakeBranch(fDigitsFile))
+  {
+    Digitizer->WriteDigits();
+    cout<<"After write digits"<<endl;
+
+    // Save the digitizer class in the AliROOT 
+    Digitizer->Write();
+    cout<<"After write digitizer"<<endl;
+  }
 }
 
 //_____________________________________________________________________________
-void AliTRD::AddDigit(Int_t *tracks, Int_t *digits)
+void AliTRD::AddDigit(Int_t *digits, Int_t *amp)
 {
   //
   // Add a digit for the TRD
   //
 
   TClonesArray &ldigits = *fDigits;
-  new(ldigits[fNdigits++]) AliTRDdigit(tracks,digits);
+  new(ldigits[fNdigits++]) AliTRDdigit(kFALSE,digits,amp);
 
 }
 
 //_____________________________________________________________________________
-void AliTRD::AddHit(Int_t track, Int_t *vol, Float_t *hits)
+void AliTRD::AddHit(Int_t track, Int_t det, Float_t *hits, Int_t q)
 {
   //
   // 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,q);
 
 }
 
@@ -142,377 +322,109 @@ void AliTRD::BuildGeometry()
   // Create the ROOT TNode geometry for the TRD
   //
 
-  TNode *Node, *Top;
+  TNode *node, *top;
   TPGON *pgon;
+
+  Float_t rmin, rmax;
+  Float_t zmax1, zmax2;
   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);
-  Float_t rrmin = kRmin / ff;
-  Float_t rrmax = kRmax / ff;
-  pgon->DefineSection(0,-kZmax1,rrmax,rrmax);
-  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);
+  switch (fDisplayType) {
+
+  case 0:
+
+    pgon = new TPGON("S_TRD","TRD","void",0,360,AliTRDgeometry::Nsect(),4);
+    rmin = AliTRDgeometry::Rmin();
+    rmax = AliTRDgeometry::Rmax();
+    pgon->DefineSection(0,-AliTRDgeometry::Zmax1(),rmax,rmax);
+    pgon->DefineSection(1,-AliTRDgeometry::Zmax2(),rmin,rmax);
+    pgon->DefineSection(2, AliTRDgeometry::Zmax2(),rmin,rmax);
+    pgon->DefineSection(3, AliTRDgeometry::Zmax1(),rmax,rmax);
+    top->cd();
+    node = new TNode("TRD","TRD","S_TRD",0,0,0,"");
+    node->SetLineColor(kColorTRD);
+    fNodes->Add(node);
+
+    break;
+
+  case 1:
+
+    Float_t slope = (AliTRDgeometry::Zmax1() - AliTRDgeometry::Zmax2())
+                  / (AliTRDgeometry::Rmax()  - AliTRDgeometry::Rmin());
+
+    rmin  = AliTRDgeometry::Rmin() + AliTRDgeometry::RaThick();
+    rmax  = rmin + AliTRDgeometry::DrThick();
+    zmax2 = AliTRDgeometry::Zmax2() + slope * AliTRDgeometry::RaThick();
+    zmax1 = zmax2 + slope * AliTRDgeometry::DrThick();
+    Char_t name[7];
+
+    for (Int_t iPlan = 0; iPlan < AliTRDgeometry::Nplan(); iPlan++) {
+
+      sprintf(name,"S_TRD%d",iPlan);
+      pgon  = new TPGON(name,"TRD","void",0,360,AliTRDgeometry::Nsect(),4);
+      pgon->DefineSection(0,-zmax1,rmax,rmax);
+      pgon->DefineSection(1,-zmax2,rmin,rmax);
+      pgon->DefineSection(2, zmax2,rmin,rmax);
+      pgon->DefineSection(3, zmax1,rmax,rmax);
+      top->cd();
+      node = new TNode("TRD","TRD",name,0,0,0,"");
+      node->SetLineColor(kColorTRD);
+      fNodes->Add(node);
+
+      Float_t height = AliTRDgeometry::Cheight() + AliTRDgeometry::Cspace(); 
+      rmin  = rmin  + height;
+      rmax  = rmax  + height;
+      zmax1 = zmax1 + slope * height;
+      zmax2 = zmax2 + slope * height;
+
+    }
+
+    break;
+
+  };
 
 }
  
+//_____________________________________________________________________________
+void AliTRD::Copy(TObject &trd)
+{
+  //
+  // Copy function
+  //
+
+  ((AliTRD &) trd).fGasMix      = fGasMix;
+  ((AliTRD &) trd).fGeometry    = fGeometry;       
+  ((AliTRD &) trd).fRecPoints   = fRecPoints;
+  ((AliTRD &) trd).fNRecPoints  = fNRecPoints;
+  ((AliTRD &) trd).fGasDensity  = fGasDensity;
+  ((AliTRD &) trd).fFoilDensity = fFoilDensity;
+  ((AliTRD &) trd).fDrawTR      = fDrawTR;
+  ((AliTRD &) trd).fDisplayType = fDisplayType;
+
+  //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);
+
 }
  
 //_____________________________________________________________________________
@@ -523,8 +435,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. };
@@ -571,7 +483,8 @@ void AliTRD::CreateMaterials()
   Float_t stmin  = -0.001;
   
   Float_t absl, radl, d, buf[1];
-  Float_t agm[2], dgm, zgm[2], wgm[2];
+  Float_t agm[2], zgm[2], wgm[2];
+  Float_t dgm1, dgm2;
   Int_t   nbuf;
   
   //////////////////////////////////////////////////////////////////////////
@@ -602,8 +515,8 @@ void AliTRD::CreateMaterials()
   // Create gas mixture 
   wgm[0] = fxc;
   wgm[1] = 1. - fxc;
-  dgm    = wgm[0] * dxe + wgm[1] * dco;
-  AliMixture(10, "Gas mixture 1$", agm, zgm, dgm,  2, wgm);
+  dgm1   = wgm[0] * dxe + wgm[1] * dco;
+  AliMixture(10, "Gas mixture 1$", agm, zgm, dgm1,  2, wgm);
   // Xe/Isobutane-mixture
   // Get properties of Xe 
   gMC->Gfmate((*fIdmate)[4], namate, agm[0], zgm[0], d, radl, absl, buf, nbuf);
@@ -612,63 +525,70 @@ void AliTRD::CreateMaterials()
   // Create gas mixture 
   wgm[0] = fxi;
   wgm[1] = 1. - fxi;
-  dgm    = wgm[0] * dxe + wgm[1] * dis;
-  AliMixture(11, "Gas mixture 2$", agm, zgm, dgm,  2, wgm);
+  dgm2   = wgm[0] * dxe + wgm[1] * dis;
+  AliMixture(11, "Gas mixture 2$", agm, zgm, dgm2,  2, wgm);
  
   //////////////////////////////////////////////////////////////////////////
   //     Tracking Media Parameters 
   //////////////////////////////////////////////////////////////////////////
 
   // 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);
 
+  // Save the density values for the TRD absorbtion
+  fFoilDensity = dmy;
+  if (fGasMix == 1)
+    fGasDensity = dgm1;
+  else
+    fGasDensity = dgm2;
+
 }
 
 //_____________________________________________________________________________
@@ -685,14 +605,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);
@@ -727,14 +665,232 @@ 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
   //
 
-  // Here the TRD initialisation code (if any!)
-  if (fGasMix == 1) 
-    printf("          Gas Mixture: 90%% Xe + 10%% CO2\n");
+  Int_t i;
+
+  printf("\n");
+  for (i = 0; i < 35; i++) printf("*");
+  printf(" TRD_INIT ");
+  for (i = 0; i < 35; i++) printf("*");
+  printf("\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::LoadPoints(Int_t track)
+{
+  //
+  // Store x, y, z of all hits in memory.
+  // Hit originating from TR photons are given a different color
+  //
+
+  if (!fDrawTR) {
+    AliDetector::LoadPoints(track);
+    return;
+  }
+
+  if (fHits == 0) return;
+
+  Int_t nhits  = fHits->GetEntriesFast();
+  if (nhits == 0) return;
+
+  Int_t tracks = gAlice->GetNtrack();
+  if (fPoints == 0) fPoints = new TObjArray(tracks);
+
+  AliTRDhit *ahit;
+  
+  Int_t    *ntrkE = new Int_t[tracks];
+  Int_t    *ntrkT = new Int_t[tracks];
+  Int_t    *limiE = new Int_t[tracks];
+  Int_t    *limiT = new Int_t[tracks];
+  Float_t **coorE = new Float_t*[tracks];
+  Float_t **coorT = new Float_t*[tracks];
+  for(Int_t i = 0; i < tracks; i++) {
+    ntrkE[i] = 0;
+    ntrkT[i] = 0;
+    coorE[i] = 0;
+    coorT[i] = 0;
+    limiE[i] = 0;
+    limiT[i] = 0;
+  }
+  
+  AliTRDpoints  *points = 0;
+  Float_t       *fp     = 0;
+  Int_t          trk;
+  Int_t          chunk  = nhits / 4 + 1;
+
+  // Loop over all the hits and store their position
+  for (Int_t hit = 0; hit < nhits; hit++) {
+
+    ahit = (AliTRDhit *) fHits->UncheckedAt(hit);
+
+    // dEdx hits
+    if (ahit->GetCharge() >= 0) {
+
+      trk = ahit->GetTrack();
+      if (ntrkE[trk] == limiE[trk]) {
+        // Initialise a new track
+        fp = new Float_t[3*(limiE[trk]+chunk)];
+        if (coorE[trk]) {
+          memcpy(fp,coorE[trk],sizeof(Float_t)*3*limiE[trk]);
+          delete [] coorE[trk];
+        }
+        limiE[trk] += chunk;
+        coorE[trk]  = fp;
+      } 
+      else {
+        fp = coorE[trk];
+      }
+      fp[3*ntrkE[trk]  ] = ahit->X();
+      fp[3*ntrkE[trk]+1] = ahit->Y();
+      fp[3*ntrkE[trk]+2] = ahit->Z();
+      ntrkE[trk]++;
+
+    }
+    // TR photon hits
+    else {
+
+      trk = ahit->GetTrack();
+      if (ntrkT[trk] == limiT[trk]) {
+        // Initialise a new track
+        fp = new Float_t[3*(limiT[trk]+chunk)];
+        if (coorT[trk]) {
+          memcpy(fp,coorT[trk],sizeof(Float_t)*3*limiT[trk]);
+          delete [] coorT[trk];
+        }
+        limiT[trk] += chunk;
+        coorT[trk]  = fp;
+      } 
+      else {
+        fp = coorT[trk];
+      }
+      fp[3*ntrkT[trk]  ] = ahit->X();
+      fp[3*ntrkT[trk]+1] = ahit->Y();
+      fp[3*ntrkT[trk]+2] = ahit->Z();
+      ntrkT[trk]++;
+
+    }
+
+  }
+
+  for (trk = 0; trk < tracks; ++trk) {
+
+    if (ntrkE[trk] || ntrkT[trk]) {
+
+      points = new AliTRDpoints();
+      points->SetDetector(this);
+      points->SetParticle(trk);
+
+      // Set the dEdx points
+      if (ntrkE[trk]) {
+        points->SetMarkerColor(GetMarkerColor());
+        points->SetMarkerSize(GetMarkerSize());
+        points->SetPolyMarker(ntrkE[trk],coorE[trk],GetMarkerStyle());
+        delete [] coorE[trk];
+        coorE[trk] = 0;
+      }
+
+      // Set the TR photon points
+      if (ntrkT[trk]) {
+        points->SetTRpoints(ntrkT[trk],coorT[trk]);
+        delete [] coorT[trk];
+        coorT[trk] = 0;
+      }
+
+      fPoints->AddAt(points,trk);
+
+    }
+
+  }
+
+  delete [] coorE;
+  delete [] coorT;
+  delete [] ntrkE;
+  delete [] ntrkT;
+  delete [] limiE;
+  delete [] limiT;
+
+}
+
+//_____________________________________________________________________________
+void AliTRD::MakeBranch(Option_t* option, char *file)
+{
+  //
+  // Create Tree branches for the TRD digits and cluster.
+  //
+
+  //Int_t  buffersize = 4000;
+  //Char_t branchname[15];
+
+  AliDetector::MakeBranch(option,file);
+
+  //Char_t *r = strstr(option,"R");
+  //sprintf(branchname,"%srecPoints",GetName());
+  //if (fRecPoints && gAlice->TreeR() && r) {
+  //  MakeBranchInTree(gAlice->TreeR(), 
+  //                  branchname, &fRecPoints,buffersize, file) ;
+  //}
+
+}
+
+//_____________________________________________________________________________
+void AliTRD::ResetRecPoints()
+{
+  //
+  // Reset number of reconstructed points and the point array
+  //
+
+  if(fRecPoints) {
+    fNRecPoints = 0;
+    Int_t nentr = fRecPoints->GetEntriesFast();
+    for(Int_t i = 0; i < nentr; i++) delete fRecPoints->RemoveAt(i);
+  }
+
+}
+
+//_____________________________________________________________________________
+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);
+      }
+    }
+  }
 
 }
 
@@ -756,50 +912,36 @@ 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)
+void AliTRD::SetPHOShole()
 {
   //
-  // Create a TRD hit
+  // Selects a geometry with a hole in front of the PHOS
   //
 
-  // 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];
+  fGeometry->SetPHOShole();
 
 }
 
-ClassImp(AliTRDdigit)
-
 //_____________________________________________________________________________
-AliTRDdigit::AliTRDdigit(Int_t *tracks, Int_t *digits)
-            :AliDigit(tracks)
+void AliTRD::SetRICHhole()
 {
   //
-  // Create a TRD digit
+  // Selects a geometry with a hole in front of the RICH
   //
 
-  // Store the volume hierarchy
-  fSector  = digits[0];
-  fChamber = digits[1];
-  fPlane   = digits[2];
+  fGeometry->SetRICHhole();
 
-  // Store the row, pad, and time bucket number
-  fRow     = digits[3];
-  fCol     = digits[4];
-  fTime    = digits[5];
+}
+
+//_____________________________________________________________________________
+AliTRD &AliTRD::operator=(const AliTRD &trd)
+{
+  //
+  // Assignment operator
+  //
 
-  // Store the signal amplitude
-  fSignal  = digits[6];
+  if (this != &trd) ((AliTRD &) trd).Copy(*this);
+  return *this;
 
 }