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 // G4SPSAngDistribution class implementation << 26 /////////////////////////////////////////////////////////////////////////////// >> 27 // >> 28 // MODULE: G4SPSAngDistribution.cc >> 29 // >> 30 // Version: 1.0 >> 31 // Date: 5/02/04 >> 32 // Author: Fan Lei >> 33 // Organisation: QinetiQ ltd. >> 34 // Customer: ESA/ESTEC >> 35 // >> 36 /////////////////////////////////////////////////////////////////////////////// >> 37 // >> 38 // >> 39 // CHANGE HISTORY >> 40 // -------------- >> 41 // >> 42 // >> 43 // Version 1.0, 05/02/2004, Fan Lei, Created. >> 44 // Based on the G4GeneralParticleSource class in Geant4 v6.0 >> 45 // >> 46 /////////////////////////////////////////////////////////////////////////////// 27 // 47 // 28 // Author: Fan Lei, QinetiQ ltd. - 05/02/2004 << 29 // Customer: ESA/ESTEC << 30 // Revisions: Andrea Dotti, SLAC << 31 // ------------------------------------------- << 32 << 33 #include "G4SPSAngDistribution.hh" << 34 << 35 #include "Randomize.hh" 48 #include "Randomize.hh" 36 #include "G4PhysicalConstants.hh" << 49 #include "G4SPSAngDistribution.hh" 37 50 38 G4SPSAngDistribution::G4SPSAngDistribution() << 51 G4SPSAngDistribution::G4SPSAngDistribution() 39 { 52 { 40 // Angular distribution Variables 53 // Angular distribution Variables 41 G4ThreeVector zero; 54 G4ThreeVector zero; 42 particle_momentum_direction = G4ParticleMome 55 particle_momentum_direction = G4ParticleMomentum(0,0,-1); 43 56 44 AngDistType = "planar"; 57 AngDistType = "planar"; 45 AngRef1 = CLHEP::HepXHat; 58 AngRef1 = CLHEP::HepXHat; 46 AngRef2 = CLHEP::HepYHat; 59 AngRef2 = CLHEP::HepYHat; 47 AngRef3 = CLHEP::HepZHat; 60 AngRef3 = CLHEP::HepZHat; 48 MinTheta = 0.; 61 MinTheta = 0.; 49 MaxTheta = pi; 62 MaxTheta = pi; 50 MinPhi = 0.; 63 MinPhi = 0.; 51 MaxPhi = twopi; 64 MaxPhi = twopi; 52 DR = 0.; 65 DR = 0.; 53 DX = 0.; 66 DX = 0.; 54 DY = 0.; 67 DY = 0.; 55 FocusPoint = G4ThreeVector(0., 0., 0.); 68 FocusPoint = G4ThreeVector(0., 0., 0.); 56 UserDistType = "NULL"; 69 UserDistType = "NULL"; 57 UserWRTSurface = true; 70 UserWRTSurface = true; 58 UserAngRef = false; 71 UserAngRef = false; 59 IPDFThetaExist = false; 72 IPDFThetaExist = false; 60 IPDFPhiExist = false; 73 IPDFPhiExist = false; 61 verbosityLevel = 0; << 74 verbosityLevel = 0 ; 62 << 63 G4MUTEXINIT(mutex); << 64 } 75 } 65 76 66 G4SPSAngDistribution::~G4SPSAngDistribution() 77 G4SPSAngDistribution::~G4SPSAngDistribution() 67 { << 78 {} 68 G4MUTEXDESTROY(mutex); << 69 } << 70 79 71 void G4SPSAngDistribution::SetAngDistType(cons << 80 // >> 81 void G4SPSAngDistribution::SetAngDistType(G4String atype) 72 { 82 { 73 G4AutoLock l(&mutex); << 74 if(atype != "iso" && atype != "cos" && atype 83 if(atype != "iso" && atype != "cos" && atype != "user" && atype != "planar" 75 && atype != "beam1d" && atype != "beam2d" 84 && atype != "beam1d" && atype != "beam2d" && atype != "focused") 76 { << 85 G4cout << "Error, distribution must be iso, cos, planar, beam1d, beam2d, focused or user" << G4endl; 77 G4cout << "Error, distribution must be iso << 78 << G4endl; << 79 } << 80 else 86 else 81 { << 82 AngDistType = atype; 87 AngDistType = atype; 83 } << 88 if (AngDistType == "cos") MaxTheta = pi/2. ; 84 if (AngDistType == "cos") { MaxTheta = pi/2 << 89 if (AngDistType == "user") { 85 if (AngDistType == "user") << 90 UDefThetaH = IPDFThetaH = ZeroPhysVector ; 86 { << 91 IPDFThetaExist = false ; 87 UDefThetaH = IPDFThetaH = ZeroPhysVector; << 92 UDefPhiH = IPDFPhiH = ZeroPhysVector ; 88 IPDFThetaExist = false; << 93 IPDFPhiExist = false ; 89 UDefPhiH = IPDFPhiH = ZeroPhysVector; << 90 IPDFPhiExist = false; << 91 } 94 } 92 } 95 } 93 96 94 void G4SPSAngDistribution::DefineAngRefAxes(co << 97 void G4SPSAngDistribution::DefineAngRefAxes(G4String refname, G4ThreeVector ref) 95 co << 96 { 98 { 97 G4AutoLock l(&mutex); << 99 if(refname == "angref1") 98 if (refname == "angref1") << 99 AngRef1 = ref.unit(); // x' 100 AngRef1 = ref.unit(); // x' 100 else if (refname == "angref2") << 101 else if(refname == "angref2") 101 AngRef2 = ref.unit(); // vector in x'y' pl 102 AngRef2 = ref.unit(); // vector in x'y' plane 102 103 103 // User defines x' (AngRef1) and a vector in 104 // User defines x' (AngRef1) and a vector in the x'y' 104 // plane (AngRef2). Then, AngRef1 x AngRef2 105 // plane (AngRef2). Then, AngRef1 x AngRef2 = AngRef3 105 // the z' vector. Then, AngRef3 x AngRef1 = 106 // the z' vector. Then, AngRef3 x AngRef1 = AngRef2 106 // which will now be y'. 107 // which will now be y'. 107 108 108 AngRef3 = AngRef1.cross(AngRef2); // z' 109 AngRef3 = AngRef1.cross(AngRef2); // z' 109 AngRef2 = AngRef3.cross(AngRef1); // y' 110 AngRef2 = AngRef3.cross(AngRef1); // y' 110 UserAngRef = true ; 111 UserAngRef = true ; 111 if(verbosityLevel == 2) 112 if(verbosityLevel == 2) 112 { << 113 { 113 G4cout << "Angular distribution rotation a << 114 G4cout << "Angular distribution rotation axes " << AngRef1 << " " << AngRef2 << " " << AngRef3 << G4endl; 114 << " " << AngRef2 << " " << AngRef3 << 115 } 115 } << 116 } 116 } 117 117 118 void G4SPSAngDistribution::SetMinTheta(G4doubl 118 void G4SPSAngDistribution::SetMinTheta(G4double mint) 119 { 119 { 120 G4AutoLock l(&mutex); << 121 MinTheta = mint; 120 MinTheta = mint; 122 } 121 } 123 122 124 void G4SPSAngDistribution::SetMinPhi(G4double 123 void G4SPSAngDistribution::SetMinPhi(G4double minp) 125 { 124 { 126 G4AutoLock l(&mutex); << 127 MinPhi = minp; 125 MinPhi = minp; 128 } 126 } 129 127 130 void G4SPSAngDistribution::SetMaxTheta(G4doubl 128 void G4SPSAngDistribution::SetMaxTheta(G4double maxt) 131 { 129 { 132 G4AutoLock l(&mutex); << 133 MaxTheta = maxt; 130 MaxTheta = maxt; 134 } 131 } 135 132 136 void G4SPSAngDistribution::SetMaxPhi(G4double 133 void G4SPSAngDistribution::SetMaxPhi(G4double maxp) 137 { 134 { 138 G4AutoLock l(&mutex); << 139 MaxPhi = maxp; 135 MaxPhi = maxp; 140 } 136 } 141 137 142 void G4SPSAngDistribution::SetBeamSigmaInAngR( 138 void G4SPSAngDistribution::SetBeamSigmaInAngR(G4double r) 143 { 139 { 144 G4AutoLock l(&mutex); << 145 DR = r; 140 DR = r; 146 } 141 } 147 142 148 void G4SPSAngDistribution::SetBeamSigmaInAngX( 143 void G4SPSAngDistribution::SetBeamSigmaInAngX(G4double r) 149 { 144 { 150 G4AutoLock l(&mutex); << 151 DX = r; 145 DX = r; 152 } 146 } 153 147 154 void G4SPSAngDistribution::SetBeamSigmaInAngY( 148 void G4SPSAngDistribution::SetBeamSigmaInAngY(G4double r) 155 { 149 { 156 G4AutoLock l(&mutex); << 157 DY = r; 150 DY = r; 158 } 151 } 159 152 160 void G4SPSAngDistribution:: << 153 void G4SPSAngDistribution::UserDefAngTheta(G4ThreeVector input) 161 SetParticleMomentumDirection(const G4ParticleM << 162 { 154 { 163 G4AutoLock l(&mutex); << 164 particle_momentum_direction = aMomentumDirec << 165 } << 166 << 167 void G4SPSAngDistribution::SetPosDistribution( << 168 { << 169 G4AutoLock l(&mutex); << 170 posDist = a; << 171 } << 172 << 173 void G4SPSAngDistribution::SetBiasRndm(G4SPSRa << 174 { << 175 G4AutoLock l(&mutex); << 176 angRndm = a; << 177 } << 178 << 179 void G4SPSAngDistribution::SetVerbosity(G4int << 180 { << 181 G4AutoLock l(&mutex); << 182 verbosityLevel = a; << 183 } << 184 << 185 void G4SPSAngDistribution::UserDefAngTheta(con << 186 { << 187 G4AutoLock l(&mutex); << 188 if(UserDistType == "NULL") UserDistType = "t 155 if(UserDistType == "NULL") UserDistType = "theta"; 189 if(UserDistType == "phi") UserDistType = "bo 156 if(UserDistType == "phi") UserDistType = "both"; 190 G4double thi, val; 157 G4double thi, val; 191 thi = input.x(); 158 thi = input.x(); 192 val = input.y(); 159 val = input.y(); 193 if(verbosityLevel >= 1) G4cout << "In UserDe << 160 if(verbosityLevel >= 1) >> 161 G4cout << "In UserDefAngTheta" << G4endl; 194 UDefThetaH.InsertValues(thi, val); 162 UDefThetaH.InsertValues(thi, val); 195 } 163 } 196 164 197 G4String G4SPSAngDistribution::GetDistType() << 165 void G4SPSAngDistribution::UserDefAngPhi(G4ThreeVector input) 198 { 166 { 199 G4AutoLock l(&mutex); << 200 return AngDistType; << 201 } << 202 << 203 G4double G4SPSAngDistribution::GetMinTheta() << 204 { << 205 G4AutoLock l(&mutex); << 206 return MinTheta; << 207 } << 208 << 209 G4double G4SPSAngDistribution::GetMaxTheta() << 210 { << 211 G4AutoLock l(&mutex); << 212 return MaxTheta; << 213 } << 214 << 215 G4double G4SPSAngDistribution::GetMinPhi() << 216 { << 217 G4AutoLock l(&mutex); << 218 return MinPhi; << 219 } << 220 << 221 G4double G4SPSAngDistribution::GetMaxPhi() << 222 { << 223 G4AutoLock l(&mutex); << 224 return MaxPhi; << 225 } << 226 << 227 G4ThreeVector G4SPSAngDistribution::GetDirecti << 228 { << 229 G4AutoLock l(&mutex); << 230 return particle_momentum_direction; << 231 } << 232 << 233 void G4SPSAngDistribution::UserDefAngPhi(const << 234 { << 235 G4AutoLock l(&mutex); << 236 if(UserDistType == "NULL") UserDistType = "p 167 if(UserDistType == "NULL") UserDistType = "phi"; 237 if(UserDistType == "theta") UserDistType = " 168 if(UserDistType == "theta") UserDistType = "both"; 238 G4double phhi, val; 169 G4double phhi, val; 239 phhi = input.x(); 170 phhi = input.x(); 240 val = input.y(); 171 val = input.y(); 241 if(verbosityLevel >= 1) G4cout << "In UserDe << 172 if(verbosityLevel >= 1) >> 173 G4cout << "In UserDefAngPhi" << G4endl; 242 UDefPhiH.InsertValues(phhi, val); 174 UDefPhiH.InsertValues(phhi, val); 243 } 175 } 244 176 245 void G4SPSAngDistribution::SetFocusPoint(const << 177 void G4SPSAngDistribution::SetFocusPoint(G4ThreeVector input) 246 { 178 { 247 G4AutoLock l(&mutex); << 248 FocusPoint = input; 179 FocusPoint = input; 249 } 180 } 250 181 251 void G4SPSAngDistribution::SetUserWRTSurface(G 182 void G4SPSAngDistribution::SetUserWRTSurface(G4bool wrtSurf) 252 { 183 { 253 G4AutoLock l(&mutex); << 184 // This is only applied in user mode? 254 << 255 // if UserWRTSurface = true then the user wa 185 // if UserWRTSurface = true then the user wants momenta with respect 256 // to the surface normals. 186 // to the surface normals. 257 // When doing this theta has to be 0-90 only 187 // When doing this theta has to be 0-90 only otherwise there will be 258 // errors, which currently are flagged anywh 188 // errors, which currently are flagged anywhere. 259 // << 260 UserWRTSurface = wrtSurf; 189 UserWRTSurface = wrtSurf; 261 } 190 } 262 191 263 void G4SPSAngDistribution::SetUseUserAngAxis(G 192 void G4SPSAngDistribution::SetUseUserAngAxis(G4bool userang) 264 { 193 { 265 G4AutoLock l(&mutex); << 266 << 267 // if UserAngRef = true the angular distrib 194 // if UserAngRef = true the angular distribution is defined wrt 268 // the user defined coordinates << 195 // the user defined co-ordinates 269 // << 270 UserAngRef = userang; 196 UserAngRef = userang; 271 } 197 } 272 198 273 void G4SPSAngDistribution::GenerateBeamFlux(G4 << 199 void G4SPSAngDistribution::GenerateBeamFlux() 274 { 200 { 275 G4double theta, phi; 201 G4double theta, phi; 276 G4double px, py, pz; 202 G4double px, py, pz; 277 if (AngDistType == "beam1d") << 203 if (AngDistType == "beam1d") 278 { << 279 theta = G4RandGauss::shoot(0.0,DR); << 280 phi = twopi * G4UniformRand(); << 281 } << 282 else << 283 { << 284 px = G4RandGauss::shoot(0.0,DX); << 285 py = G4RandGauss::shoot(0.0,DY); << 286 theta = std::sqrt (px*px + py*py); << 287 if (theta != 0.) << 288 { 204 { 289 phi = std::acos(px/theta); << 205 theta = G4RandGauss::shoot(0.0,DR); 290 if ( py < 0.) phi = -phi; << 206 phi = twopi * G4UniformRand(); 291 } 207 } 292 else << 208 else 293 { << 209 { 294 phi = 0.0; << 210 px = G4RandGauss::shoot(0.0,DX); >> 211 py = G4RandGauss::shoot(0.0,DY); >> 212 theta = std::sqrt (px*px + py*py); >> 213 if (theta != 0.) { >> 214 phi = std::acos(px/theta); >> 215 if ( py < 0.) phi = -phi; >> 216 } >> 217 else >> 218 { >> 219 phi = 0.0; >> 220 } 295 } 221 } 296 } << 297 px = -std::sin(theta) * std::cos(phi); 222 px = -std::sin(theta) * std::cos(phi); 298 py = -std::sin(theta) * std::sin(phi); 223 py = -std::sin(theta) * std::sin(phi); 299 pz = -std::cos(theta); 224 pz = -std::cos(theta); 300 G4double finx, finy, finz; << 225 G4double finx, finy, finz ; 301 finx=px, finy=py, finz=pz; << 226 finx = px, finy =py, finz =pz; 302 if (UserAngRef) << 227 if (UserAngRef){ 303 { << 304 // Apply Angular Rotation Matrix 228 // Apply Angular Rotation Matrix 305 // x * AngRef1, y * AngRef2 and z * AngRef 229 // x * AngRef1, y * AngRef2 and z * AngRef3 306 finx = (px * AngRef1.x()) + (py * AngRef2. 230 finx = (px * AngRef1.x()) + (py * AngRef2.x()) + (pz * AngRef3.x()); 307 finy = (px * AngRef1.y()) + (py * AngRef2. 231 finy = (px * AngRef1.y()) + (py * AngRef2.y()) + (pz * AngRef3.y()); 308 finz = (px * AngRef1.z()) + (py * AngRef2. 232 finz = (px * AngRef1.z()) + (py * AngRef2.z()) + (pz * AngRef3.z()); 309 G4double ResMag = std::sqrt((finx*finx) + 233 G4double ResMag = std::sqrt((finx*finx) + (finy*finy) + (finz*finz)); 310 finx = finx/ResMag; 234 finx = finx/ResMag; 311 finy = finy/ResMag; 235 finy = finy/ResMag; 312 finz = finz/ResMag; 236 finz = finz/ResMag; 313 } 237 } 314 mom.setX(finx); << 238 particle_momentum_direction.setX(finx); 315 mom.setY(finy); << 239 particle_momentum_direction.setY(finy); 316 mom.setZ(finz); << 240 particle_momentum_direction.setZ(finz); 317 << 318 // particle_momentum_direction now holds uni << 319 241 >> 242 // particle_momentum_direction now holds unit momentum vector. 320 if(verbosityLevel >= 1) 243 if(verbosityLevel >= 1) 321 { << 244 G4cout << "Generating beam vector: " << particle_momentum_direction << G4endl; 322 G4cout << "Generating beam vector: " << mo << 323 } << 324 } 245 } 325 246 326 void G4SPSAngDistribution::GenerateFocusedFlux << 247 void G4SPSAngDistribution::GenerateFocusedFlux() 327 { 248 { 328 mom = (FocusPoint - posDist->GetParticlePos( << 249 particle_momentum_direction = (FocusPoint - posDist->particle_position).unit(); 329 << 250 // 330 // particle_momentum_direction now holds uni 251 // particle_momentum_direction now holds unit momentum vector. 331 << 332 if(verbosityLevel >= 1) 252 if(verbosityLevel >= 1) 333 { << 253 G4cout << "Generating focused vector: " << particle_momentum_direction << G4endl; 334 G4cout << "Generating focused vector: " << << 335 } << 336 } 254 } 337 255 338 void G4SPSAngDistribution::GenerateIsotropicFl << 256 void G4SPSAngDistribution::GenerateIsotropicFlux() 339 { 257 { 340 // generates isotropic flux. 258 // generates isotropic flux. 341 // No vectors are needed. 259 // No vectors are needed. 342 << 343 G4double rndm, rndm2; 260 G4double rndm, rndm2; 344 G4double px, py, pz; 261 G4double px, py, pz; 345 262 >> 263 // 346 G4double sintheta, sinphi,costheta,cosphi; 264 G4double sintheta, sinphi,costheta,cosphi; 347 rndm = angRndm->GenRandTheta(); 265 rndm = angRndm->GenRandTheta(); 348 costheta = std::cos(MinTheta) - rndm * (std: << 266 costheta = std::cos(MinTheta) - rndm * (std::cos(MinTheta) - std::cos(MaxTheta)); 349 - std: << 350 sintheta = std::sqrt(1. - costheta*costheta) 267 sintheta = std::sqrt(1. - costheta*costheta); 351 268 352 rndm2 = angRndm->GenRandPhi(); 269 rndm2 = angRndm->GenRandPhi(); 353 Phi = MinPhi + (MaxPhi - MinPhi) * rndm2; 270 Phi = MinPhi + (MaxPhi - MinPhi) * rndm2; 354 sinphi = std::sin(Phi); 271 sinphi = std::sin(Phi); 355 cosphi = std::cos(Phi); 272 cosphi = std::cos(Phi); 356 273 357 px = -sintheta * cosphi; 274 px = -sintheta * cosphi; 358 py = -sintheta * sinphi; 275 py = -sintheta * sinphi; 359 pz = -costheta; 276 pz = -costheta; 360 277 361 // For volume and point source use mother or << 278 // for volume and ponit source use mother or user defined co-ordinates 362 // for plane and surface source user surface << 279 // for plane and surface source user surface-normal or userdefined co-ordinates 363 // coordinates << 364 // 280 // 365 G4double finx, finy, finz; 281 G4double finx, finy, finz; 366 if (posDist->GetSourcePosType() == "Point" << 282 if (posDist->SourcePosType == "Point" || posDist->SourcePosType == "Volume") { 367 || posDist->GetSourcePosType() == "Volume") << 283 if (UserAngRef){ 368 { << 369 if (UserAngRef) << 370 { << 371 // Apply Rotation Matrix 284 // Apply Rotation Matrix 372 // x * AngRef1, y * AngRef2 and z * AngR 285 // x * AngRef1, y * AngRef2 and z * AngRef3 373 finx = (px * AngRef1.x()) + (py * AngRef 286 finx = (px * AngRef1.x()) + (py * AngRef2.x()) + (pz * AngRef3.x()); 374 finy = (px * AngRef1.y()) + (py * AngRef 287 finy = (px * AngRef1.y()) + (py * AngRef2.y()) + (pz * AngRef3.y()); 375 finz = (px * AngRef1.z()) + (py * AngRef 288 finz = (px * AngRef1.z()) + (py * AngRef2.z()) + (pz * AngRef3.z()); 376 } << 289 } else { 377 else << 378 { << 379 finx = px; 290 finx = px; 380 finy = py; 291 finy = py; 381 finz = pz; 292 finz = pz; 382 } 293 } 383 } << 294 } else { // for plane and surface source 384 else << 295 if (UserAngRef){ 385 { // for plane and surface source << 386 if (UserAngRef) << 387 { << 388 // Apply Rotation Matrix 296 // Apply Rotation Matrix 389 // x * AngRef1, y * AngRef2 and z * AngR 297 // x * AngRef1, y * AngRef2 and z * AngRef3 390 finx = (px * AngRef1.x()) + (py * AngRef 298 finx = (px * AngRef1.x()) + (py * AngRef2.x()) + (pz * AngRef3.x()); 391 finy = (px * AngRef1.y()) + (py * AngRef 299 finy = (px * AngRef1.y()) + (py * AngRef2.y()) + (pz * AngRef3.y()); 392 finz = (px * AngRef1.z()) + (py * AngRef 300 finz = (px * AngRef1.z()) + (py * AngRef2.z()) + (pz * AngRef3.z()); 393 } << 301 } else { 394 else << 302 finx = (px*posDist->SideRefVec1.x()) + (py*posDist->SideRefVec2.x()) + (pz*posDist->SideRefVec3.x()); 395 { << 303 finy = (px*posDist->SideRefVec1.y()) + (py*posDist->SideRefVec2.y()) + (pz*posDist->SideRefVec3.y()); 396 finx = (px*posDist->GetSideRefVec1().x() << 304 finz = (px*posDist->SideRefVec1.z()) + (py*posDist->SideRefVec2.z()) + (pz*posDist->SideRefVec3.z()); 397 + (py*posDist->GetSideRefVec2().x() << 398 + (pz*posDist->GetSideRefVec3().x() << 399 finy = (px*posDist->GetSideRefVec1().y() << 400 + (py*posDist->GetSideRefVec2().y() << 401 + (pz*posDist->GetSideRefVec3().y() << 402 finz = (px*posDist->GetSideRefVec1().z() << 403 + (py*posDist->GetSideRefVec2().z() << 404 + (pz*posDist->GetSideRefVec3().z() << 405 } 305 } 406 } 306 } 407 G4double ResMag = std::sqrt((finx*finx) + (f 307 G4double ResMag = std::sqrt((finx*finx) + (finy*finy) + (finz*finz)); 408 finx = finx/ResMag; 308 finx = finx/ResMag; 409 finy = finy/ResMag; 309 finy = finy/ResMag; 410 finz = finz/ResMag; 310 finz = finz/ResMag; 411 311 412 mom.setX(finx); << 312 particle_momentum_direction.setX(finx); 413 mom.setY(finy); << 313 particle_momentum_direction.setY(finy); 414 mom.setZ(finz); << 314 particle_momentum_direction.setZ(finz); 415 315 416 // particle_momentum_direction now holds uni 316 // particle_momentum_direction now holds unit momentum vector. 417 << 418 if(verbosityLevel >= 1) 317 if(verbosityLevel >= 1) 419 { << 318 G4cout << "Generating isotropic vector: " << particle_momentum_direction << G4endl; 420 G4cout << "Generating isotropic vector: " << 421 } << 422 } 319 } 423 320 424 void G4SPSAngDistribution::GenerateCosineLawFl << 321 void G4SPSAngDistribution::GenerateCosineLawFlux() 425 { 322 { 426 // Method to generate flux distributed with 323 // Method to generate flux distributed with a cosine law 427 << 428 G4double px, py, pz; 324 G4double px, py, pz; 429 G4double rndm, rndm2; 325 G4double rndm, rndm2; 430 << 326 // 431 G4double sintheta, sinphi,costheta,cosphi; 327 G4double sintheta, sinphi,costheta,cosphi; 432 rndm = angRndm->GenRandTheta(); 328 rndm = angRndm->GenRandTheta(); 433 sintheta = std::sqrt( rndm * (std::sin(MaxTh << 329 sintheta = std::sqrt( rndm * (std::sin(MaxTheta)*std::sin(MaxTheta) - std::sin(MinTheta)*std::sin(MinTheta) ) 434 - std::sin(MinTh << 330 +std::sin(MinTheta)*std::sin(MinTheta) ); 435 + std::sin(MinTheta)*std << 436 costheta = std::sqrt(1. -sintheta*sintheta); 331 costheta = std::sqrt(1. -sintheta*sintheta); 437 332 438 rndm2 = angRndm->GenRandPhi(); 333 rndm2 = angRndm->GenRandPhi(); 439 Phi = MinPhi + (MaxPhi - MinPhi) * rndm2; 334 Phi = MinPhi + (MaxPhi - MinPhi) * rndm2; 440 sinphi = std::sin(Phi); 335 sinphi = std::sin(Phi); 441 cosphi = std::cos(Phi); 336 cosphi = std::cos(Phi); 442 337 443 px = -sintheta * cosphi; 338 px = -sintheta * cosphi; 444 py = -sintheta * sinphi; 339 py = -sintheta * sinphi; 445 pz = -costheta; 340 pz = -costheta; 446 341 447 // for volume and point source use mother or << 342 // for volume and ponit source use mother or user defined co-ordinates 448 // for plane and surface source user surface << 343 // for plane and surface source user surface-normal or userdefined co-ordinates 449 // coordinates << 450 // 344 // 451 G4double finx, finy, finz; 345 G4double finx, finy, finz; 452 if (posDist->GetSourcePosType() == "Point" << 346 if (posDist->SourcePosType == "Point" || posDist->SourcePosType == "Volume") { 453 || posDist->GetSourcePosType() == "Volume") << 347 if (UserAngRef){ 454 { << 455 if (UserAngRef) << 456 { << 457 // Apply Rotation Matrix 348 // Apply Rotation Matrix 458 finx = (px * AngRef1.x()) + (py * AngRef 349 finx = (px * AngRef1.x()) + (py * AngRef2.x()) + (pz * AngRef3.x()); 459 finy = (px * AngRef1.y()) + (py * AngRef 350 finy = (px * AngRef1.y()) + (py * AngRef2.y()) + (pz * AngRef3.y()); 460 finz = (px * AngRef1.z()) + (py * AngRef 351 finz = (px * AngRef1.z()) + (py * AngRef2.z()) + (pz * AngRef3.z()); 461 } << 352 } else { 462 else << 463 { << 464 finx = px; 353 finx = px; 465 finy = py; 354 finy = py; 466 finz = pz; 355 finz = pz; 467 } 356 } 468 } << 357 } else { // for plane and surface source 469 else << 358 if (UserAngRef){ 470 { // for plane and surface source << 471 if (UserAngRef) << 472 { << 473 // Apply Rotation Matrix 359 // Apply Rotation Matrix 474 finx = (px * AngRef1.x()) + (py * AngRef 360 finx = (px * AngRef1.x()) + (py * AngRef2.x()) + (pz * AngRef3.x()); 475 finy = (px * AngRef1.y()) + (py * AngRef 361 finy = (px * AngRef1.y()) + (py * AngRef2.y()) + (pz * AngRef3.y()); 476 finz = (px * AngRef1.z()) + (py * AngRef 362 finz = (px * AngRef1.z()) + (py * AngRef2.z()) + (pz * AngRef3.z()); 477 } << 363 } else { 478 else << 364 finx = (px*posDist->SideRefVec1.x()) + (py*posDist->SideRefVec2.x()) + (pz*posDist->SideRefVec3.x()); 479 { << 365 finy = (px*posDist->SideRefVec1.y()) + (py*posDist->SideRefVec2.y()) + (pz*posDist->SideRefVec3.y()); 480 finx = (px*posDist->GetSideRefVec1().x() << 366 finz = (px*posDist->SideRefVec1.z()) + (py*posDist->SideRefVec2.z()) + (pz*posDist->SideRefVec3.z()); 481 + (py*posDist->GetSideRefVec2().x() << 482 + (pz*posDist->GetSideRefVec3().x() << 483 finy = (px*posDist->GetSideRefVec1().y() << 484 + (py*posDist->GetSideRefVec2().y() << 485 + (pz*posDist->GetSideRefVec3().y() << 486 finz = (px*posDist->GetSideRefVec1().z() << 487 + (py*posDist->GetSideRefVec2().z() << 488 + (pz*posDist->GetSideRefVec3().z() << 489 } 367 } 490 } 368 } 491 G4double ResMag = std::sqrt((finx*finx) + (f 369 G4double ResMag = std::sqrt((finx*finx) + (finy*finy) + (finz*finz)); 492 finx = finx/ResMag; 370 finx = finx/ResMag; 493 finy = finy/ResMag; 371 finy = finy/ResMag; 494 finz = finz/ResMag; 372 finz = finz/ResMag; 495 373 496 mom.setX(finx); << 374 particle_momentum_direction.setX(finx); 497 mom.setY(finy); << 375 particle_momentum_direction.setY(finy); 498 mom.setZ(finz); << 376 particle_momentum_direction.setZ(finz); 499 377 500 // particle_momentum_direction now contains 378 // particle_momentum_direction now contains unit momentum vector. 501 << 502 if(verbosityLevel >= 1) 379 if(verbosityLevel >= 1) 503 { << 380 { 504 G4cout << "Resultant cosine-law unit momen << 381 G4cout << "Resultant cosine-law unit momentum vector " << particle_momentum_direction << G4endl; 505 } << 382 } 506 } 383 } 507 384 508 void G4SPSAngDistribution::GeneratePlanarFlux( << 385 void G4SPSAngDistribution::GeneratePlanarFlux() 509 { 386 { 510 // particle_momentum_direction now contains 387 // particle_momentum_direction now contains unit momentum vector. 511 // nothing need be done here as the m-direct 388 // nothing need be done here as the m-directions have been set directly 512 // under this option 389 // under this option 513 << 514 if(verbosityLevel >= 1) 390 if(verbosityLevel >= 1) 515 { << 391 { 516 G4cout << "Resultant Planar wave momentum << 392 G4cout << "Resultant Planar wave momentum vector " << particle_momentum_direction << G4endl; 517 } << 393 } 518 } 394 } 519 395 520 void G4SPSAngDistribution::GenerateUserDefFlux << 396 void G4SPSAngDistribution::GenerateUserDefFlux() 521 { 397 { 522 G4double rndm, px, py, pz, pmag; 398 G4double rndm, px, py, pz, pmag; 523 399 524 if(UserDistType == "NULL") 400 if(UserDistType == "NULL") 525 { << 526 G4cout << "Error: UserDistType undefined" 401 G4cout << "Error: UserDistType undefined" << G4endl; 527 } << 402 else if(UserDistType == "theta") { 528 else if(UserDistType == "theta") << 529 { << 530 Theta = 10.; 403 Theta = 10.; 531 while(Theta > MaxTheta || Theta < MinTheta 404 while(Theta > MaxTheta || Theta < MinTheta) 532 { << 533 Theta = GenerateUserDefTheta(); 405 Theta = GenerateUserDefTheta(); 534 } << 535 Phi = 10.; 406 Phi = 10.; 536 while(Phi > MaxPhi || Phi < MinPhi) << 407 while(Phi > MaxPhi || Phi < MinPhi) { 537 { << 538 rndm = angRndm->GenRandPhi(); 408 rndm = angRndm->GenRandPhi(); 539 Phi = twopi * rndm; 409 Phi = twopi * rndm; 540 } 410 } 541 } 411 } 542 else if(UserDistType == "phi") << 412 else if(UserDistType == "phi") { 543 { << 544 Theta = 10.; 413 Theta = 10.; 545 while(Theta > MaxTheta || Theta < MinTheta 414 while(Theta > MaxTheta || Theta < MinTheta) 546 { << 415 { 547 rndm = angRndm->GenRandTheta(); << 416 rndm = angRndm->GenRandTheta(); 548 Theta = std::acos(1. - (2. * rndm)); << 417 Theta = std::acos(1. - (2. * rndm)); 549 } << 418 } 550 Phi = 10.; 419 Phi = 10.; 551 while(Phi > MaxPhi || Phi < MinPhi) 420 while(Phi > MaxPhi || Phi < MinPhi) 552 { << 553 Phi = GenerateUserDefPhi(); 421 Phi = GenerateUserDefPhi(); 554 } << 555 } 422 } 556 else if(UserDistType == "both") 423 else if(UserDistType == "both") 557 { << 558 Theta = 10.; << 559 while(Theta > MaxTheta || Theta < MinTheta << 560 { << 561 Theta = GenerateUserDefTheta(); << 562 } << 563 Phi = 10.; << 564 while(Phi > MaxPhi || Phi < MinPhi) << 565 { 424 { 566 Phi = GenerateUserDefPhi(); << 425 Theta = 10.; >> 426 while(Theta > MaxTheta || Theta < MinTheta) >> 427 Theta = GenerateUserDefTheta(); >> 428 Phi = 10.; >> 429 while(Phi > MaxPhi || Phi < MinPhi) >> 430 Phi = GenerateUserDefPhi(); 567 } 431 } 568 } << 569 px = -std::sin(Theta) * std::cos(Phi); 432 px = -std::sin(Theta) * std::cos(Phi); 570 py = -std::sin(Theta) * std::sin(Phi); 433 py = -std::sin(Theta) * std::sin(Phi); 571 pz = -std::cos(Theta); 434 pz = -std::cos(Theta); 572 435 573 pmag = std::sqrt((px*px) + (py*py) + (pz*pz) 436 pmag = std::sqrt((px*px) + (py*py) + (pz*pz)); 574 437 575 if(!UserWRTSurface) << 438 if(!UserWRTSurface) { 576 { << 577 G4double finx, finy, finz; 439 G4double finx, finy, finz; 578 if (UserAngRef) << 440 if (UserAngRef) { 579 { << 580 // Apply Rotation Matrix 441 // Apply Rotation Matrix 581 // x * AngRef1, y * AngRef2 and z * AngR 442 // x * AngRef1, y * AngRef2 and z * AngRef3 582 finx = (px * AngRef1.x()) + (py * AngRef 443 finx = (px * AngRef1.x()) + (py * AngRef2.x()) + (pz * AngRef3.x()); 583 finy = (px * AngRef1.y()) + (py * AngRef 444 finy = (px * AngRef1.y()) + (py * AngRef2.y()) + (pz * AngRef3.y()); 584 finz = (px * AngRef1.z()) + (py * AngRef 445 finz = (px * AngRef1.z()) + (py * AngRef2.z()) + (pz * AngRef3.z()); 585 } << 446 } else { // use mother co-ordinates 586 else // use mother coordinates << 587 { << 588 finx = px; 447 finx = px; 589 finy = py; 448 finy = py; 590 finz = pz; 449 finz = pz; 591 } 450 } 592 G4double ResMag = std::sqrt((finx*finx) + 451 G4double ResMag = std::sqrt((finx*finx) + (finy*finy) + (finz*finz)); 593 finx = finx/ResMag; 452 finx = finx/ResMag; 594 finy = finy/ResMag; 453 finy = finy/ResMag; 595 finz = finz/ResMag; 454 finz = finz/ResMag; 596 455 597 mom.setX(finx); << 456 particle_momentum_direction.setX(finx); 598 mom.setY(finy); << 457 particle_momentum_direction.setY(finy); 599 mom.setZ(finz); << 458 particle_momentum_direction.setZ(finz); 600 } 459 } 601 else // UserWRTSurface = true << 460 else { // UserWRTSurface = true 602 { << 603 G4double pxh = px/pmag; 461 G4double pxh = px/pmag; 604 G4double pyh = py/pmag; 462 G4double pyh = py/pmag; 605 G4double pzh = pz/pmag; 463 G4double pzh = pz/pmag; 606 if(verbosityLevel > 1) << 464 if(verbosityLevel > 1) { 607 { << 465 G4cout <<"SideRefVecs " <<posDist->SideRefVec1<<posDist->SideRefVec2<<posDist->SideRefVec3<<G4endl; 608 G4cout << "SideRefVecs " << posDist->Get << 466 G4cout <<"Raw Unit vector "<<pxh<<","<<pyh<<","<<pzh<<G4endl; 609 << posDist->GetSideRefVec2() << p << 467 } 610 << G4endl; << 468 G4double resultx = (pxh*posDist->SideRefVec1.x()) + (pyh*posDist->SideRefVec2.x()) + 611 G4cout << "Raw Unit vector " << pxh << 469 (pzh*posDist->SideRefVec3.x()); 612 << "," << pyh << "," << pzh << G4 << 613 } << 614 G4double resultx = (pxh*posDist->GetSideRe << 615 + (pyh*posDist->GetSideRe << 616 + (pzh*posDist->GetSideRe << 617 470 618 G4double resulty = (pxh*posDist->GetSideRe << 471 G4double resulty = (pxh*posDist->SideRefVec1.y()) + (pyh*posDist->SideRefVec2.y()) + 619 + (pyh*posDist->GetSideRe << 472 (pzh*posDist->SideRefVec3.y()); 620 + (pzh*posDist->GetSideRe << 621 473 622 G4double resultz = (pxh*posDist->GetSideRe << 474 G4double resultz = (pxh*posDist->SideRefVec1.z()) + (pyh*posDist->SideRefVec2.z()) + 623 + (pyh*posDist->GetSideRe << 475 (pzh*posDist->SideRefVec3.z()); 624 + (pzh*posDist->GetSideRe << 625 476 626 G4double ResMag = std::sqrt((resultx*resul << 477 G4double ResMag = std::sqrt((resultx*resultx) + (resulty*resulty) + (resultz*resultz)); 627 + (resulty*resul << 628 + (resultz*resul << 629 resultx = resultx/ResMag; 478 resultx = resultx/ResMag; 630 resulty = resulty/ResMag; 479 resulty = resulty/ResMag; 631 resultz = resultz/ResMag; 480 resultz = resultz/ResMag; 632 481 633 mom.setX(resultx); << 482 particle_momentum_direction.setX(resultx); 634 mom.setY(resulty); << 483 particle_momentum_direction.setY(resulty); 635 mom.setZ(resultz); << 484 particle_momentum_direction.setZ(resultz); 636 } 485 } 637 486 638 // particle_momentum_direction now contains 487 // particle_momentum_direction now contains unit momentum vector. 639 << 640 if(verbosityLevel > 0 ) 488 if(verbosityLevel > 0 ) 641 { << 489 { 642 G4cout << "Final User Defined momentum vec << 490 G4cout << "Final User Defined momentum vector " << particle_momentum_direction << G4endl; 643 << particle_momentum_direction << G << 491 } 644 } << 645 } 492 } 646 493 647 G4double G4SPSAngDistribution::GenerateUserDef 494 G4double G4SPSAngDistribution::GenerateUserDefTheta() 648 { 495 { 649 // Create cumulative histogram if not alread << 496 // Create cumulative histogram if not already done so. Then use RandFlat 650 // Then use RandFlat::shoot to generate the << 497 //::shoot to generate the output Theta value. 651 << 652 if(UserDistType == "NULL" || UserDistType == 498 if(UserDistType == "NULL" || UserDistType == "phi") 653 { << 654 // No user defined theta distribution << 655 G4cout << "Error ***********************" << 656 G4cout << "UserDistType = " << UserDistTyp << 657 return (0.); << 658 } << 659 << 660 // UserDistType = theta or both and so a the << 661 // is defined. This should be integrated if << 662 G4AutoLock l(&mutex); << 663 if(!IPDFThetaExist) << 664 { << 665 // IPDF has not been created, so create it << 666 // << 667 G4double bins[1024],vals[1024], sum; << 668 G4int ii; << 669 auto maxbin = G4int(UDefThetaH.GetVectorL << 670 bins[0] = UDefThetaH.GetLowEdgeEnergy(std: << 671 vals[0] = UDefThetaH(std::size_t(0)); << 672 sum = vals[0]; << 673 for(ii=1; ii<maxbin; ++ii) << 674 { 499 { 675 bins[ii] = UDefThetaH.GetLowEdgeEnergy(s << 500 // No user defined theta distribution 676 vals[ii] = UDefThetaH(std::size_t(ii)) + << 501 G4cout << "Error ***********************" << G4endl; 677 sum = sum + UDefThetaH(std::size_t(ii)); << 502 G4cout << "UserDistType = " << UserDistType << G4endl; >> 503 return (0.); 678 } 504 } 679 for(ii=0; ii<maxbin; ++ii) << 505 else 680 { 506 { 681 vals[ii] = vals[ii]/sum; << 507 // UserDistType = theta or both and so a theta distribution 682 IPDFThetaH.InsertValues(bins[ii], vals[i << 508 // is defined. This should be integrated if not already done. >> 509 if(IPDFThetaExist == false) >> 510 { >> 511 // IPDF has not been created, so create it >> 512 G4double bins[1024],vals[1024], sum; >> 513 G4int ii; >> 514 G4int maxbin = G4int(UDefThetaH.GetVectorLength()); >> 515 bins[0] = UDefThetaH.GetLowEdgeEnergy(size_t(0)); >> 516 vals[0] = UDefThetaH(size_t(0)); >> 517 sum = vals[0]; >> 518 for(ii=1;ii<maxbin;ii++) >> 519 { >> 520 bins[ii] = UDefThetaH.GetLowEdgeEnergy(size_t(ii)); >> 521 vals[ii] = UDefThetaH(size_t(ii)) + vals[ii-1]; >> 522 sum = sum + UDefThetaH(size_t(ii)); >> 523 } >> 524 for(ii=0;ii<maxbin;ii++) >> 525 { >> 526 vals[ii] = vals[ii]/sum; >> 527 IPDFThetaH.InsertValues(bins[ii], vals[ii]); >> 528 } >> 529 // Make IPDFThetaExist = true >> 530 IPDFThetaExist = true; >> 531 } >> 532 // IPDF has been create so carry on >> 533 G4double rndm = G4UniformRand(); >> 534 return(IPDFThetaH.GetEnergy(rndm)); 683 } 535 } 684 IPDFThetaExist = true; << 685 } << 686 l.unlock(); << 687 << 688 // IPDF has been created so carry on << 689 // << 690 G4double rndm = G4UniformRand(); << 691 return IPDFThetaH.GetEnergy(rndm); << 692 } 536 } 693 537 694 G4double G4SPSAngDistribution::GenerateUserDef 538 G4double G4SPSAngDistribution::GenerateUserDefPhi() 695 { 539 { 696 // Create cumulative histogram if not alread << 540 // Create cumulative histogram if not already done so. Then use RandFlat 697 // Then use RandFlat::shoot to generate the << 541 //::shoot to generate the output Theta value. 698 542 699 if(UserDistType == "NULL" || UserDistType == 543 if(UserDistType == "NULL" || UserDistType == "theta") 700 { << 701 // No user defined phi distribution << 702 G4cout << "Error ***********************" << 703 G4cout << "UserDistType = " << UserDistTyp << 704 return(0.); << 705 } << 706 << 707 // UserDistType = phi or both and so a phi d << 708 // is defined. This should be integrated if << 709 G4AutoLock l(&mutex); << 710 if(!IPDFPhiExist) << 711 { << 712 // IPDF has not been created, so create it << 713 // << 714 G4double bins[1024],vals[1024], sum; << 715 G4int ii; << 716 auto maxbin = G4int(UDefPhiH.GetVectorLen << 717 bins[0] = UDefPhiH.GetLowEdgeEnergy(std::s << 718 vals[0] = UDefPhiH(std::size_t(0)); << 719 sum = vals[0]; << 720 for(ii=1; ii<maxbin; ++ii) << 721 { 544 { 722 bins[ii] = UDefPhiH.GetLowEdgeEnergy(std << 545 // No user defined phi distribution 723 vals[ii] = UDefPhiH(std::size_t(ii)) + v << 546 G4cout << "Error ***********************" << G4endl; 724 sum = sum + UDefPhiH(std::size_t(ii)); << 547 G4cout << "UserDistType = " << UserDistType << G4endl; >> 548 return(0.); 725 } 549 } 726 for(ii=0; ii<maxbin; ++ii) << 550 else 727 { 551 { 728 vals[ii] = vals[ii]/sum; << 552 // UserDistType = phi or both and so a phi distribution 729 IPDFPhiH.InsertValues(bins[ii], vals[ii] << 553 // is defined. This should be integrated if not already done. >> 554 if(IPDFPhiExist == false) >> 555 { >> 556 // IPDF has not been created, so create it >> 557 G4double bins[1024],vals[1024], sum; >> 558 G4int ii; >> 559 G4int maxbin = G4int(UDefPhiH.GetVectorLength()); >> 560 bins[0] = UDefPhiH.GetLowEdgeEnergy(size_t(0)); >> 561 vals[0] = UDefPhiH(size_t(0)); >> 562 sum = vals[0]; >> 563 for(ii=1;ii<maxbin;ii++) >> 564 { >> 565 bins[ii] = UDefPhiH.GetLowEdgeEnergy(size_t(ii)); >> 566 vals[ii] = UDefPhiH(size_t(ii)) + vals[ii-1]; >> 567 sum = sum + UDefPhiH(size_t(ii)); >> 568 } >> 569 >> 570 for(ii=0;ii<maxbin;ii++) >> 571 { >> 572 vals[ii] = vals[ii]/sum; >> 573 IPDFPhiH.InsertValues(bins[ii], vals[ii]); >> 574 } >> 575 // Make IPDFPhiExist = true >> 576 IPDFPhiExist = true; >> 577 } >> 578 // IPDF has been create so carry on >> 579 G4double rndm = G4UniformRand(); >> 580 return(IPDFPhiH.GetEnergy(rndm)); 730 } 581 } 731 IPDFPhiExist = true; << 732 } << 733 l.unlock(); << 734 << 735 // IPDF has been create so carry on << 736 // << 737 G4double rndm = G4UniformRand(); << 738 return IPDFPhiH.GetEnergy(rndm); << 739 } 582 } 740 << 583 // 741 void G4SPSAngDistribution::ReSetHist(const G4S << 584 void G4SPSAngDistribution::ReSetHist(G4String atype) 742 { 585 { 743 G4AutoLock l(&mutex); << 586 if (atype == "theta") { 744 if (atype == "theta") << 745 { << 746 UDefThetaH = IPDFThetaH = ZeroPhysVector ; 587 UDefThetaH = IPDFThetaH = ZeroPhysVector ; 747 IPDFThetaExist = false ; << 588 IPDFThetaExist = false ;} 748 } << 589 else if (atype == "phi"){ 749 else if (atype == "phi") << 750 { << 751 UDefPhiH = IPDFPhiH = ZeroPhysVector ; 590 UDefPhiH = IPDFPhiH = ZeroPhysVector ; 752 IPDFPhiExist = false ; << 591 IPDFPhiExist = false ;} 753 } << 592 else { 754 else << 755 { << 756 G4cout << "Error, histtype not accepted " 593 G4cout << "Error, histtype not accepted " << G4endl; 757 } 594 } 758 } 595 } 759 596 >> 597 760 G4ParticleMomentum G4SPSAngDistribution::Gener 598 G4ParticleMomentum G4SPSAngDistribution::GenerateOne() 761 { 599 { 762 // Local copy for thread safety << 763 // << 764 G4ParticleMomentum localM = particle_momentu << 765 << 766 // Angular stuff 600 // Angular stuff 767 // << 768 if(AngDistType == "iso") 601 if(AngDistType == "iso") 769 GenerateIsotropicFlux(localM); << 602 GenerateIsotropicFlux(); 770 else if(AngDistType == "cos") 603 else if(AngDistType == "cos") 771 GenerateCosineLawFlux(localM); << 604 GenerateCosineLawFlux(); 772 else if(AngDistType == "planar") 605 else if(AngDistType == "planar") 773 GeneratePlanarFlux(localM); << 606 GeneratePlanarFlux(); 774 else if(AngDistType == "beam1d" || AngDistTy 607 else if(AngDistType == "beam1d" || AngDistType == "beam2d" ) 775 GenerateBeamFlux(localM); << 608 GenerateBeamFlux(); 776 else if(AngDistType == "user") 609 else if(AngDistType == "user") 777 GenerateUserDefFlux(localM); << 610 GenerateUserDefFlux(); 778 else if(AngDistType == "focused") 611 else if(AngDistType == "focused") 779 GenerateFocusedFlux(localM); << 612 GenerateFocusedFlux(); 780 else 613 else 781 G4cout << "Error: AngDistType has unusual 614 G4cout << "Error: AngDistType has unusual value" << G4endl; 782 return localM; << 615 return particle_momentum_direction; 783 } 616 } >> 617 >> 618 >> 619 >> 620 >> 621 >> 622 >> 623 >> 624 >> 625 784 626