| 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 83572 2014-09-01 15:23:27Z 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" 37 #include "G4AutoLock.hh"
38 38
39 namespace 39 namespace
40 { 40 {
41 G4Mutex polyhedronMutex = G4MUTEX_INITIALIZE 41 G4Mutex polyhedronMutex = G4MUTEX_INITIALIZER;
42 } 42 }
43 43
44 ////////////////////////////////////////////// 44 //////////////////////////////////////////////////////////////////////////
45 // 45 //
46 // Constructor 46 // Constructor
47 // - Base class constructor << 47 // - Base class constructor
48 48
49 G4CSGSolid::G4CSGSolid(const G4String& name) : 49 G4CSGSolid::G4CSGSolid(const G4String& name) :
50 G4VSolid(name) << 50 G4VSolid(name), fCubicVolume(0.), fSurfaceArea(0.),
>> 51 fRebuildPolyhedron(false), fpPolyhedron(0)
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), fCubicVolume(0.), fSurfaceArea(0.),
>> 62 fRebuildPolyhedron(false), fpPolyhedron(0)
61 { 63 {
62 } 64 }
63 65
64 ////////////////////////////////////////////// 66 //////////////////////////////////////////////////////////////////////////
65 // 67 //
66 // Destructor 68 // Destructor
67 // 69 //
68 70
69 G4CSGSolid::~G4CSGSolid() << 71 G4CSGSolid::~G4CSGSolid()
70 { 72 {
71 delete fpPolyhedron; fpPolyhedron = nullptr; << 73 delete fpPolyhedron; fpPolyhedron = 0;
72 } 74 }
73 75
74 ////////////////////////////////////////////// 76 //////////////////////////////////////////////////////////////////////////
75 // 77 //
76 // Copy constructor 78 // Copy constructor
77 // 79 //
78 80
79 G4CSGSolid::G4CSGSolid(const G4CSGSolid& rhs) 81 G4CSGSolid::G4CSGSolid(const G4CSGSolid& rhs)
80 : G4VSolid(rhs), fCubicVolume(rhs.fCubicVolu 82 : G4VSolid(rhs), fCubicVolume(rhs.fCubicVolume),
81 fSurfaceArea(rhs.fSurfaceArea) << 83 fSurfaceArea(rhs.fSurfaceArea), fRebuildPolyhedron(false), fpPolyhedron(0)
82 { 84 {
83 } 85 }
84 86
85 ////////////////////////////////////////////// 87 //////////////////////////////////////////////////////////////////////////
86 // 88 //
87 // Assignment operator 89 // Assignment operator
88 90
89 G4CSGSolid& G4CSGSolid::operator = (const G4CS << 91 G4CSGSolid& G4CSGSolid::operator = (const G4CSGSolid& rhs)
90 { 92 {
91 // Check assignment to self 93 // Check assignment to self
92 // 94 //
93 if (this == &rhs) { return *this; } 95 if (this == &rhs) { return *this; }
94 96
95 // Copy base class data 97 // Copy base class data
96 // 98 //
97 G4VSolid::operator=(rhs); 99 G4VSolid::operator=(rhs);
98 100
99 // Copy data 101 // Copy data
100 // 102 //
101 fCubicVolume = rhs.fCubicVolume; 103 fCubicVolume = rhs.fCubicVolume;
102 fSurfaceArea = rhs.fSurfaceArea; 104 fSurfaceArea = rhs.fSurfaceArea;
103 fRebuildPolyhedron = false; 105 fRebuildPolyhedron = false;
104 delete fpPolyhedron; fpPolyhedron = nullptr << 106 delete fpPolyhedron; fpPolyhedron = 0;
105 107
106 return *this; 108 return *this;
107 } << 109 }
108 110
109 G4double G4CSGSolid::GetRadiusInRing(G4double 111 G4double G4CSGSolid::GetRadiusInRing(G4double rmin, G4double rmax) const
110 { 112 {
111 G4double k = G4QuickRand(); << 113 // Generate radius in annular ring according to uniform area
112 return (rmin <= 0) ? rmax*std::sqrt(k) << 114 //
113 : std::sqrt(k*rmax*rmax + << 115 if (rmin<=0.) { return rmax*std::sqrt(G4UniformRand()); }
>> 116 if (rmin!=rmax) { return std::sqrt(G4UniformRand()
>> 117 * (sqr(rmax)-sqr(rmin))+sqr(rmin)); }
>> 118 return rmin;
114 } 119 }
115 120
116 std::ostream& G4CSGSolid::StreamInfo(std::ostr 121 std::ostream& G4CSGSolid::StreamInfo(std::ostream& os) const
117 { 122 {
118 os << "------------------------------------- 123 os << "-----------------------------------------------------------\n"
119 << " *** Dump for solid - " << GetName 124 << " *** Dump for solid - " << GetName() << " ***\n"
120 << " ================================= 125 << " ===================================================\n"
121 << " Solid type: " << GetEntityType() << 126 << " Solid type: " << GetEntityType() << "\n"
122 << " Parameters: \n" 127 << " Parameters: \n"
123 << " NOT available !\n" 128 << " NOT available !\n"
124 << "------------------------------------- 129 << "-----------------------------------------------------------\n";
125 130
126 return os; 131 return os;
127 } 132 }
128 133
129 G4Polyhedron* G4CSGSolid::GetPolyhedron () con 134 G4Polyhedron* G4CSGSolid::GetPolyhedron () const
130 { 135 {
131 if (fpPolyhedron == nullptr || << 136 if (!fpPolyhedron ||
132 fRebuildPolyhedron || 137 fRebuildPolyhedron ||
133 fpPolyhedron->GetNumberOfRotationStepsAt 138 fpPolyhedron->GetNumberOfRotationStepsAtTimeOfCreation() !=
134 fpPolyhedron->GetNumberOfRotationSteps() 139 fpPolyhedron->GetNumberOfRotationSteps())
135 { 140 {
136 G4AutoLock l(&polyhedronMutex); 141 G4AutoLock l(&polyhedronMutex);
137 delete fpPolyhedron; 142 delete fpPolyhedron;
138 fpPolyhedron = CreatePolyhedron(); 143 fpPolyhedron = CreatePolyhedron();
139 fRebuildPolyhedron = false; 144 fRebuildPolyhedron = false;
140 l.unlock(); 145 l.unlock();
141 } 146 }
142 return fpPolyhedron; 147 return fpPolyhedron;
143 } 148 }
144 149