| 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: G4VAtomDeexcitation.cc 92921 2015-09-21 15:06:51Z gcosmo $
26 // 27 //
27 // ------------------------------------------- 28 // -------------------------------------------------------------------
28 // 29 //
29 // GEANT4 Class class file 30 // GEANT4 Class class file
30 // 31 //
31 // 32 //
32 // File name: G4VAtomDeexcitation 33 // File name: G4VAtomDeexcitation
33 // 34 //
34 // Author: Alfonso Mantero & Vladimir I 35 // Author: Alfonso Mantero & Vladimir Ivanchenko
35 // 36 //
36 // Creation date: 21.04.2010 37 // Creation date: 21.04.2010
37 // 38 //
38 // Modifications: 39 // Modifications:
39 // 40 //
40 // Class Description: 41 // Class Description:
41 // 42 //
42 // Abstract interface to energy loss models 43 // Abstract interface to energy loss models
43 44
44 // ------------------------------------------- 45 // -------------------------------------------------------------------
45 // 46 //
46 47
47 #include "G4VAtomDeexcitation.hh" 48 #include "G4VAtomDeexcitation.hh"
48 #include "G4SystemOfUnits.hh" 49 #include "G4SystemOfUnits.hh"
49 #include "G4EmParameters.hh" <<
50 #include "G4ParticleDefinition.hh" 50 #include "G4ParticleDefinition.hh"
51 #include "G4DynamicParticle.hh" 51 #include "G4DynamicParticle.hh"
52 #include "G4Step.hh" 52 #include "G4Step.hh"
53 #include "G4Region.hh" 53 #include "G4Region.hh"
54 #include "G4RegionStore.hh" 54 #include "G4RegionStore.hh"
55 #include "G4MaterialCutsCouple.hh" 55 #include "G4MaterialCutsCouple.hh"
56 #include "G4MaterialCutsCouple.hh" 56 #include "G4MaterialCutsCouple.hh"
57 #include "G4Material.hh" 57 #include "G4Material.hh"
58 #include "G4Element.hh" 58 #include "G4Element.hh"
59 #include "G4ElementVector.hh" 59 #include "G4ElementVector.hh"
60 #include "Randomize.hh" 60 #include "Randomize.hh"
61 #include "G4VParticleChange.hh" 61 #include "G4VParticleChange.hh"
62 #include "G4EmSecondaryParticleType.hh" << 62 #include "G4PhysicsModelCatalog.hh"
63 #include "G4Gamma.hh" 63 #include "G4Gamma.hh"
64 #include "G4Log.hh" <<
65 <<
66 #ifdef G4MULTITHREADED <<
67 G4Mutex G4VAtomDeexcitation::atomDeexcitatio <<
68 #endif <<
69 64
70 //....oooOO0OOooo........oooOO0OOooo........oo 65 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
71 66
>> 67 G4int G4VAtomDeexcitation::pixeIDg = -1;
>> 68 G4int G4VAtomDeexcitation::pixeIDe = -1;
>> 69
72 G4VAtomDeexcitation::G4VAtomDeexcitation(const 70 G4VAtomDeexcitation::G4VAtomDeexcitation(const G4String& modname)
73 : name(modname) << 71 : verbose(1), name(modname), isActive(false),
>> 72 flagAuger(false),flagAugerCascade(false),
>> 73 flagPIXE(false), ignoreCuts(false)
74 { 74 {
>> 75 theParameters = G4EmParameters::Instance();
75 vdyn.reserve(5); 76 vdyn.reserve(5);
76 theCoupleTable = nullptr; 77 theCoupleTable = nullptr;
>> 78 G4String gg = "gammaPIXE";
>> 79 G4String ee = "e-PIXE";
>> 80 if(pixeIDg < 0) { pixeIDg = G4PhysicsModelCatalog::Register(gg); }
>> 81 if(pixeIDe < 0) { pixeIDe = G4PhysicsModelCatalog::Register(ee); }
77 gamma = G4Gamma::Gamma(); 82 gamma = G4Gamma::Gamma();
78 } 83 }
79 84
80 //....oooOO0OOooo........oooOO0OOooo........oo 85 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
81 86
82 G4VAtomDeexcitation::~G4VAtomDeexcitation() = << 87 G4VAtomDeexcitation::~G4VAtomDeexcitation()
>> 88 {}
83 89
84 //....oooOO0OOooo........oooOO0OOooo........oo 90 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
85 91
86 void G4VAtomDeexcitation::InitialiseAtomicDeex 92 void G4VAtomDeexcitation::InitialiseAtomicDeexcitation()
87 { 93 {
88 G4EmParameters* theParameters = G4EmParamete <<
89 theParameters->DefineRegParamForDeex(this); <<
90 <<
91 // Define list of couples 94 // Define list of couples
92 theCoupleTable = G4ProductionCutsTable::GetP 95 theCoupleTable = G4ProductionCutsTable::GetProductionCutsTable();
93 nCouples = (G4int)theCoupleTable->GetTableSi << 96 G4int numOfCouples = theCoupleTable->GetTableSize();
94 97
95 // needed for unit tests 98 // needed for unit tests
96 std::size_t nn = std::max(nCouples, 1); << 99 G4int nn = std::max(numOfCouples, 1);
97 if(activeDeexcitationMedia.size() != nn) { << 100 activeDeexcitationMedia.resize(nn, false);
98 activeDeexcitationMedia.resize(nn, false); << 101 activeAugerMedia.resize(nn, false);
99 activeAugerMedia.resize(nn, false); << 102 activePIXEMedia.resize(nn, false);
100 activePIXEMedia.resize(nn, false); << 103 activeZ.resize(93, false);
101 } <<
102 if(activeZ.size() != 93) { activeZ.resize(93 <<
103 104
104 // initialisation of flags and options 105 // initialisation of flags and options
105 // normally there is no locksed flags << 106 isActive = theParameters->Fluo();
106 if(!isActiveLocked) { isActive = theParamet << 107 flagAuger = theParameters->Auger();
107 if(!isAugerLocked) { flagAuger = theParamet << 108 flagAugerCascade = theParameters->AugerCascade();
108 if(!isPIXELocked) { flagPIXE = theParamet << 109 flagPIXE = theParameters->Pixe();
109 ignoreCuts = theParameters->DeexcitationIgno 110 ignoreCuts = theParameters->DeexcitationIgnoreCut();
110 111
111 // Define list of regions <<
112 std::size_t nRegions = deRegions.size(); <<
113 // check if deexcitation is active for the g 112 // check if deexcitation is active for the given run
114 if(!isActive && 0 == nRegions) { return; } << 113 if( !isActive ) { return; }
>> 114
>> 115 // Define list of regions
>> 116 size_t nRegions = deRegions.size();
115 117
116 // if no active regions add a world <<
117 if(0 == nRegions) { 118 if(0 == nRegions) {
118 SetDeexcitationActiveRegion("World",isActi 119 SetDeexcitationActiveRegion("World",isActive,flagAuger,flagPIXE);
119 nRegions = deRegions.size(); 120 nRegions = deRegions.size();
120 } 121 }
121 122
122 if(0 < verbose) { 123 if(0 < verbose) {
123 G4cout << G4endl; 124 G4cout << G4endl;
124 G4cout << "### === Deexcitation model " < 125 G4cout << "### === Deexcitation model " << name
125 << " is activated for " << nRegions 126 << " is activated for " << nRegions;
126 if(1 == nRegions) { G4cout << " region:" < 127 if(1 == nRegions) { G4cout << " region:" << G4endl; }
127 else { G4cout << " regions:" 128 else { G4cout << " regions:" << G4endl;}
128 } 129 }
129 130
130 // Identify active media 131 // Identify active media
131 const G4RegionStore* regionStore = G4RegionS << 132 G4RegionStore* regionStore = G4RegionStore::GetInstance();
132 for(std::size_t j=0; j<nRegions; ++j) { << 133 for(size_t j=0; j<nRegions; ++j) {
133 const G4Region* reg = regionStore->GetRegi 134 const G4Region* reg = regionStore->GetRegion(activeRegions[j], false);
134 if(nullptr != reg && 0 < nCouples) { << 135 if(reg && 0 < numOfCouples) {
135 const G4ProductionCuts* rpcuts = reg->Ge 136 const G4ProductionCuts* rpcuts = reg->GetProductionCuts();
136 if(0 < verbose) { 137 if(0 < verbose) {
137 G4cout << " " << activeRegion << 138 G4cout << " " << activeRegions[j] << G4endl;
138 << " " << deRegions[j] << " <<
139 << " " << PIXERegions[j] << G4 <<
140 } 139 }
141 for(G4int i=0; i<nCouples; ++i) { << 140 for(G4int i=0; i<numOfCouples; ++i) {
142 const G4MaterialCutsCouple* couple = 141 const G4MaterialCutsCouple* couple =
143 theCoupleTable->GetMaterialCutsCoupl 142 theCoupleTable->GetMaterialCutsCouple(i);
144 if (couple->GetProductionCuts() == rpc 143 if (couple->GetProductionCuts() == rpcuts) {
145 activeDeexcitationMedia[i] = deRegio 144 activeDeexcitationMedia[i] = deRegions[j];
146 activeAugerMedia[i] = AugerRegions[j 145 activeAugerMedia[i] = AugerRegions[j];
147 activePIXEMedia[i] = PIXERegions[j]; 146 activePIXEMedia[i] = PIXERegions[j];
148 } 147 }
149 } 148 }
150 } 149 }
151 } 150 }
152 std::size_t nelm = G4Element::GetNumberOfEle << 151 G4int nelm = G4Element::GetNumberOfElements();
153 //G4cout << nelm << G4endl; 152 //G4cout << nelm << G4endl;
154 for(std::size_t k=0; k<nelm; ++k) { << 153 for(G4int k=0; k<nelm; ++k) {
155 G4int Z = (*(G4Element::GetElementTable()) << 154 G4int Z = G4lrint((*(G4Element::GetElementTable()))[k]->GetZ());
156 if(Z > 5 && Z < 93) { 155 if(Z > 5 && Z < 93) {
157 activeZ[Z] = true; 156 activeZ[Z] = true;
158 //G4cout << "!!! Active de-excitation Z= 157 //G4cout << "!!! Active de-excitation Z= " << Z << G4endl;
159 } 158 }
160 } 159 }
161 160
162 // Initialise derived class 161 // Initialise derived class
163 InitialiseForNewRun(); 162 InitialiseForNewRun();
164 163
165 if(0 < verbose && flagAuger) { <<
166 G4cout << "### === Auger flag: " << flagA <<
167 << G4endl; <<
168 } <<
169 if(0 < verbose) { <<
170 G4cout << "### === Ignore cuts flag: " <<
171 << G4endl; <<
172 } <<
173 if(0 < verbose && flagPIXE) { 164 if(0 < verbose && flagPIXE) {
174 G4cout << "### === PIXE model for hadrons 165 G4cout << "### === PIXE model for hadrons: "
175 << theParameters->PIXECrossSectionM 166 << theParameters->PIXECrossSectionModel()
176 << G4endl; 167 << G4endl;
177 G4cout << "### === PIXE model for e+-: 168 G4cout << "### === PIXE model for e+-: "
178 << theParameters->PIXEElectronCross 169 << theParameters->PIXEElectronCrossSectionModel()
179 << G4endl; 170 << G4endl;
180 } 171 }
181 } 172 }
182 173
183 //....oooOO0OOooo........oooOO0OOooo........oo 174 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
184 175
185 void 176 void
186 G4VAtomDeexcitation::SetDeexcitationActiveRegi 177 G4VAtomDeexcitation::SetDeexcitationActiveRegion(const G4String& rname,
187 178 G4bool valDeexcitation,
188 179 G4bool valAuger,
189 180 G4bool valPIXE)
190 { 181 {
191 // no PIXE in parallel world 182 // no PIXE in parallel world
192 if(rname == "DefaultRegionForParallelWorld") 183 if(rname == "DefaultRegionForParallelWorld") { return; }
193 184
194 G4String ss = rname; 185 G4String ss = rname;
195 /* << 186 //G4cout << "### G4VAtomDeexcitation::SetDeexcitationActiveRegion " << ss
196 G4cout << "### G4VAtomDeexcitation::SetDeexc << 187 // << " " << valDeexcitation << " " << valAuger
197 << " " << valDeexcitation << " " << << 188 // << " " << valPIXE << G4endl;
198 << " " << valPIXE << G4endl; <<
199 */ <<
200 if(ss == "world" || ss == "World" || ss == " 189 if(ss == "world" || ss == "World" || ss == "WORLD") {
201 ss = "DefaultRegionForTheWorld"; 190 ss = "DefaultRegionForTheWorld";
202 } 191 }
203 std::size_t n = deRegions.size(); << 192 size_t n = deRegions.size();
204 for(std::size_t i=0; i<n; ++i) { << 193 if(n > 0) {
>> 194 for(size_t i=0; i<n; ++i) {
205 195
206 // Region already exist << 196 // Region already exist
207 if(ss == activeRegions[i]) { << 197 if(ss == activeRegions[i]) {
208 deRegions[i] = valDeexcitation; << 198 deRegions[i] = valDeexcitation;
209 AugerRegions[i] = valAuger; << 199 AugerRegions[i] = valAuger;
210 PIXERegions[i] = valPIXE; << 200 PIXERegions[i] = valPIXE;
211 return; << 201 return;
>> 202 }
212 } 203 }
213 } 204 }
214 // New region 205 // New region
215 activeRegions.push_back(ss); 206 activeRegions.push_back(ss);
216 deRegions.push_back(valDeexcitation); 207 deRegions.push_back(valDeexcitation);
217 AugerRegions.push_back(valAuger); 208 AugerRegions.push_back(valAuger);
218 PIXERegions.push_back(valPIXE); 209 PIXERegions.push_back(valPIXE);
219 210
220 // if de-excitation defined for the world vo << 211 // if de-excitation defined fo rthe world volume
221 // it should be active for all G4Regions << 212 // it should be active everywhere
222 if(ss == "DefaultRegionForTheWorld") { 213 if(ss == "DefaultRegionForTheWorld") {
223 G4RegionStore* regions = G4RegionStore::Ge 214 G4RegionStore* regions = G4RegionStore::GetInstance();
224 std::size_t nn = regions->size(); << 215 G4int nn = regions->size();
225 for(std::size_t i=0; i<nn; ++i) { << 216 for(G4int i=0; i<nn; ++i) {
226 if(ss == (*regions)[i]->GetName()) { con <<
227 SetDeexcitationActiveRegion((*regions)[i 217 SetDeexcitationActiveRegion((*regions)[i]->GetName(), valDeexcitation,
228 valAuger, va 218 valAuger, valPIXE);
229 219
230 } 220 }
231 } 221 }
232 } 222 }
233 223
234 void G4VAtomDeexcitation::GenerateParticles(st <<
235 co <<
236 G4 <<
237 { <<
238 G4double gCut = DBL_MAX; <<
239 if(ignoreCuts) { <<
240 gCut = 0.0; <<
241 } else if (nullptr != theCoupleTable) { <<
242 gCut = (*(theCoupleTable->GetEnergyCutsVec <<
243 } <<
244 if(gCut < as->BindingEnergy()) { <<
245 G4double eCut = DBL_MAX; <<
246 if(CheckAugerActiveRegion(idx)) { <<
247 if(ignoreCuts) { <<
248 eCut = 0.0; <<
249 } else if (nullptr != theCoupleTable) { <<
250 eCut = (*(theCoupleTable->GetEnergyCut <<
251 } <<
252 } <<
253 GenerateParticles(v, as, Z, gCut, eCut); <<
254 } <<
255 } <<
256 <<
257 //....oooOO0OOooo........oooOO0OOooo........oo 224 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
258 225
259 void 226 void
260 G4VAtomDeexcitation::AlongStepDeexcitation(std 227 G4VAtomDeexcitation::AlongStepDeexcitation(std::vector<G4Track*>& tracks,
261 con 228 const G4Step& step,
262 G4d 229 G4double& eLossMax,
263 G4i 230 G4int coupleIndex)
264 { 231 {
265 G4double truelength = step.GetStepLength(); 232 G4double truelength = step.GetStepLength();
266 if(!flagPIXE && !activePIXEMedia[coupleIndex 233 if(!flagPIXE && !activePIXEMedia[coupleIndex]) { return; }
267 if(eLossMax <= 0.0 || truelength <= 0.0) 234 if(eLossMax <= 0.0 || truelength <= 0.0) { return; }
268 235
269 // step parameters 236 // step parameters
270 const G4StepPoint* preStep = step.GetPreStep 237 const G4StepPoint* preStep = step.GetPreStepPoint();
271 const G4ThreeVector prePos = preStep->GetPos << 238 G4ThreeVector prePos = preStep->GetPosition();
272 const G4ThreeVector delta = step.GetPostStep << 239 G4ThreeVector delta = step.GetPostStepPoint()->GetPosition() - prePos;
273 const G4double preTime = preStep->GetGlobalT << 240 G4double preTime = preStep->GetGlobalTime();
274 const G4double dt = step.GetPostStepPoint()- << 241 G4double dt = step.GetPostStepPoint()->GetGlobalTime() - preTime;
275 242
276 // particle parameters 243 // particle parameters
277 const G4Track* track = step.GetTrack(); 244 const G4Track* track = step.GetTrack();
278 const G4ParticleDefinition* part = track->Ge 245 const G4ParticleDefinition* part = track->GetDefinition();
279 G4double ekin = preStep->GetKineticEnergy(); 246 G4double ekin = preStep->GetKineticEnergy();
280 247
281 // media parameters 248 // media parameters
282 G4double gCut = (*theCoupleTable->GetEnergyC 249 G4double gCut = (*theCoupleTable->GetEnergyCutsVector(0))[coupleIndex];
283 if(ignoreCuts) { gCut = 0.0; } 250 if(ignoreCuts) { gCut = 0.0; }
284 G4double eCut = DBL_MAX; 251 G4double eCut = DBL_MAX;
285 if(CheckAugerActiveRegion(coupleIndex)) { 252 if(CheckAugerActiveRegion(coupleIndex)) {
286 eCut = (*theCoupleTable->GetEnergyCutsVect 253 eCut = (*theCoupleTable->GetEnergyCutsVector(1))[coupleIndex];
287 if(ignoreCuts) { eCut = 0.0; } 254 if(ignoreCuts) { eCut = 0.0; }
288 } 255 }
289 256
290 //G4cout<<"!Sample PIXE gCut(MeV)= "<<gCut<< 257 //G4cout<<"!Sample PIXE gCut(MeV)= "<<gCut<<" eCut(MeV)= "<<eCut
291 // <<" Ekin(MeV)= " << ekin/MeV << G4 258 // <<" Ekin(MeV)= " << ekin/MeV << G4endl;
292 259
293 const G4Material* material = preStep->GetMat 260 const G4Material* material = preStep->GetMaterial();
294 const G4ElementVector* theElementVector = ma 261 const G4ElementVector* theElementVector = material->GetElementVector();
295 const G4double* theAtomNumDensityVector = 262 const G4double* theAtomNumDensityVector =
296 material->GetVecNbOfAtomsPerVolume(); 263 material->GetVecNbOfAtomsPerVolume();
297 const std::size_t nelm = material->GetNumber << 264 G4int nelm = material->GetNumberOfElements();
298 265
299 // loop over deexcitations 266 // loop over deexcitations
300 for(std::size_t i=0; i<nelm; ++i) { << 267 for(G4int i=0; i<nelm; ++i) {
301 G4int Z = (*theElementVector)[i]->GetZasIn << 268 G4int Z = G4lrint((*theElementVector)[i]->GetZ());
302 if(activeZ[Z] && Z < 93) { 269 if(activeZ[Z] && Z < 93) {
303 G4int nshells = 270 G4int nshells =
304 std::min(9,(*theElementVector)[i]->Get 271 std::min(9,(*theElementVector)[i]->GetNbOfAtomicShells());
305 G4double rho = truelength*theAtomNumDens 272 G4double rho = truelength*theAtomNumDensityVector[i];
306 //G4cout<<" Z "<< Z <<" is active x(m 273 //G4cout<<" Z "<< Z <<" is active x(mm)= " << truelength/mm << G4endl;
307 for(G4int ii=0; ii<nshells; ++ii) { 274 for(G4int ii=0; ii<nshells; ++ii) {
308 auto as = (G4AtomicShellEnumerator)(ii << 275 G4AtomicShellEnumerator as = G4AtomicShellEnumerator(ii);
309 const G4AtomicShell* shell = GetAtomic 276 const G4AtomicShell* shell = GetAtomicShell(Z, as);
310 const G4double bindingEnergy = shell-> << 277 G4double bindingEnergy = shell->BindingEnergy();
311 278
312 if(gCut > bindingEnergy) { break; } 279 if(gCut > bindingEnergy) { break; }
313 280
314 if(eLossMax > bindingEnergy) { 281 if(eLossMax > bindingEnergy) {
315 G4double sig = rho* 282 G4double sig = rho*
316 GetShellIonisationCrossSectionPerA 283 GetShellIonisationCrossSectionPerAtom(part, Z, as, ekin, material);
317 284
318 // mfp is mean free path in units of 285 // mfp is mean free path in units of step size
319 if(sig > 0.0) { 286 if(sig > 0.0) {
320 G4double mfp = 1.0/sig; 287 G4double mfp = 1.0/sig;
321 G4double stot = 0.0; 288 G4double stot = 0.0;
322 //G4cout << " Shell " << ii << " m 289 //G4cout << " Shell " << ii << " mfp(mm)= " << mfp/mm << G4endl;
323 // sample ionisation points 290 // sample ionisation points
324 do { 291 do {
325 stot -= mfp*G4Log(G4UniformRand( << 292 stot -= mfp*std::log(G4UniformRand());
326 if( stot > 1.0 || eLossMax < bin 293 if( stot > 1.0 || eLossMax < bindingEnergy) { break; }
327 // sample deexcitation 294 // sample deexcitation
328 vdyn.clear(); 295 vdyn.clear();
329 GenerateParticles(&vdyn, shell, 296 GenerateParticles(&vdyn, shell, Z, gCut, eCut);
330 std::size_t nsec = vdyn.size(); << 297 G4int nsec = vdyn.size();
331 if(nsec > 0) { 298 if(nsec > 0) {
332 G4ThreeVector r = prePos + st 299 G4ThreeVector r = prePos + stot*delta;
333 G4double time = preTime + st 300 G4double time = preTime + stot*dt;
334 for(std::size_t j=0; j<nsec; + << 301 for(G4int j=0; j<nsec; ++j) {
335 G4DynamicParticle* dp = vdyn 302 G4DynamicParticle* dp = vdyn[j];
336 G4double e = dp->GetKineticE 303 G4double e = dp->GetKineticEnergy();
337 304
338 // save new secondary if the 305 // save new secondary if there is enough energy
339 if(eLossMax >= e) { 306 if(eLossMax >= e) {
340 eLossMax -= e; 307 eLossMax -= e;
341 G4Track* t = new G4Track(d 308 G4Track* t = new G4Track(dp, time, r);
342 309
343 // defined secondary type 310 // defined secondary type
344 if(dp->GetDefinition() == 311 if(dp->GetDefinition() == gamma) {
345 t->SetCreatorModelID(_Ga << 312 t->SetCreatorModelIndex(pixeIDg);
346 } else { 313 } else {
347 t->SetCreatorModelID(_eP << 314 t->SetCreatorModelIndex(pixeIDe);
348 } 315 }
>> 316
349 tracks.push_back(t); 317 tracks.push_back(t);
350 } else { 318 } else {
351 delete dp; 319 delete dp;
352 } 320 }
353 } 321 }
354 } 322 }
355 // Loop checking, 03-Aug-2015, V 323 // Loop checking, 03-Aug-2015, Vladimir Ivanchenko
356 } while (stot < 1.0); 324 } while (stot < 1.0);
357 } 325 }
358 } 326 }
359 } 327 }
360 } 328 }
361 } 329 }
362 return; 330 return;
363 } 331 }
364 332
365 //....oooOO0OOooo........oooOO0OOooo........oo 333 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
366 334