| 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 G4UPolycone wrapper class 26 // Implementation of G4UPolycone wrapper class
27 // 27 //
28 // 31.10.13 G.Cosmo, CERN 28 // 31.10.13 G.Cosmo, CERN
29 // ------------------------------------------- 29 // --------------------------------------------------------------------
30 30
31 #include "G4Polycone.hh" 31 #include "G4Polycone.hh"
32 #include "G4UPolycone.hh" 32 #include "G4UPolycone.hh"
33 33
34 #if ( defined(G4GEOM_USE_USOLIDS) || defined(G 34 #if ( defined(G4GEOM_USE_USOLIDS) || defined(G4GEOM_USE_PARTIAL_USOLIDS) )
35 35
36 #include "G4GeomTools.hh" 36 #include "G4GeomTools.hh"
37 #include "G4AffineTransform.hh" 37 #include "G4AffineTransform.hh"
38 #include "G4VPVParameterisation.hh" 38 #include "G4VPVParameterisation.hh"
39 #include "G4BoundingEnvelope.hh" 39 #include "G4BoundingEnvelope.hh"
40 40
41 using namespace CLHEP; 41 using namespace CLHEP;
42 42
43 ////////////////////////////////////////////// 43 ////////////////////////////////////////////////////////////////////////
44 // 44 //
45 // Constructor (GEANT3 style parameters) 45 // Constructor (GEANT3 style parameters)
46 // 46 //
47 G4UPolycone::G4UPolycone( const G4String& name 47 G4UPolycone::G4UPolycone( const G4String& name,
48 G4double phiStar 48 G4double phiStart,
49 G4double phiTota 49 G4double phiTotal,
50 G4int numZPlanes 50 G4int numZPlanes,
51 const G4double zPlane[ 51 const G4double zPlane[],
52 const G4double rInner[ 52 const G4double rInner[],
53 const G4double rOuter[ 53 const G4double rOuter[] )
54 : Base_t(name, phiStart, phiTotal, numZPlane 54 : Base_t(name, phiStart, phiTotal, numZPlanes, zPlane, rInner, rOuter)
55 { 55 {
56 fGenericPcon = false; 56 fGenericPcon = false;
57 SetOriginalParameters(); 57 SetOriginalParameters();
58 wrStart = phiStart; 58 wrStart = phiStart;
59 while (wrStart < 0) 59 while (wrStart < 0)
60 { 60 {
61 wrStart += twopi; 61 wrStart += twopi;
62 } 62 }
63 wrDelta = phiTotal; 63 wrDelta = phiTotal;
64 if (wrDelta <= 0 || wrDelta >= twopi*(1-DBL_ 64 if (wrDelta <= 0 || wrDelta >= twopi*(1-DBL_EPSILON))
65 { 65 {
66 wrStart = 0; 66 wrStart = 0;
67 wrDelta = twopi; 67 wrDelta = twopi;
68 } 68 }
69 rzcorners.resize(0); 69 rzcorners.resize(0);
70 for (G4int i=0; i<numZPlanes; ++i) 70 for (G4int i=0; i<numZPlanes; ++i)
71 { 71 {
72 G4double z = zPlane[i]; 72 G4double z = zPlane[i];
73 G4double r = rOuter[i]; 73 G4double r = rOuter[i];
74 rzcorners.emplace_back(r,z); << 74 rzcorners.push_back(G4TwoVector(r,z));
75 } 75 }
76 for (G4int i=numZPlanes-1; i>=0; --i) 76 for (G4int i=numZPlanes-1; i>=0; --i)
77 { 77 {
78 G4double z = zPlane[i]; 78 G4double z = zPlane[i];
79 G4double r = rInner[i]; 79 G4double r = rInner[i];
80 rzcorners.emplace_back(r,z); << 80 rzcorners.push_back(G4TwoVector(r,z));
81 } 81 }
82 std::vector<G4int> iout; 82 std::vector<G4int> iout;
83 G4GeomTools::RemoveRedundantVertices(rzcorne 83 G4GeomTools::RemoveRedundantVertices(rzcorners,iout,2*kCarTolerance);
84 } 84 }
85 85
86 86
87 ////////////////////////////////////////////// 87 ////////////////////////////////////////////////////////////////////////
88 // 88 //
89 // Constructor (generic parameters) 89 // Constructor (generic parameters)
90 // 90 //
91 G4UPolycone::G4UPolycone(const G4String& name, 91 G4UPolycone::G4UPolycone(const G4String& name,
92 G4double phiSta 92 G4double phiStart,
93 G4double phiTot 93 G4double phiTotal,
94 G4int numRZ, 94 G4int numRZ,
95 const G4double r[], 95 const G4double r[],
96 const G4double z[] 96 const G4double z[] )
97 : Base_t(name, phiStart, phiTotal, numRZ, r, 97 : Base_t(name, phiStart, phiTotal, numRZ, r, z)
98 { 98 {
99 fGenericPcon = true; 99 fGenericPcon = true;
100 SetOriginalParameters(); 100 SetOriginalParameters();
101 wrStart = phiStart; while (wrStart < 0) wrSt 101 wrStart = phiStart; while (wrStart < 0) wrStart += twopi;
102 wrDelta = phiTotal; 102 wrDelta = phiTotal;
103 if (wrDelta <= 0 || wrDelta >= twopi*(1-DBL_ 103 if (wrDelta <= 0 || wrDelta >= twopi*(1-DBL_EPSILON))
104 { 104 {
105 wrStart = 0; 105 wrStart = 0;
106 wrDelta = twopi; 106 wrDelta = twopi;
107 } 107 }
108 rzcorners.resize(0); 108 rzcorners.resize(0);
109 for (G4int i=0; i<numRZ; ++i) 109 for (G4int i=0; i<numRZ; ++i)
110 { 110 {
111 rzcorners.emplace_back(r[i],z[i]); << 111 rzcorners.push_back(G4TwoVector(r[i],z[i]));
112 } 112 }
113 std::vector<G4int> iout; 113 std::vector<G4int> iout;
114 G4GeomTools::RemoveRedundantVertices(rzcorne 114 G4GeomTools::RemoveRedundantVertices(rzcorners,iout,2*kCarTolerance);
115 } 115 }
116 116
117 117
118 ////////////////////////////////////////////// 118 ////////////////////////////////////////////////////////////////////////
119 // 119 //
120 // Fake default constructor - sets only member 120 // Fake default constructor - sets only member data and allocates memory
121 // for usage restri 121 // for usage restricted to object persistency.
122 // 122 //
123 G4UPolycone::G4UPolycone( __void__& a ) 123 G4UPolycone::G4UPolycone( __void__& a )
124 : Base_t(a) 124 : Base_t(a)
125 { 125 {
126 } 126 }
127 127
128 128
129 ////////////////////////////////////////////// 129 ////////////////////////////////////////////////////////////////////////
130 // 130 //
131 // Destructor 131 // Destructor
132 // 132 //
133 G4UPolycone::~G4UPolycone() = default; << 133 G4UPolycone::~G4UPolycone()
>> 134 {
>> 135 }
134 136
135 137
136 ////////////////////////////////////////////// 138 ////////////////////////////////////////////////////////////////////////
137 // 139 //
138 // Copy constructor 140 // Copy constructor
139 // 141 //
140 G4UPolycone::G4UPolycone( const G4UPolycone& s 142 G4UPolycone::G4UPolycone( const G4UPolycone& source )
141 : Base_t( source ) 143 : Base_t( source )
142 { 144 {
143 fGenericPcon = source.fGenericPcon; 145 fGenericPcon = source.fGenericPcon;
144 fOriginalParameters = source.fOriginalParame 146 fOriginalParameters = source.fOriginalParameters;
145 wrStart = source.wrStart; 147 wrStart = source.wrStart;
146 wrDelta = source.wrDelta; 148 wrDelta = source.wrDelta;
147 rzcorners = source.rzcorners; 149 rzcorners = source.rzcorners;
148 } 150 }
149 151
150 152
151 ////////////////////////////////////////////// 153 ////////////////////////////////////////////////////////////////////////
152 // 154 //
153 // Assignment operator 155 // Assignment operator
154 // 156 //
155 G4UPolycone& G4UPolycone::operator=( const G4U 157 G4UPolycone& G4UPolycone::operator=( const G4UPolycone& source )
156 { 158 {
157 if (this == &source) return *this; 159 if (this == &source) return *this;
158 160
159 Base_t::operator=( source ); 161 Base_t::operator=( source );
160 fGenericPcon = source.fGenericPcon; 162 fGenericPcon = source.fGenericPcon;
161 fOriginalParameters = source.fOriginalParame 163 fOriginalParameters = source.fOriginalParameters;
162 wrStart = source.wrStart; 164 wrStart = source.wrStart;
163 wrDelta = source.wrDelta; 165 wrDelta = source.wrDelta;
164 rzcorners = source.rzcorners; 166 rzcorners = source.rzcorners;
165 167
166 return *this; 168 return *this;
167 } 169 }
168 170
169 171
170 ////////////////////////////////////////////// 172 ////////////////////////////////////////////////////////////////////////
171 // 173 //
172 // Accessors & modifiers 174 // Accessors & modifiers
173 // 175 //
174 G4double G4UPolycone::GetStartPhi() const 176 G4double G4UPolycone::GetStartPhi() const
175 { 177 {
176 return wrStart; 178 return wrStart;
177 } 179 }
178 G4double G4UPolycone::GetDeltaPhi() const 180 G4double G4UPolycone::GetDeltaPhi() const
179 { 181 {
180 return wrDelta; 182 return wrDelta;
181 } 183 }
182 G4double G4UPolycone::GetEndPhi() const 184 G4double G4UPolycone::GetEndPhi() const
183 { 185 {
184 return (wrStart + wrDelta); 186 return (wrStart + wrDelta);
185 } 187 }
186 G4double G4UPolycone::GetSinStartPhi() const 188 G4double G4UPolycone::GetSinStartPhi() const
187 { 189 {
188 if (!IsOpen()) return 0.; 190 if (!IsOpen()) return 0.;
189 G4double phi = GetStartPhi(); 191 G4double phi = GetStartPhi();
190 return std::sin(phi); 192 return std::sin(phi);
191 } 193 }
192 G4double G4UPolycone::GetCosStartPhi() const 194 G4double G4UPolycone::GetCosStartPhi() const
193 { 195 {
194 if (!IsOpen()) return 1.; 196 if (!IsOpen()) return 1.;
195 G4double phi = GetStartPhi(); 197 G4double phi = GetStartPhi();
196 return std::cos(phi); 198 return std::cos(phi);
197 } 199 }
198 G4double G4UPolycone::GetSinEndPhi() const 200 G4double G4UPolycone::GetSinEndPhi() const
199 { 201 {
200 if (!IsOpen()) return 0.; 202 if (!IsOpen()) return 0.;
201 G4double phi = GetEndPhi(); 203 G4double phi = GetEndPhi();
202 return std::sin(phi); 204 return std::sin(phi);
203 } 205 }
204 G4double G4UPolycone::GetCosEndPhi() const 206 G4double G4UPolycone::GetCosEndPhi() const
205 { 207 {
206 if (!IsOpen()) return 1.; 208 if (!IsOpen()) return 1.;
207 G4double phi = GetEndPhi(); 209 G4double phi = GetEndPhi();
208 return std::cos(phi); 210 return std::cos(phi);
209 } 211 }
210 G4bool G4UPolycone::IsOpen() const 212 G4bool G4UPolycone::IsOpen() const
211 { 213 {
212 return (wrDelta < twopi); 214 return (wrDelta < twopi);
213 } 215 }
214 G4int G4UPolycone::GetNumRZCorner() const 216 G4int G4UPolycone::GetNumRZCorner() const
215 { 217 {
216 return rzcorners.size(); 218 return rzcorners.size();
217 } 219 }
218 G4PolyconeSideRZ G4UPolycone::GetCorner(G4int 220 G4PolyconeSideRZ G4UPolycone::GetCorner(G4int index) const
219 { 221 {
220 G4TwoVector rz = rzcorners.at(index); 222 G4TwoVector rz = rzcorners.at(index);
221 G4PolyconeSideRZ psiderz = { rz.x(), rz.y() 223 G4PolyconeSideRZ psiderz = { rz.x(), rz.y() };
222 224
223 return psiderz; 225 return psiderz;
224 } 226 }
225 G4PolyconeHistorical* G4UPolycone::GetOriginal 227 G4PolyconeHistorical* G4UPolycone::GetOriginalParameters() const
226 { 228 {
227 return new G4PolyconeHistorical(fOriginalPar 229 return new G4PolyconeHistorical(fOriginalParameters);
228 } 230 }
229 void G4UPolycone::SetOriginalParameters() 231 void G4UPolycone::SetOriginalParameters()
230 { 232 {
231 vecgeom::PolyconeHistorical* original_parame 233 vecgeom::PolyconeHistorical* original_parameters = Base_t::GetOriginalParameters();
232 234
233 fOriginalParameters.Start_angle = original 235 fOriginalParameters.Start_angle = original_parameters->fHStart_angle;
234 fOriginalParameters.Opening_angle = original 236 fOriginalParameters.Opening_angle = original_parameters->fHOpening_angle;
235 fOriginalParameters.Num_z_planes = original 237 fOriginalParameters.Num_z_planes = original_parameters->fHNum_z_planes;
236 238
237 delete [] fOriginalParameters.Z_values; 239 delete [] fOriginalParameters.Z_values;
238 delete [] fOriginalParameters.Rmin; 240 delete [] fOriginalParameters.Rmin;
239 delete [] fOriginalParameters.Rmax; 241 delete [] fOriginalParameters.Rmax;
240 242
241 G4int numPlanes = fOriginalParameters.Num_z_ 243 G4int numPlanes = fOriginalParameters.Num_z_planes;
242 fOriginalParameters.Z_values = new G4double[ 244 fOriginalParameters.Z_values = new G4double[numPlanes];
243 fOriginalParameters.Rmin = new G4double[numP 245 fOriginalParameters.Rmin = new G4double[numPlanes];
244 fOriginalParameters.Rmax = new G4double[numP 246 fOriginalParameters.Rmax = new G4double[numPlanes];
245 for (G4int i=0; i<numPlanes; ++i) 247 for (G4int i=0; i<numPlanes; ++i)
246 { 248 {
247 fOriginalParameters.Z_values[i] = original 249 fOriginalParameters.Z_values[i] = original_parameters->fHZ_values[i];
248 fOriginalParameters.Rmin[i] = original 250 fOriginalParameters.Rmin[i] = original_parameters->fHRmin[i];
249 fOriginalParameters.Rmax[i] = original 251 fOriginalParameters.Rmax[i] = original_parameters->fHRmax[i];
250 } 252 }
251 } 253 }
252 void G4UPolycone::SetOriginalParameters(G4Poly 254 void G4UPolycone::SetOriginalParameters(G4PolyconeHistorical* pars)
253 { 255 {
254 fOriginalParameters = *pars; 256 fOriginalParameters = *pars;
255 fRebuildPolyhedron = true; 257 fRebuildPolyhedron = true;
256 Reset(); 258 Reset();
257 } 259 }
258 260
259 G4bool G4UPolycone::Reset() 261 G4bool G4UPolycone::Reset()
260 { 262 {
261 if (fGenericPcon) 263 if (fGenericPcon)
262 { 264 {
263 std::ostringstream message; 265 std::ostringstream message;
264 message << "Solid " << GetName() << " buil 266 message << "Solid " << GetName() << " built using generic construct."
265 << G4endl << "Not applicable to th 267 << G4endl << "Not applicable to the generic construct !";
266 G4Exception("G4UPolycone::Reset()", "GeomS 268 G4Exception("G4UPolycone::Reset()", "GeomSolids1001",
267 JustWarning, message, "Paramet 269 JustWarning, message, "Parameters NOT reset.");
268 return true; // error code set 270 return true; // error code set
269 } 271 }
270 272
271 // 273 //
272 // Rebuild polycone based on original parame 274 // Rebuild polycone based on original parameters
273 // 275 //
274 wrStart = fOriginalParameters.Start_angle; 276 wrStart = fOriginalParameters.Start_angle;
275 while (wrStart < 0.) 277 while (wrStart < 0.)
276 { 278 {
277 wrStart += twopi; 279 wrStart += twopi;
278 } 280 }
279 wrDelta = fOriginalParameters.Opening_angle; 281 wrDelta = fOriginalParameters.Opening_angle;
280 if (wrDelta <= 0. || wrDelta >= twopi*(1-DBL 282 if (wrDelta <= 0. || wrDelta >= twopi*(1-DBL_EPSILON))
281 { 283 {
282 wrStart = 0.; 284 wrStart = 0.;
283 wrDelta = twopi; 285 wrDelta = twopi;
284 } 286 }
285 rzcorners.resize(0); 287 rzcorners.resize(0);
286 for (G4int i=0; i<fOriginalParameters.Num_z_ 288 for (G4int i=0; i<fOriginalParameters.Num_z_planes; ++i)
287 { 289 {
288 G4double z = fOriginalParameters.Z_value 290 G4double z = fOriginalParameters.Z_values[i];
289 G4double r = fOriginalParameters.Rmax[i] 291 G4double r = fOriginalParameters.Rmax[i];
290 rzcorners.emplace_back(r,z); << 292 rzcorners.push_back(G4TwoVector(r,z));
291 } 293 }
292 for (G4int i=fOriginalParameters.Num_z_plane 294 for (G4int i=fOriginalParameters.Num_z_planes-1; i>=0; --i)
293 { 295 {
294 G4double z = fOriginalParameters.Z_value 296 G4double z = fOriginalParameters.Z_values[i];
295 G4double r = fOriginalParameters.Rmin[i] 297 G4double r = fOriginalParameters.Rmin[i];
296 rzcorners.emplace_back(r,z); << 298 rzcorners.push_back(G4TwoVector(r,z));
297 } 299 }
298 std::vector<G4int> iout; 300 std::vector<G4int> iout;
299 G4GeomTools::RemoveRedundantVertices(rzcorne 301 G4GeomTools::RemoveRedundantVertices(rzcorners,iout,2*kCarTolerance);
300 302
301 return false; // error code unset 303 return false; // error code unset
302 } 304 }
303 305
304 ////////////////////////////////////////////// 306 ////////////////////////////////////////////////////////////////////////
305 // 307 //
306 // Dispatch to parameterisation for replicatio 308 // Dispatch to parameterisation for replication mechanism dimension
307 // computation & modification. 309 // computation & modification.
308 // 310 //
309 void G4UPolycone::ComputeDimensions(G4VPVParam 311 void G4UPolycone::ComputeDimensions(G4VPVParameterisation* p,
310 const G4in 312 const G4int n,
311 const G4VP 313 const G4VPhysicalVolume* pRep)
312 { 314 {
313 p->ComputeDimensions(*(G4Polycone*)this,n,pR 315 p->ComputeDimensions(*(G4Polycone*)this,n,pRep);
314 } 316 }
315 317
316 318
317 ////////////////////////////////////////////// 319 //////////////////////////////////////////////////////////////////////////
318 // 320 //
319 // Make a clone of the object 321 // Make a clone of the object
320 322
321 G4VSolid* G4UPolycone::Clone() const 323 G4VSolid* G4UPolycone::Clone() const
322 { 324 {
323 return new G4UPolycone(*this); 325 return new G4UPolycone(*this);
324 } 326 }
325 327
326 ////////////////////////////////////////////// 328 //////////////////////////////////////////////////////////////////////////
327 // 329 //
328 // Get bounding box 330 // Get bounding box
329 331
330 void G4UPolycone::BoundingLimits(G4ThreeVector 332 void G4UPolycone::BoundingLimits(G4ThreeVector& pMin,
331 G4ThreeVector 333 G4ThreeVector& pMax) const
332 { 334 {
333 static G4bool checkBBox = true; 335 static G4bool checkBBox = true;
334 static G4bool checkPhi = true; 336 static G4bool checkPhi = true;
335 337
336 G4double rmin = kInfinity, rmax = -kInfinity 338 G4double rmin = kInfinity, rmax = -kInfinity;
337 G4double zmin = kInfinity, zmax = -kInfinity 339 G4double zmin = kInfinity, zmax = -kInfinity;
338 340
339 for (G4int i=0; i<GetNumRZCorner(); ++i) 341 for (G4int i=0; i<GetNumRZCorner(); ++i)
340 { 342 {
341 G4PolyconeSideRZ corner = GetCorner(i); 343 G4PolyconeSideRZ corner = GetCorner(i);
342 if (corner.r < rmin) rmin = corner.r; 344 if (corner.r < rmin) rmin = corner.r;
343 if (corner.r > rmax) rmax = corner.r; 345 if (corner.r > rmax) rmax = corner.r;
344 if (corner.z < zmin) zmin = corner.z; 346 if (corner.z < zmin) zmin = corner.z;
345 if (corner.z > zmax) zmax = corner.z; 347 if (corner.z > zmax) zmax = corner.z;
346 } 348 }
347 349
348 if (IsOpen()) 350 if (IsOpen())
349 { 351 {
350 G4TwoVector vmin,vmax; 352 G4TwoVector vmin,vmax;
351 G4GeomTools::DiskExtent(rmin,rmax, 353 G4GeomTools::DiskExtent(rmin,rmax,
352 GetSinStartPhi(),G 354 GetSinStartPhi(),GetCosStartPhi(),
353 GetSinEndPhi(),Get 355 GetSinEndPhi(),GetCosEndPhi(),
354 vmin,vmax); 356 vmin,vmax);
355 pMin.set(vmin.x(),vmin.y(),zmin); 357 pMin.set(vmin.x(),vmin.y(),zmin);
356 pMax.set(vmax.x(),vmax.y(),zmax); 358 pMax.set(vmax.x(),vmax.y(),zmax);
357 } 359 }
358 else 360 else
359 { 361 {
360 pMin.set(-rmax,-rmax, zmin); 362 pMin.set(-rmax,-rmax, zmin);
361 pMax.set( rmax, rmax, zmax); 363 pMax.set( rmax, rmax, zmax);
362 } 364 }
363 365
364 // Check correctness of the bounding box 366 // Check correctness of the bounding box
365 // 367 //
366 if (pMin.x() >= pMax.x() || pMin.y() >= pMax 368 if (pMin.x() >= pMax.x() || pMin.y() >= pMax.y() || pMin.z() >= pMax.z())
367 { 369 {
368 std::ostringstream message; 370 std::ostringstream message;
369 message << "Bad bounding box (min >= max) 371 message << "Bad bounding box (min >= max) for solid: "
370 << GetName() << " !" 372 << GetName() << " !"
371 << "\npMin = " << pMin 373 << "\npMin = " << pMin
372 << "\npMax = " << pMax; 374 << "\npMax = " << pMax;
373 G4Exception("G4UPolycone::BoundingLimits() 375 G4Exception("G4UPolycone::BoundingLimits()", "GeomMgt0001",
374 JustWarning, message); 376 JustWarning, message);
375 StreamInfo(G4cout); 377 StreamInfo(G4cout);
376 } 378 }
377 379
378 // Check consistency of bounding boxes 380 // Check consistency of bounding boxes
379 // 381 //
380 if (checkBBox) 382 if (checkBBox)
381 { 383 {
382 U3Vector vmin, vmax; 384 U3Vector vmin, vmax;
383 Extent(vmin,vmax); 385 Extent(vmin,vmax);
384 if (std::abs(pMin.x()-vmin.x()) > kCarTole 386 if (std::abs(pMin.x()-vmin.x()) > kCarTolerance ||
385 std::abs(pMin.y()-vmin.y()) > kCarTole 387 std::abs(pMin.y()-vmin.y()) > kCarTolerance ||
386 std::abs(pMin.z()-vmin.z()) > kCarTole 388 std::abs(pMin.z()-vmin.z()) > kCarTolerance ||
387 std::abs(pMax.x()-vmax.x()) > kCarTole 389 std::abs(pMax.x()-vmax.x()) > kCarTolerance ||
388 std::abs(pMax.y()-vmax.y()) > kCarTole 390 std::abs(pMax.y()-vmax.y()) > kCarTolerance ||
389 std::abs(pMax.z()-vmax.z()) > kCarTole 391 std::abs(pMax.z()-vmax.z()) > kCarTolerance)
390 { 392 {
391 std::ostringstream message; 393 std::ostringstream message;
392 message << "Inconsistency in bounding bo 394 message << "Inconsistency in bounding boxes for solid: "
393 << GetName() << " !" 395 << GetName() << " !"
394 << "\nBBox min: wrapper = " << p 396 << "\nBBox min: wrapper = " << pMin << " solid = " << vmin
395 << "\nBBox max: wrapper = " << p 397 << "\nBBox max: wrapper = " << pMax << " solid = " << vmax;
396 G4Exception("G4UPolycone::BoundingLimits 398 G4Exception("G4UPolycone::BoundingLimits()", "GeomMgt0001",
397 JustWarning, message); 399 JustWarning, message);
398 checkBBox = false; 400 checkBBox = false;
399 } 401 }
400 } 402 }
401 403
402 // Check consistency of angles 404 // Check consistency of angles
403 // 405 //
404 if (checkPhi) 406 if (checkPhi)
405 { 407 {
406 if (GetStartPhi() != Base_t::GetStartPhi() 408 if (GetStartPhi() != Base_t::GetStartPhi() ||
407 GetEndPhi() != Base_t::GetEndPhi() 409 GetEndPhi() != Base_t::GetEndPhi() ||
408 IsOpen() != (Base_t::GetDeltaPhi( 410 IsOpen() != (Base_t::GetDeltaPhi() < twopi))
409 { 411 {
410 std::ostringstream message; 412 std::ostringstream message;
411 message << "Inconsistency in Phi angles 413 message << "Inconsistency in Phi angles or # of sides for solid: "
412 << GetName() << " !" 414 << GetName() << " !"
413 << "\nPhi start : wrapper = " < 415 << "\nPhi start : wrapper = " << GetStartPhi()
414 << " solid = " << Base_t::Ge 416 << " solid = " << Base_t::GetStartPhi()
415 << "\nPhi end : wrapper = " < 417 << "\nPhi end : wrapper = " << GetEndPhi()
416 << " solid = " << Base_t::Ge 418 << " solid = " << Base_t::GetEndPhi()
417 << "\nPhi is open: wrapper = " < 419 << "\nPhi is open: wrapper = " << (IsOpen() ? "true" : "false")
418 << " solid = " 420 << " solid = "
419 << ((Base_t::GetDeltaPhi() < two 421 << ((Base_t::GetDeltaPhi() < twopi) ? "true" : "false");
420 G4Exception("G4UPolycone::BoundingLimits 422 G4Exception("G4UPolycone::BoundingLimits()", "GeomMgt0001",
421 JustWarning, message); 423 JustWarning, message);
422 checkPhi = false; 424 checkPhi = false;
423 } 425 }
424 } 426 }
425 } 427 }
426 428
427 ////////////////////////////////////////////// 429 //////////////////////////////////////////////////////////////////////////
428 // 430 //
429 // Calculate extent under transform and specif 431 // Calculate extent under transform and specified limit
430 432
431 G4bool G4UPolycone::CalculateExtent(const EAxi 433 G4bool G4UPolycone::CalculateExtent(const EAxis pAxis,
432 const G4Vo 434 const G4VoxelLimits& pVoxelLimit,
433 const G4Af 435 const G4AffineTransform& pTransform,
434 G4do 436 G4double& pMin, G4double& pMax) const
435 { 437 {
436 G4ThreeVector bmin, bmax; 438 G4ThreeVector bmin, bmax;
437 G4bool exist; 439 G4bool exist;
438 440
439 // Check bounding box (bbox) 441 // Check bounding box (bbox)
440 // 442 //
441 BoundingLimits(bmin,bmax); 443 BoundingLimits(bmin,bmax);
442 G4BoundingEnvelope bbox(bmin,bmax); 444 G4BoundingEnvelope bbox(bmin,bmax);
443 #ifdef G4BBOX_EXTENT 445 #ifdef G4BBOX_EXTENT
444 return bbox.CalculateExtent(pAxis,pVoxelLimi 446 return bbox.CalculateExtent(pAxis,pVoxelLimit,pTransform,pMin,pMax);
445 #endif 447 #endif
446 if (bbox.BoundingBoxVsVoxelLimits(pAxis,pVox 448 if (bbox.BoundingBoxVsVoxelLimits(pAxis,pVoxelLimit,pTransform,pMin,pMax))
447 { 449 {
448 return exist = pMin < pMax; << 450 return exist = (pMin < pMax) ? true : false;
449 } 451 }
450 452
451 // To find the extent, RZ contour of the pol 453 // To find the extent, RZ contour of the polycone is subdivided
452 // in triangles. The extent is calculated as 454 // in triangles. The extent is calculated as cumulative extent of
453 // all sub-polycones formed by rotation of t 455 // all sub-polycones formed by rotation of triangles around Z
454 // 456 //
455 G4TwoVectorList contourRZ; 457 G4TwoVectorList contourRZ;
456 G4TwoVectorList triangles; 458 G4TwoVectorList triangles;
457 std::vector<G4int> iout; 459 std::vector<G4int> iout;
458 G4double eminlim = pVoxelLimit.GetMinExtent( 460 G4double eminlim = pVoxelLimit.GetMinExtent(pAxis);
459 G4double emaxlim = pVoxelLimit.GetMaxExtent( 461 G4double emaxlim = pVoxelLimit.GetMaxExtent(pAxis);
460 462
461 // get RZ contour, ensure anticlockwise orde 463 // get RZ contour, ensure anticlockwise order of corners
462 for (G4int i=0; i<GetNumRZCorner(); ++i) 464 for (G4int i=0; i<GetNumRZCorner(); ++i)
463 { 465 {
464 G4PolyconeSideRZ corner = GetCorner(i); 466 G4PolyconeSideRZ corner = GetCorner(i);
465 contourRZ.emplace_back(corner.r,corner.z); << 467 contourRZ.push_back(G4TwoVector(corner.r,corner.z));
466 } 468 }
467 G4GeomTools::RemoveRedundantVertices(contour 469 G4GeomTools::RemoveRedundantVertices(contourRZ,iout,2*kCarTolerance);
468 G4double area = G4GeomTools::PolygonArea(con 470 G4double area = G4GeomTools::PolygonArea(contourRZ);
469 if (area < 0.) std::reverse(contourRZ.begin( 471 if (area < 0.) std::reverse(contourRZ.begin(),contourRZ.end());
470 472
471 // triangulate RZ countour 473 // triangulate RZ countour
472 if (!G4GeomTools::TriangulatePolygon(contour 474 if (!G4GeomTools::TriangulatePolygon(contourRZ,triangles))
473 { 475 {
474 std::ostringstream message; 476 std::ostringstream message;
475 message << "Triangulation of RZ contour ha 477 message << "Triangulation of RZ contour has failed for solid: "
476 << GetName() << " !" 478 << GetName() << " !"
477 << "\nExtent has been calculated u 479 << "\nExtent has been calculated using boundary box";
478 G4Exception("G4UPolycone::CalculateExtent( 480 G4Exception("G4UPolycone::CalculateExtent()",
479 "GeomMgt1002", JustWarning, me 481 "GeomMgt1002", JustWarning, message);
480 return bbox.CalculateExtent(pAxis,pVoxelLi 482 return bbox.CalculateExtent(pAxis,pVoxelLimit,pTransform,pMin,pMax);
481 } 483 }
482 484
483 // set trigonometric values 485 // set trigonometric values
484 const G4int NSTEPS = 24; // numbe 486 const G4int NSTEPS = 24; // number of steps for whole circle
485 G4double astep = twopi/NSTEPS; // max a 487 G4double astep = twopi/NSTEPS; // max angle for one step
486 488
487 G4double sphi = GetStartPhi(); 489 G4double sphi = GetStartPhi();
488 G4double ephi = GetEndPhi(); 490 G4double ephi = GetEndPhi();
489 G4double dphi = IsOpen() ? ephi-sphi : two 491 G4double dphi = IsOpen() ? ephi-sphi : twopi;
490 G4int ksteps = (dphi <= astep) ? 1 : (G4i 492 G4int ksteps = (dphi <= astep) ? 1 : (G4int)((dphi-deg)/astep) + 1;
491 G4double ang = dphi/ksteps; 493 G4double ang = dphi/ksteps;
492 494
493 G4double sinHalf = std::sin(0.5*ang); 495 G4double sinHalf = std::sin(0.5*ang);
494 G4double cosHalf = std::cos(0.5*ang); 496 G4double cosHalf = std::cos(0.5*ang);
495 G4double sinStep = 2.*sinHalf*cosHalf; 497 G4double sinStep = 2.*sinHalf*cosHalf;
496 G4double cosStep = 1. - 2.*sinHalf*sinHalf; 498 G4double cosStep = 1. - 2.*sinHalf*sinHalf;
497 499
498 G4double sinStart = GetSinStartPhi(); 500 G4double sinStart = GetSinStartPhi();
499 G4double cosStart = GetCosStartPhi(); 501 G4double cosStart = GetCosStartPhi();
500 G4double sinEnd = GetSinEndPhi(); 502 G4double sinEnd = GetSinEndPhi();
501 G4double cosEnd = GetCosEndPhi(); 503 G4double cosEnd = GetCosEndPhi();
502 504
503 // define vectors and arrays 505 // define vectors and arrays
504 std::vector<const G4ThreeVectorList *> polyg 506 std::vector<const G4ThreeVectorList *> polygons;
505 polygons.resize(ksteps+2); 507 polygons.resize(ksteps+2);
506 G4ThreeVectorList pols[NSTEPS+2]; 508 G4ThreeVectorList pols[NSTEPS+2];
507 for (G4int k=0; k<ksteps+2; ++k) pols[k].res 509 for (G4int k=0; k<ksteps+2; ++k) pols[k].resize(6);
508 for (G4int k=0; k<ksteps+2; ++k) polygons[k] 510 for (G4int k=0; k<ksteps+2; ++k) polygons[k] = &pols[k];
509 G4double r0[6],z0[6]; // contour with origin 511 G4double r0[6],z0[6]; // contour with original edges of triangle
510 G4double r1[6]; // shifted radii of ex 512 G4double r1[6]; // shifted radii of external edges of triangle
511 513
512 // main loop along triangles 514 // main loop along triangles
513 pMin = kInfinity; 515 pMin = kInfinity;
514 pMax =-kInfinity; 516 pMax =-kInfinity;
515 G4int ntria = triangles.size()/3; 517 G4int ntria = triangles.size()/3;
516 for (G4int i=0; i<ntria; ++i) 518 for (G4int i=0; i<ntria; ++i)
517 { 519 {
518 G4int i3 = i*3; 520 G4int i3 = i*3;
519 for (G4int k=0; k<3; ++k) 521 for (G4int k=0; k<3; ++k)
520 { 522 {
521 G4int e0 = i3+k, e1 = (k<2) ? e0+1 : i3; 523 G4int e0 = i3+k, e1 = (k<2) ? e0+1 : i3;
522 G4int k2 = k*2; 524 G4int k2 = k*2;
523 // set contour with original edges of tr 525 // set contour with original edges of triangle
524 r0[k2+0] = triangles[e0].x(); z0[k2+0] = 526 r0[k2+0] = triangles[e0].x(); z0[k2+0] = triangles[e0].y();
525 r0[k2+1] = triangles[e1].x(); z0[k2+1] = 527 r0[k2+1] = triangles[e1].x(); z0[k2+1] = triangles[e1].y();
526 // set shifted radii 528 // set shifted radii
527 r1[k2+0] = r0[k2+0]; 529 r1[k2+0] = r0[k2+0];
528 r1[k2+1] = r0[k2+1]; 530 r1[k2+1] = r0[k2+1];
529 if (z0[k2+1] - z0[k2+0] <= 0) continue; 531 if (z0[k2+1] - z0[k2+0] <= 0) continue;
530 r1[k2+0] /= cosHalf; 532 r1[k2+0] /= cosHalf;
531 r1[k2+1] /= cosHalf; 533 r1[k2+1] /= cosHalf;
532 } 534 }
533 535
534 // rotate countour, set sequence of 6-side 536 // rotate countour, set sequence of 6-sided polygons
535 G4double sinCur = sinStart*cosHalf + cosSt 537 G4double sinCur = sinStart*cosHalf + cosStart*sinHalf;
536 G4double cosCur = cosStart*cosHalf - sinSt 538 G4double cosCur = cosStart*cosHalf - sinStart*sinHalf;
537 for (G4int j=0; j<6; ++j) pols[0][j].set(r 539 for (G4int j=0; j<6; ++j) pols[0][j].set(r0[j]*cosStart,r0[j]*sinStart,z0[j]);
538 for (G4int k=1; k<ksteps+1; ++k) 540 for (G4int k=1; k<ksteps+1; ++k)
539 { 541 {
540 for (G4int j=0; j<6; ++j) pols[k][j].set 542 for (G4int j=0; j<6; ++j) pols[k][j].set(r1[j]*cosCur,r1[j]*sinCur,z0[j]);
541 G4double sinTmp = sinCur; 543 G4double sinTmp = sinCur;
542 sinCur = sinCur*cosStep + cosCur*sinStep 544 sinCur = sinCur*cosStep + cosCur*sinStep;
543 cosCur = cosCur*cosStep - sinTmp*sinStep 545 cosCur = cosCur*cosStep - sinTmp*sinStep;
544 } 546 }
545 for (G4int j=0; j<6; ++j) pols[ksteps+1][j 547 for (G4int j=0; j<6; ++j) pols[ksteps+1][j].set(r0[j]*cosEnd,r0[j]*sinEnd,z0[j]);
546 548
547 // set sub-envelope and adjust extent 549 // set sub-envelope and adjust extent
548 G4double emin,emax; 550 G4double emin,emax;
549 G4BoundingEnvelope benv(polygons); 551 G4BoundingEnvelope benv(polygons);
550 if (!benv.CalculateExtent(pAxis,pVoxelLimi 552 if (!benv.CalculateExtent(pAxis,pVoxelLimit,pTransform,emin,emax)) continue;
551 if (emin < pMin) pMin = emin; 553 if (emin < pMin) pMin = emin;
552 if (emax > pMax) pMax = emax; 554 if (emax > pMax) pMax = emax;
553 if (eminlim > pMin && emaxlim < pMax) retu 555 if (eminlim > pMin && emaxlim < pMax) return true; // max possible extent
554 } 556 }
555 return (pMin < pMax); 557 return (pMin < pMax);
556 } 558 }
557 559
558 ////////////////////////////////////////////// 560 ////////////////////////////////////////////////////////////////////////
559 // 561 //
560 // CreatePolyhedron 562 // CreatePolyhedron
561 // 563 //
562 G4Polyhedron* G4UPolycone::CreatePolyhedron() 564 G4Polyhedron* G4UPolycone::CreatePolyhedron() const
563 { 565 {
564 return new G4PolyhedronPcon(wrStart, wrDelta 566 return new G4PolyhedronPcon(wrStart, wrDelta, rzcorners);
565 } 567 }
566 568
567 #endif // G4GEOM_USE_USOLIDS 569 #endif // G4GEOM_USE_USOLIDS
568 570