Fix of geometry and pad plane parameter

diff --git a/TRD/AliTRDgeometry.cxx b/TRD/AliTRDgeometry.cxx
index e0925311c6f35e6e0248103a3e85a91692148a1f..f3516fc493b506af116db966a4c13e550f8e2f03 100644 (file)
--- a/TRD/AliTRDgeometry.cxx
+++ b/TRD/AliTRDgeometry.cxx
@@ -64,8 +64,8 @@ ClassImp(AliTRDgeometry)
   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;  
+  const Float_t AliTRDgeometry::fgkSMpltT  =   0.2;
+  const Float_t AliTRDgeometry::fgkSMgapT  =   0.5;  
 
   // Height of different chamber parts
   // Radiator
@@ -194,7 +194,7 @@ void AliTRDgeometry::Init()
   // Changed with the introduction of 
   // the new layer 0. The old layer 6
   // is removed.
-  fCwidth[0] =  92.6;
+  fCwidth[0] =  90.4;
   fCwidth[1] =  94.8;
   fCwidth[2] =  99.3;
   fCwidth[3] = 103.7;
@@ -481,31 +481,6 @@ Int_t AliTRDgeometry::GetSector(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];
-    }
-  }
-
-}
-
 //_____________________________________________________________________________
 AliTRDgeometry* AliTRDgeometry::GetGeometry(AliRunLoader* runLoader)
 {

diff --git a/TRD/AliTRDgeometry.h b/TRD/AliTRDgeometry.h
index 5e29aa5171f96caae639f0fc93ef5f7fd1e60c28..e31d56aa3e9be7b85f1bd6739efac7912671d72e 100644 (file)
--- a/TRD/AliTRDgeometry.h
+++ b/TRD/AliTRDgeometry.h
@@ -56,6 +56,7 @@ class AliTRDgeometry : public AliGeometry {
   static  Float_t  CdrHght() { return fgkCdrH;    };
   static  Float_t  CamHght() { return fgkCamH;    };
   static  Float_t  CroHght() { return fgkCroH;    };
+  static  Float_t  CroWid()  { return fgkCroW;    };
   static  Float_t  MyThick() { return fgkMyThick; };
   static  Float_t  DrThick() { return fgkDrThick; };
   static  Float_t  AmThick() { return fgkAmThick; };
@@ -66,8 +67,6 @@ class AliTRDgeometry : public AliGeometry {
   virtual void     SetPHOShole() = 0;
   virtual void     SetRICHhole() = 0;
 
-  virtual void     SetOldGeometry();
-
   virtual Bool_t   GetPHOShole() const = 0;
   virtual Bool_t   GetRICHhole() const = 0;
   virtual Bool_t   IsHole(Int_t /*iplan*/, Int_t /*icham*/, Int_t /*isect*/) const {return kFALSE;}

diff --git a/TRD/AliTRDgeometryFull.cxx b/TRD/AliTRDgeometryFull.cxx
index a111f04868944f2c292d795ede1b89aafcc1e5ae..59be1c3a936559883af7b97a6403b71ce32e3215 100644 (file)
--- a/TRD/AliTRDgeometryFull.cxx
+++ b/TRD/AliTRDgeometryFull.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.14  2004/05/07 06:52:50  cblume
+Bug fix to allow for fPHOShole and not fRICHhole
+
 Revision 1.13  2004/02/27 15:40:18  cblume
 Fix definition of rotation matrices
 
@@ -119,19 +122,23 @@ void AliTRDgeometryFull::Init()
 
   // The outer lengths of the chambers for the sectors with holes for the PHOS
   Float_t lengthPH[kNplan][kNcham] = { { 124.0, 117.0,   0.0, 117.0, 124.0 }
+                                     , { 124.0, 117.0,   0.0, 117.0, 124.0 }
                                     , { 131.0, 124.0,   0.0, 124.0, 131.0 }
                                     , { 138.0, 131.0,   0.0, 131.0, 138.0 }
                                     , { 145.0, 138.0,   0.0, 138.0, 145.0 }
-                                    , { 147.0, 140.0,   0.0, 140.0, 147.0 }
                                     , { 147.0, 140.0,   0.0, 140.0, 147.0 } };
+  // Old layer 6                                    
+  //                                 , { 147.0, 140.0,   0.0, 140.0, 147.0 } };
 
   // The outer lengths of the chambers for the sectors with holes for the RICH
   Float_t lengthRH[kNplan][kNcham] = { {  87.5,   0.0,   0.0,   0.0,  87.5 }
+                                    , {  87.5,   0.0,   0.0,   0.0,  87.5 }
                                     , { 101.5,   0.0,   0.0,   0.0, 101.5 }
                                     , { 115.5,   0.0,   0.0,   0.0, 115.5 }
                                     , { 129.5,   0.0,   0.0,   0.0, 129.5 }
-                                    , { 133.5,   0.0,   0.0,   0.0, 133.5 }
                                     , { 133.5,   0.0,   0.0,   0.0, 133.5 } };
+  // Old layer 6
+  //                                , { 133.5,   0.0,   0.0,   0.0, 133.5 } };
 
   for (icham = 0; icham < kNcham; icham++) {
     for (iplan = 0; iplan < kNplan; iplan++) {
@@ -1377,38 +1384,3 @@ void AliTRDgeometryFull::CreateServices(Int_t *idtmed)
   delete parameter;
 
 }
-
-//_____________________________________________________________________________
-void AliTRDgeometryFull::SetOldGeometry()
-{
-  //
-  // Use the old chamber lengths
-  //
-
-  Int_t icham;
-  Int_t iplan;
-
-  AliTRDgeometry::SetOldGeometry();
-
-  Float_t lengthPH[kNplan][kNcham] = { { 123.5, 116.5,   0.0, 116.5, 123.5 }
-                                    , { 131.0, 124.0,   0.0, 124.0, 131.0 }
-                                    , { 134.5, 131.5,   0.0, 131.5, 134.5 }
-                                    , { 142.0, 139.0,   0.0, 139.0, 142.0 }
-                                    , { 142.0, 146.0,   0.0, 146.0, 142.0 }
-                                     , { 134.5, 153.5,   0.0, 153.5, 134.5 } };
-
-  Float_t lengthRH[kNplan][kNcham] = { {  86.5,   0.0,   0.0,   0.0,  86.5 }
-                                    , { 101.5,   0.0,   0.0,   0.0, 101.5 }
-                                    , { 112.5,   0.0,   0.0,   0.0, 112.5 }
-                                    , { 127.5,   0.0,   0.0,   0.0, 127.5 }
-                                    , { 134.5,   0.0,   0.0,   0.0, 134.5 }
-                                     , { 134.5,   0.0,   0.0,   0.0, 134.5 } };
-                                                                               
-  for (icham = 0; icham < kNcham; icham++) {
-    for (iplan = 0; iplan < kNplan; iplan++) {
-      fClengthPH[iplan][icham] = lengthPH[iplan][icham];
-      fClengthRH[iplan][icham] = lengthRH[iplan][icham];
-    }
-  }
-
-}

diff --git a/TRD/AliTRDgeometryHole.cxx b/TRD/AliTRDgeometryHole.cxx
index 06a792206c9a95a087be36e79c6323e41b5dea53..cf58563cb20f2cf889746388f570de83b433a351 100644 (file)
--- a/TRD/AliTRDgeometryHole.cxx
+++ b/TRD/AliTRDgeometryHole.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.12  2004/02/02 13:37:52  hristov
+Implementing of new function to check for holes (M.Ivanov)
+
 Revision 1.11  2003/09/18 09:06:07  cblume
 Geometry update, Removal of compiler warnings
 
@@ -747,42 +750,4 @@ void AliTRDgeometryHole::CreateGeometry(Int_t *idtmed)
 
 }
 
-//_____________________________________________________________________________
-void AliTRDgeometryHole::SetOldGeometry()
-{
-  //
-  // Use the old chamber lengths
-  //
-
-  Int_t icham;
-  Int_t iplan;
-
-  AliTRDgeometry::SetOldGeometry();
-
-  // The outer lengths of the chambers for the sectors with holes for the PHOS
-  Float_t lengthPH[kNplan][kNcham] = { {   0.0,   0.0,   0.0, 116.5, 123.5 }
-                                    , {   0.0,   0.0,   0.0, 124.0, 131.0 }
-                                    , {   0.0,   0.0,   0.0, 131.5, 134.5 }
-                                    , {   0.0,   0.0,   0.0, 139.0, 142.0 }
-                                    , {   0.0,   0.0,   0.0, 146.0, 142.0 }
-                                     , {   0.0,   0.0,   0.0, 153.5, 134.5 } };
-
-  // The outer lengths of the chambers for the sectors with holes for the RICH
-  Float_t lengthRH[kNplan][kNcham] = { {   0.0,   0.0,   0.0,   0.0,  86.5 }
-                                    , {   0.0,   0.0,   0.0,   0.0, 101.5 }
-                                    , {   0.0,   0.0,   0.0,   0.0, 112.5 }
-                                    , {   0.0,   0.0,   0.0,   0.0, 127.5 }
-                                    , {   0.0,   0.0,   0.0,   0.0, 134.5 }
-                                     , {   0.0,   0.0,   0.0,   0.0, 134.5 } };
-
-  for (icham = 0; icham < kNcham; icham++) {
-    for (iplan = 0; iplan < kNplan; iplan++) {
-      fClengthPH[iplan][icham] = lengthPH[iplan][icham];
-      fClengthRH[iplan][icham] = lengthRH[iplan][icham];
-    }
-  }
-
-}
-
-
 

diff --git a/TRD/AliTRDpadPlane.cxx b/TRD/AliTRDpadPlane.cxx
index 58d913638eddc01c02c228cf13da9d791273af13..cdc9665d06c463b241b87aee0fde8dd49b9c8460 100644 (file)
--- a/TRD/AliTRDpadPlane.cxx
+++ b/TRD/AliTRDpadPlane.cxx
@@ -77,9 +77,6 @@ AliTRDpadPlane::AliTRDpadPlane(Int_t p, Int_t c):TObject()
   fPla = p;
   fCha = c;
 
-  //fRowSpacing = 0.025;
-  //fColSpacing = 0.025;
-
   fRowSpacing = 0.0;
   fColSpacing = 0.0;
 
@@ -97,7 +94,7 @@ AliTRDpadPlane::AliTRDpadPlane(Int_t p, Int_t c):TObject()
       // L0C0 type
       fNrows        =  12;
       fLength       = 108.0;
-      fWidth        =  94.4;
+      fWidth        =  92.2;
       fLengthOPad   =   8.0;
       fWidthOPad    =   0.515;
       fLengthIPad   =   9.0;
@@ -108,7 +105,7 @@ AliTRDpadPlane::AliTRDpadPlane(Int_t p, Int_t c):TObject()
       // L0C1 type
       fNrows        =  16;
       fLength       = 122.0;
-      fWidth        =  94.4;
+      fWidth        =  92.2;
       fLengthOPad   =   7.5;
       fWidthOPad    =   0.515;
       fLengthIPad   =   7.5;
@@ -268,6 +265,7 @@ AliTRDpadPlane::AliTRDpadPlane(Int_t p, Int_t c):TObject()
   if (fPadCol) delete [] fPadCol;
   fPadCol = new Double_t[fNcols];
   Double_t col = fGeo->GetChamberWidth(p) / 2. 
+               + fGeo->CroWid()
                - fWidthRim;
   for (Int_t ic = 0; ic < fNcols; ic++) {
     fPadCol[ic] = col;