| 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 <<
27 // 26 //
28 // 27.03.98 J.Apostolakis - First version. << 27 // $Id: G4CSGSolid.cc 69788 2013-05-15 12:06:57Z gcosmo $
>> 28 //
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 "G4Polyhedron.hh" 35 #include "G4Polyhedron.hh"
36 36
37 #include "G4AutoLock.hh" <<
38 <<
39 namespace <<
40 { <<
41 G4Mutex polyhedronMutex = G4MUTEX_INITIALIZE <<
42 } <<
43 <<
44 ////////////////////////////////////////////// 37 //////////////////////////////////////////////////////////////////////////
45 // 38 //
46 // Constructor 39 // Constructor
47 // - Base class constructor << 40 // - Base class constructor
48 41
49 G4CSGSolid::G4CSGSolid(const G4String& name) : 42 G4CSGSolid::G4CSGSolid(const G4String& name) :
50 G4VSolid(name) << 43 G4VSolid(name), fCubicVolume(0.), fSurfaceArea(0.), fpPolyhedron(0)
51 { 44 {
52 } 45 }
53 46
54 ////////////////////////////////////////////// 47 //////////////////////////////////////////////////////////////////////////
55 // 48 //
56 // Fake default constructor - sets only member 49 // Fake default constructor - sets only member data and allocates memory
57 // for usage restri 50 // for usage restricted to object persistency.
58 51
59 G4CSGSolid::G4CSGSolid( __void__& a ) 52 G4CSGSolid::G4CSGSolid( __void__& a )
60 : G4VSolid(a) << 53 : G4VSolid(a), fCubicVolume(0.), fSurfaceArea(0.), fpPolyhedron(0)
61 { 54 {
62 } 55 }
63 56
64 ////////////////////////////////////////////// 57 //////////////////////////////////////////////////////////////////////////
65 // 58 //
66 // Destructor 59 // Destructor
67 // 60 //
68 61
69 G4CSGSolid::~G4CSGSolid() << 62 G4CSGSolid::~G4CSGSolid()
70 { 63 {
71 delete fpPolyhedron; fpPolyhedron = nullptr; << 64 delete fpPolyhedron;
72 } 65 }
73 66
74 ////////////////////////////////////////////// 67 //////////////////////////////////////////////////////////////////////////
75 // 68 //
76 // Copy constructor 69 // Copy constructor
77 // 70 //
78 71
79 G4CSGSolid::G4CSGSolid(const G4CSGSolid& rhs) 72 G4CSGSolid::G4CSGSolid(const G4CSGSolid& rhs)
80 : G4VSolid(rhs), fCubicVolume(rhs.fCubicVolu 73 : G4VSolid(rhs), fCubicVolume(rhs.fCubicVolume),
81 fSurfaceArea(rhs.fSurfaceArea) << 74 fSurfaceArea(rhs.fSurfaceArea), fpPolyhedron(0)
82 { 75 {
83 } 76 }
84 77
85 ////////////////////////////////////////////// 78 //////////////////////////////////////////////////////////////////////////
86 // 79 //
87 // Assignment operator 80 // Assignment operator
88 81
89 G4CSGSolid& G4CSGSolid::operator = (const G4CS << 82 G4CSGSolid& G4CSGSolid::operator = (const G4CSGSolid& rhs)
90 { 83 {
91 // Check assignment to self 84 // Check assignment to self
92 // 85 //
93 if (this == &rhs) { return *this; } 86 if (this == &rhs) { return *this; }
94 87
95 // Copy base class data 88 // Copy base class data
96 // 89 //
97 G4VSolid::operator=(rhs); 90 G4VSolid::operator=(rhs);
98 91
99 // Copy data 92 // Copy data
100 // 93 //
101 fCubicVolume = rhs.fCubicVolume; 94 fCubicVolume = rhs.fCubicVolume;
102 fSurfaceArea = rhs.fSurfaceArea; 95 fSurfaceArea = rhs.fSurfaceArea;
103 fRebuildPolyhedron = false; << 96 fpPolyhedron = 0;
104 delete fpPolyhedron; fpPolyhedron = nullptr <<
105 97
106 return *this; 98 return *this;
107 } << 99 }
108 100
109 G4double G4CSGSolid::GetRadiusInRing(G4double 101 G4double G4CSGSolid::GetRadiusInRing(G4double rmin, G4double rmax) const
110 { 102 {
111 G4double k = G4QuickRand(); << 103 // Generate radius in annular ring according to uniform area
112 return (rmin <= 0) ? rmax*std::sqrt(k) << 104 //
113 : std::sqrt(k*rmax*rmax + << 105 if (rmin<=0.) { return rmax*std::sqrt(G4UniformRand()); }
>> 106 if (rmin!=rmax) { return std::sqrt(G4UniformRand()
>> 107 * (sqr(rmax)-sqr(rmin))+sqr(rmin)); }
>> 108 return rmin;
114 } 109 }
115 110
116 std::ostream& G4CSGSolid::StreamInfo(std::ostr 111 std::ostream& G4CSGSolid::StreamInfo(std::ostream& os) const
117 { 112 {
118 os << "------------------------------------- 113 os << "-----------------------------------------------------------\n"
119 << " *** Dump for solid - " << GetName 114 << " *** Dump for solid - " << GetName() << " ***\n"
120 << " ================================= 115 << " ===================================================\n"
121 << " Solid type: " << GetEntityType() << 116 << " Solid type: " << GetEntityType() << "\n"
122 << " Parameters: \n" 117 << " Parameters: \n"
123 << " NOT available !\n" 118 << " NOT available !\n"
124 << "------------------------------------- 119 << "-----------------------------------------------------------\n";
125 120
126 return os; 121 return os;
127 } 122 }
128 123
129 G4Polyhedron* G4CSGSolid::GetPolyhedron () con 124 G4Polyhedron* G4CSGSolid::GetPolyhedron () const
130 { 125 {
131 if (fpPolyhedron == nullptr || << 126 if (!fpPolyhedron ||
132 fRebuildPolyhedron || <<
133 fpPolyhedron->GetNumberOfRotationStepsAt 127 fpPolyhedron->GetNumberOfRotationStepsAtTimeOfCreation() !=
134 fpPolyhedron->GetNumberOfRotationSteps() 128 fpPolyhedron->GetNumberOfRotationSteps())
135 { 129 {
136 G4AutoLock l(&polyhedronMutex); <<
137 delete fpPolyhedron; 130 delete fpPolyhedron;
138 fpPolyhedron = CreatePolyhedron(); 131 fpPolyhedron = CreatePolyhedron();
139 fRebuildPolyhedron = false; <<
140 l.unlock(); <<
141 } 132 }
142 return fpPolyhedron; 133 return fpPolyhedron;
143 } 134 }
144 135