| 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 //
>> 27 // $Id: G4VTwistSurface.hh 91755 2015-08-05 08:17:56Z gcosmo $
>> 28 //
>> 29 //
>> 30 // --------------------------------------------------------------------
>> 31 // GEANT 4 class header file
>> 32 //
>> 33 //
26 // G4VTwistSurface 34 // G4VTwistSurface
27 // 35 //
28 // Class description: 36 // Class description:
29 // 37 //
30 // Abstract base class for boundary surface of << 38 // Abstract base class for boundary surface of G4VSolid.
31 39
32 // 01-Aug-2002 - Kotoyo Hoshina (hoshina@hepbu << 40 // Author:
33 // 13-Nov-2003 - O.Link (Oliver.Link@cern.ch), << 41 // 01-Aug-2002 - Kotoyo Hoshina (hoshina@hepburn.s.chiba-u.ac.jp)
34 // from original version in Jupi << 42 //
>> 43 // History:
>> 44 // 13-Nov-2003 - O.Link (Oliver.Link@cern.ch), Integration in Geant4
>> 45 // from original version in Jupiter-2.5.02 application.
35 // ------------------------------------------- 46 // --------------------------------------------------------------------
36 #ifndef G4VTWISTSURFACE_HH << 47 #ifndef __G4VTWISTSURFACE__
37 #define G4VTWISTSURFACE_HH << 48 #define __G4VTWISTSURFACE__
38 49
39 #include <CLHEP/Units/SystemOfUnits.h> 50 #include <CLHEP/Units/SystemOfUnits.h>
40 51
41 #include "G4VSolid.hh" 52 #include "G4VSolid.hh"
42 #include "geomdefs.hh" 53 #include "geomdefs.hh"
43 54
44 #include "G4RotationMatrix.hh" 55 #include "G4RotationMatrix.hh"
45 56
46 #define G4VSURFACENXX 10 57 #define G4VSURFACENXX 10
47 58
48 class G4VTwistSurface 59 class G4VTwistSurface
49 { 60 {
50 public: << 61 public: // without description
>> 62
>> 63 enum EValidate {kDontValidate = 0, kValidateWithTol = 1,
>> 64 kValidateWithoutTol = 2, kUninitialized = 3};
51 65
52 enum EValidate { kDontValidate = 0, kValida << 66 public: // with description
53 kValidateWithoutTol = 2, k <<
54 67
55 G4VTwistSurface (const G4String& name); << 68 G4VTwistSurface (const G4String &name);
56 G4VTwistSurface (const G4String& name, << 69 G4VTwistSurface (const G4String &name,
57 const G4RotationMatrix& ro << 70 const G4RotationMatrix &rot,
58 const G4ThreeVector& tl << 71 const G4ThreeVector &tlate,
59 G4int ha << 72 G4int handedness,
60 const EAxis ax << 73 const EAxis axis1,
61 const EAxis ax << 74 const EAxis axis2,
62 G4double ax << 75 G4double axis0min = -kInfinity,
63 G4double ax << 76 G4double axis1min = -kInfinity,
64 G4double ax << 77 G4double axis0max = kInfinity,
65 G4double ax << 78 G4double axis1max = kInfinity);
66 79
67 virtual ~G4VTwistSurface() = default; << 80 virtual ~G4VTwistSurface();
68 81
69 virtual G4int AmIOnLeftSide(const G4Thr << 82 virtual G4int AmIOnLeftSide(const G4ThreeVector &me,
70 const G4Thr << 83 const G4ThreeVector &vec,
71 G4boo 84 G4bool withTol = true);
72 85
73 virtual G4double DistanceToBoundary( 86 virtual G4double DistanceToBoundary( G4int areacode,
74 << 87 G4ThreeVector &xx,
75 const << 88 const G4ThreeVector &p) ;
>> 89
76 90
77 virtual G4double DistanceToIn(const G4Thre << 91 virtual G4double DistanceToIn(const G4ThreeVector &gp,
78 const G4Thre << 92 const G4ThreeVector &gv,
79 G4Thre << 93 G4ThreeVector &gxxbest);
80 virtual G4double DistanceToOut(const G4Thr << 94 virtual G4double DistanceToOut(const G4ThreeVector &gp,
81 const G4Thr << 95 const G4ThreeVector &gv,
82 G4Thr << 96 G4ThreeVector &gxxbest);
83 virtual G4double DistanceTo(const G4ThreeV << 97 virtual G4double DistanceTo(const G4ThreeVector &gp,
84 G4ThreeV << 98 G4ThreeVector &gxx);
85 99
86 virtual G4int DistanceToSurface(const G << 100 virtual G4int DistanceToSurface(const G4ThreeVector &gp,
87 const G << 101 const G4ThreeVector &gv,
88 G 102 G4ThreeVector gxx[],
89 G 103 G4double distance[],
90 G 104 G4int areacode[],
91 G 105 G4bool isvalid[],
92 EValida 106 EValidate validate=kValidateWithTol) = 0;
93 107
94 virtual G4int DistanceToSurface(const G << 108 virtual G4int DistanceToSurface(const G4ThreeVector &gp,
95 G 109 G4ThreeVector gxx[],
96 G 110 G4double distance[],
97 G 111 G4int areacode[]) = 0;
98 112
99 void DebugPrint() const; 113 void DebugPrint() const;
100 114
101 virtual G4ThreeVector GetNormal(const G4Thr << 115 // get methods
>> 116
>> 117 virtual G4ThreeVector GetNormal(const G4ThreeVector &xx,G4bool isGlobal) = 0;
102 118
103 virtual G4String GetName() const { ret 119 virtual G4String GetName() const { return fName; }
104 virtual void GetBoundaryParameters << 120 virtual void GetBoundaryParameters(const G4int &areacode,
105 << 121 G4ThreeVector &d,
106 << 122 G4ThreeVector &x0,
107 << 123 G4int &boundarytype) const;
108 virtual G4ThreeVector GetBoundaryAtPZ(G4int 124 virtual G4ThreeVector GetBoundaryAtPZ(G4int areacode,
109 const << 125 const G4ThreeVector &p) const;
110 126
111 inline G4double DistanceToPlaneWithV(const << 127 inline G4double DistanceToPlaneWithV(const G4ThreeVector &p,
112 const << 128 const G4ThreeVector &v,
113 const << 129 const G4ThreeVector &x0,
114 const << 130 const G4ThreeVector &n0,
115 << 131 G4ThreeVector &xx);
116 << 132
117 inline G4double DistanceToPlane(const G4Th << 133 inline G4double DistanceToPlane(const G4ThreeVector &p,
118 const G4Th << 134 const G4ThreeVector &x0,
119 const G4Th << 135 const G4ThreeVector &n0,
120 G4Th << 136 G4ThreeVector &xx);
121 137
122 inline G4double DistanceToPlane(const G4Th << 138 inline G4double DistanceToPlane(const G4ThreeVector &p,
123 const G4Th << 139 const G4ThreeVector &x0,
124 const G4Th << 140 const G4ThreeVector &t1,
125 const G4Th << 141 const G4ThreeVector &t2,
126 G4Th << 142 G4ThreeVector &xx,
127 G4Th << 143 G4ThreeVector &n);
128 << 144
129 inline G4double DistanceToLine (const G4Th << 145 inline G4double DistanceToLine (const G4ThreeVector &p,
130 const G4Th << 146 const G4ThreeVector &x0,
131 const G4Th << 147 const G4ThreeVector &d,
132 G4Th << 148 G4ThreeVector &xx);
133 << 149
134 inline G4bool IsAxis0 (G4int areacode) c << 150 inline G4bool IsAxis0 (G4int areacode) const;
135 inline G4bool IsAxis1 (G4int areacode) c << 151 inline G4bool IsAxis1 (G4int areacode) const;
136 inline G4bool IsOutside (G4int areacode) c << 152 inline G4bool IsOutside (G4int areacode) const;
137 inline G4bool IsInside (G4int areacode, G << 153 inline G4bool IsInside (G4int areacode, G4bool testbitmode = false) const;
138 inline G4bool IsBoundary (G4int areacode, G << 154 inline G4bool IsBoundary (G4int areacode, G4bool testbitmode = false) const;
139 inline G4bool IsCorner (G4int areacode, G << 155 inline G4bool IsCorner (G4int areacode, G4bool testbitmode = false) const;
140 inline G4bool IsValidNorm() const { return << 156 inline G4bool IsValidNorm() const { return fIsValidNorm; }
141 G4bool IsSameBoundary (G4VTwistSurface* sur << 157 G4bool IsSameBoundary (G4VTwistSurface *surface1, G4int areacode1,
142 G4VTwistSurface* sur << 158 G4VTwistSurface *surface2, G4int areacode2 ) const;
143 inline G4int GetAxisType(G4int areacode, G << 159 inline G4int GetAxisType(G4int areacode, G4int whichaxis) const;
144 << 160
145 inline G4ThreeVector ComputeGlobalPoint << 161 inline G4ThreeVector ComputeGlobalPoint (const G4ThreeVector &lp) const;
146 inline G4ThreeVector ComputeLocalPoint << 162 inline G4ThreeVector ComputeLocalPoint (const G4ThreeVector &gp) const;
147 inline G4ThreeVector ComputeGlobalDirection << 163 inline G4ThreeVector ComputeGlobalDirection (const G4ThreeVector &lp) const;
148 inline G4ThreeVector ComputeLocalDirection << 164 inline G4ThreeVector ComputeLocalDirection (const G4ThreeVector &gp) const;
149 165
150 // set methods 166 // set methods
151 167
152 inline void SetAxis(G4int i, const EAxis ax 168 inline void SetAxis(G4int i, const EAxis axis) { fAxis[i] = axis; }
153 inline void SetNeighbours(G4VTwistSurface* << 169 inline void SetNeighbours(G4VTwistSurface* axis0min, G4VTwistSurface* axis1min,
154 G4VTwistSurface* << 170 G4VTwistSurface* axis0max, G4VTwistSurface* axis1max);
155 171
156 virtual G4ThreeVector SurfacePoint(G4double << 172 virtual G4ThreeVector SurfacePoint(G4double , G4double,
157 G4bool i 173 G4bool isGlobal = false ) = 0 ;
158 virtual G4double GetBoundaryMin(G4double) = 174 virtual G4double GetBoundaryMin(G4double) = 0 ;
159 virtual G4double GetBoundaryMax(G4double) = 175 virtual G4double GetBoundaryMax(G4double) = 0 ;
160 virtual G4double GetSurfaceArea() = 0 ; 176 virtual G4double GetSurfaceArea() = 0 ;
161 virtual void GetFacets(G4int m, G4int n, G4 177 virtual void GetFacets(G4int m, G4int n, G4double xyz[][3],
162 G4int faces[][4], G4 178 G4int faces[][4], G4int iside) = 0 ;
163 G4int GetNode( G4int i, G4int j, G4int m, G << 179 G4int GetNode( G4int i, G4int j, G4int m, G4int n, G4int iside ) ;
164 G4int GetFace( G4int i, G4int j, G4int m, G << 180 G4int GetFace( G4int i, G4int j, G4int m, G4int n, G4int iside ) ;
165 G4int GetEdgeVisibility( G4int i, G4int j, << 181 G4int GetEdgeVisibility( G4int i, G4int j, G4int m, G4int n, G4int number, G4int orientation) ;
166 G4int number, G4in << 182
>> 183
>> 184 public: // without description
167 185
168 G4VTwistSurface(__void__&); 186 G4VTwistSurface(__void__&);
169 // Fake default constructor for usage res 187 // Fake default constructor for usage restricted to direct object
170 // persistency for clients requiring prea 188 // persistency for clients requiring preallocation of memory for
171 // persistifiable objects. 189 // persistifiable objects.
172 190
173 protected: << 191 protected: // with description
174 192
175 inline G4VTwistSurface** GetNeighbours() { << 193 // get methods
176 inline G4int GetNeighbours(G4int areacode, << 194
177 inline G4ThreeVector GetCorner(G4int areaco << 195 inline G4VTwistSurface** GetNeighbours() { return fNeighbours; }
178 void GetBoundaryAxis(G4int areacode, EAxis << 196 inline G4int GetNeighbours(G4int areacode, G4VTwistSurface* surfaces[]);
179 void GetBoundaryLimit(G4int areacode, G4dou << 197 inline G4ThreeVector GetCorner(G4int areacode) const;
180 virtual G4int GetAreaCode(const G4ThreeVect << 198 void GetBoundaryAxis(G4int areacode, EAxis axis[]) const;
181 << 199 void GetBoundaryLimit(G4int areacode, G4double limit[]) const;
182 virtual void SetBoundary(const G4int& << 200 virtual G4int GetAreaCode(const G4ThreeVector &xx, G4bool withtol=true) = 0;
183 const G4ThreeVecto << 201
184 const G4ThreeVecto << 202 // set methods
185 const G4int& << 203
>> 204 virtual void SetBoundary(const G4int &axiscode,
>> 205 const G4ThreeVector &direction,
>> 206 const G4ThreeVector &x0,
>> 207 const G4int &boundarytype);
186 // areacode must be one of them: 208 // areacode must be one of them:
187 // sAxis0 & sAxisMin, sAxis0 & sAxisMax, 209 // sAxis0 & sAxisMin, sAxis0 & sAxisMax,
188 // sAxis1 & sAxisMin, sAxis1 & sAxisMax. 210 // sAxis1 & sAxisMin, sAxis1 & sAxisMax.
189 // boundarytype represents the shape of l 211 // boundarytype represents the shape of locus
190 // from the start point to end point of b 212 // from the start point to end point of boundary.
191 // ex. 213 // ex.
192 // sAxisRho = linear line which start poi 214 // sAxisRho = linear line which start point is fixed at origin.
193 // sAxisPhi = part of circle which center 215 // sAxisPhi = part of circle which center placed at the origin.
194 216
195 void SetCorner(G4int areacode, G4double x, 217 void SetCorner(G4int areacode, G4double x, G4double y, G4double z);
196 218
197 private: 219 private:
198 220
199 virtual void SetBoundaries() = 0; 221 virtual void SetBoundaries() = 0;
200 virtual void SetCorners() = 0; 222 virtual void SetCorners() = 0;
201 223
202 // data members ----------------------------- 224 // data members ---------------------------------------------------------
203 225
204 public: 226 public:
205 227
206 static const G4int sOutside ; 228 static const G4int sOutside ;
207 static const G4int sInside ; 229 static const G4int sInside ;
208 static const G4int sBoundary; 230 static const G4int sBoundary;
209 static const G4int sCorner; 231 static const G4int sCorner;
210 static const G4int sC0Min1Min; 232 static const G4int sC0Min1Min;
211 static const G4int sC0Max1Min; 233 static const G4int sC0Max1Min;
212 static const G4int sC0Max1Max; 234 static const G4int sC0Max1Max;
213 static const G4int sC0Min1Max; 235 static const G4int sC0Min1Max;
214 static const G4int sAxisMin; 236 static const G4int sAxisMin;
215 static const G4int sAxisMax; 237 static const G4int sAxisMax;
216 static const G4int sAxisX; 238 static const G4int sAxisX;
217 static const G4int sAxisY; 239 static const G4int sAxisY;
218 static const G4int sAxisZ; 240 static const G4int sAxisZ;
219 static const G4int sAxisRho; 241 static const G4int sAxisRho;
220 static const G4int sAxisPhi; 242 static const G4int sAxisPhi;
221 static const G4int sAxis0; 243 static const G4int sAxis0;
222 static const G4int sAxis1; 244 static const G4int sAxis1;
223 static const G4int sSizeMask; 245 static const G4int sSizeMask;
224 static const G4int sAxisMask; 246 static const G4int sAxisMask;
225 static const G4int sAreaMask; 247 static const G4int sAreaMask;
226 248
227 protected: 249 protected:
228 250
229 class CurrentStatus 251 class CurrentStatus
230 { 252 {
231 public: << 253 public:
232 254
233 CurrentStatus(); 255 CurrentStatus();
234 virtual ~CurrentStatus(); 256 virtual ~CurrentStatus();
235 257
236 inline G4ThreeVector GetXX(G4int i) 258 inline G4ThreeVector GetXX(G4int i) const { return fXX[i]; }
237 inline G4double GetDistance(G4int i 259 inline G4double GetDistance(G4int i) const { return fDistance[i]; }
238 inline G4int GetAreacode(G4int i 260 inline G4int GetAreacode(G4int i) const { return fAreacode[i]; }
239 inline G4int GetNXX() 261 inline G4int GetNXX() const { return fNXX; }
240 inline G4bool IsDone() 262 inline G4bool IsDone() const { return fDone; }
241 inline G4bool IsValid(G4int i) 263 inline G4bool IsValid(G4int i) const { return fIsValid[i]; }
242 264
243 void SetCurrentStatus(G4int 265 void SetCurrentStatus(G4int i,
244 G4ThreeVector& << 266 G4ThreeVector &xx,
245 G4double& << 267 G4double &dist,
246 G4int& << 268 G4int &areacode,
247 G4bool& << 269 G4bool &isvalid,
248 G4int 270 G4int nxx,
249 EValidate 271 EValidate validate,
250 const G4ThreeVector* p, << 272 const G4ThreeVector *p,
251 const G4ThreeVector* v = << 273 const G4ThreeVector *v = 0);
252 274
253 void ResetfDone(EValidate validate, << 275 void ResetfDone(EValidate validate,
254 const G4ThreeVector* p, << 276 const G4ThreeVector *p,
255 const G4ThreeVector* v = nullp << 277 const G4ThreeVector *v = 0);
256 278
257 279
258 void DebugPrint() const; 280 void DebugPrint() const;
259 281
260 private: << 282 private:
261 283
262 G4double fDistance[G4VSURFAC 284 G4double fDistance[G4VSURFACENXX];
263 G4ThreeVector fXX[G4VSURFACENXX]; 285 G4ThreeVector fXX[G4VSURFACENXX];
264 G4int fAreacode[G4VSURFAC 286 G4int fAreacode[G4VSURFACENXX];
265 G4bool fIsValid[G4VSURFACE 287 G4bool fIsValid[G4VSURFACENXX];
266 G4int fNXX; 288 G4int fNXX;
267 G4ThreeVector fLastp; 289 G4ThreeVector fLastp;
268 G4ThreeVector fLastv; 290 G4ThreeVector fLastv;
269 EValidate fLastValidate; 291 EValidate fLastValidate;
270 G4bool fDone; 292 G4bool fDone;
271 }; 293 };
272 294
273 class Boundary 295 class Boundary
274 { 296 {
275 public: << 297 public:
276 << 298 Boundary();
277 Boundary() = default; << 299 virtual ~Boundary();
278 virtual ~Boundary() = default; <<
279 300
280 void SetFields(const G4int& areac << 301 void SetFields(const G4int &areacode,
281 const G4ThreeVector& d, << 302 const G4ThreeVector &d,
282 const G4ThreeVector& x0, << 303 const G4ThreeVector &x0,
283 const G4int& boun << 304 const G4int &boundarytype);
284 305
285 G4bool IsEmpty() const; 306 G4bool IsEmpty() const;
286 307
287 G4bool GetBoundaryParameters(const G4int << 308 G4bool GetBoundaryParameters(const G4int &areacode,
288 G4Thr << 309 G4ThreeVector &d,
289 G4Thr << 310 G4ThreeVector &x0,
290 G4int << 311 G4int &boundarytype) const;
291 <<
292 private: <<
293 312
294 G4int fBoundaryAcode{-1}; << 313 private:
>> 314 G4int fBoundaryAcode;
295 G4ThreeVector fBoundaryDirection; 315 G4ThreeVector fBoundaryDirection;
296 G4ThreeVector fBoundaryX0; 316 G4ThreeVector fBoundaryX0;
297 G4int fBoundaryType{0}; << 317 G4int fBoundaryType;
298 }; 318 };
299 319
300 EAxis fAxis[2]; 320 EAxis fAxis[2];
301 G4double fAxisMin[2]; 321 G4double fAxisMin[2];
302 G4double fAxisMax[2]; 322 G4double fAxisMax[2];
303 CurrentStatus fCurStatWithV; 323 CurrentStatus fCurStatWithV;
304 CurrentStatus fCurStat; 324 CurrentStatus fCurStat;
305 G4RotationMatrix fRot; 325 G4RotationMatrix fRot;
306 G4ThreeVector fTrans; 326 G4ThreeVector fTrans;
307 G4int fHandedness; 327 G4int fHandedness;
308 class G4SurfCurNormal 328 class G4SurfCurNormal
309 { 329 {
310 public: 330 public:
311 <<
312 G4ThreeVector p; 331 G4ThreeVector p;
313 G4ThreeVector normal; 332 G4ThreeVector normal;
314 }; 333 };
315 G4SurfCurNormal fCurrentNormal; 334 G4SurfCurNormal fCurrentNormal;
316 G4bool fIsValidNorm; 335 G4bool fIsValidNorm;
317 G4double kCarTolerance; 336 G4double kCarTolerance;
318 337
319 private: 338 private:
320 339
321 G4VTwistSurface* fNeighbours[4]; // {0,1,2, << 340 G4VTwistSurface *fNeighbours[4]; // {0,1,2,3} = sAxis0min, sAxis1min,
322 // << 341 // sAxis0max, sAxis1max
323 G4ThreeVector fCorners[4]; // corners o 342 G4ThreeVector fCorners[4]; // corners of the surface in local coordinate
324 Boundary fBoundaries[4]; // boundarie 343 Boundary fBoundaries[4]; // boundaries of the surface.
325 G4String fName; 344 G4String fName;
326 345
327 class G4SurfSideQuery 346 class G4SurfSideQuery
328 { 347 {
329 public: 348 public:
330 <<
331 G4ThreeVector me; 349 G4ThreeVector me;
332 G4ThreeVector vec; 350 G4ThreeVector vec;
333 G4bool withTol; 351 G4bool withTol;
334 G4int amIOnLeftSide; 352 G4int amIOnLeftSide;
335 }; 353 };
336 G4SurfSideQuery fAmIOnLeftSide; 354 G4SurfSideQuery fAmIOnLeftSide;
337 }; 355 };
338 356
339 //============================================ 357 //========================================================
340 // inline functions 358 // inline functions
341 //============================================ 359 //========================================================
342 360
343 struct Intersection 361 struct Intersection
344 { 362 {
345 G4double phi ; // parameter phi 363 G4double phi ; // parameter phi
346 G4double u ; // parameter u 364 G4double u ; // parameter u
347 G4ThreeVector xx ; // intersection point i 365 G4ThreeVector xx ; // intersection point in cartesian
348 G4double distance ; // distance to intersec 366 G4double distance ; // distance to intersection
349 G4int areacode ; // the areacode of the << 367 G4int areacode; // the areacode of the intersection
350 G4bool isvalid ; // valid intersection ? 368 G4bool isvalid ; // valid intersection ??
351 369
352 }; 370 };
353 371
354 inline 372 inline
355 G4bool DistanceSort( const Intersection& a, co << 373 G4bool DistanceSort( const Intersection &a, const Intersection &b)
356 { 374 {
357 return a.distance < b.distance ; 375 return a.distance < b.distance ;
358 } 376 }
359 377
360 inline 378 inline
361 G4bool EqualIntersection( const Intersection& << 379 G4bool EqualIntersection( const Intersection &a, const Intersection &b)
362 { 380 {
363 return ( ( a.xx - b.xx ).mag() < 1E-9*CLHEP: 381 return ( ( a.xx - b.xx ).mag() < 1E-9*CLHEP::mm ) ;
364 } 382 }
365 383
366 #include "G4VTwistSurface.icc" 384 #include "G4VTwistSurface.icc"
367 385
368 #endif 386 #endif
369 387