From 8737e16f916c8e4632c2036be17b3a95caab0561 Mon Sep 17 00:00:00 2001 From: cblume Date: Thu, 31 Oct 2002 17:45:35 +0000 Subject: [PATCH] New chamber geometry --- TRD/AliTRDgeometry.cxx | 39 +++++++++++++++++++---- TRD/AliTRDgeometry.h | 2 ++ TRD/AliTRDgeometryFull.cxx | 58 +++++++++++++++++++++++++++++------ TRD/AliTRDgeometryFull.h | 2 ++ TRD/AliTRDgeometryHole.cxx | 63 ++++++++++++++++++++++++++++++++------ TRD/AliTRDgeometryHole.h | 2 ++ 6 files changed, 140 insertions(+), 26 deletions(-) diff --git a/TRD/AliTRDgeometry.cxx b/TRD/AliTRDgeometry.cxx index 5eeaa035767..4dbb20dc069 100644 --- a/TRD/AliTRDgeometry.cxx +++ b/TRD/AliTRDgeometry.cxx @@ -15,6 +15,9 @@ /* $Log$ +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 @@ -290,12 +293,12 @@ void AliTRDgeometry::Init() fCwidth[5] = 117.8; // 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 } }; + 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++) { @@ -482,3 +485,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]; + } + } + +} diff --git a/TRD/AliTRDgeometry.h b/TRD/AliTRDgeometry.h index 0f1b754aff2..f544bbbe13a 100644 --- a/TRD/AliTRDgeometry.h +++ b/TRD/AliTRDgeometry.h @@ -61,6 +61,8 @@ 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; diff --git a/TRD/AliTRDgeometryFull.cxx b/TRD/AliTRDgeometryFull.cxx index feca4e85499..50cbc44e487 100644 --- a/TRD/AliTRDgeometryFull.cxx +++ b/TRD/AliTRDgeometryFull.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.8 2002/02/11 14:21:16 cblume +Update of the geometry. Get rid of MANY + Revision 1.7 2001/05/11 07:56:12 hristov Consistent declarations needed on Alpha @@ -102,20 +105,20 @@ void AliTRDgeometryFull::Init() fRICHhole = kFALSE; // The outer lengths of the chambers for the sectors with holes for the PHOS - Float_t lengthPH[kNplan][kNcham] = { { 123.5, 116.5, 0.0, 116.5, 123.5 } + Float_t lengthPH[kNplan][kNcham] = { { 124.0, 117.0, 0.0, 117.0, 124.0 } , { 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 } }; + , { 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 } }; // The outer lengths of the chambers for the sectors with holes for the RICH - Float_t lengthRH[kNplan][kNcham] = { { 86.5, 0.0, 0.0, 0.0, 86.5 } + Float_t lengthRH[kNplan][kNcham] = { { 87.5, 0.0, 0.0, 0.0, 87.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 } }; + , { 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 } }; for (icham = 0; icham < kNcham; icham++) { for (iplan = 0; iplan < kNplan; iplan++) { @@ -776,3 +779,38 @@ void AliTRDgeometryFull::CreateGeometry(Int_t *idtmed) } } + +//_____________________________________________________________________________ +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/AliTRDgeometryFull.h b/TRD/AliTRDgeometryFull.h index 837693ff6d8..5eb30be9ba3 100644 --- a/TRD/AliTRDgeometryFull.h +++ b/TRD/AliTRDgeometryFull.h @@ -27,6 +27,8 @@ class AliTRDgeometryFull : public AliTRDgeometry { void SetPHOShole() { fPHOShole = kTRUE; }; void SetRICHhole() { fRICHhole = kTRUE; }; + virtual void SetOldGeometry(); + Bool_t GetPHOShole() const { return fPHOShole; }; Bool_t GetRICHhole() const { return fRICHhole; }; diff --git a/TRD/AliTRDgeometryHole.cxx b/TRD/AliTRDgeometryHole.cxx index 206abb4121b..7410b83e9df 100644 --- a/TRD/AliTRDgeometryHole.cxx +++ b/TRD/AliTRDgeometryHole.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.7 2002/02/11 14:21:16 cblume +Update of the geometry. Get rid of MANY + Revision 1.6 2001/05/11 07:56:12 hristov Consistent declarations needed on Alpha @@ -90,20 +93,20 @@ void AliTRDgeometryHole::Init() Int_t icham; // 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 } + Float_t lengthPH[kNplan][kNcham] = { { 0.0, 0.0, 0.0, 117.0, 124.0 } , { 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 } }; + , { 0.0, 0.0, 0.0, 131.0, 138.0 } + , { 0.0, 0.0, 0.0, 138.0, 145.0 } + , { 0.0, 0.0, 0.0, 140.0, 147.0 } + , { 0.0, 0.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] = { { 0.0, 0.0, 0.0, 0.0, 86.5 } + Float_t lengthRH[kNplan][kNcham] = { { 0.0, 0.0, 0.0, 0.0, 87.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 } }; + , { 0.0, 0.0, 0.0, 0.0, 115.5 } + , { 0.0, 0.0, 0.0, 0.0, 129.5 } + , { 0.0, 0.0, 0.0, 0.0, 133.5 } + , { 0.0, 0.0, 0.0, 0.0, 133.5 } }; for (icham = 0; icham < kNcham; icham++) { for (iplan = 0; iplan < kNplan; iplan++) { @@ -721,3 +724,43 @@ void AliTRDgeometryHole::CreateGeometry(Int_t *idtmed) gMC->Gspos("UTR3",3,"BTR3",xpos,ypos,zpos,0,"ONLY"); } + +//_____________________________________________________________________________ +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/AliTRDgeometryHole.h b/TRD/AliTRDgeometryHole.h index 70d4c42ce30..1cf4b96dbde 100644 --- a/TRD/AliTRDgeometryHole.h +++ b/TRD/AliTRDgeometryHole.h @@ -27,6 +27,8 @@ class AliTRDgeometryHole : public AliTRDgeometry { void SetPHOShole() { }; void SetRICHhole() { }; + virtual void SetOldGeometry(); + Bool_t GetPHOShole() const { return kTRUE; }; Bool_t GetRICHhole() const { return kTRUE; }; -- 2.31.1