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