Using sync TTimer instead of the a-sync one (C.Cheshkov)

[u/mrichter/AliRoot.git] / TRD / AliTRDgeometry.cxx

diff --git a/TRD/AliTRDgeometry.cxx b/TRD/AliTRDgeometry.cxx
index e12cc6b66bf7fe510b0809bdfccf85cda0b5033e..6c22fb54bedac2d772946f476cc087c58ff6141b 100644 (file)
--- a/TRD/AliTRDgeometry.cxx
+++ b/TRD/AliTRDgeometry.cxx
@@ -15,6 +15,33 @@
 
 /*
 $Log$
+Revision 1.22  2002/11/21 22:38:47  alibrary
+Removing AliMC and AliMCProcess
+
+Revision 1.21  2002/11/21 16:09:44  cblume
+Change fgkRpadW to 1.0 cm for new pad plane
+
+Revision 1.20  2002/10/31 17:45:35  cblume
+New chamber geometry
+
+Revision 1.19  2002/10/14 14:57:43  hristov
+Merging the VirtualMC branch to the main development branch (HEAD)
+
+Revision 1.15.6.2  2002/07/24 10:09:30  alibrary
+Updating VirtualMC
+
+Revision 1.15.6.1  2002/06/10 15:28:58  hristov
+Merged with v3-08-02
+
+Revision 1.17  2002/04/05 13:20:12  cblume
+Remove const for CreateGeometry
+
+Revision 1.16  2002/03/28 14:59:07  cblume
+Coding conventions
+
+Revision 1.18  2002/06/12 09:54:35  cblume
+Update of tracking code provided by Sergei
+
 Revision 1.17  2002/04/05 13:20:12  cblume
 Remove const for CreateGeometry
 
@@ -107,11 +134,9 @@ Add new TRD classes
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "AliMC.h"
 
 #include "AliTRDgeometry.h"
 #include "AliTRDparameter.h"
-#include "AliMC.h"
 
 ClassImp(AliTRDgeometry)
 
@@ -145,6 +170,10 @@ ClassImp(AliTRDgeometry)
   const Float_t AliTRDgeometry::fgkSlenTR2 = 313.5; 
   const Float_t AliTRDgeometry::fgkSlenTR3 = 159.5;  
 
+  // The super module side plates
+  const Float_t AliTRDgeometry::fgkSMpltT  = 0.2;
+  const Float_t AliTRDgeometry::fgkSMgapT  = 0.5;  
+
   // Height of different chamber parts
   // Radiator
   const Float_t AliTRDgeometry::fgkCraH    =   4.8; 
@@ -153,7 +182,7 @@ ClassImp(AliTRDgeometry)
   // Amplification region
   const Float_t AliTRDgeometry::fgkCamH    =   0.7;
   // Readout
-  const Float_t AliTRDgeometry::fgkCroH    =   2.0;
+  const Float_t AliTRDgeometry::fgkCroH    =   2.316;
   // Total height
   const Float_t AliTRDgeometry::fgkCH      = AliTRDgeometry::fgkCraH
                                            + AliTRDgeometry::fgkCdrH
@@ -161,7 +190,7 @@ ClassImp(AliTRDgeometry)
                                            + AliTRDgeometry::fgkCroH;  
 
   // Vertical spacing of the chambers
-  const Float_t AliTRDgeometry::fgkVspace  =   2.1;
+  const Float_t AliTRDgeometry::fgkVspace  =   1.784;
 
   // Horizontal spacing of the chambers
   const Float_t AliTRDgeometry::fgkHspace  =   2.0;
@@ -182,8 +211,9 @@ ClassImp(AliTRDgeometry)
   const Float_t AliTRDgeometry::fgkCroW    =   0.9;
 
   // Difference of outer chamber width and pad plane width
-  const Float_t AliTRDgeometry::fgkCpadW   =   1.0;
-  const Float_t AliTRDgeometry::fgkRpadW   =   1.5;
+  //const Float_t AliTRDgeometry::fgkCpadW   =   1.0;
+  const Float_t AliTRDgeometry::fgkCpadW   =   0.0;
+  const Float_t AliTRDgeometry::fgkRpadW   =   1.0;
 
   //
   // Thickness of the the material layers
@@ -267,20 +297,21 @@ void AliTRDgeometry::Init()
   Int_t isect;
 
   // The outer width of the chambers
-  fCwidth[0] =  95.6;
-  fCwidth[1] = 100.1;
-  fCwidth[2] = 104.5;
-  fCwidth[3] = 108.9;
-  fCwidth[4] = 113.4;
-  fCwidth[5] = 117.8;
+  fCwidth[0] =  94.8;
+  fCwidth[1] =  99.3;
+  fCwidth[2] = 103.7;
+  fCwidth[3] = 108.1;
+  fCwidth[4] = 112.6;
+  fCwidth[5] = 117.0;
 
   // The outer lengths of the chambers
-  Float_t length[kNplan][kNcham]   = { { 123.5, 123.5, 110.0, 123.5, 123.5 }
-                                    , { 131.0, 131.0, 110.0, 131.0, 131.0 }
-                                    , { 134.5, 138.5, 110.0, 138.5, 134.5 }
-                                    , { 142.0, 146.0, 110.0, 146.0, 142.0 }
-                                    , { 142.0, 153.0, 110.0, 153.0, 142.0 }
-                                     , { 134.0, 160.5, 110.0, 160.5, 134.0 } };
+  // Includes the spacings between the chambers!
+  Float_t length[kNplan][kNcham]   = { { 124.0, 124.0, 110.0, 124.0, 124.0 }
+                                     , { 131.0, 131.0, 110.0, 131.0, 131.0 }
+                                     , { 138.0, 138.0, 110.0, 138.0, 138.0 }
+                                     , { 145.0, 145.0, 110.0, 145.0, 145.0 }
+                                     , { 147.0, 147.0, 110.0, 147.0, 147.0 }
+                                     , { 147.0, 147.0, 110.0, 147.0, 147.0 } };
 
   for (icham = 0; icham < kNcham; icham++) {
     for (iplan = 0; iplan < kNplan; iplan++) {
@@ -308,7 +339,7 @@ void AliTRDgeometry::Init()
 }
 
 //_____________________________________________________________________________
-void AliTRDgeometry::CreateGeometry(Int_t *idtmed)
+void AliTRDgeometry::CreateGeometry(Int_t* )
 {
   //
   // Create TRD geometry
@@ -467,3 +498,27 @@ Int_t AliTRDgeometry::GetSector(const Int_t d) const
 
 }
 
+//_____________________________________________________________________________
+void AliTRDgeometry::SetOldGeometry()
+{
+  //
+  // Use the old chamber lengths
+  //
+
+  Int_t icham;
+  Int_t iplan;
+
+  Float_t length[kNplan][kNcham]   = { { 123.5, 123.5, 110.0, 123.5, 123.5 }
+                                    , { 131.0, 131.0, 110.0, 131.0, 131.0 }
+                                    , { 134.5, 138.5, 110.0, 138.5, 134.5 }
+                                    , { 142.0, 146.0, 110.0, 146.0, 142.0 }
+                                    , { 142.0, 153.0, 110.0, 153.0, 142.0 }
+                                     , { 134.0, 160.5, 110.0, 160.5, 134.0 } };
+
+  for (icham = 0; icham < kNcham; icham++) {
+    for (iplan = 0; iplan < kNplan; iplan++) {
+      fClength[iplan][icham]   = length[iplan][icham];
+    }
+  }
+
+}