| 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 // ------------------------------------------- 26 // -------------------------------------------------------------------
27 // 27 //
28 // GEANT4 Class file 28 // GEANT4 Class file
29 // 29 //
30 // 30 //
31 // File name: G4LossTableBuilder 31 // File name: G4LossTableBuilder
32 // 32 //
33 // Author: Vladimir Ivanchenko 33 // Author: Vladimir Ivanchenko
34 // 34 //
35 // Creation date: 03.01.2002 35 // Creation date: 03.01.2002
36 // 36 //
37 // Modifications: 37 // Modifications:
38 // 38 //
39 // 23-01-03 V.Ivanchenko Cut per region 39 // 23-01-03 V.Ivanchenko Cut per region
40 // 21-07-04 V.Ivanchenko Fix problem of range 40 // 21-07-04 V.Ivanchenko Fix problem of range for dedx=0
41 // 08-11-04 Migration to new interface of Stor 41 // 08-11-04 Migration to new interface of Store/Retrieve tables (V.Ivanchenko)
42 // 07-12-04 Fix of BuildDEDX table (V.Ivanchen 42 // 07-12-04 Fix of BuildDEDX table (V.Ivanchenko)
43 // 27-03-06 Add bool options isIonisation (V.I 43 // 27-03-06 Add bool options isIonisation (V.Ivanchenko)
44 // 16-01-07 Fill new (not old) DEDX table (V.I 44 // 16-01-07 Fill new (not old) DEDX table (V.Ivanchenko)
45 // 12-02-07 Use G4LPhysicsFreeVector for the i 45 // 12-02-07 Use G4LPhysicsFreeVector for the inverse range table (V.Ivanchenko)
46 // 24-06-09 Removed hidden bin in G4PhysicsVec 46 // 24-06-09 Removed hidden bin in G4PhysicsVector (V.Ivanchenko)
47 // 47 //
48 // Class Description: 48 // Class Description:
49 // 49 //
50 // ------------------------------------------- 50 // -------------------------------------------------------------------
51 // 51 //
52 //....oooOO0OOooo........oooOO0OOooo........oo 52 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
53 //....oooOO0OOooo........oooOO0OOooo........oo 53 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
54 54
55 #include "G4LossTableBuilder.hh" 55 #include "G4LossTableBuilder.hh"
56 #include "G4SystemOfUnits.hh" 56 #include "G4SystemOfUnits.hh"
57 #include "G4PhysicsTable.hh" 57 #include "G4PhysicsTable.hh"
58 #include "G4PhysicsLogVector.hh" 58 #include "G4PhysicsLogVector.hh"
59 #include "G4PhysicsTableHelper.hh" 59 #include "G4PhysicsTableHelper.hh"
60 #include "G4PhysicsFreeVector.hh" << 60 #include "G4LPhysicsFreeVector.hh"
61 #include "G4ProductionCutsTable.hh" 61 #include "G4ProductionCutsTable.hh"
62 #include "G4MaterialCutsCouple.hh" 62 #include "G4MaterialCutsCouple.hh"
63 #include "G4Material.hh" 63 #include "G4Material.hh"
64 #include "G4VEmModel.hh" 64 #include "G4VEmModel.hh"
65 #include "G4ParticleDefinition.hh" 65 #include "G4ParticleDefinition.hh"
66 #include "G4LossTableManager.hh" 66 #include "G4LossTableManager.hh"
67 #include "G4EmParameters.hh" 67 #include "G4EmParameters.hh"
68 68
69 G4bool G4LossTableBuilder::baseMatFlag = false <<
70 std::vector<G4double>* G4LossTableBuilder::the 69 std::vector<G4double>* G4LossTableBuilder::theDensityFactor = nullptr;
71 std::vector<G4int>* G4LossTableBuilder::the 70 std::vector<G4int>* G4LossTableBuilder::theDensityIdx = nullptr;
72 std::vector<G4bool>* G4LossTableBuilder::the 71 std::vector<G4bool>* G4LossTableBuilder::theFlag = nullptr;
>> 72 #ifdef G4MULTITHREADED
>> 73 G4Mutex G4LossTableBuilder::ltbMutex = G4MUTEX_INITIALIZER;
>> 74 #endif
73 75
74 //....oooOO0OOooo........oooOO0OOooo........oo 76 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
75 77
76 G4LossTableBuilder::G4LossTableBuilder(G4bool << 78 G4LossTableBuilder::G4LossTableBuilder(G4bool master) : isMaster(master)
77 : isInitializer(master) <<
78 { 79 {
79 theParameters = G4EmParameters::Instance(); 80 theParameters = G4EmParameters::Instance();
80 if (nullptr == theFlag) { << 81 splineFlag = true;
81 theDensityFactor = new std::vector<G4doubl << 82 isInitialized = false;
82 theDensityIdx = new std::vector<G4int>; << 83 if(isMaster || !theFlag) {
83 theFlag = new std::vector<G4bool>; << 84 #ifdef G4MULTITHREADED
>> 85 G4MUTEXLOCK(<bMutex);
>> 86 if(isMaster || !theFlag) {
>> 87 #endif
>> 88 isMaster = true;
>> 89 theDensityFactor = new std::vector<G4double>;
>> 90 theDensityIdx = new std::vector<G4int>;
>> 91 theFlag = new std::vector<G4bool>;
>> 92 } else {
>> 93 isMaster = false;
>> 94 #ifdef G4MULTITHREADED
>> 95 }
>> 96 G4MUTEXUNLOCK(<bMutex);
>> 97 #endif
84 } 98 }
85 } 99 }
86 100
87 //....oooOO0OOooo........oooOO0OOooo........oo 101 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
88 102
89 G4LossTableBuilder::~G4LossTableBuilder() 103 G4LossTableBuilder::~G4LossTableBuilder()
90 { 104 {
91 if (isInitializer) { << 105 if(isMaster) {
92 delete theDensityFactor; 106 delete theDensityFactor;
93 delete theDensityIdx; 107 delete theDensityIdx;
94 delete theFlag; 108 delete theFlag;
95 theDensityFactor = nullptr; 109 theDensityFactor = nullptr;
96 theDensityIdx = nullptr; 110 theDensityIdx = nullptr;
97 theFlag = nullptr; 111 theFlag = nullptr;
98 } 112 }
99 } 113 }
100 114
101 //....oooOO0OOooo........oooOO0OOooo........oo 115 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
102 116
103 const std::vector<G4int>* G4LossTableBuilder:: << 117 const std::vector<G4int>* G4LossTableBuilder::GetCoupleIndexes() const
104 { 118 {
105 return theDensityIdx; 119 return theDensityIdx;
106 } 120 }
107 121
108 //....oooOO0OOooo........oooOO0OOooo........oo 122 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
109 123
110 const std::vector<G4double>* G4LossTableBuilde << 124 const std::vector<G4double>* G4LossTableBuilder::GetDensityFactors() const
111 { 125 {
112 return theDensityFactor; 126 return theDensityFactor;
113 } 127 }
114 128
115 //....oooOO0OOooo........oooOO0OOooo........oo 129 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
116 130
117 G4bool G4LossTableBuilder::GetFlag(std::size_t << 131 G4bool G4LossTableBuilder::GetFlag(size_t idx)
118 { 132 {
>> 133 if(theFlag->empty()) { InitialiseBaseMaterials(); }
119 return (idx < theFlag->size()) ? (*theFlag)[ 134 return (idx < theFlag->size()) ? (*theFlag)[idx] : false;
120 } 135 }
121 136
122 //....oooOO0OOooo........oooOO0OOooo........oo 137 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
123 138
124 G4bool G4LossTableBuilder::GetBaseMaterialFlag <<
125 { <<
126 return baseMatFlag; <<
127 } <<
128 <<
129 //....oooOO0OOooo........oooOO0OOooo........oo <<
130 <<
131 void 139 void
132 G4LossTableBuilder::BuildDEDXTable(G4PhysicsTa 140 G4LossTableBuilder::BuildDEDXTable(G4PhysicsTable* dedxTable,
133 const std:: 141 const std::vector<G4PhysicsTable*>& list)
134 { 142 {
135 InitialiseBaseMaterials(dedxTable); 143 InitialiseBaseMaterials(dedxTable);
136 std::size_t n_processes = list.size(); << 144 size_t n_processes = list.size();
>> 145 //G4cout << "Nproc= " << n_processes << " Ncoup= "
>> 146 //<< dedxTable->size() << G4endl;
137 if(1 >= n_processes) { return; } 147 if(1 >= n_processes) { return; }
138 148
139 std::size_t nCouples = dedxTable->size(); << 149 size_t nCouples = dedxTable->size();
140 //G4cout << "Nproc= " << n_processes << " nC <<
141 // << dedxTable->size() << G4endl; <<
142 if(0 >= nCouples) { return; } 150 if(0 >= nCouples) { return; }
143 151
144 for (std::size_t i=0; i<nCouples; ++i) { << 152 for (size_t i=0; i<nCouples; ++i) {
145 auto pv0 = static_cast<G4PhysicsLogVector* << 153 G4PhysicsLogVector* pv0 = static_cast<G4PhysicsLogVector*>((*(list[0]))[i]);
146 //if (0 == i) G4cout << i << ". pv0=" << p << 154 if(pv0) {
147 if(pv0 == nullptr) { continue; } << 155 size_t npoints = pv0->GetVectorLength();
148 std::size_t npoints = pv0->GetVectorLength << 156 G4PhysicsLogVector* pv = new G4PhysicsLogVector(*pv0);
149 auto pv = new G4PhysicsLogVector(*pv0); << 157 pv->SetSpline(splineFlag);
150 for (std::size_t j=0; j<npoints; ++j) { << 158 for (size_t j=0; j<npoints; ++j) {
151 G4double dedx = 0.0; << 159 G4double dedx = 0.0;
152 for (std::size_t k=0; k<n_processes; ++k << 160 for (size_t k=0; k<n_processes; ++k) {
153 const G4PhysicsVector* pv1 = (*(list[k]))[i] << 161 G4PhysicsVector* pv1 = (*(list[k]))[i];
154 //if (0 == i) G4cout << " " << k << ". p << 162 dedx += (*pv1)[j];
155 dedx += (*pv1)[j]; << 163 }
>> 164 pv->PutValue(j, dedx);
156 } 165 }
157 pv->PutValue(j, dedx); << 166 if(splineFlag) { pv->FillSecondDerivatives(); }
>> 167 G4PhysicsTableHelper::SetPhysicsVector(dedxTable, i, pv);
158 } 168 }
159 if(splineFlag) { pv->FillSecondDerivatives <<
160 G4PhysicsTableHelper::SetPhysicsVector(ded <<
161 } 169 }
162 //G4cout << "### G4LossTableBuilder::BuildDE <<
163 //G4cout << *dedxTable << G4endl; <<
164 } 170 }
165 171
166 //....oooOO0OOooo........oooOO0OOooo........oo 172 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
167 173
168 void G4LossTableBuilder::BuildRangeTable(const 174 void G4LossTableBuilder::BuildRangeTable(const G4PhysicsTable* dedxTable,
169 G4Phy << 175 G4PhysicsTable* rangeTable,
>> 176 G4bool useBM)
170 // Build range table from the energy loss tabl 177 // Build range table from the energy loss table
171 { 178 {
172 //G4cout << "### G4LossTableBuilder::BuildRa << 179 size_t nCouples = dedxTable->size();
173 //G4cout << *const_cast<G4PhysicsTable*>(ded <<
174 const std::size_t nCouples = dedxTable->size <<
175 if(0 >= nCouples) { return; } 180 if(0 >= nCouples) { return; }
176 181
177 const std::size_t n = 100; << 182 size_t n = 100;
178 const G4double del = 1.0/(G4double)n; << 183 G4double del = 1.0/(G4double)n;
179 184
180 for (std::size_t i=0; i<nCouples; ++i) { << 185 for (size_t i=0; i<nCouples; ++i) {
181 auto pv = static_cast<G4PhysicsLogVector*> << 186 G4PhysicsLogVector* pv = static_cast<G4PhysicsLogVector*>((*dedxTable)[i]);
182 if((pv == nullptr) || (isBaseMatActive && << 187 if((pv == nullptr) || (useBM && !(*theFlag)[i])) { continue; }
183 std::size_t npoints = pv->GetVectorLength( << 188 size_t npoints = pv->GetVectorLength();
184 std::size_t bin0 = 0; << 189 size_t bin0 = 0;
185 G4double elow = pv->Energy(0); 190 G4double elow = pv->Energy(0);
186 G4double ehigh = pv->Energy(npoints-1); 191 G4double ehigh = pv->Energy(npoints-1);
187 G4double dedx1 = (*pv)[0]; 192 G4double dedx1 = (*pv)[0];
188 193
>> 194 //G4cout << "i= " << i << "npoints= " << npoints << " dedx1= "
>> 195 //<< dedx1 << G4endl;
>> 196
189 // protection for specific cases dedx=0 197 // protection for specific cases dedx=0
190 if(dedx1 == 0.0) { 198 if(dedx1 == 0.0) {
191 for (std::size_t k=1; k<npoints; ++k) { << 199 for (size_t k=1; k<npoints; ++k) {
192 ++bin0; 200 ++bin0;
193 elow = pv->Energy(k); 201 elow = pv->Energy(k);
194 dedx1 = (*pv)[k]; 202 dedx1 = (*pv)[k];
195 if(dedx1 > 0.0) { break; } 203 if(dedx1 > 0.0) { break; }
196 } 204 }
197 npoints -= bin0; 205 npoints -= bin0;
198 } 206 }
>> 207 //G4cout<<"New Range vector" << G4endl;
>> 208 //G4cout<<"nbins= "<<npoints-1<<" elow= "<<elow<<" ehigh= "<<ehigh
>> 209 // <<" bin0= " << bin0 <<G4endl;
199 210
200 // initialisation of a new vector 211 // initialisation of a new vector
201 if(npoints < 3) { npoints = 3; } << 212 if(npoints < 2) { npoints = 2; }
202 213
203 delete (*rangeTable)[i]; 214 delete (*rangeTable)[i];
204 G4PhysicsLogVector* v; 215 G4PhysicsLogVector* v;
205 if(0 == bin0) { v = new G4PhysicsLogVector 216 if(0 == bin0) { v = new G4PhysicsLogVector(*pv); }
206 else { v = new G4PhysicsLogVector(elow, eh << 217 else { v = new G4PhysicsLogVector(elow, ehigh, npoints-1); }
>> 218
>> 219 // dedx is exact zero cannot build range table
>> 220 if(2 == npoints) {
>> 221 v->PutValue(0,1000.);
>> 222 v->PutValue(1,2000.);
>> 223 G4PhysicsTableHelper::SetPhysicsVector(rangeTable, i, v);
>> 224 return;
>> 225 }
>> 226 v->SetSpline(splineFlag);
207 227
208 // assumed dedx proportional to beta 228 // assumed dedx proportional to beta
209 G4double energy1 = v->Energy(0); 229 G4double energy1 = v->Energy(0);
210 G4double range = 2.*energy1/dedx1; 230 G4double range = 2.*energy1/dedx1;
211 /* << 231 //G4cout << "range0= " << range << G4endl;
212 G4cout << "New Range vector Npoints=" << v <<
213 << " coupleIdx=" << i << " spline=" << v- <<
214 << " Elow=" << v->GetMinEnergy() <<" Ehig <<
215 << " DEDX(Elow)=" << dedx1 << " R(Elow)=" <<
216 */ <<
217 v->PutValue(0,range); 232 v->PutValue(0,range);
218 233
219 for (std::size_t j=1; j<npoints; ++j) { << 234 for (size_t j=1; j<npoints; ++j) {
220 235
221 G4double energy2 = v->Energy(j); 236 G4double energy2 = v->Energy(j);
222 G4double de = (energy2 - energy1) * 237 G4double de = (energy2 - energy1) * del;
223 G4double energy = energy2 + de*0.5; 238 G4double energy = energy2 + de*0.5;
224 G4double sum = 0.0; 239 G4double sum = 0.0;
225 std::size_t idx = j - 1; << 240 //G4cout << "j= " << j << " e1= " << energy1 << " e2= " << energy2
226 for (std::size_t k=0; k<n; ++k) { << 241 // << " n= " << n << G4endl;
>> 242 for (size_t k=0; k<n; ++k) {
227 energy -= de; 243 energy -= de;
228 dedx1 = pv->Value(energy, idx); << 244 dedx1 = pv->Value(energy);
229 if(dedx1 > 0.0) { sum += de/dedx1; } 245 if(dedx1 > 0.0) { sum += de/dedx1; }
230 } 246 }
231 range += sum; 247 range += sum;
232 /* <<
233 if(energy < 10.) <<
234 G4cout << "j= " << j << " e1= " << energy1 < <<
235 << " n= " << n << " range=" << range< <<
236 */ <<
237 v->PutValue(j,range); 248 v->PutValue(j,range);
238 energy1 = energy2; 249 energy1 = energy2;
239 } 250 }
240 if(splineFlag) { v->FillSecondDerivatives( 251 if(splineFlag) { v->FillSecondDerivatives(); }
241 G4PhysicsTableHelper::SetPhysicsVector(ran 252 G4PhysicsTableHelper::SetPhysicsVector(rangeTable, i, v);
242 } 253 }
243 //G4cout << "### Range table" << G4endl; <<
244 //G4cout << *rangeTable << G4endl; <<
245 } 254 }
246 255
247 //....oooOO0OOooo........oooOO0OOooo........oo 256 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
248 257
249 void 258 void
250 G4LossTableBuilder::BuildInverseRangeTable(con 259 G4LossTableBuilder::BuildInverseRangeTable(const G4PhysicsTable* rangeTable,
251 G4P << 260 G4PhysicsTable* invRangeTable,
>> 261 G4bool useBM)
252 // Build inverse range table from the energy l 262 // Build inverse range table from the energy loss table
253 { 263 {
254 std::size_t nCouples = rangeTable->size(); << 264 size_t nCouples = rangeTable->size();
255 if(0 >= nCouples) { return; } 265 if(0 >= nCouples) { return; }
256 266
257 for (std::size_t i=0; i<nCouples; ++i) { << 267 for (size_t i=0; i<nCouples; ++i) {
258 G4PhysicsVector* pv = (*rangeTable)[i]; 268 G4PhysicsVector* pv = (*rangeTable)[i];
259 if((pv == nullptr) || (isBaseMatActive && << 269 if((pv == nullptr) || (useBM && !(*theFlag)[i])) { continue; }
260 std::size_t npoints = pv->GetVectorLength( << 270 size_t npoints = pv->GetVectorLength();
>> 271 G4double rlow = (*pv)[0];
>> 272 G4double rhigh = (*pv)[npoints-1];
261 273
262 delete (*invRangeTable)[i]; 274 delete (*invRangeTable)[i];
263 auto v = new G4PhysicsFreeVector(npoints, << 275 G4LPhysicsFreeVector* v = new G4LPhysicsFreeVector(npoints,rlow,rhigh);
>> 276 v->SetSpline(splineFlag);
264 277
265 for (std::size_t j=0; j<npoints; ++j) { << 278 for (size_t j=0; j<npoints; ++j) {
266 G4double e = pv->Energy(j); 279 G4double e = pv->Energy(j);
267 G4double r = (*pv)[j]; 280 G4double r = (*pv)[j];
268 v->PutValues(j,r,e); 281 v->PutValues(j,r,e);
269 } 282 }
270 if (splineFlag) { v->FillSecondDerivatives << 283 if(splineFlag) { v->FillSecondDerivatives(); }
271 v->EnableLogBinSearch(theParameters->Numbe <<
272 284
273 G4PhysicsTableHelper::SetPhysicsVector(inv 285 G4PhysicsTableHelper::SetPhysicsVector(invRangeTable, i, v);
274 } 286 }
275 //G4cout << "### Inverse range table" << G4e <<
276 //G4cout << *invRangeTable << G4endl; <<
277 } 287 }
278 288
279 //....oooOO0OOooo........oooOO0OOooo........oo 289 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
280 290
281 void G4LossTableBuilder::InitialiseBaseMateria 291 void G4LossTableBuilder::InitialiseBaseMaterials(const G4PhysicsTable* table)
282 { 292 {
283 if(!isInitializer) { return; } << 293 if(!isMaster) { return; }
284 const G4ProductionCutsTable* theCoupleTable= 294 const G4ProductionCutsTable* theCoupleTable=
285 G4ProductionCutsTable::GetProductionCutsTa 295 G4ProductionCutsTable::GetProductionCutsTable();
286 std::size_t nCouples = theCoupleTable->GetTa << 296 size_t nCouples = theCoupleTable->GetTableSize();
287 std::size_t nFlags = theFlag->size(); << 297 size_t nFlags = theFlag->size();
288 /* << 298 if(isInitialized && nFlags == nCouples) { return; }
289 G4cout << "### InitialiseBaseMaterials: nCou <<
290 << " nFlags=" << nFlags << " isInit:" << is <<
291 << " baseMat:" << baseMatFlag << G4endl; <<
292 */ <<
293 // define base material flag <<
294 if(isBaseMatActive && !baseMatFlag) { <<
295 for(G4int i=0; i<(G4int)nCouples; ++i) { <<
296 if(nullptr != theCoupleTable->GetMateria <<
297 baseMatFlag = true; <<
298 isInitialized = false; <<
299 break; <<
300 } <<
301 } <<
302 } <<
303 299
304 if(nFlags != nCouples) { isInitialized = fal <<
305 if(isInitialized) { return; } <<
306 <<
307 // reserve memory <<
308 theFlag->resize(nCouples, true); <<
309 theDensityFactor->resize(nCouples,1.0); <<
310 theDensityIdx->resize(nCouples, 0); <<
311 <<
312 // define default flag and index of used mat <<
313 for (G4int i=0; i<(G4int)nCouples; ++i) { <<
314 (*theFlag)[i] = (nullptr == table) ? true <<
315 (*theDensityIdx)[i] = i; <<
316 } <<
317 isInitialized = true; 300 isInitialized = true;
318 if (!baseMatFlag) { return; } << 301 if(0 == nFlags) {
319 << 302 theDensityFactor->reserve(nCouples);
>> 303 theDensityIdx->reserve(nCouples);
>> 304 theFlag->reserve(nCouples);
>> 305 }
>> 306 for(size_t i=0; i<nFlags; ++i) {
>> 307 (*theFlag)[i] = (table) ? table->GetFlag(i) : true;
>> 308 }
>> 309 for(size_t i=nFlags; i<nCouples; ++i) {
>> 310 G4bool yes = (table) ? table->GetFlag(i) : true;
>> 311 theDensityFactor->push_back(1.0);
>> 312 theDensityIdx->push_back(i);
>> 313 theFlag->push_back(yes);
>> 314 }
320 // use base materials 315 // use base materials
321 for (G4int i=0; i<(G4int)nCouples; ++i) { << 316 for(size_t i=0; i<nCouples; ++i) {
322 // base material is needed only for a coup 317 // base material is needed only for a couple which is not
323 // initialised and for which tables will b 318 // initialised and for which tables will be computed
324 auto couple = theCoupleTable->GetMaterialC 319 auto couple = theCoupleTable->GetMaterialCutsCouple(i);
325 auto pcuts = couple->GetProductionCuts(); 320 auto pcuts = couple->GetProductionCuts();
326 auto mat = couple->GetMaterial(); 321 auto mat = couple->GetMaterial();
327 auto bmat = mat->GetBaseMaterial(); 322 auto bmat = mat->GetBaseMaterial();
328 323
329 // base material exists - find it and chec 324 // base material exists - find it and check if it can be reused
330 if(nullptr != bmat) { << 325 if(bmat) {
331 for(G4int j=0; j<(G4int)nCouples; ++j) { << 326 for(size_t j=0; j<nCouples; ++j) {
332 if(j == i) { continue; } 327 if(j == i) { continue; }
333 auto bcouple = theCoupleTable->GetMaterialCu 328 auto bcouple = theCoupleTable->GetMaterialCutsCouple(j);
334 329
335 if(bcouple->GetMaterial() == bmat && 330 if(bcouple->GetMaterial() == bmat &&
336 bcouple->GetProductionCuts() == pcuts) { 331 bcouple->GetProductionCuts() == pcuts) {
337 332
338 // based couple exist in the same region 333 // based couple exist in the same region
339 (*theDensityFactor)[i] = mat->GetDensity() 334 (*theDensityFactor)[i] = mat->GetDensity()/bmat->GetDensity();
340 (*theDensityIdx)[i] = j; 335 (*theDensityIdx)[i] = j;
341 (*theFlag)[i] = false; 336 (*theFlag)[i] = false;
342 337
343 // ensure that there will no double initia 338 // ensure that there will no double initialisation
344 (*theDensityFactor)[j] = 1.0; 339 (*theDensityFactor)[j] = 1.0;
345 (*theDensityIdx)[j] = j; 340 (*theDensityIdx)[j] = j;
346 (*theFlag)[j] = true; 341 (*theFlag)[j] = true;
347 break; << 342 break;
348 } << 343 }
349 } 344 }
350 } 345 }
351 } 346 }
>> 347 /*
>> 348 for(size_t i=0; i<nCouples; ++i) {
>> 349 G4cout << "CoupleIdx= " << i << " Flag= " << theFlag[i]
>> 350 << " TableFlag= " << table->GetFlag(i) << " "
>> 351 << theCoupleTable->GetMaterialCutsCouple(i)->GetMaterial()->GetName()
>> 352 << G4endl;
>> 353 }
>> 354 */
352 } 355 }
353 356
354 //....oooOO0OOooo........oooOO0OOooo........oo 357 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
355 358
356 G4PhysicsTable* 359 G4PhysicsTable*
357 G4LossTableBuilder::BuildTableForModel(G4Physi 360 G4LossTableBuilder::BuildTableForModel(G4PhysicsTable* aTable,
358 G4VEmMo 361 G4VEmModel* model,
359 const G 362 const G4ParticleDefinition* part,
360 G4doubl 363 G4double emin, G4double emax,
361 G4bool 364 G4bool spline)
362 { 365 {
363 // check input 366 // check input
364 G4PhysicsTable* table = G4PhysicsTableHelper 367 G4PhysicsTable* table = G4PhysicsTableHelper::PreparePhysicsTable(aTable);
365 if (nullptr == table) { return table; } << 368 if(!table) { return table; }
366 if (aTable != nullptr && aTable != table) { << 369 if(emin >= emax) {
367 aTable->clearAndDestroy(); << 370 table->clearAndDestroy();
368 delete aTable; << 371 delete table;
>> 372 table = nullptr;
>> 373 return table;
369 } 374 }
370 <<
371 InitialiseBaseMaterials(table); 375 InitialiseBaseMaterials(table);
372 G4int nbins = theParameters->NumberOfBinsPer 376 G4int nbins = theParameters->NumberOfBinsPerDecade();
>> 377 G4bool useMB = model->UseBaseMaterials();
373 378
374 // Access to materials 379 // Access to materials
375 const G4ProductionCutsTable* theCoupleTable= 380 const G4ProductionCutsTable* theCoupleTable=
376 G4ProductionCutsTable::GetProductionCu 381 G4ProductionCutsTable::GetProductionCutsTable();
377 std::size_t numOfCouples = theCoupleTable->G << 382 size_t numOfCouples = theCoupleTable->GetTableSize();
378 /* << 383
379 G4cout << " G4LossTableBuilder::BuildTable <<
380 << " isMaster=" << isInitializer << " model <<
381 << " " << part->GetParticleName() << G4end <<
382 */ <<
383 G4PhysicsLogVector* aVector = nullptr; 384 G4PhysicsLogVector* aVector = nullptr;
384 385
385 for(G4int i=0; i<(G4int)numOfCouples; ++i) { << 386 for(size_t i=0; i<numOfCouples; ++i) {
386 //G4cout << i << ". " << (*theFlag)[i] << << 387 if ((useMB && GetFlag(i)) || (!useMB && table->GetFlag(i))) {
387 if (table->GetFlag(i)) { <<
388 388
389 // create physics vector and fill it 389 // create physics vector and fill it
390 auto couple = theCoupleTable->GetMateria 390 auto couple = theCoupleTable->GetMaterialCutsCouple(i);
391 delete (*table)[i]; 391 delete (*table)[i];
392 392
393 // if start from zero then change the sc 393 // if start from zero then change the scale
>> 394
394 const G4Material* mat = couple->GetMater 395 const G4Material* mat = couple->GetMaterial();
395 396
396 G4double tmin = std::max(emin, model->Mi << 397 G4double tmin = std::max(emin,model->MinPrimaryEnergy(mat,part));
397 if(0.0 >= tmin) { tmin = CLHEP::eV; } 398 if(0.0 >= tmin) { tmin = CLHEP::eV; }
398 G4int n = nbins; 399 G4int n = nbins;
399 400
400 if(tmin >= emax) { 401 if(tmin >= emax) {
401 aVector = nullptr; 402 aVector = nullptr;
402 } else { 403 } else {
403 n *= G4lrint(std::log10(emax/tmin)); << 404 n *= (G4int)(std::log10(emax/tmin) + 0.5);
404 n = std::max(n, 3); 405 n = std::max(n, 3);
405 aVector = new G4PhysicsLogVector(tmin, << 406 aVector = new G4PhysicsLogVector(tmin, emax, n);
406 } 407 }
407 408
408 if(nullptr != aVector) { << 409 if(aVector) {
>> 410 aVector->SetSpline(spline);
409 //G4cout << part->GetParticleName() << 411 //G4cout << part->GetParticleName() << " in " << mat->GetName()
410 // << " emin= " << tmin << " emax=" << e << 412 // << " tmin= " << tmin << G4endl;
411 for(G4int j=0; j<=n; ++j) { 413 for(G4int j=0; j<=n; ++j) {
412 G4double e = aVector->Energy(j); << 414 aVector->PutValue(j, model->Value(couple, part,
413 G4double y = model->Value(couple, part, e) << 415 aVector->Energy(j)));
414 //G4cout << " " << j << ") E=" << e < <<
415 aVector->PutValue(j, y); <<
416 } 416 }
417 if(spline) { aVector->FillSecondDeriva 417 if(spline) { aVector->FillSecondDerivatives(); }
418 } 418 }
419 G4PhysicsTableHelper::SetPhysicsVector(t 419 G4PhysicsTableHelper::SetPhysicsVector(table, i, aVector);
420 } 420 }
421 } 421 }
422 /* 422 /*
423 G4cout << "G4LossTableBuilder::BuildTableFor 423 G4cout << "G4LossTableBuilder::BuildTableForModel done for "
424 << part->GetParticleName() << " and " 424 << part->GetParticleName() << " and "<< model->GetName()
425 << " " << table << G4endl; 425 << " " << table << G4endl;
426 */ 426 */
427 //G4cout << *table << G4endl; <<
428 return table; 427 return table;
429 } 428 }
430 429
431 //....oooOO0OOooo........oooOO0OOooo........oo 430 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
>> 431
432 432