| Geant4 Cross Reference |
1 // 1 //
2 // ******************************************* 2 // ********************************************************************
3 // * License and Disclaimer 3 // * License and Disclaimer *
4 // * 4 // * *
5 // * The Geant4 software is copyright of th 5 // * The Geant4 software is copyright of the Copyright Holders of *
6 // * the Geant4 Collaboration. It is provided 6 // * the Geant4 Collaboration. It is provided under the terms and *
7 // * conditions of the Geant4 Software License 7 // * conditions of the Geant4 Software License, included in the file *
8 // * LICENSE and available at http://cern.ch/ 8 // * LICENSE and available at http://cern.ch/geant4/license . These *
9 // * include a list of copyright holders. 9 // * include a list of copyright holders. *
10 // * 10 // * *
11 // * Neither the authors of this software syst 11 // * Neither the authors of this software system, nor their employing *
12 // * institutes,nor the agencies providing fin 12 // * institutes,nor the agencies providing financial support for this *
13 // * work make any representation or warran 13 // * work make any representation or warranty, express or implied, *
14 // * regarding this software system or assum 14 // * regarding this software system or assume any liability for its *
15 // * use. Please see the license in the file 15 // * use. Please see the license in the file LICENSE and URL above *
16 // * for the full disclaimer and the limitatio 16 // * for the full disclaimer and the limitation of liability. *
17 // * 17 // * *
18 // * This code implementation is the result 18 // * This code implementation is the result of the scientific and *
19 // * technical work of the GEANT4 collaboratio 19 // * technical work of the GEANT4 collaboration. *
20 // * By using, copying, modifying or distri 20 // * By using, copying, modifying or distributing the software (or *
21 // * any work based on the software) you ag 21 // * any work based on the software) you agree to acknowledge its *
22 // * use in resulting scientific publicati 22 // * use in resulting scientific publications, and indicate your *
23 // * acceptance of all terms of the Geant4 Sof 23 // * acceptance of all terms of the Geant4 Software license. *
24 // ******************************************* 24 // ********************************************************************
25 // 25 //
26 // Implementation of G4CSGSolid 26 // Implementation of G4CSGSolid
27 // 27 //
28 // 27.03.98 J.Apostolakis - First version. 28 // 27.03.98 J.Apostolakis - First version.
29 // ------------------------------------------- 29 // --------------------------------------------------------------------
30 30
31 #include <cmath> 31 #include <cmath>
32 32
33 #include "G4CSGSolid.hh" 33 #include "G4CSGSolid.hh"
34 #include "G4QuickRand.hh" << 34 #include "Randomize.hh"
>> 35 #include "G4RandomTools.hh"
35 #include "G4Polyhedron.hh" 36 #include "G4Polyhedron.hh"
36 37
37 #include "G4AutoLock.hh" 38 #include "G4AutoLock.hh"
38 39
39 namespace 40 namespace
40 { 41 {
41 G4Mutex polyhedronMutex = G4MUTEX_INITIALIZE 42 G4Mutex polyhedronMutex = G4MUTEX_INITIALIZER;
42 } 43 }
43 44
44 ////////////////////////////////////////////// 45 //////////////////////////////////////////////////////////////////////////
45 // 46 //
46 // Constructor 47 // Constructor
47 // - Base class constructor << 48 // - Base class constructor
48 49
49 G4CSGSolid::G4CSGSolid(const G4String& name) : 50 G4CSGSolid::G4CSGSolid(const G4String& name) :
50 G4VSolid(name) 51 G4VSolid(name)
51 { 52 {
52 } 53 }
53 54
54 ////////////////////////////////////////////// 55 //////////////////////////////////////////////////////////////////////////
55 // 56 //
56 // Fake default constructor - sets only member 57 // Fake default constructor - sets only member data and allocates memory
57 // for usage restri 58 // for usage restricted to object persistency.
58 59
59 G4CSGSolid::G4CSGSolid( __void__& a ) 60 G4CSGSolid::G4CSGSolid( __void__& a )
60 : G4VSolid(a) 61 : G4VSolid(a)
61 { 62 {
62 } 63 }
63 64
64 ////////////////////////////////////////////// 65 //////////////////////////////////////////////////////////////////////////
65 // 66 //
66 // Destructor 67 // Destructor
67 // 68 //
68 69
69 G4CSGSolid::~G4CSGSolid() << 70 G4CSGSolid::~G4CSGSolid()
70 { 71 {
71 delete fpPolyhedron; fpPolyhedron = nullptr; 72 delete fpPolyhedron; fpPolyhedron = nullptr;
72 } 73 }
73 74
74 ////////////////////////////////////////////// 75 //////////////////////////////////////////////////////////////////////////
75 // 76 //
76 // Copy constructor 77 // Copy constructor
77 // 78 //
78 79
79 G4CSGSolid::G4CSGSolid(const G4CSGSolid& rhs) 80 G4CSGSolid::G4CSGSolid(const G4CSGSolid& rhs)
80 : G4VSolid(rhs), fCubicVolume(rhs.fCubicVolu 81 : G4VSolid(rhs), fCubicVolume(rhs.fCubicVolume),
81 fSurfaceArea(rhs.fSurfaceArea) 82 fSurfaceArea(rhs.fSurfaceArea)
82 { 83 {
83 } 84 }
84 85
85 ////////////////////////////////////////////// 86 //////////////////////////////////////////////////////////////////////////
86 // 87 //
87 // Assignment operator 88 // Assignment operator
88 89
89 G4CSGSolid& G4CSGSolid::operator = (const G4CS << 90 G4CSGSolid& G4CSGSolid::operator = (const G4CSGSolid& rhs)
90 { 91 {
91 // Check assignment to self 92 // Check assignment to self
92 // 93 //
93 if (this == &rhs) { return *this; } 94 if (this == &rhs) { return *this; }
94 95
95 // Copy base class data 96 // Copy base class data
96 // 97 //
97 G4VSolid::operator=(rhs); 98 G4VSolid::operator=(rhs);
98 99
99 // Copy data 100 // Copy data
100 // 101 //
101 fCubicVolume = rhs.fCubicVolume; 102 fCubicVolume = rhs.fCubicVolume;
102 fSurfaceArea = rhs.fSurfaceArea; 103 fSurfaceArea = rhs.fSurfaceArea;
103 fRebuildPolyhedron = false; 104 fRebuildPolyhedron = false;
104 delete fpPolyhedron; fpPolyhedron = nullptr 105 delete fpPolyhedron; fpPolyhedron = nullptr;
105 106
106 return *this; 107 return *this;
107 } << 108 }
108 109
109 G4double G4CSGSolid::GetRadiusInRing(G4double 110 G4double G4CSGSolid::GetRadiusInRing(G4double rmin, G4double rmax) const
110 { 111 {
111 G4double k = G4QuickRand(); << 112 return G4RandomRadiusInRing(rmin, rmax);
112 return (rmin <= 0) ? rmax*std::sqrt(k) <<
113 : std::sqrt(k*rmax*rmax + <<
114 } 113 }
115 114
116 std::ostream& G4CSGSolid::StreamInfo(std::ostr 115 std::ostream& G4CSGSolid::StreamInfo(std::ostream& os) const
117 { 116 {
118 os << "------------------------------------- 117 os << "-----------------------------------------------------------\n"
119 << " *** Dump for solid - " << GetName 118 << " *** Dump for solid - " << GetName() << " ***\n"
120 << " ================================= 119 << " ===================================================\n"
121 << " Solid type: " << GetEntityType() << 120 << " Solid type: " << GetEntityType() << "\n"
122 << " Parameters: \n" 121 << " Parameters: \n"
123 << " NOT available !\n" 122 << " NOT available !\n"
124 << "------------------------------------- 123 << "-----------------------------------------------------------\n";
125 124
126 return os; 125 return os;
127 } 126 }
128 127
129 G4Polyhedron* G4CSGSolid::GetPolyhedron () con 128 G4Polyhedron* G4CSGSolid::GetPolyhedron () const
130 { 129 {
131 if (fpPolyhedron == nullptr || 130 if (fpPolyhedron == nullptr ||
132 fRebuildPolyhedron || 131 fRebuildPolyhedron ||
133 fpPolyhedron->GetNumberOfRotationStepsAt 132 fpPolyhedron->GetNumberOfRotationStepsAtTimeOfCreation() !=
134 fpPolyhedron->GetNumberOfRotationSteps() 133 fpPolyhedron->GetNumberOfRotationSteps())
135 { 134 {
136 G4AutoLock l(&polyhedronMutex); 135 G4AutoLock l(&polyhedronMutex);
137 delete fpPolyhedron; 136 delete fpPolyhedron;
138 fpPolyhedron = CreatePolyhedron(); 137 fpPolyhedron = CreatePolyhedron();
139 fRebuildPolyhedron = false; 138 fRebuildPolyhedron = false;
140 l.unlock(); 139 l.unlock();
141 } 140 }
142 return fpPolyhedron; 141 return fpPolyhedron;
143 } 142 }
144 143