| 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 // $Id: G4MollerBhabhaModel.cc 84397 2014-10-15 07:19:14Z gcosmo $
26 // 27 //
27 // ------------------------------------------- 28 // -------------------------------------------------------------------
28 // 29 //
29 // GEANT4 Class file 30 // GEANT4 Class file
30 // 31 //
31 // 32 //
32 // File name: G4MollerBhabhaModel 33 // File name: G4MollerBhabhaModel
33 // 34 //
34 // Author: Vladimir Ivanchenko on base 35 // Author: Vladimir Ivanchenko on base of Laszlo Urban code
35 // 36 //
36 // Creation date: 03.01.2002 37 // Creation date: 03.01.2002
37 // 38 //
38 // Modifications: 39 // Modifications:
39 // 40 //
40 // 13-11-02 Minor fix - use normalised directi 41 // 13-11-02 Minor fix - use normalised direction (V.Ivanchenko)
41 // 04-12-02 Change G4DynamicParticle construct 42 // 04-12-02 Change G4DynamicParticle constructor in PostStepDoIt (V.Ivanchenko)
42 // 23-12-02 Change interface in order to move 43 // 23-12-02 Change interface in order to move to cut per region (V.Ivanchenko)
43 // 27-01-03 Make models region aware (V.Ivanch 44 // 27-01-03 Make models region aware (V.Ivanchenko)
44 // 13-02-03 Add name (V.Ivanchenko) 45 // 13-02-03 Add name (V.Ivanchenko)
45 // 08-04-05 Major optimisation of internal int 46 // 08-04-05 Major optimisation of internal interfaces (V.Ivantchenko)
46 // 25-07-05 Add protection in calculation of r 47 // 25-07-05 Add protection in calculation of recoil direction for the case
47 // of complete energy transfer from e 48 // of complete energy transfer from e+ to e- (V.Ivanchenko)
48 // 06-02-06 ComputeCrossSectionPerElectron, Co 49 // 06-02-06 ComputeCrossSectionPerElectron, ComputeCrossSectionPerAtom (mma)
49 // 15-05-06 Fix MinEnergyCut (V.Ivanchenko) 50 // 15-05-06 Fix MinEnergyCut (V.Ivanchenko)
50 // 51 //
51 // 52 //
52 // Class Description: 53 // Class Description:
53 // 54 //
54 // Implementation of energy loss and delta-ele 55 // Implementation of energy loss and delta-electron production by e+/e-
55 // 56 //
56 // ------------------------------------------- 57 // -------------------------------------------------------------------
57 // 58 //
58 //....oooOO0OOooo........oooOO0OOooo........oo 59 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
59 //....oooOO0OOooo........oooOO0OOooo........oo 60 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
60 61
61 #include "G4MollerBhabhaModel.hh" 62 #include "G4MollerBhabhaModel.hh"
62 #include "G4PhysicalConstants.hh" 63 #include "G4PhysicalConstants.hh"
63 #include "G4SystemOfUnits.hh" 64 #include "G4SystemOfUnits.hh"
64 #include "G4Electron.hh" 65 #include "G4Electron.hh"
65 #include "G4Positron.hh" 66 #include "G4Positron.hh"
66 #include "Randomize.hh" 67 #include "Randomize.hh"
67 #include "G4ParticleChangeForLoss.hh" 68 #include "G4ParticleChangeForLoss.hh"
68 #include "G4Log.hh" 69 #include "G4Log.hh"
69 #include "G4DeltaAngle.hh" 70 #include "G4DeltaAngle.hh"
70 71
71 //....oooOO0OOooo........oooOO0OOooo........oo 72 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
72 73
73 using namespace std; 74 using namespace std;
74 75
75 G4MollerBhabhaModel::G4MollerBhabhaModel(const 76 G4MollerBhabhaModel::G4MollerBhabhaModel(const G4ParticleDefinition* p,
76 const 77 const G4String& nam)
77 : G4VEmModel(nam), 78 : G4VEmModel(nam),
78 particle(nullptr), << 79 particle(0),
79 isElectron(true), 80 isElectron(true),
80 twoln10(2.0*G4Log(10.0)), 81 twoln10(2.0*G4Log(10.0)),
81 lowLimit(0.02*keV), 82 lowLimit(0.02*keV),
82 isInitialised(false) 83 isInitialised(false)
83 { 84 {
84 theElectron = G4Electron::Electron(); 85 theElectron = G4Electron::Electron();
85 if(nullptr != p) { SetParticle(p); } << 86 if(p) { SetParticle(p); }
86 fParticleChange = nullptr; << 87 fParticleChange = 0;
87 } 88 }
88 89
89 //....oooOO0OOooo........oooOO0OOooo........oo 90 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
90 91
91 G4MollerBhabhaModel::~G4MollerBhabhaModel() = << 92 G4MollerBhabhaModel::~G4MollerBhabhaModel()
>> 93 {}
92 94
93 //....oooOO0OOooo........oooOO0OOooo........oo 95 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
94 96
95 G4double G4MollerBhabhaModel::MaxSecondaryEner 97 G4double G4MollerBhabhaModel::MaxSecondaryEnergy(const G4ParticleDefinition*,
96 << 98 G4double kinEnergy)
97 { 99 {
98 G4double tmax = kinEnergy; 100 G4double tmax = kinEnergy;
99 if(isElectron) { tmax *= 0.5; } 101 if(isElectron) { tmax *= 0.5; }
100 return tmax; 102 return tmax;
101 } 103 }
102 104
103 //....oooOO0OOooo........oooOO0OOooo........oo 105 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
104 106
105 void G4MollerBhabhaModel::Initialise(const G4P 107 void G4MollerBhabhaModel::Initialise(const G4ParticleDefinition* p,
106 const G4D 108 const G4DataVector&)
107 { 109 {
108 if(p != particle) { SetParticle(p); } << 110 if(!particle) { SetParticle(p); }
109 111
110 if(isInitialised) { return; } 112 if(isInitialised) { return; }
111 113
112 isInitialised = true; 114 isInitialised = true;
113 fParticleChange = GetParticleChangeForLoss() 115 fParticleChange = GetParticleChangeForLoss();
114 if(UseAngularGeneratorFlag() && !GetAngularD 116 if(UseAngularGeneratorFlag() && !GetAngularDistribution()) {
115 SetAngularDistribution(new G4DeltaAngle()) 117 SetAngularDistribution(new G4DeltaAngle());
116 } 118 }
117 } 119 }
118 120
119 //....oooOO0OOooo........oooOO0OOooo........oo 121 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
120 122
121 G4double G4MollerBhabhaModel::ComputeCrossSect << 123 G4double
122 const G4ParticleDefinition* p, G4doub << 124 G4MollerBhabhaModel::ComputeCrossSectionPerElectron(const G4ParticleDefinition* p,
123 G4double cutEnergy, G4double maxEnergy) << 125 G4double kineticEnergy,
>> 126 G4double cutEnergy,
>> 127 G4double maxEnergy)
124 { 128 {
125 if(p != particle) { SetParticle(p); } << 129 if(!particle) { SetParticle(p); }
126 130
127 G4double cross = 0.0; 131 G4double cross = 0.0;
128 G4double tmax = MaxSecondaryEnergy(p, kineti 132 G4double tmax = MaxSecondaryEnergy(p, kineticEnergy);
129 tmax = std::min(maxEnergy, tmax); 133 tmax = std::min(maxEnergy, tmax);
130 //G4cout << "E= " << kineticEnergy << " cut= 134 //G4cout << "E= " << kineticEnergy << " cut= " << cutEnergy
131 // << " Emax= " << tmax << G4endl; << 135 // << " Emax= " << tmax << G4endl;
132 if(cutEnergy < tmax) { 136 if(cutEnergy < tmax) {
133 137
134 G4double xmin = cutEnergy/kineticEnergy; 138 G4double xmin = cutEnergy/kineticEnergy;
135 G4double xmax = tmax/kineticEnergy; 139 G4double xmax = tmax/kineticEnergy;
136 G4double tau = kineticEnergy/electron_ma 140 G4double tau = kineticEnergy/electron_mass_c2;
137 G4double gam = tau + 1.0; 141 G4double gam = tau + 1.0;
138 G4double gamma2= gam*gam; 142 G4double gamma2= gam*gam;
139 G4double beta2 = tau*(tau + 2)/gamma2; 143 G4double beta2 = tau*(tau + 2)/gamma2;
140 144
141 //Moller (e-e-) scattering 145 //Moller (e-e-) scattering
142 if (isElectron) { 146 if (isElectron) {
143 147
144 G4double gg = (2.0*gam - 1.0)/gamma2; 148 G4double gg = (2.0*gam - 1.0)/gamma2;
145 cross = ((xmax - xmin)*(1.0 - gg + 1.0/( 149 cross = ((xmax - xmin)*(1.0 - gg + 1.0/(xmin*xmax)
146 + 1.0/((1.0-xmin << 150 + 1.0/((1.0-xmin)*(1.0 - xmax)))
147 - gg*G4Log( xmax*(1.0 - xmin)/(xmi 151 - gg*G4Log( xmax*(1.0 - xmin)/(xmin*(1.0 - xmax)) ) ) / beta2;
148 152
149 //Bhabha (e+e-) scattering 153 //Bhabha (e+e-) scattering
150 } else { 154 } else {
151 155
152 G4double y = 1.0/(1.0 + gam); 156 G4double y = 1.0/(1.0 + gam);
153 G4double y2 = y*y; 157 G4double y2 = y*y;
154 G4double y12 = 1.0 - 2.0*y; 158 G4double y12 = 1.0 - 2.0*y;
155 G4double b1 = 2.0 - y2; 159 G4double b1 = 2.0 - y2;
156 G4double b2 = y12*(3.0 + y2); 160 G4double b2 = y12*(3.0 + y2);
157 G4double y122= y12*y12; 161 G4double y122= y12*y12;
158 G4double b4 = y122*y12; 162 G4double b4 = y122*y12;
159 G4double b3 = b4 + y122; 163 G4double b3 = b4 + y122;
160 164
161 cross = (xmax - xmin)*(1.0/(beta2*xmin*x 165 cross = (xmax - xmin)*(1.0/(beta2*xmin*xmax) + b2
162 - 0.5*b3*(xmin + xmax) 166 - 0.5*b3*(xmin + xmax)
163 + b4*(xmin*xmin + xmin*xmax + xmax << 167 + b4*(xmin*xmin + xmin*xmax + xmax*xmax)/3.0)
164 - b1*G4Log(xmax/xmin); 168 - b1*G4Log(xmax/xmin);
165 } 169 }
166 170
167 cross *= twopi_mc2_rcl2/kineticEnergy; 171 cross *= twopi_mc2_rcl2/kineticEnergy;
168 } 172 }
169 return cross; 173 return cross;
170 } 174 }
171 175
172 //....oooOO0OOooo........oooOO0OOooo........oo 176 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
173 177
174 G4double G4MollerBhabhaModel::ComputeCrossSect 178 G4double G4MollerBhabhaModel::ComputeCrossSectionPerAtom(
175 con 179 const G4ParticleDefinition* p,
176 180 G4double kineticEnergy,
177 << 181 G4double Z, G4double,
178 182 G4double cutEnergy,
179 183 G4double maxEnergy)
180 { 184 {
181 return Z*ComputeCrossSectionPerElectron(p,ki 185 return Z*ComputeCrossSectionPerElectron(p,kineticEnergy,cutEnergy,maxEnergy);
182 } 186 }
183 187
184 //....oooOO0OOooo........oooOO0OOooo........oo 188 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
185 189
186 G4double G4MollerBhabhaModel::CrossSectionPerV 190 G4double G4MollerBhabhaModel::CrossSectionPerVolume(
187 con << 191 const G4Material* material,
188 con 192 const G4ParticleDefinition* p,
189 193 G4double kinEnergy,
190 194 G4double cutEnergy,
191 195 G4double maxEnergy)
192 { 196 {
193 G4double eDensity = material->GetElectronDen 197 G4double eDensity = material->GetElectronDensity();
194 return eDensity*ComputeCrossSectionPerElectr 198 return eDensity*ComputeCrossSectionPerElectron(p,kinEnergy,cutEnergy,maxEnergy);
>> 199 /*
>> 200 G4double Zeff = eDensity/material->GetTotNbOfAtomsPerVolume();
>> 201 G4double th = 0.25*sqrt(Zeff)*keV;
>> 202 G4double cut;
>> 203 if(isElectron) { cut = std::max(th*0.5, cutEnergy); }
>> 204 else { cut = std::max(th, cutEnergy); }
>> 205 G4double res = 0.0;
>> 206 // below this threshold no bremsstrahlung
>> 207 if (kinEnergy > th) {
>> 208 res = eDensity*ComputeCrossSectionPerElectron(p,kinEnergy,cut,maxEnergy);
>> 209 }
>> 210 return res;
>> 211 */
195 } 212 }
196 213
197 //....oooOO0OOooo........oooOO0OOooo........oo 214 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
198 215
199 G4double G4MollerBhabhaModel::ComputeDEDXPerVo 216 G4double G4MollerBhabhaModel::ComputeDEDXPerVolume(
200 cons << 217 const G4Material* material,
201 cons 218 const G4ParticleDefinition* p,
202 219 G4double kineticEnergy,
203 220 G4double cut)
204 { 221 {
205 if(p != particle) { SetParticle(p); } << 222 if(!particle) { SetParticle(p); }
206 // calculate the dE/dx due to the ionization 223 // calculate the dE/dx due to the ionization by Seltzer-Berger formula
207 // checl low-energy limit 224 // checl low-energy limit
208 G4double electronDensity = material->GetElec 225 G4double electronDensity = material->GetElectronDensity();
209 226
210 G4double Zeff = material->GetIonisation()-> << 227 G4double Zeff = electronDensity/material->GetTotNbOfAtomsPerVolume();
211 G4double th = 0.25*sqrt(Zeff)*keV; 228 G4double th = 0.25*sqrt(Zeff)*keV;
212 G4double tkin = std::max(kineticEnergy, th); << 229 // G4double cut;
>> 230 // if(isElectron) { cut = std::max(th*0.5, cutEnergy); }
>> 231 // else { cut = std::max(th, cutEnergy); }
>> 232 G4double tkin = kineticEnergy;
>> 233 if (kineticEnergy < th) { tkin = th; }
213 234
214 G4double tau = tkin/electron_mass_c2; 235 G4double tau = tkin/electron_mass_c2;
215 G4double gam = tau + 1.0; 236 G4double gam = tau + 1.0;
216 G4double gamma2= gam*gam; 237 G4double gamma2= gam*gam;
217 G4double bg2 = tau*(tau + 2); 238 G4double bg2 = tau*(tau + 2);
218 G4double beta2 = bg2/gamma2; 239 G4double beta2 = bg2/gamma2;
219 240
220 G4double eexc = material->GetIonisation()-> 241 G4double eexc = material->GetIonisation()->GetMeanExcitationEnergy();
221 eexc /= electron_mass_c2; 242 eexc /= electron_mass_c2;
222 G4double eexc2 = eexc*eexc; 243 G4double eexc2 = eexc*eexc;
223 244
224 G4double d = std::min(cut, MaxSecondaryEnerg 245 G4double d = std::min(cut, MaxSecondaryEnergy(p, tkin))/electron_mass_c2;
225 G4double dedx; 246 G4double dedx;
226 247
227 // electron 248 // electron
228 if (isElectron) { 249 if (isElectron) {
229 250
230 dedx = G4Log(2.0*(tau + 2.0)/eexc2) - 1.0 251 dedx = G4Log(2.0*(tau + 2.0)/eexc2) - 1.0 - beta2
231 + G4Log((tau-d)*d) + tau/(tau-d) 252 + G4Log((tau-d)*d) + tau/(tau-d)
232 + (0.5*d*d + (2.0*tau + 1.)*G4Log(1. 253 + (0.5*d*d + (2.0*tau + 1.)*G4Log(1. - d/tau))/gamma2;
233 254
234 //positron 255 //positron
235 } else { 256 } else {
236 257
237 G4double d2 = d*d*0.5; 258 G4double d2 = d*d*0.5;
238 G4double d3 = d2*d/1.5; 259 G4double d3 = d2*d/1.5;
239 G4double d4 = d3*d*0.75; 260 G4double d4 = d3*d*0.75;
240 G4double y = 1.0/(1.0 + gam); 261 G4double y = 1.0/(1.0 + gam);
241 dedx = G4Log(2.0*(tau + 2.0)/eexc2) + G4Lo 262 dedx = G4Log(2.0*(tau + 2.0)/eexc2) + G4Log(tau*d)
242 - beta2*(tau + 2.0*d - y*(3.0*d2 263 - beta2*(tau + 2.0*d - y*(3.0*d2
243 + y*(d - d3 + y*(d2 - tau*d3 + d4)))) 264 + y*(d - d3 + y*(d2 - tau*d3 + d4))))/tau;
244 } 265 }
245 266
246 //density correction 267 //density correction
247 G4double x = G4Log(bg2)/twoln10; 268 G4double x = G4Log(bg2)/twoln10;
248 dedx -= material->GetIonisation()->DensityCo 269 dedx -= material->GetIonisation()->DensityCorrection(x);
249 270
250 // now you can compute the total ionization 271 // now you can compute the total ionization loss
251 dedx *= twopi_mc2_rcl2*electronDensity/beta2 272 dedx *= twopi_mc2_rcl2*electronDensity/beta2;
252 if (dedx < 0.0) { dedx = 0.0; } 273 if (dedx < 0.0) { dedx = 0.0; }
253 274
254 // lowenergy extrapolation 275 // lowenergy extrapolation
255 276
256 if (kineticEnergy < th) { 277 if (kineticEnergy < th) {
257 x = kineticEnergy/th; 278 x = kineticEnergy/th;
258 if(x > 0.25) { dedx /= sqrt(x); } 279 if(x > 0.25) { dedx /= sqrt(x); }
259 else { dedx *= 1.4*sqrt(x)/(0.1 + x); } 280 else { dedx *= 1.4*sqrt(x)/(0.1 + x); }
260 } 281 }
261 return dedx; 282 return dedx;
262 } 283 }
263 284
264 //....oooOO0OOooo........oooOO0OOooo........oo 285 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
265 286
266 void 287 void
267 G4MollerBhabhaModel::SampleSecondaries(std::ve 288 G4MollerBhabhaModel::SampleSecondaries(std::vector<G4DynamicParticle*>* vdp,
268 const G << 289 const G4MaterialCutsCouple* couple,
269 const G << 290 const G4DynamicParticle* dp,
270 G4doubl << 291 G4double cutEnergy,
271 G4doubl << 292 G4double maxEnergy)
272 { 293 {
273 G4double kineticEnergy = dp->GetKineticEnerg 294 G4double kineticEnergy = dp->GetKineticEnergy();
274 //G4cout << "G4MollerBhabhaModel::SampleSeco << 295 //const G4Material* mat = couple->GetMaterial();
275 // << " in " << couple->GetMaterial()- << 296 //G4double Zeff = mat->GetElectronDensity()/mat->GetTotNbOfAtomsPerVolume();
>> 297 // G4double th = 0.25*sqrt(Zeff)*keV;
276 G4double tmax; 298 G4double tmax;
277 G4double tmin = cutEnergy; 299 G4double tmin = cutEnergy;
278 if(isElectron) { 300 if(isElectron) {
279 tmax = 0.5*kineticEnergy; 301 tmax = 0.5*kineticEnergy;
280 } else { 302 } else {
281 tmax = kineticEnergy; 303 tmax = kineticEnergy;
282 } 304 }
283 if(maxEnergy < tmax) { tmax = maxEnergy; } 305 if(maxEnergy < tmax) { tmax = maxEnergy; }
284 if(tmin >= tmax) { return; } 306 if(tmin >= tmax) { return; }
285 307
286 G4double energy = kineticEnergy + electron_m 308 G4double energy = kineticEnergy + electron_mass_c2;
287 G4double xmin = tmin/kineticEnergy; 309 G4double xmin = tmin/kineticEnergy;
288 G4double xmax = tmax/kineticEnergy; 310 G4double xmax = tmax/kineticEnergy;
289 G4double gam = energy/electron_mass_c2; 311 G4double gam = energy/electron_mass_c2;
290 G4double gamma2 = gam*gam; 312 G4double gamma2 = gam*gam;
291 G4double beta2 = 1.0 - 1.0/gamma2; 313 G4double beta2 = 1.0 - 1.0/gamma2;
292 G4double x, z, grej; << 314 G4double x, z, q, grej;
293 CLHEP::HepRandomEngine* rndmEngine = G4Rando <<
294 G4double rndm[2]; <<
295 315
296 //Moller (e-e-) scattering 316 //Moller (e-e-) scattering
297 if (isElectron) { 317 if (isElectron) {
298 318
299 G4double gg = (2.0*gam - 1.0)/gamma2; 319 G4double gg = (2.0*gam - 1.0)/gamma2;
300 G4double y = 1.0 - xmax; 320 G4double y = 1.0 - xmax;
301 grej = 1.0 - gg*xmax + xmax*xmax*(1.0 - gg 321 grej = 1.0 - gg*xmax + xmax*xmax*(1.0 - gg + (1.0 - gg*y)/(y*y));
302 322
303 do { 323 do {
304 rndmEngine->flatArray(2, rndm); << 324 q = G4UniformRand();
305 x = xmin*xmax/(xmin*(1.0 - rndm[0]) + xm << 325 x = xmin*xmax/(xmin*(1.0 - q) + xmax*q);
306 y = 1.0 - x; 326 y = 1.0 - x;
307 z = 1.0 - gg*x + x*x*(1.0 - gg + (1.0 - 327 z = 1.0 - gg*x + x*x*(1.0 - gg + (1.0 - gg*y)/(y*y));
308 /* 328 /*
309 if(z > grej) { 329 if(z > grej) {
310 G4cout << "G4MollerBhabhaModel::Sample 330 G4cout << "G4MollerBhabhaModel::SampleSecondary Warning! "
311 << "Majorant " << grej << " < " 331 << "Majorant " << grej << " < "
312 << z << " for x= " << x 332 << z << " for x= " << x
313 << " e-e- scattering" 333 << " e-e- scattering"
314 << G4endl; 334 << G4endl;
315 } 335 }
316 */ 336 */
317 // Loop checking, 03-Aug-2015, Vladimir << 337 } while(grej * G4UniformRand() > z);
318 } while(grej * rndm[1] > z); <<
319 338
320 //Bhabha (e+e-) scattering 339 //Bhabha (e+e-) scattering
321 } else { 340 } else {
322 341
323 G4double y = 1.0/(1.0 + gam); 342 G4double y = 1.0/(1.0 + gam);
324 G4double y2 = y*y; 343 G4double y2 = y*y;
325 G4double y12 = 1.0 - 2.0*y; 344 G4double y12 = 1.0 - 2.0*y;
326 G4double b1 = 2.0 - y2; 345 G4double b1 = 2.0 - y2;
327 G4double b2 = y12*(3.0 + y2); 346 G4double b2 = y12*(3.0 + y2);
328 G4double y122= y12*y12; 347 G4double y122= y12*y12;
329 G4double b4 = y122*y12; 348 G4double b4 = y122*y12;
330 G4double b3 = b4 + y122; 349 G4double b3 = b4 + y122;
331 350
332 y = xmax*xmax; 351 y = xmax*xmax;
333 grej = 1.0 + (y*y*b4 - xmin*xmin*xmin*b3 + 352 grej = 1.0 + (y*y*b4 - xmin*xmin*xmin*b3 + y*b2 - xmin*b1)*beta2;
334 do { 353 do {
335 rndmEngine->flatArray(2, rndm); << 354 q = G4UniformRand();
336 x = xmin*xmax/(xmin*(1.0 - rndm[0]) + xm << 355 x = xmin*xmax/(xmin*(1.0 - q) + xmax*q);
337 y = x*x; 356 y = x*x;
338 z = 1.0 + (y*y*b4 - x*y*b3 + y*b2 - x*b1 357 z = 1.0 + (y*y*b4 - x*y*b3 + y*b2 - x*b1)*beta2;
339 /* 358 /*
340 if(z > grej) { 359 if(z > grej) {
341 G4cout << "G4MollerBhabhaModel::Sample 360 G4cout << "G4MollerBhabhaModel::SampleSecondary Warning! "
342 << "Majorant " << grej << " < " 361 << "Majorant " << grej << " < "
343 << z << " for x= " << x 362 << z << " for x= " << x
344 << " e+e- scattering" 363 << " e+e- scattering"
345 << G4endl; 364 << G4endl;
346 } 365 }
347 */ 366 */
348 // Loop checking, 03-Aug-2015, Vladimir << 367 } while(grej * G4UniformRand() > z);
349 } while(grej * rndm[1] > z); <<
350 } 368 }
351 369
352 G4double deltaKinEnergy = x * kineticEnergy; 370 G4double deltaKinEnergy = x * kineticEnergy;
353 371
354 G4ThreeVector deltaDirection; 372 G4ThreeVector deltaDirection;
355 373
356 if(UseAngularGeneratorFlag()) { 374 if(UseAngularGeneratorFlag()) {
357 const G4Material* mat = couple->GetMateri 375 const G4Material* mat = couple->GetMaterial();
358 G4int Z = SelectRandomAtomNumber(mat); 376 G4int Z = SelectRandomAtomNumber(mat);
359 377
360 deltaDirection = 378 deltaDirection =
361 GetAngularDistribution()->SampleDirectio 379 GetAngularDistribution()->SampleDirection(dp, deltaKinEnergy, Z, mat);
362 380
363 } else { 381 } else {
364 382
365 G4double deltaMomentum = 383 G4double deltaMomentum =
366 sqrt(deltaKinEnergy * (deltaKinEnergy + 384 sqrt(deltaKinEnergy * (deltaKinEnergy + 2.0*electron_mass_c2));
367 G4double cost = deltaKinEnergy * (energy + 385 G4double cost = deltaKinEnergy * (energy + electron_mass_c2) /
368 (deltaMomentum * dp->GetTotalMomentum()) 386 (deltaMomentum * dp->GetTotalMomentum());
369 if(cost > 1.0) { cost = 1.0; } 387 if(cost > 1.0) { cost = 1.0; }
370 G4double sint = sqrt((1.0 - cost)*(1.0 + c 388 G4double sint = sqrt((1.0 - cost)*(1.0 + cost));
371 389
372 G4double phi = twopi * rndmEngine->flat() << 390 G4double phi = twopi * G4UniformRand() ;
373 391
374 deltaDirection.set(sint*cos(phi),sint*sin( 392 deltaDirection.set(sint*cos(phi),sint*sin(phi), cost) ;
375 deltaDirection.rotateUz(dp->GetMomentumDir 393 deltaDirection.rotateUz(dp->GetMomentumDirection());
376 } 394 }
377 395
378 // create G4DynamicParticle object for delta 396 // create G4DynamicParticle object for delta ray
379 auto delta = new G4DynamicParticle(theElectr << 397 G4DynamicParticle* delta =
>> 398 new G4DynamicParticle(theElectron,deltaDirection,deltaKinEnergy);
380 vdp->push_back(delta); 399 vdp->push_back(delta);
381 400
382 // primary change 401 // primary change
383 kineticEnergy -= deltaKinEnergy; 402 kineticEnergy -= deltaKinEnergy;
384 G4ThreeVector finalP = dp->GetMomentum() - d 403 G4ThreeVector finalP = dp->GetMomentum() - delta->GetMomentum();
385 finalP = finalP.unit(); 404 finalP = finalP.unit();
386 405
387 fParticleChange->SetProposedKineticEnergy(ki 406 fParticleChange->SetProposedKineticEnergy(kineticEnergy);
388 fParticleChange->SetProposedMomentumDirectio 407 fParticleChange->SetProposedMomentumDirection(finalP);
389 } 408 }
390 409
391 //....oooOO0OOooo........oooOO0OOooo........oo 410 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
392 411