| 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 // G4TwistTrapParallelSide implementation <<
27 // 26 //
28 // Author: Oliver Link (Oliver.Link@cern.ch) << 27 // $Id: G4TwistTrapParallelSide.cc,v
>> 28 //
>> 29 //
>> 30 // --------------------------------------------------------------------
>> 31 // GEANT 4 class source file
>> 32 //
>> 33 //
>> 34 // G4TwistTrapParallelSide.cc
>> 35 //
>> 36 // Author:
>> 37 //
>> 38 // Oliver Link (Oliver.Link@cern.ch)
>> 39 //
29 // ------------------------------------------- 40 // --------------------------------------------------------------------
30 41
31 #include <cmath> 42 #include <cmath>
32 43
33 #include "G4TwistTrapParallelSide.hh" 44 #include "G4TwistTrapParallelSide.hh"
34 #include "G4PhysicalConstants.hh" 45 #include "G4PhysicalConstants.hh"
35 #include "G4JTPolynomialSolver.hh" 46 #include "G4JTPolynomialSolver.hh"
36 47
37 //============================================ 48 //=====================================================================
38 //* constructors ----------------------------- 49 //* constructors ------------------------------------------------------
39 50
40 G4TwistTrapParallelSide::G4TwistTrapParallelSi << 51 G4TwistTrapParallelSide::G4TwistTrapParallelSide(const G4String &name,
41 G4double PhiTwist, << 52 G4double PhiTwist, // twist angle
42 G4double pDz, << 53 G4double pDz, // half z lenght
43 G4double pTheta, << 54 G4double pTheta, // direction between end planes
44 G4double pPhi, << 55 G4double pPhi, // defined by polar and azimutal angles.
45 G4double pDy1, << 56 G4double pDy1, // half y length at -pDz
46 G4double pDx1, << 57 G4double pDx1, // half x length at -pDz,-pDy
47 G4double pDx2, << 58 G4double pDx2, // half x length at -pDz,+pDy
48 G4double pDy2, << 59 G4double pDy2, // half y length at +pDz
49 G4double pDx3, << 60 G4double pDx3, // half x length at +pDz,-pDy
50 G4double pDx4, << 61 G4double pDx4, // half x length at +pDz,+pDy
51 G4double pAlph, << 62 G4double pAlph, // tilt angle at +pDz
52 G4double AngleSide << 63 G4double AngleSide // parity
53 64 )
54 : G4VTwistSurface(name) 65 : G4VTwistSurface(name)
55 { 66 {
56 67
57 fAxis[0] = kXAxis; // in local coordinate 68 fAxis[0] = kXAxis; // in local coordinate system
58 fAxis[1] = kZAxis; 69 fAxis[1] = kZAxis;
59 fAxisMin[0] = -kInfinity ; // X Axis bounda 70 fAxisMin[0] = -kInfinity ; // X Axis boundary
60 fAxisMax[0] = kInfinity ; // depends on 71 fAxisMax[0] = kInfinity ; // depends on z !!
61 fAxisMin[1] = -pDz ; // Z Axis bounda << 72 fAxisMin[1] = -pDz ; // Z Axis boundary
62 fAxisMax[1] = pDz ; 73 fAxisMax[1] = pDz ;
63 74
64 fDx1 = pDx1 ; 75 fDx1 = pDx1 ;
65 fDx2 = pDx2 ; 76 fDx2 = pDx2 ;
66 fDx3 = pDx3 ; 77 fDx3 = pDx3 ;
67 fDx4 = pDx4 ; 78 fDx4 = pDx4 ;
68 79
69 fDy1 = pDy1 ; 80 fDy1 = pDy1 ;
70 fDy2 = pDy2 ; 81 fDy2 = pDy2 ;
71 82
72 fDz = pDz ; 83 fDz = pDz ;
73 84
74 fAlph = pAlph ; 85 fAlph = pAlph ;
75 fTAlph = std::tan(fAlph) ; 86 fTAlph = std::tan(fAlph) ;
76 87
77 fTheta = pTheta ; 88 fTheta = pTheta ;
78 fPhi = pPhi ; 89 fPhi = pPhi ;
79 90
80 // precalculate frequently used parameters << 91 // precalculate frequently used parameters
81 // <<
82 fDx4plus2 = fDx4 + fDx2 ; 92 fDx4plus2 = fDx4 + fDx2 ;
83 fDx4minus2 = fDx4 - fDx2 ; 93 fDx4minus2 = fDx4 - fDx2 ;
84 fDx3plus1 = fDx3 + fDx1 ; 94 fDx3plus1 = fDx3 + fDx1 ;
85 fDx3minus1 = fDx3 - fDx1 ; 95 fDx3minus1 = fDx3 - fDx1 ;
86 fDy2plus1 = fDy2 + fDy1 ; 96 fDy2plus1 = fDy2 + fDy1 ;
87 fDy2minus1 = fDy2 - fDy1 ; 97 fDy2minus1 = fDy2 - fDy1 ;
88 98
89 fa1md1 = 2*fDx2 - 2*fDx1 ; 99 fa1md1 = 2*fDx2 - 2*fDx1 ;
90 fa2md2 = 2*fDx4 - 2*fDx3 ; 100 fa2md2 = 2*fDx4 - 2*fDx3 ;
91 101
92 fPhiTwist = PhiTwist ; // dphi << 102 fPhiTwist = PhiTwist ; // dphi
93 fAngleSide = AngleSide ; // 0,90,180,270 de 103 fAngleSide = AngleSide ; // 0,90,180,270 deg
94 104
95 fdeltaX = 2*fDz*std::tan(fTheta)*std::cos(fP << 105 fdeltaX = 2 * fDz * std::tan(fTheta) * std::cos(fPhi) ; // dx in surface equation
96 fdeltaY = 2*fDz*std::tan(fTheta)*std::sin(fP << 106 fdeltaY = 2 * fDz * std::tan(fTheta) * std::sin(fPhi) ; // dy in surface equation
97 107
98 fRot.rotateZ( AngleSide ) ; 108 fRot.rotateZ( AngleSide ) ;
99 109
100 fTrans.set(0, 0, 0); // No Translation 110 fTrans.set(0, 0, 0); // No Translation
101 fIsValidNorm = false; 111 fIsValidNorm = false;
102 112
103 SetCorners() ; 113 SetCorners() ;
104 SetBoundaries() ; 114 SetBoundaries() ;
>> 115
105 } 116 }
106 117
>> 118
107 //============================================ 119 //=====================================================================
108 //* Fake default constructor ----------------- 120 //* Fake default constructor ------------------------------------------
109 121
110 G4TwistTrapParallelSide::G4TwistTrapParallelSi 122 G4TwistTrapParallelSide::G4TwistTrapParallelSide( __void__& a )
111 : G4VTwistSurface(a) << 123 : G4VTwistSurface(a), fTheta(0.), fPhi(0.), fDy1(0.), fDx1(0.), fDx2(0.),
>> 124 fDy2(0.), fDx3(0.), fDx4(0.), fDz(0.), fAlph(0.), fTAlph(0.), fPhiTwist(0.),
>> 125 fAngleSide(0.), fdeltaX(0.), fdeltaY(0.), fDx4plus2(0.), fDx4minus2(0.),
>> 126 fDx3plus1(0.), fDx3minus1(0.), fDy2plus1(0.), fDy2minus1(0.), fa1md1(0.),
>> 127 fa2md2(0.)
112 { 128 {
113 } 129 }
114 130
>> 131
115 //============================================ 132 //=====================================================================
116 //* destructor ------------------------------- 133 //* destructor --------------------------------------------------------
117 134
118 G4TwistTrapParallelSide::~G4TwistTrapParallelS << 135 G4TwistTrapParallelSide::~G4TwistTrapParallelSide()
>> 136 {
>> 137 }
119 138
120 //============================================ 139 //=====================================================================
121 //* GetNormal -------------------------------- 140 //* GetNormal ---------------------------------------------------------
122 141
123 G4ThreeVector G4TwistTrapParallelSide::GetNorm << 142 G4ThreeVector G4TwistTrapParallelSide::GetNormal(const G4ThreeVector &tmpxx,
124 << 143 G4bool isGlobal)
125 { 144 {
126 // GetNormal returns a normal vector at a s 145 // GetNormal returns a normal vector at a surface (or very close
127 // to surface) point at tmpxx. 146 // to surface) point at tmpxx.
128 // If isGlobal=true, it returns the normal 147 // If isGlobal=true, it returns the normal in global coordinate.
129 // 148 //
130 149
131 G4ThreeVector xx; 150 G4ThreeVector xx;
132 if (isGlobal) << 151 if (isGlobal) {
133 { <<
134 xx = ComputeLocalPoint(tmpxx); 152 xx = ComputeLocalPoint(tmpxx);
135 if ((xx - fCurrentNormal.p).mag() < 0.5 << 153 if ((xx - fCurrentNormal.p).mag() < 0.5 * kCarTolerance) {
136 { <<
137 return ComputeGlobalDirection(fCurren 154 return ComputeGlobalDirection(fCurrentNormal.normal);
138 } 155 }
139 } << 156 } else {
140 else <<
141 { <<
142 xx = tmpxx; 157 xx = tmpxx;
143 if (xx == fCurrentNormal.p) << 158 if (xx == fCurrentNormal.p) {
144 { <<
145 return fCurrentNormal.normal; 159 return fCurrentNormal.normal;
146 } 160 }
147 } 161 }
148 162
149 G4double phi ; 163 G4double phi ;
150 G4double u ; 164 G4double u ;
151 165
152 GetPhiUAtX(xx,phi,u) ; // phi,u for point 166 GetPhiUAtX(xx,phi,u) ; // phi,u for point xx close to surface
153 167
154 G4ThreeVector normal = NormAng(phi,u) ; / 168 G4ThreeVector normal = NormAng(phi,u) ; // the normal vector at phi,u
155 169
156 #ifdef G4TWISTDEBUG 170 #ifdef G4TWISTDEBUG
157 G4cout << "normal vector = " << normal << 171 G4cout << "normal vector = " << normal << G4endl ;
158 G4cout << "phi = " << phi << " , u = " << u 172 G4cout << "phi = " << phi << " , u = " << u << G4endl ;
159 #endif 173 #endif
160 174
161 // normal = normal/normal.mag() ; 175 // normal = normal/normal.mag() ;
162 176
163 if (isGlobal) << 177 if (isGlobal) {
164 { <<
165 fCurrentNormal.normal = ComputeGlobalDir 178 fCurrentNormal.normal = ComputeGlobalDirection(normal.unit());
166 } << 179 } else {
167 else <<
168 { <<
169 fCurrentNormal.normal = normal.unit(); 180 fCurrentNormal.normal = normal.unit();
170 } 181 }
171 return fCurrentNormal.normal; 182 return fCurrentNormal.normal;
172 } 183 }
173 184
174 //============================================ 185 //=====================================================================
175 //* DistanceToSurface ------------------------ 186 //* DistanceToSurface -------------------------------------------------
176 187
177 G4int G4TwistTrapParallelSide::DistanceToSurfa << 188 G4int G4TwistTrapParallelSide::DistanceToSurface(const G4ThreeVector &gp,
178 << 189 const G4ThreeVector &gv,
179 << 190 G4ThreeVector gxx[],
180 << 191 G4double distance[],
181 << 192 G4int areacode[],
182 << 193 G4bool isvalid[],
183 << 194 EValidate validate)
184 { 195 {
>> 196
185 static const G4double pihalf = pi/2 ; 197 static const G4double pihalf = pi/2 ;
186 const G4double ctol = 0.5 * kCarTolerance; 198 const G4double ctol = 0.5 * kCarTolerance;
187 199
188 G4bool IsParallel = false ; 200 G4bool IsParallel = false ;
189 G4bool IsConverged = false ; 201 G4bool IsConverged = false ;
190 202
191 G4int nxx = 0 ; // number of physical solut 203 G4int nxx = 0 ; // number of physical solutions
192 204
193 fCurStatWithV.ResetfDone(validate, &gp, &gv) 205 fCurStatWithV.ResetfDone(validate, &gp, &gv);
194 206
195 if (fCurStatWithV.IsDone()) << 207 if (fCurStatWithV.IsDone()) {
196 { << 208 G4int i;
197 for (G4int i=0; i<fCurStatWithV.GetNXX(); << 209 for (i=0; i<fCurStatWithV.GetNXX(); i++) {
198 { <<
199 gxx[i] = fCurStatWithV.GetXX(i); 210 gxx[i] = fCurStatWithV.GetXX(i);
200 distance[i] = fCurStatWithV.GetDistance( 211 distance[i] = fCurStatWithV.GetDistance(i);
201 areacode[i] = fCurStatWithV.GetAreacode( 212 areacode[i] = fCurStatWithV.GetAreacode(i);
202 isvalid[i] = fCurStatWithV.IsValid(i); 213 isvalid[i] = fCurStatWithV.IsValid(i);
203 } 214 }
204 return fCurStatWithV.GetNXX(); 215 return fCurStatWithV.GetNXX();
205 } << 216 } else {
206 else // initialize << 217
207 { << 218 // initialize
208 for (G4int i=0; i<G4VSURFACENXX ; ++i) << 219 G4int i;
209 { << 220 for (i=0; i<G4VSURFACENXX ; i++) {
210 distance[i] = kInfinity; 221 distance[i] = kInfinity;
211 areacode[i] = sOutside; 222 areacode[i] = sOutside;
212 isvalid[i] = false; 223 isvalid[i] = false;
213 gxx[i].set(kInfinity, kInfinity, kInfini 224 gxx[i].set(kInfinity, kInfinity, kInfinity);
214 } 225 }
215 } 226 }
216 227
217 G4ThreeVector p = ComputeLocalPoint(gp); 228 G4ThreeVector p = ComputeLocalPoint(gp);
218 G4ThreeVector v = ComputeLocalDirection(gv); 229 G4ThreeVector v = ComputeLocalDirection(gv);
219 230
220 #ifdef G4TWISTDEBUG 231 #ifdef G4TWISTDEBUG
221 G4cout << "Local point p = " << p << G4endl 232 G4cout << "Local point p = " << p << G4endl ;
222 G4cout << "Local direction v = " << v << G4e 233 G4cout << "Local direction v = " << v << G4endl ;
223 #endif 234 #endif
224 235
225 G4double phi,u ; // parameters 236 G4double phi,u ; // parameters
226 237
227 // temporary variables 238 // temporary variables
228 239
229 G4double tmpdist = kInfinity ; 240 G4double tmpdist = kInfinity ;
230 G4ThreeVector tmpxx; 241 G4ThreeVector tmpxx;
231 G4int tmpareacode = sOutside ; 242 G4int tmpareacode = sOutside ;
232 G4bool tmpisvalid = false ; 243 G4bool tmpisvalid = false ;
233 244
234 std::vector<Intersection> xbuf ; 245 std::vector<Intersection> xbuf ;
235 Intersection xbuftmp ; 246 Intersection xbuftmp ;
236 247
237 // prepare some variables for the intersecti 248 // prepare some variables for the intersection finder
238 249
239 G4double L = 2*fDz ; 250 G4double L = 2*fDz ;
240 251
241 G4double phixz = fPhiTwist * ( p.x() * v.z() 252 G4double phixz = fPhiTwist * ( p.x() * v.z() - p.z() * v.x() ) ;
242 G4double phiyz = fPhiTwist * ( p.y() * v.z() 253 G4double phiyz = fPhiTwist * ( p.y() * v.z() - p.z() * v.y() ) ;
243 254
244 // special case vz = 0 255 // special case vz = 0
245 256
246 if ( v.z() == 0. ) << 257 if ( v.z() == 0. ) {
247 { << 258
248 if ( std::fabs(p.z()) <= L ) // inte << 259 if ( std::fabs(p.z()) <= L ) { // intersection possible in z
249 { << 260
250 phi = p.z() * fPhiTwist / L ; // phi is 261 phi = p.z() * fPhiTwist / L ; // phi is determined by the z-position
251 262
252 u = (2*(fdeltaY*phi*v.x() - fPhiTwist*p. 263 u = (2*(fdeltaY*phi*v.x() - fPhiTwist*p.y()*v.x() - fdeltaX*phi*v.y()
253 + fPhiTwist*p.x()*v.y()) + (fDy2 264 + fPhiTwist*p.x()*v.y()) + (fDy2plus1*fPhiTwist
254 + 2*fDy2minus1*phi)*(v.x()*std:: 265 + 2*fDy2minus1*phi)*(v.x()*std::cos(phi) + v.y()*std::sin(phi)))
255 / (2.* fPhiTwist*(v.y()*std::cos(phi) 266 / (2.* fPhiTwist*(v.y()*std::cos(phi) - v.x()*std::sin(phi)));
256 267
257 xbuftmp.phi = phi ; 268 xbuftmp.phi = phi ;
258 xbuftmp.u = u ; 269 xbuftmp.u = u ;
259 xbuftmp.areacode = sOutside ; 270 xbuftmp.areacode = sOutside ;
260 xbuftmp.distance = kInfinity ; 271 xbuftmp.distance = kInfinity ;
261 xbuftmp.isvalid = false ; 272 xbuftmp.isvalid = false ;
262 273
263 xbuf.push_back(xbuftmp) ; // store it to << 274 xbuf.push_back(xbuftmp) ; // store it to xbuf
>> 275
264 } 276 }
265 else // no in << 277
266 { << 278 else { // no intersection possible
>> 279
267 distance[0] = kInfinity; 280 distance[0] = kInfinity;
268 gxx[0].set(kInfinity,kInfinity,kInfinity 281 gxx[0].set(kInfinity,kInfinity,kInfinity);
269 isvalid[0] = false ; 282 isvalid[0] = false ;
270 areacode[0] = sOutside ; 283 areacode[0] = sOutside ;
271 fCurStatWithV.SetCurrentStatus(0, gxx[0] 284 fCurStatWithV.SetCurrentStatus(0, gxx[0], distance[0],
272 areacode[ 285 areacode[0], isvalid[0],
273 0, valida 286 0, validate, &gp, &gv);
274 287
275 return 0; 288 return 0;
>> 289
>> 290
276 } // end std::fabs(p.z() <= L 291 } // end std::fabs(p.z() <= L
>> 292
277 } // end v.z() == 0 293 } // end v.z() == 0
278 else // general solution for non-zero vz << 294
279 { << 295
>> 296 // general solution for non-zero vz
>> 297
>> 298 else {
>> 299
280 G4double c[9],srd[8],si[8] ; 300 G4double c[9],srd[8],si[8] ;
281 301
282 c[8] = -3600*(-2*phiyz + fDy2plus1*fPhiTwi 302 c[8] = -3600*(-2*phiyz + fDy2plus1*fPhiTwist*v.z()) ;
283 c[7] = -7200*(phixz - 2*fDz*v.y() + (fdelt 303 c[7] = -7200*(phixz - 2*fDz*v.y() + (fdeltaY + fDy2minus1)*v.z()) ;
284 c[6] = 120*(-52*phiyz - 120*fDz*v.x() + 60 << 304 c[6] = 120*(-52*phiyz - 120*fDz*v.x() + 60*fdeltaX*v.z() + 11*fDy2plus1*fPhiTwist*v.z()) ;
285 + 11*fDy2plus1*fPhiTwist*v.z()) ; << 305 c[5] = 240*(16*phixz - 52*fDz*v.y() + 26*fdeltaY*v.z() + 11*fDy2minus1*v.z()) ;
286 c[5] = 240*(16*phixz - 52*fDz*v.y() + 26*f << 306 c[4] = 12*(127*phiyz + 640*fDz*v.x() - 320*fdeltaX*v.z() + 4*fDy2plus1*fPhiTwist*v.z()) ;
287 + 11*fDy2minus1*v.z()) ; << 307 c[3] = -404*phixz + 3048*fDz*v.y() - 1524*fdeltaY*v.z() + 96*fDy2minus1*v.z() ;
288 c[4] = 12*(127*phiyz + 640*fDz*v.x() - 320 <<
289 + 4*fDy2plus1*fPhiTwist*v.z()) ; <<
290 c[3] = -404*phixz + 3048*fDz*v.y() - 1524* <<
291 + 96*fDy2minus1*v.z() ; <<
292 c[2] = -72*phiyz + 404*(-2*fDz*v.x() + fde 308 c[2] = -72*phiyz + 404*(-2*fDz*v.x() + fdeltaX*v.z()) ;
293 c[1] = 12*(phixz - 12*fDz*v.y() + 6*fdelta 309 c[1] = 12*(phixz - 12*fDz*v.y() + 6*fdeltaY*v.z()) ;
294 c[0] = 24*fDz*v.x() - 12*fdeltaX*v.z() ; 310 c[0] = 24*fDz*v.x() - 12*fdeltaX*v.z() ;
295 311
296 312
297 #ifdef G4TWISTDEBUG 313 #ifdef G4TWISTDEBUG
298 G4cout << "coef = " << c[0] << " " 314 G4cout << "coef = " << c[0] << " "
299 << c[1] << " " 315 << c[1] << " "
300 << c[2] << " " 316 << c[2] << " "
301 << c[3] << " " 317 << c[3] << " "
302 << c[4] << " " 318 << c[4] << " "
303 << c[5] << " " 319 << c[5] << " "
304 << c[6] << " " 320 << c[6] << " "
305 << c[7] << " " 321 << c[7] << " "
306 << c[8] << G4endl ; 322 << c[8] << G4endl ;
307 #endif 323 #endif
308 324
309 G4JTPolynomialSolver trapEq ; 325 G4JTPolynomialSolver trapEq ;
310 G4int num = trapEq.FindRoots(c,8,srd,si); 326 G4int num = trapEq.FindRoots(c,8,srd,si);
>> 327
311 328
312 for (G4int i = 0 ; i<num ; ++i ) // loop << 329 for (G4int i = 0 ; i<num ; i++ ) { // loop over all mathematical solutions
313 { << 330 if ( si[i]==0.0 ) { // only real solutions
314 if ( si[i]==0.0 ) // only real solutio <<
315 { <<
316 #ifdef G4TWISTDEBUG 331 #ifdef G4TWISTDEBUG
317 G4cout << "Solution " << i << " : " << 332 G4cout << "Solution " << i << " : " << srd[i] << G4endl ;
318 #endif 333 #endif
319 phi = std::fmod(srd[i] , pihalf) ; 334 phi = std::fmod(srd[i] , pihalf) ;
320 u = (1/std::cos(phi)*(2*phixz + 4*fDz* << 335
321 - 2*fdeltaX*phi*v.z() + (fDy2plus1*f << 336 u = (1/std::cos(phi)*(2*phixz + 4*fDz*phi*v.x() - 2*fdeltaX*phi*v.z() + (fDy2plus1*fPhiTwist + 2*fDy2minus1*phi)*v.z()* std::sin(phi)))/(2.*fPhiTwist*v.z()) ;
322 + 2*fDy2minus1*phi)*v.z()* std::sin( <<
323 337
324 xbuftmp.phi = phi ; 338 xbuftmp.phi = phi ;
325 xbuftmp.u = u ; 339 xbuftmp.u = u ;
326 xbuftmp.areacode = sOutside ; 340 xbuftmp.areacode = sOutside ;
327 xbuftmp.distance = kInfinity ; 341 xbuftmp.distance = kInfinity ;
328 xbuftmp.isvalid = false ; 342 xbuftmp.isvalid = false ;
329 343
330 xbuf.push_back(xbuftmp) ; // store it 344 xbuf.push_back(xbuftmp) ; // store it to xbuf
331 345
332 #ifdef G4TWISTDEBUG 346 #ifdef G4TWISTDEBUG
333 G4cout << "solution " << i << " = " << 347 G4cout << "solution " << i << " = " << phi << " , " << u << G4endl ;
334 #endif 348 #endif
335 349
336 } // end if real solution 350 } // end if real solution
337 } // end loop i 351 } // end loop i
338 } // end general case << 352
>> 353 } // end general case
>> 354
339 355
340 nxx = (G4int)xbuf.size() ; // save the numb << 356 nxx = xbuf.size() ; // save the number of solutions
341 357
342 G4ThreeVector xxonsurface ; // point 358 G4ThreeVector xxonsurface ; // point on surface
343 G4ThreeVector surfacenormal ; // normal 359 G4ThreeVector surfacenormal ; // normal vector
344 G4double deltaX ; // distance between inter << 360 G4double deltaX ; // distance between intersection point and point on surface
345 G4double theta ; // angle 361 G4double theta ; // angle between track and surfacenormal
346 G4double factor ; // a scal 362 G4double factor ; // a scaling factor
347 G4int maxint = 30 ; // number 363 G4int maxint = 30 ; // number of iterations
348 364
349 365
350 for (auto & k : xbuf) << 366 for ( size_t k = 0 ; k<xbuf.size() ; k++ ) {
351 { << 367
352 #ifdef G4TWISTDEBUG 368 #ifdef G4TWISTDEBUG
353 G4cout << "Solution " << k << " : " 369 G4cout << "Solution " << k << " : "
354 << "reconstructed phiR = " << xbuf[ 370 << "reconstructed phiR = " << xbuf[k].phi
355 << ", uR = " << xbuf[k].u << G4endl 371 << ", uR = " << xbuf[k].u << G4endl ;
356 #endif 372 #endif
357 373
358 phi = k.phi ; // get the stored values fo << 374 phi = xbuf[k].phi ; // get the stored values for phi and u
359 u = k.u ; << 375 u = xbuf[k].u ;
360 376
361 IsConverged = false ; // no convergence 377 IsConverged = false ; // no convergence at the beginning
362 378
363 for ( G4int i = 1 ; i<maxint ; ++i ) << 379 for ( G4int i = 1 ; i<maxint ; i++ ) {
364 { << 380
365 xxonsurface = SurfacePoint(phi,u) ; 381 xxonsurface = SurfacePoint(phi,u) ;
366 surfacenormal = NormAng(phi,u) ; 382 surfacenormal = NormAng(phi,u) ;
367 tmpdist = DistanceToPlaneWithV(p, v, xxo 383 tmpdist = DistanceToPlaneWithV(p, v, xxonsurface, surfacenormal, tmpxx);
368 deltaX = ( tmpxx - xxonsurface ).mag() ; 384 deltaX = ( tmpxx - xxonsurface ).mag() ;
369 theta = std::fabs(std::acos(v*surfacenor 385 theta = std::fabs(std::acos(v*surfacenormal) - pihalf) ;
370 if ( theta < 0.001 ) << 386 if ( theta < 0.001 ) {
371 { <<
372 factor = 50 ; 387 factor = 50 ;
373 IsParallel = true ; 388 IsParallel = true ;
374 } 389 }
375 else << 390 else {
376 { <<
377 factor = 1 ; 391 factor = 1 ;
378 } 392 }
379 393
380 #ifdef G4TWISTDEBUG 394 #ifdef G4TWISTDEBUG
381 G4cout << "Step i = " << i << ", distanc << 395 G4cout << "Step i = " << i << ", distance = " << tmpdist << ", " << deltaX << G4endl ;
382 << tmpdist << ", " << deltaX << G <<
383 G4cout << "X = " << tmpxx << G4endl ; 396 G4cout << "X = " << tmpxx << G4endl ;
384 #endif 397 #endif
385 398
386 GetPhiUAtX(tmpxx, phi, u); // new point << 399 GetPhiUAtX(tmpxx, phi, u) ; // the new point xx is accepted and phi/u replaced
387 400
388 #ifdef G4TWISTDEBUG 401 #ifdef G4TWISTDEBUG
389 G4cout << "approximated phi = " << phi < 402 G4cout << "approximated phi = " << phi << ", u = " << u << G4endl ;
390 #endif 403 #endif
391 404
392 if ( deltaX <= factor*ctol ) { IsConverg 405 if ( deltaX <= factor*ctol ) { IsConverged = true ; break ; }
>> 406
393 } // end iterative loop (i) 407 } // end iterative loop (i)
394 408
>> 409
>> 410 // new code 21.09.05 O.Link
395 if ( std::fabs(tmpdist)<ctol ) tmpdist = 0 411 if ( std::fabs(tmpdist)<ctol ) tmpdist = 0 ;
396 412
>> 413
397 #ifdef G4TWISTDEBUG 414 #ifdef G4TWISTDEBUG
398 G4cout << "refined solution " << phi << " 415 G4cout << "refined solution " << phi << " , " << u << G4endl ;
399 G4cout << "distance = " << tmpdist << G4en 416 G4cout << "distance = " << tmpdist << G4endl ;
400 G4cout << "local X = " << tmpxx << G4endl 417 G4cout << "local X = " << tmpxx << G4endl ;
401 #endif 418 #endif
402 419
403 tmpisvalid = false ; // init 420 tmpisvalid = false ; // init
404 421
405 if ( IsConverged ) << 422 if ( IsConverged ) {
406 { << 423
407 if (validate == kValidateWithTol) << 424 if (validate == kValidateWithTol) {
408 { <<
409 tmpareacode = GetAreaCode(tmpxx); 425 tmpareacode = GetAreaCode(tmpxx);
410 if (!IsOutside(tmpareacode)) << 426 if (!IsOutside(tmpareacode)) {
411 { <<
412 if (tmpdist >= 0) tmpisvalid = true; 427 if (tmpdist >= 0) tmpisvalid = true;
413 } 428 }
414 } << 429 } else if (validate == kValidateWithoutTol) {
415 else if (validate == kValidateWithoutTol <<
416 { <<
417 tmpareacode = GetAreaCode(tmpxx, false 430 tmpareacode = GetAreaCode(tmpxx, false);
418 if (IsInside(tmpareacode)) << 431 if (IsInside(tmpareacode)) {
419 { <<
420 if (tmpdist >= 0) tmpisvalid = true; 432 if (tmpdist >= 0) tmpisvalid = true;
421 } 433 }
422 } << 434 } else { // kDontValidate
423 else // kDontValidate <<
424 { <<
425 G4Exception("G4TwistTrapParallelSide:: 435 G4Exception("G4TwistTrapParallelSide::DistanceToSurface()",
426 "GeomSolids0001", FatalExc 436 "GeomSolids0001", FatalException,
427 "Feature NOT implemented ! 437 "Feature NOT implemented !");
428 } 438 }
>> 439
429 } 440 }
430 else << 441 else {
431 { <<
432 tmpdist = kInfinity; // no convergen 442 tmpdist = kInfinity; // no convergence after 10 steps
433 tmpisvalid = false ; // solution is 443 tmpisvalid = false ; // solution is not vaild
434 } 444 }
435 445
>> 446
436 // store the found values 447 // store the found values
437 k.xx = tmpxx ; << 448 xbuf[k].xx = tmpxx ;
438 k.distance = tmpdist ; << 449 xbuf[k].distance = tmpdist ;
439 k.areacode = tmpareacode ; << 450 xbuf[k].areacode = tmpareacode ;
440 k.isvalid = tmpisvalid ; << 451 xbuf[k].isvalid = tmpisvalid ;
>> 452
>> 453
441 } // end loop over physical solutions (vari 454 } // end loop over physical solutions (variable k)
442 455
>> 456
443 std::sort(xbuf.begin() , xbuf.end(), Distanc 457 std::sort(xbuf.begin() , xbuf.end(), DistanceSort ) ; // sorting
444 458
445 #ifdef G4TWISTDEBUG 459 #ifdef G4TWISTDEBUG
446 G4cout << G4endl << "list xbuf after sorting 460 G4cout << G4endl << "list xbuf after sorting : " << G4endl ;
447 G4cout << G4endl << G4endl ; 461 G4cout << G4endl << G4endl ;
448 #endif 462 #endif
449 463
>> 464
450 // erase identical intersection (within kCar 465 // erase identical intersection (within kCarTolerance)
451 xbuf.erase(std::unique(xbuf.begin(),xbuf.end << 466 xbuf.erase( std::unique(xbuf.begin(), xbuf.end() , EqualIntersection ) , xbuf.end() ) ;
452 467
453 468
454 // add guesses 469 // add guesses
455 470
456 auto nxxtmp = (G4int)xbuf.size() ; << 471 G4int nxxtmp = xbuf.size() ;
>> 472
>> 473 if ( nxxtmp<2 || IsParallel ) {
457 474
458 if ( nxxtmp<2 || IsParallel ) <<
459 { <<
460 // positive end 475 // positive end
461 #ifdef G4TWISTDEBUG 476 #ifdef G4TWISTDEBUG
462 G4cout << "add guess at +z/2 .. " << G4end 477 G4cout << "add guess at +z/2 .. " << G4endl ;
463 #endif 478 #endif
464 479
465 phi = fPhiTwist/2 ; 480 phi = fPhiTwist/2 ;
466 u = 0 ; 481 u = 0 ;
467 482
468 xbuftmp.phi = phi ; 483 xbuftmp.phi = phi ;
469 xbuftmp.u = u ; 484 xbuftmp.u = u ;
470 xbuftmp.areacode = sOutside ; 485 xbuftmp.areacode = sOutside ;
471 xbuftmp.distance = kInfinity ; 486 xbuftmp.distance = kInfinity ;
472 xbuftmp.isvalid = false ; 487 xbuftmp.isvalid = false ;
473 488
474 xbuf.push_back(xbuftmp) ; // store it to 489 xbuf.push_back(xbuftmp) ; // store it to xbuf
475 490
>> 491
476 #ifdef G4TWISTDEBUG 492 #ifdef G4TWISTDEBUG
477 G4cout << "add guess at -z/2 .. " << G4end 493 G4cout << "add guess at -z/2 .. " << G4endl ;
478 #endif 494 #endif
479 495
480 phi = -fPhiTwist/2 ; 496 phi = -fPhiTwist/2 ;
481 u = 0 ; 497 u = 0 ;
482 498
483 xbuftmp.phi = phi ; 499 xbuftmp.phi = phi ;
484 xbuftmp.u = u ; 500 xbuftmp.u = u ;
485 xbuftmp.areacode = sOutside ; 501 xbuftmp.areacode = sOutside ;
486 xbuftmp.distance = kInfinity ; 502 xbuftmp.distance = kInfinity ;
487 xbuftmp.isvalid = false ; 503 xbuftmp.isvalid = false ;
488 504
489 xbuf.push_back(xbuftmp) ; // store it to 505 xbuf.push_back(xbuftmp) ; // store it to xbuf
490 506
491 for ( std::size_t k = nxxtmp ; k<xbuf.size << 507 for ( size_t k = nxxtmp ; k<xbuf.size() ; k++ ) {
492 { << 508
493 #ifdef G4TWISTDEBUG 509 #ifdef G4TWISTDEBUG
494 G4cout << "Solution " << k << " : " 510 G4cout << "Solution " << k << " : "
495 << "reconstructed phiR = " << xbu 511 << "reconstructed phiR = " << xbuf[k].phi
496 << ", uR = " << xbuf[k].u << G4en 512 << ", uR = " << xbuf[k].u << G4endl ;
497 #endif 513 #endif
498 514
499 phi = xbuf[k].phi ; // get the stored v 515 phi = xbuf[k].phi ; // get the stored values for phi and u
500 u = xbuf[k].u ; 516 u = xbuf[k].u ;
501 517
502 IsConverged = false ; // no convergenc 518 IsConverged = false ; // no convergence at the beginning
503 519
504 for ( G4int i = 1 ; i<maxint ; ++i ) << 520 for ( G4int i = 1 ; i<maxint ; i++ ) {
505 { << 521
506 xxonsurface = SurfacePoint(phi,u) ; 522 xxonsurface = SurfacePoint(phi,u) ;
507 surfacenormal = NormAng(phi,u) ; 523 surfacenormal = NormAng(phi,u) ;
508 tmpdist = DistanceToPlaneWithV(p, v, x 524 tmpdist = DistanceToPlaneWithV(p, v, xxonsurface, surfacenormal, tmpxx);
509 deltaX = ( tmpxx - xxonsurface ).mag() 525 deltaX = ( tmpxx - xxonsurface ).mag() ;
510 theta = std::fabs(std::acos(v*surfacen 526 theta = std::fabs(std::acos(v*surfacenormal) - pihalf) ;
511 if ( theta < 0.001 ) << 527 if ( theta < 0.001 ) {
512 { <<
513 factor = 50 ; 528 factor = 50 ;
514 } 529 }
515 else << 530 else {
516 { <<
517 factor = 1 ; 531 factor = 1 ;
518 } 532 }
519 533
520 #ifdef G4TWISTDEBUG 534 #ifdef G4TWISTDEBUG
521 G4cout << "Step i = " << i << ", dista << 535 G4cout << "Step i = " << i << ", distance = " << tmpdist << ", " << deltaX << G4endl ;
522 << tmpdist << ", " << deltaX << <<
523 G4cout << "X = " << tmpxx << G4endl ; 536 G4cout << "X = " << tmpxx << G4endl ;
524 #endif 537 #endif
525 538
526 GetPhiUAtX(tmpxx, phi, u) ; // new poi << 539 GetPhiUAtX(tmpxx, phi, u) ; // the new point xx is accepted and phi/u replaced
527 << 540
528 #ifdef G4TWISTDEBUG 541 #ifdef G4TWISTDEBUG
529 G4cout << "approximated phi = " << phi 542 G4cout << "approximated phi = " << phi << ", u = " << u << G4endl ;
530 #endif 543 #endif
531 544
532 if ( deltaX <= factor*ctol ) { IsConve 545 if ( deltaX <= factor*ctol ) { IsConverged = true ; break ; }
>> 546
533 } // end iterative loop (i) 547 } // end iterative loop (i)
>> 548
534 549
>> 550 // new code 21.09.05 O.Link
535 if ( std::fabs(tmpdist)<ctol ) tmpdist = 551 if ( std::fabs(tmpdist)<ctol ) tmpdist = 0 ;
536 552
>> 553
537 #ifdef G4TWISTDEBUG 554 #ifdef G4TWISTDEBUG
538 G4cout << "refined solution " << phi << 555 G4cout << "refined solution " << phi << " , " << u << G4endl ;
539 G4cout << "distance = " << tmpdist << G4 556 G4cout << "distance = " << tmpdist << G4endl ;
540 G4cout << "local X = " << tmpxx << G4end 557 G4cout << "local X = " << tmpxx << G4endl ;
541 #endif 558 #endif
542 559
543 tmpisvalid = false ; // init 560 tmpisvalid = false ; // init
544 561
545 if ( IsConverged ) << 562 if ( IsConverged ) {
546 { << 563
547 if (validate == kValidateWithTol) << 564 if (validate == kValidateWithTol) {
548 { <<
549 tmpareacode = GetAreaCode(tmpxx); 565 tmpareacode = GetAreaCode(tmpxx);
550 if (!IsOutside(tmpareacode)) << 566 if (!IsOutside(tmpareacode)) {
551 { <<
552 if (tmpdist >= 0) tmpisvalid = tru 567 if (tmpdist >= 0) tmpisvalid = true;
553 } 568 }
554 } << 569 } else if (validate == kValidateWithoutTol) {
555 else if (validate == kValidateWithoutT <<
556 { <<
557 tmpareacode = GetAreaCode(tmpxx, fal 570 tmpareacode = GetAreaCode(tmpxx, false);
558 if (IsInside(tmpareacode)) << 571 if (IsInside(tmpareacode)) {
559 { <<
560 if (tmpdist >= 0) tmpisvalid = tru 572 if (tmpdist >= 0) tmpisvalid = true;
561 } 573 }
562 } << 574 } else { // kDontValidate
563 else // kDontValidate <<
564 { <<
565 G4Exception("G4TwistedBoxSide::Dista 575 G4Exception("G4TwistedBoxSide::DistanceToSurface()",
566 "GeomSolids0001", FatalE 576 "GeomSolids0001", FatalException,
567 "Feature NOT implemented 577 "Feature NOT implemented !");
568 } 578 }
569 579
570 } 580 }
571 else << 581 else {
572 { <<
573 tmpdist = kInfinity; // no converg 582 tmpdist = kInfinity; // no convergence after 10 steps
574 tmpisvalid = false ; // solution i 583 tmpisvalid = false ; // solution is not vaild
575 } 584 }
576 << 585
>> 586
577 // store the found values 587 // store the found values
578 xbuf[k].xx = tmpxx ; 588 xbuf[k].xx = tmpxx ;
579 xbuf[k].distance = tmpdist ; 589 xbuf[k].distance = tmpdist ;
580 xbuf[k].areacode = tmpareacode ; 590 xbuf[k].areacode = tmpareacode ;
581 xbuf[k].isvalid = tmpisvalid ; 591 xbuf[k].isvalid = tmpisvalid ;
582 592
>> 593
583 } // end loop over physical solutions 594 } // end loop over physical solutions
>> 595
>> 596
584 } // end less than 2 solutions 597 } // end less than 2 solutions
585 598
>> 599
586 // sort again 600 // sort again
587 std::sort(xbuf.begin() , xbuf.end(), Distanc 601 std::sort(xbuf.begin() , xbuf.end(), DistanceSort ) ; // sorting
588 602
589 // erase identical intersection (within kCar 603 // erase identical intersection (within kCarTolerance)
590 xbuf.erase(std::unique(xbuf.begin(),xbuf.end << 604 xbuf.erase( std::unique(xbuf.begin(), xbuf.end() , EqualIntersection ) , xbuf.end() ) ;
591 605
592 #ifdef G4TWISTDEBUG 606 #ifdef G4TWISTDEBUG
593 G4cout << G4endl << "list xbuf after sorting 607 G4cout << G4endl << "list xbuf after sorting : " << G4endl ;
594 G4cout << G4endl << G4endl ; 608 G4cout << G4endl << G4endl ;
595 #endif 609 #endif
596 610
597 nxx = (G4int)xbuf.size() ; // determine nu << 611 nxx = xbuf.size() ; // determine number of solutions again.
598 612
599 for ( G4int i = 0 ; i<(G4int)xbuf.size() ; + << 613 for ( size_t i = 0 ; i<xbuf.size() ; i++ ) {
600 { << 614
601 distance[i] = xbuf[i].distance; 615 distance[i] = xbuf[i].distance;
602 gxx[i] = ComputeGlobalPoint(xbuf[i].x 616 gxx[i] = ComputeGlobalPoint(xbuf[i].xx);
603 areacode[i] = xbuf[i].areacode ; 617 areacode[i] = xbuf[i].areacode ;
604 isvalid[i] = xbuf[i].isvalid ; 618 isvalid[i] = xbuf[i].isvalid ;
605 619
606 fCurStatWithV.SetCurrentStatus(i, gxx[i], 620 fCurStatWithV.SetCurrentStatus(i, gxx[i], distance[i], areacode[i],
607 isvalid[i 621 isvalid[i], nxx, validate, &gp, &gv);
>> 622
608 #ifdef G4TWISTDEBUG 623 #ifdef G4TWISTDEBUG
609 G4cout << "element Nr. " << i 624 G4cout << "element Nr. " << i
610 << ", local Intersection = " << xbu 625 << ", local Intersection = " << xbuf[i].xx
611 << ", distance = " << xbuf[i].dista 626 << ", distance = " << xbuf[i].distance
612 << ", u = " << xbuf[i].u 627 << ", u = " << xbuf[i].u
613 << ", phi = " << xbuf[i].phi 628 << ", phi = " << xbuf[i].phi
614 << ", isvalid = " << xbuf[i].isvali 629 << ", isvalid = " << xbuf[i].isvalid
615 << G4endl ; 630 << G4endl ;
616 #endif 631 #endif
>> 632
617 } // end for( i ) loop 633 } // end for( i ) loop
618 634
>> 635
619 #ifdef G4TWISTDEBUG 636 #ifdef G4TWISTDEBUG
620 G4cout << "G4TwistTrapParallelSide finished 637 G4cout << "G4TwistTrapParallelSide finished " << G4endl ;
621 G4cout << nxx << " possible physical solutio 638 G4cout << nxx << " possible physical solutions found" << G4endl ;
622 for ( G4int k= 0 ; k< nxx ; ++k ) << 639 for ( G4int k= 0 ; k< nxx ; k++ ) {
623 { <<
624 G4cout << "global intersection Point found 640 G4cout << "global intersection Point found: " << gxx[k] << G4endl ;
625 G4cout << "distance = " << distance[k] << 641 G4cout << "distance = " << distance[k] << G4endl ;
626 G4cout << "isvalid = " << isvalid[k] << G4 642 G4cout << "isvalid = " << isvalid[k] << G4endl ;
627 } 643 }
628 #endif 644 #endif
629 645
630 return nxx ; 646 return nxx ;
>> 647
631 } 648 }
632 649
>> 650
>> 651
633 //============================================ 652 //=====================================================================
634 //* DistanceToSurface ------------------------ 653 //* DistanceToSurface -------------------------------------------------
635 654
636 G4int G4TwistTrapParallelSide::DistanceToSurfa << 655 G4int G4TwistTrapParallelSide::DistanceToSurface(const G4ThreeVector &gp,
637 << 656 G4ThreeVector gxx[],
638 << 657 G4double distance[],
639 << 658 G4int areacode[])
640 { 659 {
>> 660 // to do
>> 661
641 const G4double ctol = 0.5 * kCarTolerance; 662 const G4double ctol = 0.5 * kCarTolerance;
642 663
643 fCurStat.ResetfDone(kDontValidate, &gp); 664 fCurStat.ResetfDone(kDontValidate, &gp);
644 665
645 if (fCurStat.IsDone()) << 666 if (fCurStat.IsDone()) {
646 { << 667 G4int i;
647 for (G4int i=0; i<fCurStat.GetNXX(); ++i << 668 for (i=0; i<fCurStat.GetNXX(); i++) {
648 { <<
649 gxx[i] = fCurStat.GetXX(i); 669 gxx[i] = fCurStat.GetXX(i);
650 distance[i] = fCurStat.GetDistance(i) 670 distance[i] = fCurStat.GetDistance(i);
651 areacode[i] = fCurStat.GetAreacode(i) 671 areacode[i] = fCurStat.GetAreacode(i);
652 } 672 }
653 return fCurStat.GetNXX(); 673 return fCurStat.GetNXX();
654 } << 674 } else {
655 else // initialize << 675 // initialize
656 { << 676 G4int i;
657 for (G4int i=0; i<G4VSURFACENXX; ++i) << 677 for (i=0; i<G4VSURFACENXX; i++) {
658 { <<
659 distance[i] = kInfinity; 678 distance[i] = kInfinity;
660 areacode[i] = sOutside; 679 areacode[i] = sOutside;
661 gxx[i].set(kInfinity, kInfinity, kInf 680 gxx[i].set(kInfinity, kInfinity, kInfinity);
662 } 681 }
663 } 682 }
664 683
665 G4ThreeVector p = ComputeLocalPoint(gp); 684 G4ThreeVector p = ComputeLocalPoint(gp);
666 G4ThreeVector xx; // intersection point 685 G4ThreeVector xx; // intersection point
667 G4ThreeVector xxonsurface ; // interpolated 686 G4ThreeVector xxonsurface ; // interpolated intersection point
668 687
669 // the surfacenormal at that surface point 688 // the surfacenormal at that surface point
670 G4double phiR = 0 ; // 689 G4double phiR = 0 ; //
671 G4double uR = 0 ; 690 G4double uR = 0 ;
672 691
673 G4ThreeVector surfacenormal ; 692 G4ThreeVector surfacenormal ;
674 G4double deltaX ; 693 G4double deltaX ;
675 694
676 G4int maxint = 20 ; 695 G4int maxint = 20 ;
677 696
678 for ( G4int i = 1 ; i<maxint ; ++i ) << 697 for ( G4int i = 1 ; i<maxint ; i++ ) {
679 { << 698
680 xxonsurface = SurfacePoint(phiR,uR) ; 699 xxonsurface = SurfacePoint(phiR,uR) ;
681 surfacenormal = NormAng(phiR,uR) ; 700 surfacenormal = NormAng(phiR,uR) ;
682 distance[0] = DistanceToPlane(p, xxonsurf 701 distance[0] = DistanceToPlane(p, xxonsurface, surfacenormal, xx); // new XX
683 deltaX = ( xx - xxonsurface ).mag() ; 702 deltaX = ( xx - xxonsurface ).mag() ;
684 703
685 #ifdef G4TWISTDEBUG 704 #ifdef G4TWISTDEBUG
686 G4cout << "i = " << i << ", distance = " << 705 G4cout << "i = " << i << ", distance = " << distance[0] << ", " << deltaX << G4endl ;
687 << distance[0] << ", " << deltaX < <<
688 G4cout << "X = " << xx << G4endl ; 706 G4cout << "X = " << xx << G4endl ;
689 #endif 707 #endif
690 708
691 // the new point xx is accepted and phi/p 709 // the new point xx is accepted and phi/psi replaced
692 GetPhiUAtX(xx, phiR, uR) ; 710 GetPhiUAtX(xx, phiR, uR) ;
693 711
694 if ( deltaX <= ctol ) { break ; } 712 if ( deltaX <= ctol ) { break ; }
>> 713
695 } 714 }
696 715
697 // check validity of solution ( valid phi,p 716 // check validity of solution ( valid phi,psi )
698 717
699 G4double halfphi = 0.5*fPhiTwist ; 718 G4double halfphi = 0.5*fPhiTwist ;
700 G4double uMax = GetBoundaryMax(phiR) ; 719 G4double uMax = GetBoundaryMax(phiR) ;
701 G4double uMin = GetBoundaryMin(phiR) ; 720 G4double uMin = GetBoundaryMin(phiR) ;
702 721
703 if ( phiR > halfphi ) phiR = halfphi ; 722 if ( phiR > halfphi ) phiR = halfphi ;
704 if ( phiR < -halfphi ) phiR = -halfphi ; 723 if ( phiR < -halfphi ) phiR = -halfphi ;
705 if ( uR > uMax ) uR = uMax ; 724 if ( uR > uMax ) uR = uMax ;
706 if ( uR < uMin ) uR = uMin ; 725 if ( uR < uMin ) uR = uMin ;
707 726
708 xxonsurface = SurfacePoint(phiR,uR) ; 727 xxonsurface = SurfacePoint(phiR,uR) ;
709 distance[0] = ( p - xx ).mag() ; 728 distance[0] = ( p - xx ).mag() ;
710 if ( distance[0] <= ctol ) { distance[0] = 729 if ( distance[0] <= ctol ) { distance[0] = 0 ; }
711 730
712 // end of validity 731 // end of validity
713 732
714 #ifdef G4TWISTDEBUG 733 #ifdef G4TWISTDEBUG
715 G4cout << "refined solution " << phiR << " 734 G4cout << "refined solution " << phiR << " , " << uR << " , " << G4endl ;
716 G4cout << "distance = " << distance[0] << G 735 G4cout << "distance = " << distance[0] << G4endl ;
717 G4cout << "X = " << xx << G4endl ; 736 G4cout << "X = " << xx << G4endl ;
718 #endif 737 #endif
719 738
720 G4bool isvalid = true; 739 G4bool isvalid = true;
721 gxx[0] = ComputeGlobalPoint(xx); 740 gxx[0] = ComputeGlobalPoint(xx);
722 741
723 #ifdef G4TWISTDEBUG 742 #ifdef G4TWISTDEBUG
724 G4cout << "intersection Point found: " << g 743 G4cout << "intersection Point found: " << gxx[0] << G4endl ;
725 G4cout << "distance = " << distance[0] << G 744 G4cout << "distance = " << distance[0] << G4endl ;
726 #endif 745 #endif
727 746
728 fCurStat.SetCurrentStatus(0, gxx[0], distan 747 fCurStat.SetCurrentStatus(0, gxx[0], distance[0], areacode[0],
729 isvalid, 1, kDontV 748 isvalid, 1, kDontValidate, &gp);
730 return 1; 749 return 1;
731 } 750 }
732 751
>> 752
733 //============================================ 753 //=====================================================================
734 //* GetAreaCode ------------------------------ 754 //* GetAreaCode -------------------------------------------------------
735 755
736 G4int G4TwistTrapParallelSide::GetAreaCode(con << 756 G4int G4TwistTrapParallelSide::GetAreaCode(const G4ThreeVector &xx,
737 G4b << 757 G4bool withTol)
738 { 758 {
739 // We must use the function in local coordi 759 // We must use the function in local coordinate system.
740 // See the description of DistanceToSurface 760 // See the description of DistanceToSurface(p,v).
741 761
742 const G4double ctol = 0.5 * kCarTolerance; 762 const G4double ctol = 0.5 * kCarTolerance;
743 763
744 G4double phi ; 764 G4double phi ;
745 G4double yprime ; 765 G4double yprime ;
746 GetPhiUAtX(xx, phi,yprime ) ; 766 GetPhiUAtX(xx, phi,yprime ) ;
747 767
748 G4double fXAxisMax = GetBoundaryMax(phi) ; 768 G4double fXAxisMax = GetBoundaryMax(phi) ;
749 G4double fXAxisMin = GetBoundaryMin(phi) ; 769 G4double fXAxisMin = GetBoundaryMin(phi) ;
750 770
751 #ifdef G4TWISTDEBUG 771 #ifdef G4TWISTDEBUG
752 G4cout << "GetAreaCode: phi = " << phi << G 772 G4cout << "GetAreaCode: phi = " << phi << G4endl ;
753 G4cout << "GetAreaCode: yprime = " << yprim 773 G4cout << "GetAreaCode: yprime = " << yprime << G4endl ;
754 G4cout << "Intervall is " << fXAxisMin << " 774 G4cout << "Intervall is " << fXAxisMin << " to " << fXAxisMax << G4endl ;
755 #endif 775 #endif
756 776
757 G4int areacode = sInside; 777 G4int areacode = sInside;
758 778
759 if (fAxis[0] == kXAxis && fAxis[1] == kZAxi << 779 if (fAxis[0] == kXAxis && fAxis[1] == kZAxis) {
760 { << 780
761 G4int zaxis = 1; 781 G4int zaxis = 1;
762 782
763 if (withTol) << 783 if (withTol) {
764 { << 784
765 G4bool isoutside = false; << 785 G4bool isoutside = false;
766 786
767 // test boundary of xaxis 787 // test boundary of xaxis
768 788
769 if (yprime < fXAxisMin + ctol) << 789 if (yprime < fXAxisMin + ctol) {
770 { <<
771 areacode |= (sAxis0 & (sAxisX | sA 790 areacode |= (sAxis0 & (sAxisX | sAxisMin)) | sBoundary;
772 if (yprime <= fXAxisMin - ctol) is 791 if (yprime <= fXAxisMin - ctol) isoutside = true;
773 792
774 } << 793 } else if (yprime > fXAxisMax - ctol) {
775 else if (yprime > fXAxisMax - ctol) <<
776 { <<
777 areacode |= (sAxis0 & (sAxisX | sA 794 areacode |= (sAxis0 & (sAxisX | sAxisMax)) | sBoundary;
778 if (yprime >= fXAxisMax + ctol) i 795 if (yprime >= fXAxisMax + ctol) isoutside = true;
779 } 796 }
780 797
781 // test boundary of z-axis 798 // test boundary of z-axis
782 799
783 if (xx.z() < fAxisMin[zaxis] + ctol) << 800 if (xx.z() < fAxisMin[zaxis] + ctol) {
784 { <<
785 areacode |= (sAxis1 & (sAxisZ | sA 801 areacode |= (sAxis1 & (sAxisZ | sAxisMin));
786 802
787 if ((areacode & sBoundary) != 0) << 803 if (areacode & sBoundary) areacode |= sCorner; // xx is on the corner.
788 else areaco 804 else areacode |= sBoundary;
789 if (xx.z() <= fAxisMin[zaxis] - ct 805 if (xx.z() <= fAxisMin[zaxis] - ctol) isoutside = true;
790 806
791 } << 807 } else if (xx.z() > fAxisMax[zaxis] - ctol) {
792 else if (xx.z() > fAxisMax[zaxis] - c <<
793 { <<
794 areacode |= (sAxis1 & (sAxisZ | sA 808 areacode |= (sAxis1 & (sAxisZ | sAxisMax));
795 809
796 if ((areacode & sBoundary) != 0) << 810 if (areacode & sBoundary) areacode |= sCorner; // xx is on the corner.
797 else areaco 811 else areacode |= sBoundary;
798 if (xx.z() >= fAxisMax[zaxis] + ct 812 if (xx.z() >= fAxisMax[zaxis] + ctol) isoutside = true;
799 } 813 }
800 814
801 // if isoutside = true, clear inside 815 // if isoutside = true, clear inside bit.
802 // if not on boundary, add axis infor 816 // if not on boundary, add axis information.
803 817
804 if (isoutside) << 818 if (isoutside) {
805 { <<
806 G4int tmpareacode = areacode & (~s 819 G4int tmpareacode = areacode & (~sInside);
807 areacode = tmpareacode; 820 areacode = tmpareacode;
808 } << 821 } else if ((areacode & sBoundary) != sBoundary) {
809 else if ((areacode & sBoundary) != sB <<
810 { <<
811 areacode |= (sAxis0 & sAxisX) | (s 822 areacode |= (sAxis0 & sAxisX) | (sAxis1 & sAxisZ);
812 } 823 }
813 824
814 } << 825 } else {
815 else << 826
816 { <<
817 // boundary of y-axis 827 // boundary of y-axis
818 828
819 if (yprime < fXAxisMin ) << 829 if (yprime < fXAxisMin ) {
820 { <<
821 areacode |= (sAxis0 & (sAxisX | sA 830 areacode |= (sAxis0 & (sAxisX | sAxisMin)) | sBoundary;
822 } << 831 } else if (yprime > fXAxisMax) {
823 else if (yprime > fXAxisMax) <<
824 { <<
825 areacode |= (sAxis0 & (sAxisX | sA 832 areacode |= (sAxis0 & (sAxisX | sAxisMax)) | sBoundary;
826 } 833 }
827 834
828 // boundary of z-axis 835 // boundary of z-axis
829 836
830 if (xx.z() < fAxisMin[zaxis]) << 837 if (xx.z() < fAxisMin[zaxis]) {
831 { <<
832 areacode |= (sAxis1 & (sAxisZ | sA 838 areacode |= (sAxis1 & (sAxisZ | sAxisMin));
833 if ((areacode & sBoundary) != 0) << 839 if (areacode & sBoundary) areacode |= sCorner; // xx is on the corner.
834 else areaco 840 else areacode |= sBoundary;
835 841
836 } << 842 } else if (xx.z() > fAxisMax[zaxis]) {
837 else if (xx.z() > fAxisMax[zaxis]) <<
838 { <<
839 areacode |= (sAxis1 & (sAxisZ | sA 843 areacode |= (sAxis1 & (sAxisZ | sAxisMax)) ;
840 if ((areacode & sBoundary) != 0) << 844 if (areacode & sBoundary) areacode |= sCorner; // xx is on the corner.
841 else areaco 845 else areacode |= sBoundary;
842 } 846 }
843 847
844 if ((areacode & sBoundary) != sBounda << 848 if ((areacode & sBoundary) != sBoundary) {
845 { <<
846 areacode |= (sAxis0 & sAxisX) | (s 849 areacode |= (sAxis0 & sAxisX) | (sAxis1 & sAxisZ);
847 } 850 }
848 } 851 }
849 return areacode; 852 return areacode;
850 } << 853 } else {
851 else <<
852 { <<
853 G4Exception("G4TwistTrapParallelSide::Ge 854 G4Exception("G4TwistTrapParallelSide::GetAreaCode()",
854 "GeomSolids0001", FatalExcep 855 "GeomSolids0001", FatalException,
855 "Feature NOT implemented !") 856 "Feature NOT implemented !");
856 } 857 }
857 return areacode; 858 return areacode;
858 } 859 }
859 860
860 //============================================ 861 //=====================================================================
861 //* SetCorners() ----------------------------- 862 //* SetCorners() ------------------------------------------------------
862 863
863 void G4TwistTrapParallelSide::SetCorners() 864 void G4TwistTrapParallelSide::SetCorners()
864 { 865 {
865 866
866 // Set Corner points in local coodinate. 867 // Set Corner points in local coodinate.
867 868
868 if (fAxis[0] == kXAxis && fAxis[1] == kZAxis << 869 if (fAxis[0] == kXAxis && fAxis[1] == kZAxis) {
869 { << 870
870 G4double x, y, z; 871 G4double x, y, z;
871 872
872 // corner of Axis0min and Axis1min 873 // corner of Axis0min and Axis1min
873 874
874 x = -fdeltaX/2. + (-fDx2 + fDy1*fTAlph)*st << 875 x = -fdeltaX/2. + (-fDx2 + fDy1*fTAlph)*std::cos(fPhiTwist/2.) + fDy1*std::sin(fPhiTwist/2.) ;
875 + fDy1*std::sin(fPhiTwist/2.) ; << 876 y = -fdeltaY/2. + fDy1*std::cos(fPhiTwist/2.) + (fDx2 - fDy1*fTAlph)*std::sin(fPhiTwist/2.) ;
876 y = -fdeltaY/2. + fDy1*std::cos(fPhiTwist/ <<
877 + (fDx2 - fDy1*fTAlph)*std::sin(fPhiTwis <<
878 z = -fDz ; 877 z = -fDz ;
879 878
880 SetCorner(sC0Min1Min, x, y, z); 879 SetCorner(sC0Min1Min, x, y, z);
881 880
882 // corner of Axis0max and Axis1min 881 // corner of Axis0max and Axis1min
883 882
884 x = -fdeltaX/2. + (fDx2 + fDy1*fTAlph)*std << 883 x = -fdeltaX/2. + (fDx2 + fDy1*fTAlph)*std::cos(fPhiTwist/2.) + fDy1*std::sin(fPhiTwist/2.) ;
885 + fDy1*std::sin(fPhiTwist/2.) ; << 884 y = -fdeltaY/2. + fDy1*std::cos(fPhiTwist/2.) - (fDx2 + fDy1*fTAlph)*std::sin(fPhiTwist/2.) ;
886 y = -fdeltaY/2. + fDy1*std::cos(fPhiTwist/ <<
887 - (fDx2 + fDy1*fTAlph)*std::sin(fPhiTwis <<
888 z = -fDz; 885 z = -fDz;
889 886
890 SetCorner(sC0Max1Min, x, y, z); 887 SetCorner(sC0Max1Min, x, y, z);
891 888
892 // corner of Axis0max and Axis1max 889 // corner of Axis0max and Axis1max
893 x = fdeltaX/2. + (fDx4 + fDy2*fTAlph)*std: << 890 x = fdeltaX/2. + (fDx4 + fDy2*fTAlph)*std::cos(fPhiTwist/2.) - fDy2*std::sin(fPhiTwist/2.) ;
894 - fDy2*std::sin(fPhiTwist/2.) ; << 891 y = fdeltaY/2. + fDy2*std::cos(fPhiTwist/2.) + (fDx4 + fDy2*fTAlph)*std::sin(fPhiTwist/2.) ;
895 y = fdeltaY/2. + fDy2*std::cos(fPhiTwist/2 <<
896 + (fDx4 + fDy2*fTAlph)*std::sin(fPhiTwis <<
897 z = fDz ; 892 z = fDz ;
898 893
899 SetCorner(sC0Max1Max, x, y, z); 894 SetCorner(sC0Max1Max, x, y, z);
900 895
901 // corner of Axis0min and Axis1max 896 // corner of Axis0min and Axis1max
902 x = fdeltaX/2. + (-fDx4 + fDy2*fTAlph)*std << 897 x = fdeltaX/2. + (-fDx4 + fDy2*fTAlph)*std::cos(fPhiTwist/2.) - fDy2*std::sin(fPhiTwist/2.) ;
903 - fDy2*std::sin(fPhiTwist/2.) ; << 898 y = fdeltaY/2. + fDy2*std::cos(fPhiTwist/2.) + (-fDx4 + fDy2*fTAlph)*std::sin(fPhiTwist/2.) ;
904 y = fdeltaY/2. + fDy2*std::cos(fPhiTwist/2 <<
905 + (-fDx4 + fDy2*fTAlph)*std::sin(fPhiTwi <<
906 z = fDz ; 899 z = fDz ;
907 900
908 SetCorner(sC0Min1Max, x, y, z); 901 SetCorner(sC0Min1Max, x, y, z);
909 } << 902
910 else << 903 } else {
911 { << 904
912 G4Exception("G4TwistTrapParallelSide::SetC 905 G4Exception("G4TwistTrapParallelSide::SetCorners()",
913 "GeomSolids0001", FatalExcepti 906 "GeomSolids0001", FatalException,
914 "Method NOT implemented !"); 907 "Method NOT implemented !");
915 } 908 }
916 } 909 }
917 910
918 //============================================ 911 //=====================================================================
919 //* SetBoundaries() -------------------------- 912 //* SetBoundaries() ---------------------------------------------------
920 913
921 void G4TwistTrapParallelSide::SetBoundaries() 914 void G4TwistTrapParallelSide::SetBoundaries()
922 { 915 {
923 // Set direction-unit vector of boundary-li 916 // Set direction-unit vector of boundary-lines in local coodinate.
924 // 917 //
925 918
926 G4ThreeVector direction; 919 G4ThreeVector direction;
927 920
928 if (fAxis[0] == kXAxis && fAxis[1] == kZAxis << 921 if (fAxis[0] == kXAxis && fAxis[1] == kZAxis) {
929 { << 922
930 // sAxis0 & sAxisMin 923 // sAxis0 & sAxisMin
931 direction = GetCorner(sC0Min1Max) - GetCor 924 direction = GetCorner(sC0Min1Max) - GetCorner(sC0Min1Min);
932 direction = direction.unit(); 925 direction = direction.unit();
933 SetBoundary(sAxis0 & (sAxisX | sAxisMin), 926 SetBoundary(sAxis0 & (sAxisX | sAxisMin), direction,
934 GetCorner(sC0Min1Min), sAxisZ) 927 GetCorner(sC0Min1Min), sAxisZ) ;
935 928
936 // sAxis0 & sAxisMax 929 // sAxis0 & sAxisMax
937 direction = GetCorner(sC0Max1Max) - GetCor 930 direction = GetCorner(sC0Max1Max) - GetCorner(sC0Max1Min);
938 direction = direction.unit(); 931 direction = direction.unit();
939 SetBoundary(sAxis0 & (sAxisX | sAxisMax), 932 SetBoundary(sAxis0 & (sAxisX | sAxisMax), direction,
940 GetCorner(sC0Max1Min), sAxisZ) 933 GetCorner(sC0Max1Min), sAxisZ);
941 934
942 // sAxis1 & sAxisMin 935 // sAxis1 & sAxisMin
943 direction = GetCorner(sC0Max1Min) - GetCor 936 direction = GetCorner(sC0Max1Min) - GetCorner(sC0Min1Min);
944 direction = direction.unit(); 937 direction = direction.unit();
945 SetBoundary(sAxis1 & (sAxisZ | sAxisMin), 938 SetBoundary(sAxis1 & (sAxisZ | sAxisMin), direction,
946 GetCorner(sC0Min1Min), sAxisX) 939 GetCorner(sC0Min1Min), sAxisX);
947 940
948 // sAxis1 & sAxisMax 941 // sAxis1 & sAxisMax
949 direction = GetCorner(sC0Max1Max) - GetCor 942 direction = GetCorner(sC0Max1Max) - GetCorner(sC0Min1Max);
950 direction = direction.unit(); 943 direction = direction.unit();
951 SetBoundary(sAxis1 & (sAxisZ | sAxisMax), 944 SetBoundary(sAxis1 & (sAxisZ | sAxisMax), direction,
952 GetCorner(sC0Min1Max), sAxisX) 945 GetCorner(sC0Min1Max), sAxisX);
>> 946
>> 947 } else {
>> 948
>> 949 G4Exception("G4TwistTrapParallelSide::SetCorners()",
>> 950 "GeomSolids0001", FatalException,
>> 951 "Feature NOT implemented !");
953 } 952 }
954 else << 953
955 { <<
956 G4Exception("G4TwistTrapParallelSide::SetC <<
957 "GeomSolids0001", FatalExcepti <<
958 "Feature NOT implemented !"); <<
959 } <<
960 } 954 }
961 955
962 //============================================ 956 //=====================================================================
963 //* GetPhiUAtX() ----------------------------- 957 //* GetPhiUAtX() ------------------------------------------------------
964 958
965 void 959 void
966 G4TwistTrapParallelSide::GetPhiUAtX( const G4T << 960 G4TwistTrapParallelSide::GetPhiUAtX( G4ThreeVector p, G4double &phi, G4double &u)
967 G4double& <<
968 { 961 {
969 // find closest point XX on surface for a gi 962 // find closest point XX on surface for a given point p
970 // X0 is a point on the surface, d is the d << 963 // X0 is a point on the surface, d is the direction ( both for a fixed z = pz)
971 // ( both for a fixed z = pz) <<
972 964
973 // phi is given by the z coordinate of p 965 // phi is given by the z coordinate of p
974 966
975 phi = p.z()/(2*fDz)*fPhiTwist ; 967 phi = p.z()/(2*fDz)*fPhiTwist ;
976 968
977 u = ((-(fdeltaX*phi) + fPhiTwist*p.x())* std << 969 u = ((-(fdeltaX*phi) + fPhiTwist*p.x())* std::cos(phi) + (-(fdeltaY*phi) + fPhiTwist*p.y())*std::sin(phi))/fPhiTwist ;
978 + (-(fdeltaY*phi) + fPhiTwist*p.y())*std:: << 970
979 } 971 }
980 972
981 //============================================ 973 //=====================================================================
982 //* ProjectPoint() --------------------------- 974 //* ProjectPoint() ----------------------------------------------------
983 975
984 G4ThreeVector G4TwistTrapParallelSide::Project << 976 G4ThreeVector G4TwistTrapParallelSide::ProjectPoint(const G4ThreeVector &p,
985 977 G4bool isglobal)
986 { 978 {
987 // Get Rho at p.z() on Hyperbolic Surface. 979 // Get Rho at p.z() on Hyperbolic Surface.
988 G4ThreeVector tmpp; 980 G4ThreeVector tmpp;
989 if (isglobal) << 981 if (isglobal) {
990 { <<
991 tmpp = fRot.inverse()*p - fTrans; 982 tmpp = fRot.inverse()*p - fTrans;
992 } << 983 } else {
993 else <<
994 { <<
995 tmpp = p; 984 tmpp = p;
996 } 985 }
997 986
998 G4double phi ; 987 G4double phi ;
999 G4double u ; 988 G4double u ;
1000 989
1001 GetPhiUAtX( tmpp, phi, u ) ; // calculate << 990 GetPhiUAtX( tmpp, phi, u ) ; // calculate (phi, u) for a point p close the surface
1002 991
1003 G4ThreeVector xx = SurfacePoint(phi,u) ; // << 992 G4ThreeVector xx = SurfacePoint(phi,u) ; // transform back to cartesian coordinates
1004 993
1005 if (isglobal) << 994 if (isglobal) {
1006 { <<
1007 return (fRot * xx + fTrans); 995 return (fRot * xx + fTrans);
1008 } << 996 } else {
1009 else <<
1010 { <<
1011 return xx; 997 return xx;
1012 } 998 }
1013 } 999 }
1014 1000
1015 //=========================================== 1001 //=====================================================================
1016 //* GetFacets() ----------------------------- 1002 //* GetFacets() -------------------------------------------------------
1017 1003
1018 void G4TwistTrapParallelSide::GetFacets( G4in 1004 void G4TwistTrapParallelSide::GetFacets( G4int k, G4int n, G4double xyz[][3],
1019 G4in 1005 G4int faces[][4], G4int iside )
1020 { 1006 {
>> 1007
1021 G4double phi ; 1008 G4double phi ;
1022 G4double z, u ; // the two parameters f 1009 G4double z, u ; // the two parameters for the surface equation
1023 G4ThreeVector p ; // a point on the surfac 1010 G4ThreeVector p ; // a point on the surface, given by (z,u)
1024 1011
1025 G4int nnode ; 1012 G4int nnode ;
1026 G4int nface ; 1013 G4int nface ;
1027 1014
1028 G4double umin, umax ; 1015 G4double umin, umax ;
1029 1016
1030 // calculate the (n-1)*(k-1) vertices 1017 // calculate the (n-1)*(k-1) vertices
1031 1018
1032 for ( G4int i = 0 ; i<n ; ++i ) << 1019 G4int i,j ;
1033 { << 1020
>> 1021 for ( i = 0 ; i<n ; i++ ) {
>> 1022
1034 z = -fDz+i*(2.*fDz)/(n-1) ; 1023 z = -fDz+i*(2.*fDz)/(n-1) ;
1035 phi = z*fPhiTwist/(2*fDz) ; 1024 phi = z*fPhiTwist/(2*fDz) ;
1036 umin = GetBoundaryMin(phi) ; 1025 umin = GetBoundaryMin(phi) ;
1037 umax = GetBoundaryMax(phi) ; 1026 umax = GetBoundaryMax(phi) ;
1038 1027
1039 for ( G4int j = 0 ; j<k ; ++j ) << 1028 for ( j = 0 ; j<k ; j++ ) {
1040 { << 1029
1041 nnode = GetNode(i,j,k,n,iside) ; 1030 nnode = GetNode(i,j,k,n,iside) ;
1042 u = umax - j*(umax-umin)/(k-1) ; 1031 u = umax - j*(umax-umin)/(k-1) ;
1043 p = SurfacePoint(phi,u,true) ; // surf << 1032 p = SurfacePoint(phi,u,true) ; // surface point in global coordinate system
1044 1033
1045 xyz[nnode][0] = p.x() ; 1034 xyz[nnode][0] = p.x() ;
1046 xyz[nnode][1] = p.y() ; 1035 xyz[nnode][1] = p.y() ;
1047 xyz[nnode][2] = p.z() ; 1036 xyz[nnode][2] = p.z() ;
1048 1037
1049 if ( i<n-1 && j<k-1 ) // conterclock << 1038 if ( i<n-1 && j<k-1 ) { // conterclock wise filling
1050 { << 1039
1051 nface = GetFace(i,j,k,n,iside) ; 1040 nface = GetFace(i,j,k,n,iside) ;
1052 faces[nface][0] = GetEdgeVisibility(i << 1041 faces[nface][0] = GetEdgeVisibility(i,j,k,n,0,-1) * (GetNode(i ,j ,k,n,iside)+1) ; // fortran numbering
1053 * (GetNode(i ,j ,k, << 1042 faces[nface][1] = GetEdgeVisibility(i,j,k,n,1,-1) * (GetNode(i ,j+1,k,n,iside)+1) ;
1054 faces[nface][1] = GetEdgeVisibility(i << 1043 faces[nface][2] = GetEdgeVisibility(i,j,k,n,2,-1) * (GetNode(i+1,j+1,k,n,iside)+1) ;
1055 * (GetNode(i ,j+1,k, << 1044 faces[nface][3] = GetEdgeVisibility(i,j,k,n,3,-1) * (GetNode(i+1,j ,k,n,iside)+1) ;
1056 faces[nface][2] = GetEdgeVisibility(i << 1045
1057 * (GetNode(i+1,j+1,k, <<
1058 faces[nface][3] = GetEdgeVisibility(i <<
1059 * (GetNode(i+1,j ,k, <<
1060 } 1046 }
1061 } 1047 }
1062 } 1048 }
1063 } 1049 }
1064 1050