From eeacf08b243d5ef04d04ed32ad046c1926283d48 Mon Sep 17 00:00:00 2001 From: hristov Date: Wed, 5 Mar 2003 15:11:58 +0000 Subject: [PATCH] Corrections to obey the coding conventions --- STRUCT/AliABSO.cxx | 21 +--- STRUCT/AliABSO.h | 10 +- STRUCT/AliABSOv0.cxx | 55 +--------- STRUCT/AliABSOvF.cxx | 8 +- STRUCT/AliALIFE.cxx | 27 ++--- STRUCT/AliALIFE.h | 8 ++ STRUCT/AliBODY.cxx | 27 +---- STRUCT/AliBODY.h | 2 +- STRUCT/AliDIPO.cxx | 7 +- STRUCT/AliDIPOv1.cxx | 15 +-- STRUCT/AliDIPOv1.h | 2 +- STRUCT/AliDIPOv2.cxx | 44 +------- STRUCT/AliDIPOv2.h | 2 +- STRUCT/AliFRAME.cxx | 4 +- STRUCT/AliFRAMEv0.cxx | 34 ++---- STRUCT/AliFRAMEv1.cxx | 31 ++---- STRUCT/AliFRAMEv2.cxx | 57 ++-------- STRUCT/AliFRAMEv2.h | 6 +- STRUCT/AliHALL.cxx | 45 +------- STRUCT/AliHALL.h | 2 +- STRUCT/AliMAG.cxx | 28 +---- STRUCT/AliPIPE.cxx | 4 +- STRUCT/AliPIPEv0.cxx | 244 +++++++++++++++--------------------------- STRUCT/AliPIPEv0.h | 2 +- STRUCT/AliPIPEv1.cxx | 17 +-- STRUCT/AliPIPEv1.h | 2 +- STRUCT/AliPIPEv3.cxx | 27 +---- STRUCT/AliPIPEv3.h | 2 +- STRUCT/AliSHIL.cxx | 19 +--- STRUCT/AliSHILv0.cxx | 76 +------------ STRUCT/AliSHILv0.h | 2 +- STRUCT/AliSHILv2.cxx | 51 ++++----- STRUCT/AliSHILvF.cxx | 63 ++--------- 33 files changed, 184 insertions(+), 760 deletions(-) diff --git a/STRUCT/AliABSO.cxx b/STRUCT/AliABSO.cxx index a1fd68679d8..6943700fb9d 100644 --- a/STRUCT/AliABSO.cxx +++ b/STRUCT/AliABSO.cxx @@ -13,24 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.10 2000/10/02 21:28:15 fca -Removal of useless dependecies via forward declarations - -Revision 1.9 2000/06/11 12:32:12 morsch -Coding rule violations corrected - -Revision 1.8 2000/02/23 13:46:04 morsch -Detailed composition of insulation material. - -Revision 1.7 2000/01/12 15:36:28 morsch -Base class only - -Revision 1.6 1999/09/29 09:24:29 fca -Introduction of the Copyright and cvs Log - -*/ +/* $Id$ */ /////////////////////////////////////////////////////////////////////////////// // // @@ -316,7 +299,7 @@ void AliABSO::Init() printf("\n"); } -Int_t AliABSO::GetMatId(Int_t imat) +Int_t AliABSO::GetMatId(Int_t imat) const { // Get geant material number Int_t kmat=(*fIdmate)[imat]; diff --git a/STRUCT/AliABSO.h b/STRUCT/AliABSO.h index 91a4d619e53..fbdb2e87b61 100644 --- a/STRUCT/AliABSO.h +++ b/STRUCT/AliABSO.h @@ -23,10 +23,12 @@ class AliABSO : public AliModule { virtual void Init(); virtual Int_t IsVersion() const {return 0;} virtual void DrawModule(); - virtual Int_t GetMatId(Int_t imat); - virtual Int_t NumberOfLayers(Int_t i) {return fNLayers[i];} - virtual Float_t ZPositionOfLayer(Int_t i, Int_t il) {return fZLayers[i][il];} - virtual Int_t MaterialOfLayer (Int_t i, Int_t il) {return fMLayers[i][il];} + virtual Int_t GetMatId(Int_t imat) const; + virtual Int_t NumberOfLayers(Int_t i) const {return fNLayers[i];} + virtual Float_t ZPositionOfLayer(Int_t i, Int_t il) const + {return fZLayers[i][il];} + virtual Int_t MaterialOfLayer (Int_t i, Int_t il) const + {return fMLayers[i][il];} protected: Int_t fNLayers[2]; // Number of Material Layers in the tracking Region Float_t fZLayers[2][15]; // z-position of layers diff --git a/STRUCT/AliABSOv0.cxx b/STRUCT/AliABSOv0.cxx index 53db49b04e2..5504ca8ef64 100644 --- a/STRUCT/AliABSOv0.cxx +++ b/STRUCT/AliABSOv0.cxx @@ -13,60 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.15 2002/10/29 09:53:40 morsch -Constants start with k. Warnings corrected. - -Revision 1.14 2002/10/21 09:09:33 alibrary -Removing unused variables - -Revision 1.13 2002/10/14 14:57:34 hristov -Merging the VirtualMC branch to the main development branch (HEAD) - -Revision 1.11.6.1 2002/07/24 10:08:27 alibrary -Updating VirtualMC - -Revision 1.12 2002/07/15 07:56:41 morsch -Steel rear and Al ring. - -Revision 1.11 2001/11/29 14:16:51 morsch -- truncated inner W-cone -- new support structure - -Revision 1.10 2001/10/25 08:50:57 morsch -New beamshield geometry with increased tolerances and insulation thickness. - -Revision 1.9 2001/05/16 14:57:22 alibrary -New files for folders and Stack - -Revision 1.8 2001/01/12 13:16:09 morsch -Store absorber composition information in fMLayers and fZLayers -Rear 25 cm Fe + 35 cm Cu - -Revision 1.7 2000/10/02 21:28:15 fca -Removal of useless dependecies via forward declarations - -Revision 1.6 2000/06/15 09:40:31 morsch -Obsolete typedef keyword removed - -Revision 1.5 2000/06/12 19:39:01 morsch -New structure of beam pipe and heating jacket. - -Revision 1.4 2000/04/03 08:13:40 fca -Introduce extra scope for non ANSI compliant C++ compilers - -Revision 1.3 2000/01/18 17:49:56 morsch -Serious overlap of ABSM with shield corrected -Small error in ARPB parameters corrected - -Revision 1.2 2000/01/13 11:23:59 morsch -Last layer of Pb outer angle corrected - -Revision 1.1 2000/01/12 15:39:30 morsch -Standard version of ABSO - -*/ +/* $Id$ */ /////////////////////////////////////////////////////////////////////////////// // // diff --git a/STRUCT/AliABSOvF.cxx b/STRUCT/AliABSOvF.cxx index 96d3db8c6ef..d9d1125e942 100644 --- a/STRUCT/AliABSOvF.cxx +++ b/STRUCT/AliABSOvF.cxx @@ -13,13 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.3 2001/01/12 13:14:49 morsch -Store absorber composition information in fMLayers and fZLayers -Rear: 25 cm Fe + 4*5cm Pb + 3*5cm PolyCH2 - -*/ +/* $Id$ */ // // // // diff --git a/STRUCT/AliALIFE.cxx b/STRUCT/AliALIFE.cxx index 56363b6d409..6f319cdf606 100644 --- a/STRUCT/AliALIFE.cxx +++ b/STRUCT/AliALIFE.cxx @@ -13,22 +13,13 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.3.6.1 2002/08/29 18:08:17 hristov -Replace strcpy by assignment operator - -Revision 1.3 2001/10/31 15:56:54 morsch -Correction in OnionCone. - -Revision 1.2 2000/10/10 06:40:25 hristov -Bug fixes - -Revision 1.1 2000/07/26 15:10:57 morsch -Helper class to write geometry in ALIFE format in parallel with Geant geometry definition. - -*/ +/* $Id$ */ +//---------------------------------------------------------------------- +// Helper class to write geometry in ALIFE format +// in parallel with Geant geometry definition. +// Author: A.Morsch +//---------------------------------------------------------------------- #include ClassImp(AliALIFE) @@ -200,6 +191,7 @@ void AliALIFE::Cone(Float_t rmin1, Float_t rmin2, // outer radius d=zmax-zmin; + sprintf(nameCou, "C%4.4d", fNBodies++); if (rmax1 >= 0. && rmax2 >= 0.) { if (rmax1!=rmax2) { if (rmax1 > rmax2) { @@ -212,12 +204,10 @@ void AliALIFE::Cone(Float_t rmin1, Float_t rmin2, r1=rmax2; r2=rmax1; } - sprintf(nameCou, "C%4.4d", fNBodies++); fprintf(fFile1,"%5s TRC%10.3f%10.3f%10.3f%10.3f%10.3f%10.3f\n", nameCou, pos[0], pos[1], pos[2], 0., 0., d); fprintf(fFile1," %10.3f%10.3f\n",r1,r2); } else { - sprintf(nameCou, "C%4.4d", fNBodies++); fprintf(fFile1,"%5s ZCC%10.3f%10.3f%10.3f\n", nameCou, pos[0], pos[1], rmax1); } @@ -228,6 +218,7 @@ void AliALIFE::Cone(Float_t rmin1, Float_t rmin2, // inner radius + sprintf(nameCin, "C%4.4d", fNBodies++); if (rmin1 >= 0. && rmin2 >= 0.) { if (rmin1!=rmin2) { if (rmin1 != 0 && rmin2 !=0) { @@ -242,13 +233,11 @@ void AliALIFE::Cone(Float_t rmin1, Float_t rmin2, r2=rmin1; d=-d; } - sprintf(nameCin, "C%4.4d", fNBodies++); fprintf(fFile1,"%5s TRC%10.3f%10.3f%10.3f%10.3f%10.3f%10.3f\n", nameCin, pos[0], pos[1], pos[2], 0., 0., d); fprintf(fFile1," %10.3f%10.3f\n",r1,r2); } } else { - sprintf(nameCin, "C%4.4d", fNBodies++); fprintf(fFile1,"%5s ZCC%10.3f%10.3f%10.3f\n", nameCin, pos[0], pos[1], rmin1); } diff --git a/STRUCT/AliALIFE.h b/STRUCT/AliALIFE.h index 25620ff179d..cbda6ec48e3 100644 --- a/STRUCT/AliALIFE.h +++ b/STRUCT/AliALIFE.h @@ -12,6 +12,10 @@ class AliALIFE : public TObject { public: AliALIFE(const char *name1, const char *name2); AliALIFE(); + AliALIFE(const AliALIFE &rh) { + // copy ctor requested by coding convention but not needed + Fatal("Copy constructor","not implemented"); + } virtual ~AliALIFE() {} void Cylinder(Float_t rmin, Float_t rmax, Float_t zmin, Float_t zmax, @@ -62,6 +66,10 @@ class AliALIFE : public TObject { private: void BodyHeader(); void VolumeHeader(); + AliALIFE & operator = (const AliALIFE &) { + // assignement operator requested by coding convention but not needed + return *this; + } ClassDef(AliALIFE,1) diff --git a/STRUCT/AliBODY.cxx b/STRUCT/AliBODY.cxx index 1713e80808e..2bc4a978e2d 100644 --- a/STRUCT/AliBODY.cxx +++ b/STRUCT/AliBODY.cxx @@ -13,30 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.11 2002/10/14 14:57:39 hristov -Merging the VirtualMC branch to the main development branch (HEAD) - -Revision 1.8.12.1 2002/07/24 10:08:27 alibrary -Updating VirtualMC - -Revision 1.10 2002/07/10 10:16:15 morsch -Bigger volume for CRT. - -Revision 1.9 2002/06/20 15:33:13 morsch -Larger BOX in case CRT is present. - -Revision 1.8 2000/10/02 21:28:15 fca -Removal of useless dependecies via forward declarations - -Revision 1.7 2000/06/11 12:32:51 morsch -Coding rule violations corrected - -Revision 1.6 1999/09/29 09:24:30 fca -Introduction of the Copyright and cvs Log - -*/ +/* $Id$ */ /////////////////////////////////////////////////////////////////////////////// // // @@ -171,7 +148,7 @@ void AliBODY::CreateMaterials() } //_____________________________________________________________________________ -void AliBODY::DrawModule() +void AliBODY::DrawModule() const { // // Draw a view of the Alice outside box diff --git a/STRUCT/AliBODY.h b/STRUCT/AliBODY.h index eb4c56de5a4..304f133d893 100644 --- a/STRUCT/AliBODY.h +++ b/STRUCT/AliBODY.h @@ -22,7 +22,7 @@ public: virtual void CreateGeometry(); virtual void CreateMaterials(); virtual Int_t IsVersion() const {return 0;} - virtual void DrawModule(); + virtual void DrawModule() const; ClassDef(AliBODY,1) //Class manager for the ALICE body }; diff --git a/STRUCT/AliDIPO.cxx b/STRUCT/AliDIPO.cxx index a509be2ee98..09ed4d6b7e7 100644 --- a/STRUCT/AliDIPO.cxx +++ b/STRUCT/AliDIPO.cxx @@ -13,12 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.4 1999/09/29 09:24:30 fca -Introduction of the Copyright and cvs Log - -*/ +/* $Id$ */ /////////////////////////////////////////////////////////////////////////////// // // diff --git a/STRUCT/AliDIPOv1.cxx b/STRUCT/AliDIPOv1.cxx index 85adecdbc1d..4cc125c24ee 100644 --- a/STRUCT/AliDIPOv1.cxx +++ b/STRUCT/AliDIPOv1.cxx @@ -13,18 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.8 2000/10/02 21:28:15 fca -Removal of useless dependecies via forward declarations - -Revision 1.7 2000/06/11 12:33:34 morsch -Coding rule violations corrected - -Revision 1.6 1999/09/29 09:24:30 fca -Introduction of the Copyright and cvs Log - -*/ +/* $Id$ */ /////////////////////////////////////////////////////////////////////////////// // // @@ -174,7 +163,7 @@ void AliDIPOv1::CreateGeometry() } //_____________________________________________________________________________ -void AliDIPOv1::DrawModule() +void AliDIPOv1::DrawModule() const { // // Draw a shaded view of the muon absorber diff --git a/STRUCT/AliDIPOv1.h b/STRUCT/AliDIPOv1.h index 8faca3faa91..d3f5c12e342 100644 --- a/STRUCT/AliDIPOv1.h +++ b/STRUCT/AliDIPOv1.h @@ -20,7 +20,7 @@ public: virtual void CreateGeometry(); virtual void CreateMaterials(); virtual Int_t IsVersion() const {return 1;} - virtual void DrawModule(); + virtual void DrawModule() const; ClassDef(AliDIPOv1,1) //Class for the Magnetic Dipole version 1 }; diff --git a/STRUCT/AliDIPOv2.cxx b/STRUCT/AliDIPOv2.cxx index f6a8d6fe0d9..39f7235d607 100644 --- a/STRUCT/AliDIPOv2.cxx +++ b/STRUCT/AliDIPOv2.cxx @@ -13,47 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.18 2001/06/21 14:16:43 morsch -Use absolute coordinates for mother volume PCON. - -Revision 1.17 2001/06/21 11:59:25 morsch -Some more details in compensator geometry. - -Revision 1.16 2001/06/20 16:07:08 morsch -Compensator dipole MBWMD (MCB@SPS) added. - -Revision 1.15 2001/03/16 15:34:37 morsch -Mothervolume defined MANY because overlap with station 3 mothervolume not avoidable (A. de Falco) - -Revision 1.14 2000/12/21 16:37:23 morsch -Use Al for coil and cable material. The materials used before cause the dipole to -have hydrogene on the outer surface leading to unrealistic gamma rates due to -n-capture. - -Revision 1.13 2000/10/02 21:28:15 fca -Removal of useless dependecies via forward declarations - -Revision 1.12 2000/06/20 10:53:01 morsch -Volume placed outside mother volume (DDIP) corrected (Galina Chabratova) - -Revision 1.11 2000/06/11 12:33:46 morsch -Coding rule violations corrected - -Revision 1.10 2000/06/09 19:32:56 morsch -New detailed and corrected version from Galina Chabratova - -Revision 1.9 2000/04/27 09:29:53 fca -Reverting to version 1.6.2 - -Revision 1.6.2.1 1999/12/03 16:38:51 fca -Correct overlap in magnet - -Revision 1.6 1999/09/29 09:24:30 fca -Introduction of the Copyright and cvs Log - -*/ +/* $Id$ */ /////////////////////////////////////////////////////////////////////////////// // // @@ -801,7 +761,7 @@ void AliDIPOv2::CreateCompensatorDipole() } //_____________________________________________________________________________ -void AliDIPOv2::DrawModule() +void AliDIPOv2::DrawModule() const { // // Draw a shaded view of the muon absorber diff --git a/STRUCT/AliDIPOv2.h b/STRUCT/AliDIPOv2.h index b6457e7711b..7a88ef63603 100644 --- a/STRUCT/AliDIPOv2.h +++ b/STRUCT/AliDIPOv2.h @@ -20,7 +20,7 @@ public: virtual void CreateGeometry(); virtual void CreateMaterials(); virtual Int_t IsVersion() const {return 2;} - virtual void DrawModule(); + virtual void DrawModule() const; private: virtual void CreateSpectrometerDipole(); virtual void CreateCompensatorDipole(); diff --git a/STRUCT/AliFRAME.cxx b/STRUCT/AliFRAME.cxx index b92e37cf30a..6058c972182 100644 --- a/STRUCT/AliFRAME.cxx +++ b/STRUCT/AliFRAME.cxx @@ -13,9 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -*/ +/* $Id$ */ /////////////////////////////////////////////////////////////////////////////// // // diff --git a/STRUCT/AliFRAMEv0.cxx b/STRUCT/AliFRAMEv0.cxx index df28b0f57a9..658d7c53ef7 100644 --- a/STRUCT/AliFRAMEv0.cxx +++ b/STRUCT/AliFRAMEv0.cxx @@ -13,35 +13,13 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.15 2000/12/21 16:41:06 morsch -Coding convention clean-up (RS3) - -Revision 1.14 2000/10/02 21:28:15 fca -Removal of useless dependecies via forward declarations - -Revision 1.13 2000/06/11 12:34:49 morsch -Coding rule violations corrected - -Revision 1.12 2000/02/23 16:25:24 fca -AliVMC and AliGeant3 classes introduced -ReadEuclid moved from AliRun to AliModule - -Revision 1.11 1999/11/01 20:42:42 fca -FRAME version 1 is now the symmetric one. - -Revision 1.10 1999/10/06 20:56:55 fca -Introducing new frame 1099 - -Revision 1.9 1999/09/29 09:24:30 fca -Introduction of the Copyright and cvs Log - -*/ +/* $Id$ */ -//////////////////////////////////////////////// -// space frame class / -//////////////////////////////////////////////// +//------------------------------------------------------------------------- +// Space frame class +// Reads the geometry from an Euclid file +// Author: A.Morsch +//------------------------------------------------------------------------- #include "AliFRAMEv0.h" #include "AliRun.h" diff --git a/STRUCT/AliFRAMEv1.cxx b/STRUCT/AliFRAMEv1.cxx index 1dd4f34348e..a457d2f24b8 100644 --- a/STRUCT/AliFRAMEv1.cxx +++ b/STRUCT/AliFRAMEv1.cxx @@ -13,32 +13,13 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.11 2001/05/16 14:57:22 alibrary -New files for folders and Stack - -Revision 1.10 2000/10/02 21:28:15 fca -Removal of useless dependecies via forward declarations - -Revision 1.9 2000/06/11 12:35:02 morsch -Coding rule violations corrected - -Revision 1.8 2000/02/23 16:25:24 fca -AliVMC and AliGeant3 classes introduced -ReadEuclid moved from AliRun to AliModule - -Revision 1.7 1999/11/01 20:42:42 fca -FRAME version 1 is now the symmetric one. - -Revision 1.6 1999/09/29 09:24:30 fca -Introduction of the Copyright and cvs Log - -*/ +/* $Id$ */ -//////////////////////////////////////////////// -// space frame class / -//////////////////////////////////////////////// +//------------------------------------------------------------------------- +// AliFRAMEv1.cxx +// symmetric space frame without holes +// Author: +//------------------------------------------------------------------------- #include "AliFRAMEv1.h" #include "AliRun.h" diff --git a/STRUCT/AliFRAMEv2.cxx b/STRUCT/AliFRAMEv2.cxx index 90be07f893b..0ce634275b7 100644 --- a/STRUCT/AliFRAMEv2.cxx +++ b/STRUCT/AliFRAMEv2.cxx @@ -13,55 +13,13 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.13 2002/11/21 16:28:39 alibrary -Removing AliMCProcess and AliMC - -Revision 1.12 2002/10/14 14:57:39 hristov -Merging the VirtualMC branch to the main development branch (HEAD) - -Revision 1.9.6.2 2002/07/24 10:08:27 alibrary -Updating VirtualMC - -Revision 1.11 2002/06/13 09:54:40 morsch -Some additional outer cross-bars removed. - -Revision 1.10 2002/05/28 08:13:51 morsch -Cross-bars in front of RICH at 60+/- 30deg. removed. - -Revision 1.9 2001/12/05 12:10:26 morsch -Rails for spaceframe included. - -Revision 1.8 2001/10/18 14:11:35 morsch -Some changes/bug corrections for SetHole(1) option. - -Revision 1.7 2001/10/16 14:50:59 morsch -... or better use modified IsVersion() method. - -Revision 1.6 2001/10/16 14:33:04 morsch -Hole() method needed by TRD to find out wheter frame has holes. +/* $Id$ */ -Revision 1.5 2001/08/28 15:54:29 morsch -Web frame and inner rings pointing. - -Revision 1.4 2001/06/22 14:11:17 morsch -Back to official z-positions of rings. - -Revision 1.3 2001/06/22 12:02:20 morsch -Ring locations matching TRD module positions. - -Revision 1.2 2001/05/25 07:59:54 morsch -Initialization print-out in debug mode only. - -Revision 1.1 2001/05/11 13:18:05 morsch -C++ version of spaceframe with specs according to Jan Bielski Feb. 2001 - -*/ - -//////////////////////////////////////////////// -// space frame class / -/////////////////////////////////////////////// +//------------------------------------------------------------------------ +// AliFRAMEv2.cxx +// symmetric space frame with possibility for holes +// Author: A.Morsch +//------------------------------------------------------------------------ #include "AliFRAMEv2.h" #include "AliMagF.h" @@ -1029,7 +987,7 @@ void AliFRAMEv2::CreateGeometry() //___________________________________________ void AliFRAMEv2::CreateMaterials() { - + // Creates the materials Float_t epsil, stemax, tmaxfd, deemax, stmin; epsil = 1.e-4; // Tracking precision, @@ -1069,6 +1027,7 @@ void AliFRAMEv2::Init() Int_t AliFRAMEv2::IsVersion() const { + // Returns the version of the FRAME (1 if no holes, 0 otherwise) Int_t version = 0; if (fHoles == 0) version = 1; return version; diff --git a/STRUCT/AliFRAMEv2.h b/STRUCT/AliFRAMEv2.h index 559dc65301d..ca25d0e0645 100644 --- a/STRUCT/AliFRAMEv2.h +++ b/STRUCT/AliFRAMEv2.h @@ -22,9 +22,9 @@ public: virtual void Init(); virtual Int_t IsVersion() const; virtual void SetHoles(Int_t flag=0) {fHoles = flag;} - virtual Int_t Holes() {return fHoles;} - public: - Int_t fHoles; + virtual Int_t Holes() const {return fHoles;} + private: + Int_t fHoles; // flag fHoles=0 => no holes, with holes otherwise ClassDef(AliFRAMEv2,2) //Class for FRAME version 2 }; diff --git a/STRUCT/AliHALL.cxx b/STRUCT/AliHALL.cxx index 2a80c6ec071..2f64171970f 100644 --- a/STRUCT/AliHALL.cxx +++ b/STRUCT/AliHALL.cxx @@ -13,48 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.17 2002/10/14 14:57:39 hristov -Merging the VirtualMC branch to the main development branch (HEAD) - -Revision 1.14.6.2 2002/06/14 10:29:54 hristov -Merged with v3-08-03 - -Revision 1.16 2002/06/12 08:28:28 morsch -HBMT positioning commented out. - -Revision 1.15 2002/05/28 08:47:38 morsch -Reduces size of pillars to avoid overlap with DIPO. - -Revision 1.14 2001/11/16 12:38:26 morsch -Reverse z-ordering in HMBS. (I. Hrivnacova) - -Revision 1.13 2001/06/21 12:26:52 morsch -Simple concrete shielding around compensator dipole. - -Revision 1.12 2001/06/20 16:08:56 morsch -Remove some shielding to accomodate compensator magnet. - -Revision 1.11 2001/05/16 14:57:22 alibrary -New files for folders and Stack - -Revision 1.10 2000/10/02 21:28:15 fca -Removal of useless dependecies via forward declarations - -Revision 1.9 2000/06/13 14:55:26 morsch -Unused variables removed - -Revision 1.8 2000/06/11 12:35:41 morsch -Coding rule violations corrected - -Revision 1.7 2000/01/12 15:33:28 morsch -Muon filter removed - -Revision 1.6 1999/09/29 09:24:30 fca -Introduction of the Copyright and cvs Log - -*/ +/* $Id$ */ /////////////////////////////////////////////////////////////////////////////// // // @@ -419,7 +378,7 @@ void AliHALL::Init() } //_____________________________________________________________________________ -void AliHALL::DrawModule() +void AliHALL::DrawModule() const { // // Draw a shaded view of Experimental Hall diff --git a/STRUCT/AliHALL.h b/STRUCT/AliHALL.h index c701da72ff3..56e54f3d5ac 100644 --- a/STRUCT/AliHALL.h +++ b/STRUCT/AliHALL.h @@ -22,7 +22,7 @@ public: virtual void CreateMaterials(); virtual void Init(); virtual Int_t IsVersion() const {return 0;} - virtual void DrawModule(); + virtual void DrawModule() const; ClassDef(AliHALL,1) //Class for ALICE experimental hall }; diff --git a/STRUCT/AliMAG.cxx b/STRUCT/AliMAG.cxx index 5801482ecad..f6d176391a9 100644 --- a/STRUCT/AliMAG.cxx +++ b/STRUCT/AliMAG.cxx @@ -13,33 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.13 2002/11/06 15:20:32 hristov -Corrected logics (I.Hrivnacova) - -Revision 1.12 2002/11/01 10:59:49 hristov -Correcting geometry (corresponds to version 1.9) - -Revision 1.11 2002/10/17 16:33:07 hristov -Corrected check of the MC type - -Revision 1.10 2002/10/17 16:14:05 hristov -MAG geometry with resolved MANY (I.Hrivnacova) - -Revision 1.9 2001/05/16 14:57:22 alibrary -New files for folders and Stack - -Revision 1.8 2000/10/02 21:28:15 fca -Removal of useless dependecies via forward declarations - -Revision 1.7 2000/06/11 12:35:56 morsch -Coding rule violations corrected - -Revision 1.6 1999/09/29 09:24:30 fca -Introduction of the Copyright and cvs Log - -*/ +/* $Id$ */ /////////////////////////////////////////////////////////////////////////////// // // diff --git a/STRUCT/AliPIPE.cxx b/STRUCT/AliPIPE.cxx index 86b597c7af3..d2973276c9f 100644 --- a/STRUCT/AliPIPE.cxx +++ b/STRUCT/AliPIPE.cxx @@ -13,9 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -*/ +/* $Id$ */ /////////////////////////////////////////////////////////////////////////////// // // diff --git a/STRUCT/AliPIPEv0.cxx b/STRUCT/AliPIPEv0.cxx index bbb2816de81..ba09c61d74c 100644 --- a/STRUCT/AliPIPEv0.cxx +++ b/STRUCT/AliPIPEv0.cxx @@ -13,89 +13,13 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.25 2002/11/21 16:28:39 alibrary -Removing AliMCProcess and AliMC - -Revision 1.24 2002/10/22 15:02:47 alibrary -Introducing Riostream.h - -Revision 1.23 2002/10/14 14:57:39 hristov -Merging the VirtualMC branch to the main development branch (HEAD) - -Revision 1.19.4.2 2002/10/11 08:04:28 hristov -Updating VirtualMC to v3-09-02 - -Revision 1.22 2002/09/02 15:29:20 morsch -Gsbool calls to resolve MANY added (I. Hrivnacova). - -Revision 1.19.4.1 2002/06/10 15:13:48 hristov -Merged with v3-08-02 - -Revision 1.21 2002/05/11 19:14:44 morsch -PCONE QBEU had last z defined twice. - -Revision 1.20 2002/05/02 12:36:43 morsch -New version of beam-pipe geometry. Ref. AL502206PL -(used in production readiness report). - -Revision 1.19 2002/03/25 12:34:40 morsch -Obsolete support rollers removed. - -Revision 1.18 2002/02/01 18:02:41 morsch -Material of beam pipe between inner Be piece and forward detectors -can be set by SetPipeMaterial(mat), mat = kInox, kAlu, kBe ... - -Revision 1.17 2001/09/24 13:11:50 morsch -Ion pump and bellows moved out by 15 cm to make space for forward -detectors. - -Revision 1.16 2001/05/16 14:57:22 alibrary -New files for folders and Stack - -Revision 1.15 2001/05/02 11:50:18 morsch -New layout of the non-absorber side provided by Y. Viyogi. Not the final design -but the prsent most realistic. - -Revision 1.14 2001/01/20 16:56:33 morsch -Put air in connecting tubes and flanges of vacuum pump. - -Revision 1.13 2001/01/20 16:35:27 morsch -Increase mother volume for bellows. - -Revision 1.12 2000/12/21 16:41:06 morsch -Coding convention clean-up (RS3) - -Revision 1.11 2000/11/28 16:06:57 morsch -Undulated beam-pipe replaced by Al-Be (40,60) pipe 1.5 mm thick. - -Revision 1.10 2000/11/24 13:00:37 morsch -- Geometry and materials imported from euclid output -- include comments -- better struturing of volume tree -- improved version of flange close to front absorber -- more realistic pump materials -- undulated beam pipe imported from v3. - -Revision 1.9 2000/10/02 21:28:15 fca -Removal of useless dependecies via forward declarations - -Revision 1.8 2000/06/11 12:37:01 morsch -Coding rule violations corrected - -Revision 1.7 2000/02/23 16:25:24 fca -AliVMC and AliGeant3 classes introduced -ReadEuclid moved from AliRun to AliModule - -Revision 1.6 1999/09/29 09:24:30 fca -Introduction of the Copyright and cvs Log - -*/ +/* $Id$ */ -//////////////////////////////////////////////// -// Beam pipe class / -//////////////////////////////////////////////// +//------------------------------------------------------------------------- +// Beam pipe class +// Default version +// Author: A.Morsch +//------------------------------------------------------------------------- #include "AliPIPEv0.h" #include "AliRun.h" @@ -165,11 +89,11 @@ void AliPIPEv0::CreateGeometry() // Bellow // // distance between bellows - const Float_t dzbb = 9.0; + const Float_t kdzbb = 9.0; // total size of bellow section - const Float_t dzb = 15.0; + const Float_t kdzb = 15.0; // size of undulated region - const Float_t dzub = 2.0; + const Float_t kdzub = 2.0; // half-lengths of various beam pipe sections // central Be-Pipe @@ -187,7 +111,7 @@ void AliPIPEv0::CreateGeometry() Float_t hlenQb29 = 11.5/2.+1.75 + 5.0; // // Bellow element - Float_t hlenQbe0 = dzb; + Float_t hlenQbe0 = kdzb; // // Inox pipe between Be and Bellow (absorber side) Float_t hlenQb24[3] = {10.5/2., 1.8, 3.3}; @@ -196,15 +120,15 @@ void AliPIPEv0::CreateGeometry() Float_t hlenQb28 = (800.-hlenQbbe1-2.*hlenQbab-4.*hlenQb29-2.*hlenQbe0)/2.; // // Position of the pump - Float_t zPump = hlenQbbe1+2.*hlenQbab+2.*hlenQb29+dzb; + Float_t zPump = hlenQbbe1+2.*hlenQbab+2.*hlenQb29+kdzb; // // Inner beam pipe radius - Float_t RinBe = 2.9; - Float_t RinSt = 2.92; + const Float_t kRinBe = 2.9; + const Float_t kRinSt = 2.92; // // - Float_t RoutBe = 2.98; - Float_t RoutSt = 3.00; + const Float_t kRoutBe = 2.98; + const Float_t kRoutSt = 3.00; // @@ -238,7 +162,7 @@ void AliPIPEv0::CreateGeometry() ppcon[16] = 0.; ppcon[17] = 4.1; // 6 - ppcon[18] = ppcon[15] + 2. + 2.*dzub+0.2; + ppcon[18] = ppcon[15] + 2. + 2.*kdzub+0.2; ppcon[19] = 0.; ppcon[20] = 4.1; // 7 @@ -246,7 +170,7 @@ void AliPIPEv0::CreateGeometry() ppcon[22] = 0.; ppcon[23] = 3.2; // 8 - ppcon[24] = ppcon[21] + 2.* dzbb-0.4; + ppcon[24] = ppcon[21] + 2.* kdzbb-0.4; ppcon[25] = 0.; ppcon[26] = 3.2; // 9 @@ -286,7 +210,7 @@ void AliPIPEv0::CreateGeometry() ppcon[52] = 0.; ppcon[53] = 56.; // 18 - ppcon[54] = ppcon[51]+2.*dzb+10.; + ppcon[54] = ppcon[51]+2.*kdzb+10.; ppcon[55] = 0.; ppcon[56] = 56.; // 19 @@ -309,27 +233,27 @@ void AliPIPEv0::CreateGeometry() // The Vacuum gMC->Gsvolu("QBVA","TUBE", idtmed[kVac], ptube, 0); ptube[0] = 0.0; - ptube[1] = RinSt; + ptube[1] = kRinSt; ptube[2] = (90.-hlenQbbe2)/2.; dz = -90. + ptube[2]; gMC->Gsposp ("QBVA", 1, "QBPM", 0., 0., dz , 0, "ONLY", ptube, 3); dz = dz + ptube[2]; - ptube[1] = RinBe; + ptube[1] = kRinBe; ptube[2] = hlenQbbe+hlenQbab; dz = dz + ptube[2]; gMC->Gsposp ("QBVA", 2, "QBPM", 0., 0., dz , 0, "ONLY", ptube, 3); dz = dz + ptube[2]; - ptube[1] = RinSt; + ptube[1] = kRinSt; ptube[2] = (800.-hlenQbbe1-2.*hlenQbab)/2.; dz = dz + ptube[2]; gMC->Gsposp ("QBVA", 3, "QBPM", 0., 0., dz , 0, "ONLY", ptube, 3); // // Be Pipe in central Alice - ptube[0] = RinBe; - ptube[1] = RoutBe; + ptube[0] = kRinBe; + ptube[1] = kRoutBe; ptube[2] = hlenQbbe; gMC->Gsvolu("QBBE","TUBE", idtmed[kBe], ptube, 3); @@ -383,38 +307,38 @@ void AliPIPEv0::CreateGeometry() ppcon[2] = 4; // 1: ppcon[3] = -hlenQb29; - ppcon[4] = RinSt; + ppcon[4] = kRinSt; ppcon[5] = 5.8; // 2 ppcon[6] = ppcon[3]+3.6; - ppcon[7] = RinSt; + ppcon[7] = kRinSt; ppcon[8] = 5.8; // 3 ppcon[9] = ppcon[6]; - ppcon[10] = RinSt; + ppcon[10] = kRinSt; ppcon[11] = 3.6; // 4 ppcon[12] = hlenQb29; - ppcon[13] = RinSt; + ppcon[13] = kRinSt; ppcon[14] = 3.6; gMC->Gsvolu("QB29", "PCON", idtmed[kAir], ppcon,15); // Flange - ptube[0] = RinSt; + ptube[0] = kRinSt; ptube[1] = 5.7; ptube[2] = 1.75; gMC->Gsvolu("QF29","TUBE", idtmed[kInox], ptube, 3); gMC->Gspos("QF29", 1, "QB29", 0.0, 0.0, -hlenQb29+1.75, 0, "ONLY"); // Pipe - ptube[0] = RinSt; + ptube[0] = kRinSt; ptube[1] = 3.0; ptube[2] = hlenQb29; gMC->Gsvolu("QS29","TUBE", idtmed[kInox], ptube, 3); gMC->Gspos("QS29", 1, "QB29", 0.0, 0.0, 0., 0, "ONLY"); // Fixed point - ptube[0] = RinSt; + ptube[0] = kRinSt; ptube[1] = 3.5; ptube[2] = 0.3; gMC->Gsvolu("QP29","TUBE", idtmed[kInox], ptube, 3); @@ -424,8 +348,8 @@ void AliPIPEv0::CreateGeometry() // // Inox beam pipe: final section on non-absorber side - ptube[0] = RinSt; - ptube[1] = RoutSt; + ptube[0] = kRinSt; + ptube[1] = kRoutSt; ptube[2] = hlenQb28; gMC->Gsvolu("QB28","TUBE", idtmed[kInox], ptube, 3); @@ -436,13 +360,13 @@ void AliPIPEv0::CreateGeometry() // This section is under study (A.M. 1/2/2002) // - ptube[0] = RinBe; + ptube[0] = kRinBe; if (fPipeMaterial == kAlu) { ptube[1] = 3.0; } else if (fPipeMaterial == kBe) { - ptube[1] = RoutBe; + ptube[1] = kRoutBe; } else if (fPipeMaterial == kInox){ - ptube[1] = RoutSt; + ptube[1] = kRoutSt; } ptube[2] = hlenQbab; @@ -466,59 +390,59 @@ void AliPIPEv0::CreateGeometry() pconQBE0[ 1]= 360; pconQBE0[ 2]= 10; // 1 - pconQBE0[ 3]= -dzb; - pconQBE0[ 4]= RinSt; - pconQBE0[ 5]= RoutSt; + pconQBE0[ 3]= -kdzb; + pconQBE0[ 4]= kRinSt; + pconQBE0[ 5]= kRoutSt; // 2 - pconQBE0[ 6]= -dzb+2.; - pconQBE0[ 7]= RinSt; - pconQBE0[ 8]= RoutSt; + pconQBE0[ 6]= -kdzb+2.; + pconQBE0[ 7]= kRinSt; + pconQBE0[ 8]= kRoutSt; // 3 - pconQBE0[ 9]= -dzb+2.; - pconQBE0[10]= RinSt; + pconQBE0[ 9]= -kdzb+2.; + pconQBE0[10]= kRinSt; pconQBE0[11]= 4.00; // 4 - pconQBE0[12]= -dzb+2.+2.*dzub; - pconQBE0[13]= RinSt; + pconQBE0[12]= -kdzb+2.+2.*kdzub; + pconQBE0[13]= kRinSt; pconQBE0[14]= 4.00; // 5 - pconQBE0[15]= -dzb+2.+2.*dzub; - pconQBE0[16]= RinSt; - pconQBE0[17]= RoutSt; + pconQBE0[15]= -kdzb+2.+2.*kdzub; + pconQBE0[16]= kRinSt; + pconQBE0[17]= kRoutSt; // 6 - pconQBE0[18]= -dzb+2.+2.*dzub+2.*dzbb; - pconQBE0[19]= RinSt; - pconQBE0[20]= RoutSt; + pconQBE0[18]= -kdzb+2.+2.*kdzub+2.*kdzbb; + pconQBE0[19]= kRinSt; + pconQBE0[20]= kRoutSt; // 7 - pconQBE0[21]= -dzb+2.+2.*dzub+2.*dzbb; - pconQBE0[22]= RinSt; + pconQBE0[21]= -kdzb+2.+2.*kdzub+2.*kdzbb; + pconQBE0[22]= kRinSt; pconQBE0[23]= 4.00; // 8 - pconQBE0[24]= -dzb+2.+4.*dzub+2.*dzbb; - pconQBE0[25]= RinSt; + pconQBE0[24]= -kdzb+2.+4.*kdzub+2.*kdzbb; + pconQBE0[25]= kRinSt; pconQBE0[26]= 4.00; // 9 - pconQBE0[27]= -dzb+2.+4.*dzub+2.*dzbb; - pconQBE0[28]= RinSt; - pconQBE0[29]= RoutSt; + pconQBE0[27]= -kdzb+2.+4.*kdzub+2.*kdzbb; + pconQBE0[28]= kRinSt; + pconQBE0[29]= kRoutSt; // 10 - pconQBE0[30]= +dzb; - pconQBE0[31]= RinSt; - pconQBE0[32]= RoutSt; + pconQBE0[30]= +kdzb; + pconQBE0[31]= kRinSt; + pconQBE0[32]= kRoutSt; gMC->Gsvolu("QBE0", "PCON", idtmed[kAir], pconQBE0, 33); // // Undulated piece mother - ptube[0] = RinSt; + ptube[0] = kRinSt; ptube[1] = 4.00; - ptube[2] = dzub; + ptube[2] = kdzub; gMC->Gsvolu("QBEM","TUBE", idtmed[kAir], ptube, 3); - dz = -dzb+2.+dzub; + dz = -kdzb+2.+kdzub; gMC->Gspos("QBEM", 2 ,"QBE0", 0.0, 0.0, dz, 0 , "ONLY"); gMC->Gspos("QBEM", 1 ,"QBE0", 0.0, 0.0, -dz, idrotm[2012], "ONLY"); // Float_t pund[30]; Float_t uw = 0.02; - Float_t ur = 2.*dzub-12.*uw; + Float_t ur = 2.*kdzub-12.*uw; Float_t uz = ur/13.; Float_t ut = uz+uw; @@ -527,8 +451,8 @@ void AliPIPEv0::CreateGeometry() pund[ 2] = 8; pund[ 3] = -ut; - pund[ 4] = RinSt; - pund[ 5] = RinSt+uw; + pund[ 4] = kRinSt; + pund[ 5] = kRinSt+uw; pund[ 6] = -ut+uz; pund[ 7] = pund[4]; @@ -551,7 +475,7 @@ void AliPIPEv0::CreateGeometry() pund[20] = pund[17]; pund[21] = pund[18]; - pund[22] = RinSt; + pund[22] = kRinSt; pund[23] = pund[20]; pund[24] = pund[21]+uw; @@ -562,23 +486,23 @@ void AliPIPEv0::CreateGeometry() for (i = 0; i < 6; i++) { - dz = -dzub+(1+2*i)*ut; + dz = -kdzub+(1+2*i)*ut; gMC->Gspos("QBEU", i+1 ,"QBEM", 0.0, 0.0, dz, 0 , "ONLY"); } - ptube[0] = RinSt; - ptube[1] = RinSt+uw; + ptube[0] = kRinSt; + ptube[1] = kRinSt+uw; ptube[2] = uz; gMC->Gsvolu("QBEW","TUBE", idtmed[kInox], ptube, 3); - gMC->Gspos("QBEW", 1 ,"QBEM", 0.0, 0.0, dzub-uz, 0 , "ONLY"); + gMC->Gspos("QBEW", 1 ,"QBEM", 0.0, 0.0, kdzub-uz, 0 , "ONLY"); // // BeamPipe gMC->Gsvolu("QBEP","TUBE", idtmed[kInox], ptube, 0); - ptube[0] = RinSt; - ptube[1] = RoutSt; + ptube[0] = kRinSt; + ptube[1] = kRoutSt; ptube[2] = 1.; - gMC->Gsposp("QBEP", 1 ,"QBE0", 0.0, 0.0, -dzb+1., 0 , "ONLY", ptube, 3); - gMC->Gsposp("QBEP", 2 ,"QBE0", 0.0, 0.0, dzb-1., 0 , "ONLY", ptube, 3); - ptube[2] = dzbb; + gMC->Gsposp("QBEP", 1 ,"QBE0", 0.0, 0.0, -kdzb+1., 0 , "ONLY", ptube, 3); + gMC->Gsposp("QBEP", 2 ,"QBE0", 0.0, 0.0, kdzb-1., 0 , "ONLY", ptube, 3); + ptube[2] = kdzbb; gMC->Gsposp("QBEP", 3 ,"QBE0", 0.0, 0.0, 0., 0 , "ONLY", ptube, 3); // // End undulated part @@ -693,18 +617,18 @@ void AliPIPEv0::CreateGeometry() // gMC->Gsvolu("QB24","TUBE", idtmed[kInox], ptube, 0); - ptube[0] = RinSt; - ptube[1] = RoutSt; + ptube[0] = kRinSt; + ptube[1] = kRoutSt; ptube[2] = hlenQb24[0]; dz = hlenQbbe2 + ptube[2]; gMC->Gsposp("QB24", 1 ,"QBPM", 0.0, 0.0, -dz, 0, "ONLY", ptube, 3); // // Bellow on absorber side - dz = dz+hlenQb24[0] + dzb; + dz = dz+hlenQb24[0] + kdzb; gMC->Gspos("QBE0", 1 ,"QBPM", 0.0, 0.0, -dz, 0, "ONLY"); // ptube[2] = hlenQb24[1]; - dz = dz + dzb + ptube[2]; + dz = dz + kdzb + ptube[2]; gMC->Gsposp("QB24", 2 ,"QBPM", 0.0, 0.0, -dz, 0, "ONLY", ptube, 3); dz = dz + ptube[2]; @@ -712,7 +636,7 @@ void AliPIPEv0::CreateGeometry() // Flange // // Mother Volume - ptube[0] = RinSt; + ptube[0] = kRinSt; ptube[1] = 4.300; ptube[2] = 1.4; @@ -722,8 +646,8 @@ void AliPIPEv0::CreateGeometry() dz = dz + ptube[2]; // // - ptube[0] = RinSt; - ptube[1] = RoutSt; + ptube[0] = kRinSt; + ptube[1] = kRoutSt; ptube[2] = hlenQb24[2]; dz = dz + ptube[2]; gMC->Gsposp("QB24", 3 ,"QBPM", 0.0, 0.0, -dz, 0, "ONLY", ptube, 3); diff --git a/STRUCT/AliPIPEv0.h b/STRUCT/AliPIPEv0.h index ebd1b3064e1..adf2f2135e7 100644 --- a/STRUCT/AliPIPEv0.h +++ b/STRUCT/AliPIPEv0.h @@ -25,7 +25,7 @@ class AliPIPEv0 : public AliPIPE { virtual void SetPipeMaterial(Int_t mat = kBe) {fPipeMaterial = mat;} virtual Int_t IsVersion() const {return 0;} protected: - Int_t fPipeMaterial; + Int_t fPipeMaterial; // Pipe material (Al, Be, or Inox) ClassDef(AliPIPEv0,2) //Class for PIPE version 0 }; diff --git a/STRUCT/AliPIPEv1.cxx b/STRUCT/AliPIPEv1.cxx index 7d28ad14db2..53a83b28afc 100644 --- a/STRUCT/AliPIPEv1.cxx +++ b/STRUCT/AliPIPEv1.cxx @@ -13,22 +13,11 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.8 2000/10/02 21:28:15 fca -Removal of useless dependecies via forward declarations - -Revision 1.7 2000/06/11 12:37:25 morsch -Coding rule violations corrected - -Revision 1.6 1999/09/29 09:24:30 fca -Introduction of the Copyright and cvs Log - -*/ +/* $Id$ */ /////////////////////////////////////////////////////////////////////////////// // // -// Beam pipe class // +// Beam pipe class. Test version // // // //Begin_Html /* @@ -250,7 +239,7 @@ void AliPIPEv1::CreateGeometry() } //_____________________________________________________________________________ -void AliPIPEv1::DrawModule() +void AliPIPEv1::DrawModule() const { // // Draw a shaded view of the Beam Pipe diff --git a/STRUCT/AliPIPEv1.h b/STRUCT/AliPIPEv1.h index 7367b60933e..110f769e992 100644 --- a/STRUCT/AliPIPEv1.h +++ b/STRUCT/AliPIPEv1.h @@ -21,7 +21,7 @@ public: virtual void CreateGeometry(); virtual void CreateMaterials(); virtual Int_t IsVersion() const {return 1;} - virtual void DrawModule(); + virtual void DrawModule() const; ClassDef(AliPIPEv1,1) //Class for PIPE version 1 }; diff --git a/STRUCT/AliPIPEv3.cxx b/STRUCT/AliPIPEv3.cxx index a8890972eb8..aefb50e902a 100644 --- a/STRUCT/AliPIPEv3.cxx +++ b/STRUCT/AliPIPEv3.cxx @@ -13,30 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.10 2002/10/14 14:57:39 hristov -Merging the VirtualMC branch to the main development branch (HEAD) - -Revision 1.8.12.1 2002/07/24 10:08:27 alibrary -Updating VirtualMC - -Revision 1.9 2002/07/23 13:08:46 morsch -All volume names start with "Q". - -Revision 1.8 2000/10/02 21:28:15 fca -Removal of useless dependecies via forward declarations - -Revision 1.7 2000/06/11 12:38:00 morsch -Coding rule violations corrected - -Revision 1.6 1999/10/06 19:57:07 fca -Correct materials in pipe - -Revision 1.5 1999/09/29 09:24:30 fca -Introduction of the Copyright and cvs Log - -*/ +/* $Id$ */ /////////////////////////////////////////////////////////////////////////////// // // @@ -333,7 +310,7 @@ void AliPIPEv3::CreateGeometry() } //_____________________________________________________________________________ -void AliPIPEv3::DrawModule() +void AliPIPEv3::DrawModule() const { // // Draw a shaded view of the Beam Pipe diff --git a/STRUCT/AliPIPEv3.h b/STRUCT/AliPIPEv3.h index 9fc3ee1f614..c10cb850a13 100644 --- a/STRUCT/AliPIPEv3.h +++ b/STRUCT/AliPIPEv3.h @@ -21,7 +21,7 @@ public: virtual void CreateGeometry(); virtual void CreateMaterials(); virtual Int_t IsVersion() const {return 3;} - virtual void DrawModule(); + virtual void DrawModule() const; virtual void Undulation(char *undul, Float_t pitch, Float_t thick, Float_t zundul, Float_t rundul, char (*cone)[5]); ClassDef(AliPIPEv3,1) //Class for PIPE version 3 diff --git a/STRUCT/AliSHIL.cxx b/STRUCT/AliSHIL.cxx index 013521b4c48..f014a69f762 100644 --- a/STRUCT/AliSHIL.cxx +++ b/STRUCT/AliSHIL.cxx @@ -13,24 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.10 2000/10/02 21:28:15 fca -Removal of useless dependecies via forward declarations - -Revision 1.9 2000/06/11 12:38:40 morsch -Coding rule violations corrected - -Revision 1.8 2000/02/23 13:48:33 morsch -Detailed composition of insulation material. - -Revision 1.7 2000/01/12 15:37:57 morsch -Base class only - -Revision 1.6 1999/09/29 09:24:30 fca -Introduction of the Copyright and cvs Log - -*/ +/* $Id$ */ /////////////////////////////////////////////////////////////////////////////// // // diff --git a/STRUCT/AliSHILv0.cxx b/STRUCT/AliSHILv0.cxx index 57e9a11f917..db56b68c54e 100644 --- a/STRUCT/AliSHILv0.cxx +++ b/STRUCT/AliSHILv0.cxx @@ -13,81 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.21 2002/10/29 17:20:38 hristov -Corrections for subscript out of range (Alpha) - -Revision 1.20 2002/10/29 09:53:40 morsch -Constants start with k. Warnings corrected. - - -Revision 1.19 2002/10/14 14:57:39 hristov -Merging the VirtualMC branch to the main development branch (HEAD) - -Revision 1.17.6.1 2002/07/24 13:33:35 alibrary -Make geometry consistent with new current parameters. - -Revision 1.18 2002/07/24 13:28:49 morsch -Make geometry consistent with new current parameters. - -Revision 1.17 2001/11/17 01:29:21 morsch -Obsolete and wrong volume YXO5 removed. - -Revision 1.16 2001/11/16 08:57:42 morsch -Volume YP32 obsolete. - -Revision 1.15 2001/11/05 10:41:06 morsch -Avoid overlap of compensation magnet with HALL. - -Revision 1.14 2001/10/26 08:36:19 morsch -Geometry update. - -Revision 1.13 2001/04/23 23:12:41 morsch -Overlap in closing cone corrected (thanks to Ivana Hrivnacova) - -Revision 1.12 2001/03/16 16:26:05 morsch -Put vacuum in beam-pipe not air. - -Revision 1.11 2000/10/27 15:21:24 morsch -Shield composition after muon project leader meeting: 24/10/2000 -- 1 cm recess in steel for station 3 -- no heavy shielding between chambers for stations 1 and 2 - -Revision 1.10 2000/10/02 21:28:15 fca -Removal of useless dependecies via forward declarations - -Revision 1.9 2000/09/12 17:00:45 morsch -Overlaps in YMO3 and YMO4 (side-effect from last update only) corrected. - -Revision 1.8 2000/09/12 16:11:43 morsch -- Bug in volume YGO2 corrected: PCON started with twice the same z-value. -- Recesses for chambers added to outer Pb cone. - -Revision 1.7 2000/06/15 09:40:31 morsch -Obsolete typedef keyword removed - -Revision 1.6 2000/06/13 15:01:38 morsch -Make kind of heavy shielding material (Pb, NiCuW) dependent on presence of outer cone. - -Revision 1.5 2000/06/12 19:40:00 morsch -New structure of beam pipe and heating jacket. -Optional outer Pb cone added. Not yet compatible with chamber inner radii. - -Revision 1.4 2000/04/03 08:13:40 fca -Introduce extra scope for non ANSI compliant C++ compilers - -Revision 1.3 2000/01/17 10:29:30 morsch -Overlap between Shield and Absorber due to limited numerical precision removed -by displacing the Shield by epsilon = 0.01 cm. - -Revision 1.2 2000/01/13 11:27:51 morsch -Overlaps corrected: YCS3, YCS4; Inner radius YS21 corrected - -Revision 1.1 2000/01/12 15:44:03 morsch -Standard version of SHIL - -*/ +/* $Id$ */ /////////////////////////////////////////////////////////////////////////////// // // diff --git a/STRUCT/AliSHILv0.h b/STRUCT/AliSHILv0.h index 3e50c8b1cff..1b613a6ee23 100644 --- a/STRUCT/AliSHILv0.h +++ b/STRUCT/AliSHILv0.h @@ -24,7 +24,7 @@ public: virtual void SetPbCone(Bool_t flag=kTRUE) {fPbCone=flag;} protected: - Bool_t fPbCone; + Bool_t fPbCone; // flag for the Pb cone ClassDef(AliSHILv0,1) // Muon Shield Class (Open Geometry) diff --git a/STRUCT/AliSHILv2.cxx b/STRUCT/AliSHILv2.cxx index 40877c43428..6130886a422 100644 --- a/STRUCT/AliSHILv2.cxx +++ b/STRUCT/AliSHILv2.cxx @@ -13,34 +13,13 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.8 2002/11/21 16:28:39 alibrary -Removing AliMCProcess and AliMC - -Revision 1.7 2002/11/12 17:06:13 morsch -Update on recess between stations 4 and 5. - -Revision 1.6 2002/10/29 09:53:40 morsch -Constants start with k. Warnings corrected. - -Revision 1.5 2002/10/14 14:57:39 hristov -Merging the VirtualMC branch to the main development branch (HEAD) - -Revision 1.3.2.2 2002/10/11 08:04:28 hristov -Updating VirtualMC to v3-09-02 - -Revision 1.4 2002/09/02 15:32:15 morsch -Gsbool calls to resolve MANY added (I. Hrivnacova) - -Revision 1.3 2002/07/25 10:00:08 morsch -par4 size increased. - -Revision 1.2 2002/07/15 08:16:35 morsch -New shield geometry. - -*/ +/* $Id$ */ +//------------------------------------------------------------------------- +// MUON shielding class +// Default version +// Author: A.Morsch +//------------------------------------------------------------------------- #include "AliSHILv2.h" #include "AliRun.h" @@ -622,15 +601,21 @@ void AliSHILv2::CreateGeometry() // begin Fluka // Float_t rf1[10], rf2[10]; - rf1[0]=0.; rf2[0]=0.; + rf1[0]=0.; rf1[1] = cpar0[1]; - rf2[1] = cpar0[3]; - + rf1[2]=rf1[1]+0.15; + rf1[3]=rf1[2]+0.5; + rf1[4]=rf1[3]+0.1; + rf1[5]=par1[4]; + rf1[6]=0.; //PH This has to be checked... - rf1[2]=rf1[1]+0.15; rf1[3]=rf1[2]+0.5; rf1[4]=rf1[3]+0.1; - rf1[5]=par1[4]; - rf2[2]=rf2[1]+0.15; rf2[3]=rf2[2]+0.5; rf2[4]=rf2[3]+0.1; + rf2[0]=0.; + rf2[1] = cpar0[3]; + rf2[2]=rf2[1]+0.15; + rf2[3]=rf2[2]+0.5; + rf2[4]=rf2[3]+0.1; rf2[5]=par1[7]; + rf2[6]=0.; //PH This has to be checked char* materialsA[7] = {"VACUUM", "STEEL", "PIPEINSU", "STEEL", "AIR", "AIR"}; diff --git a/STRUCT/AliSHILvF.cxx b/STRUCT/AliSHILvF.cxx index 58aacb54b63..7bdac292d36 100644 --- a/STRUCT/AliSHILvF.cxx +++ b/STRUCT/AliSHILvF.cxx @@ -13,64 +13,13 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.19 2002/10/29 17:20:38 hristov -Corrections for subscript out of range (Alpha) - -Revision 1.18 2002/10/29 09:53:40 morsch -Constants start with k. Warnings corrected. - -Revision 1.17 2002/10/14 14:57:39 hristov -Merging the VirtualMC branch to the main development branch (HEAD) - -Revision 1.12.6.2 2002/07/24 10:08:27 alibrary -Updating VirtualMC - -Revision 1.16 2002/07/08 15:13:24 morsch -Position of bellow. - -Revision 1.15 2002/05/30 11:58:34 morsch -More robust geometry for bellows: use divisions and neg. parameters. - -Revision 1.14 2002/05/29 11:23:46 morsch -Numerical overlap for 2nd bellow corrected. - -Revision 1.13 2002/05/02 12:50:06 morsch -For G4: gMC->VolId(...) replaced by gAlice->GetModule(...). - -Revision 1.12 2002/01/21 11:31:21 morsch -ALIFE output only on demand. - -Revision 1.11 2001/11/17 01:29:21 morsch -Obsolete and wrong volume YXO5 removed. - -Revision 1.10 2001/11/16 08:57:42 morsch -Volume YP32 obsolete. - -Revision 1.9 2001/11/12 10:19:30 morsch -Correction of uninitialized array element problem. - -Revision 1.8 2001/10/25 08:50:57 morsch -New beamshield geometry with increased tolerances and insulation thickness. - -Revision 1.6 2001/04/23 23:12:41 morsch -Overlap in closing cone corrected (thanks to Ivana Hrivnacova) - -Revision 1.5 2001/03/16 16:26:05 morsch -Put vacuum in beam-pipe not air. - -Revision 1.4 2001/01/31 11:55:27 hristov -Loop variables declared once (required by HP) - -Revision 1.3 2001/01/30 12:28:27 morsch -Recess station 1 changed do make space for chambers. - -Revision 1.2 2000/12/04 16:30:02 morsch -Update to geometry defined for the Muon Spectrometer Addendum to the TDR. - -*/ +/* $Id$ */ +//------------------------------------------------------------------------- +// MUON shielding class +// Version producing Fluka output +// Author: A.Morsch +//------------------------------------------------------------------------- #include "AliSHILvF.h" #include "AliRun.h" -- 2.43.0