Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/processes/electromagnetic/lowenergy/src/G4eIonisationParameters.cc

Version: [ ReleaseNotes ] [ 1.0 ] [ 1.1 ] [ 2.0 ] [ 3.0 ] [ 3.1 ] [ 3.2 ] [ 4.0 ] [ 4.0.p1 ] [ 4.0.p2 ] [ 4.1 ] [ 4.1.p1 ] [ 5.0 ] [ 5.0.p1 ] [ 5.1 ] [ 5.1.p1 ] [ 5.2 ] [ 5.2.p1 ] [ 5.2.p2 ] [ 6.0 ] [ 6.0.p1 ] [ 6.1 ] [ 6.2 ] [ 6.2.p1 ] [ 6.2.p2 ] [ 7.0 ] [ 7.0.p1 ] [ 7.1 ] [ 7.1.p1 ] [ 8.0 ] [ 8.0.p1 ] [ 8.1 ] [ 8.1.p1 ] [ 8.1.p2 ] [ 8.2 ] [ 8.2.p1 ] [ 8.3 ] [ 8.3.p1 ] [ 8.3.p2 ] [ 9.0 ] [ 9.0.p1 ] [ 9.0.p2 ] [ 9.1 ] [ 9.1.p1 ] [ 9.1.p2 ] [ 9.1.p3 ] [ 9.2 ] [ 9.2.p1 ] [ 9.2.p2 ] [ 9.2.p3 ] [ 9.2.p4 ] [ 9.3 ] [ 9.3.p1 ] [ 9.3.p2 ] [ 9.4 ] [ 9.4.p1 ] [ 9.4.p2 ] [ 9.4.p3 ] [ 9.4.p4 ] [ 9.5 ] [ 9.5.p1 ] [ 9.5.p2 ] [ 9.6 ] [ 9.6.p1 ] [ 9.6.p2 ] [ 9.6.p3 ] [ 9.6.p4 ] [ 10.0 ] [ 10.0.p1 ] [ 10.0.p2 ] [ 10.0.p3 ] [ 10.0.p4 ] [ 10.1 ] [ 10.1.p1 ] [ 10.1.p2 ] [ 10.1.p3 ] [ 10.2 ] [ 10.2.p1 ] [ 10.2.p2 ] [ 10.2.p3 ] [ 10.3 ] [ 10.3.p1 ] [ 10.3.p2 ] [ 10.3.p3 ] [ 10.4 ] [ 10.4.p1 ] [ 10.4.p2 ] [ 10.4.p3 ] [ 10.5 ] [ 10.5.p1 ] [ 10.6 ] [ 10.6.p1 ] [ 10.6.p2 ] [ 10.6.p3 ] [ 10.7 ] [ 10.7.p1 ] [ 10.7.p2 ] [ 10.7.p3 ] [ 10.7.p4 ] [ 11.0 ] [ 11.0.p1 ] [ 11.0.p2 ] [ 11.0.p3, ] [ 11.0.p4 ] [ 11.1 ] [ 11.1.1 ] [ 11.1.2 ] [ 11.1.3 ] [ 11.2 ] [ 11.2.1 ] [ 11.2.2 ] [ 11.3.0 ]

Diff markup

Differences between /processes/electromagnetic/lowenergy/src/G4eIonisationParameters.cc (Version 11.3.0) and /processes/electromagnetic/lowenergy/src/G4eIonisationParameters.cc (Version 9.3.p1)


  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 // $Id: G4eIonisationParameters.cc,v 1.25 2009/06/10 13:32:36 mantero Exp $
                                                   >>  28 // GEANT4 tag $Name: geant4-09-03-patch-01 $
 27 //                                                 29 //
 28 // Author: Maria Grazia Pia (Maria.Grazia.Pia@     30 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
 29 //                                                 31 //
 30 // History:                                        32 // History:
 31 // -----------                                     33 // -----------
 32 // 31 Jul 2001   MGP        Created, with dumm     34 // 31 Jul 2001   MGP        Created, with dummy implementation
 33 // 12.09.01 V.Ivanchenko    Add param and inte     35 // 12.09.01 V.Ivanchenko    Add param and interpolation of parameters
 34 // 04.10.01 V.Ivanchenko    Add BindingEnergy      36 // 04.10.01 V.Ivanchenko    Add BindingEnergy method
 35 // 25.10.01 MGP             Many bug fixes, mo     37 // 25.10.01 MGP             Many bug fixes, mostly related to the
 36 //                          management of poin     38 //                          management of pointers
 37 // 29.11.01 V.Ivanchenko    New parametrisatio     39 // 29.11.01 V.Ivanchenko    New parametrisation + Excitation
 38 // 30.05.02 V.Ivanchenko    Format and names o     40 // 30.05.02 V.Ivanchenko    Format and names of the data files were
 39 //                          chenged to "ion-..     41 //                          chenged to "ion-..."
 40 // 17.02.04 V.Ivanchenko    Increase buffer si     42 // 17.02.04 V.Ivanchenko    Increase buffer size
 41 // 23.03.09 L.Pandola       Updated warning me     43 // 23.03.09 L.Pandola       Updated warning message
 42 // 03.12.10 V.Ivanchenko    Fixed memory leak  << 
 43 //                                                 44 //
 44 // -------------------------------------------     45 // -------------------------------------------------------------------
 45                                                    46 
 46 #include "G4eIonisationParameters.hh"              47 #include "G4eIonisationParameters.hh"
 47 #include "G4SystemOfUnits.hh"                  << 
 48 #include "G4VEMDataSet.hh"                         48 #include "G4VEMDataSet.hh"
 49 #include "G4ShellEMDataSet.hh"                     49 #include "G4ShellEMDataSet.hh"
 50 #include "G4EMDataSet.hh"                          50 #include "G4EMDataSet.hh"
 51 #include "G4CompositeEMDataSet.hh"                 51 #include "G4CompositeEMDataSet.hh"
 52 #include "G4LinInterpolation.hh"                   52 #include "G4LinInterpolation.hh"
 53 #include "G4LogLogInterpolation.hh"                53 #include "G4LogLogInterpolation.hh"
 54 #include "G4LinLogLogInterpolation.hh"             54 #include "G4LinLogLogInterpolation.hh"
 55 #include "G4SemiLogInterpolation.hh"               55 #include "G4SemiLogInterpolation.hh"
 56 #include "G4Material.hh"                           56 #include "G4Material.hh"
 57 #include "G4DataVector.hh"                         57 #include "G4DataVector.hh"
 58 #include <fstream>                                 58 #include <fstream>
 59 #include <sstream>                                 59 #include <sstream>
 60                                                    60 
 61 //....oooOO0OOooo........oooOO0OOooo........oo << 
 62                                                    61 
 63 G4eIonisationParameters:: G4eIonisationParamet <<  62 G4eIonisationParameters:: G4eIonisationParameters(G4int minZ, G4int maxZ)
                                                   >>  63   : zMin(minZ), zMax(maxZ),
                                                   >>  64   length(24)
 64 {                                                  65 {
 65   LoadData();                                      66   LoadData();
 66 }                                                  67 }
 67                                                    68 
 68 //....oooOO0OOooo........oooOO0OOooo........oo << 
 69                                                    69 
 70 G4eIonisationParameters::~G4eIonisationParamet     70 G4eIonisationParameters::~G4eIonisationParameters()
 71 {                                                  71 { 
 72   // Reset the map of data sets: remove the da     72   // Reset the map of data sets: remove the data sets from the map 
 73   for (auto& pos : param)                      <<  73   std::map<G4int,G4VEMDataSet*,std::less<G4int> >::iterator pos;
                                                   >>  74 
                                                   >>  75   for (pos = param.begin(); pos != param.end(); ++pos)
 74     {                                              76     {
 75       G4VEMDataSet* dataSet =  pos.second;     <<  77       G4VEMDataSet* dataSet = (*pos).second;
 76       delete dataSet;                              78       delete dataSet;
 77       dataSet = nullptr;                       << 
 78     }                                              79     }
 79   for (auto& pos : excit)                      <<  80 
 80     {                                          <<  81   for (pos = excit.begin(); pos != excit.end(); ++pos)
 81       G4VEMDataSet* dataSet =  pos.second;     <<  82     {
                                                   >>  83       G4VEMDataSet* dataSet = (*pos).second;
 82       delete dataSet;                              84       delete dataSet;
 83       dataSet = nullptr;                       << 
 84     }                                              85     }
                                                   >>  86 
 85   activeZ.clear();                                 87   activeZ.clear();
 86 }                                                  88 }
 87                                                    89 
 88 //....oooOO0OOooo........oooOO0OOooo........oo << 
 89                                                    90 
 90 G4double G4eIonisationParameters::Parameter(G4     91 G4double G4eIonisationParameters::Parameter(G4int Z, G4int shellIndex, 
 91                                                    92                                                      G4int parameterIndex, 
 92                                                    93                                                      G4double e) const
 93 {                                                  94 {
 94   G4double value = 0.;                             95   G4double value = 0.;
 95   G4int id = Z*100 + parameterIndex;               96   G4int id = Z*100 + parameterIndex;
                                                   >>  97   std::map<G4int,G4VEMDataSet*,std::less<G4int> >::const_iterator pos;
 96                                                    98 
 97   auto pos = param.find(id);                   <<  99   pos = param.find(id);
 98   if (pos!= param.end()) {                        100   if (pos!= param.end()) {
 99     G4VEMDataSet* dataSet = (*pos).second;        101     G4VEMDataSet* dataSet = (*pos).second;
100     G4int nShells = (G4int)dataSet->NumberOfCo << 102     G4int nShells = dataSet->NumberOfComponents();
101                                                   103 
102     if(shellIndex < nShells) {                    104     if(shellIndex < nShells) { 
103       const G4VEMDataSet* component = dataSet-    105       const G4VEMDataSet* component = dataSet->GetComponent(shellIndex);
104       const G4DataVector ener = component->Get    106       const G4DataVector ener = component->GetEnergies(0);
105       G4double ee = std::max(ener.front(),std:    107       G4double ee = std::max(ener.front(),std::min(ener.back(),e));
106       value = component->FindValue(ee);           108       value = component->FindValue(ee);
107     } else {                                      109     } else {
108       G4cout << "WARNING: G4IonisationParamete    110       G4cout << "WARNING: G4IonisationParameters::FindParameter "
109              << "has no parameters for shell=     111              << "has no parameters for shell= " << shellIndex 
110              << "; Z= " << Z                      112              << "; Z= " << Z
111              << G4endl;                           113              << G4endl;
112     }                                             114     }
113   } else {                                        115   } else {
114     G4cout << "WARNING: G4IonisationParameters    116     G4cout << "WARNING: G4IonisationParameters::Parameter "
115            << "did not find ID = "                117            << "did not find ID = "
116            << shellIndex << G4endl;               118            << shellIndex << G4endl;
117   }                                               119   }
118                                                   120 
119   return value;                                   121   return value;
120 }                                                 122 }
121                                                   123 
122 //....oooOO0OOooo........oooOO0OOooo........oo << 
123                                                << 
124 G4double G4eIonisationParameters::Excitation(G    124 G4double G4eIonisationParameters::Excitation(G4int Z, G4double e) const
125 {                                                 125 {
126   G4double value = 0.;                            126   G4double value = 0.;
127   auto pos = excit.find(Z);                    << 127   std::map<G4int,G4VEMDataSet*,std::less<G4int> >::const_iterator pos;
                                                   >> 128 
                                                   >> 129   pos = excit.find(Z);
128   if (pos!= excit.end()) {                        130   if (pos!= excit.end()) {
129     G4VEMDataSet* dataSet = (*pos).second;        131     G4VEMDataSet* dataSet = (*pos).second;
130                                                   132 
131     const G4DataVector ener = dataSet->GetEner    133     const G4DataVector ener = dataSet->GetEnergies(0);
132     G4double ee = std::max(ener.front(),std::m    134     G4double ee = std::max(ener.front(),std::min(ener.back(),e));
133     value = dataSet->FindValue(ee);               135     value = dataSet->FindValue(ee);
134   } else {                                        136   } else {
135     G4cout << "WARNING: G4IonisationParameters    137     G4cout << "WARNING: G4IonisationParameters::Excitation "
136            << "did not find ID = "                138            << "did not find ID = "
137            << Z << G4endl;                        139            << Z << G4endl;
138   }                                               140   }
139                                                   141 
140   return value;                                   142   return value;
141 }                                                 143 }
142                                                   144 
143 //....oooOO0OOooo........oooOO0OOooo........oo << 
144                                                   145 
145 void G4eIonisationParameters::LoadData()          146 void G4eIonisationParameters::LoadData()
146 {                                                 147 {
147   // ---------------------------------------      148   // ---------------------------------------
148   // Please document what are the parameters      149   // Please document what are the parameters 
149   // ---------------------------------------      150   // ---------------------------------------
150                                                   151 
151   // define active elements                       152   // define active elements
152                                                   153 
153   const G4MaterialTable* materialTable = G4Mat    154   const G4MaterialTable* materialTable = G4Material::GetMaterialTable();
154   if (materialTable == nullptr)                << 155   if (materialTable == 0)
155      G4Exception("G4eIonisationParameters::Loa << 156      G4Exception("G4eIonisationParameters: no MaterialTable found)");
156         "em1001",FatalException,"Unable to fin << 
157                                                   157 
158   std::size_t nMaterials = G4Material::GetNumb << 158   G4int nMaterials = G4Material::GetNumberOfMaterials();
159                                                   159   
160   for (std::size_t mLocal=0; mLocal<nMaterials << 160   for (G4int m=0; m<nMaterials; m++) {
161                                                   161 
162     const G4Material* material= (*materialTabl << 162     const G4Material* material= (*materialTable)[m];        
163     const G4ElementVector* elementVector = mat    163     const G4ElementVector* elementVector = material->GetElementVector();
164     const std::size_t nElements = material->Ge << 164     const size_t nElements = material->GetNumberOfElements();
165                                                   165       
166     for (std::size_t iEl=0; iEl<nElements; ++i << 166     for (size_t iEl=0; iEl<nElements; iEl++) {
167       G4double Z = (*elementVector)[iEl]->GetZ << 167       G4Element* element = (*elementVector)[iEl];
                                                   >> 168       G4double Z = element->GetZ();
168       if (!(activeZ.contains(Z))) {               169       if (!(activeZ.contains(Z))) {
169   activeZ.push_back(Z);                           170   activeZ.push_back(Z);
170       }                                           171       }
171     }                                             172     }
172   }                                               173   }
173                                                   174   
174   const char* path = G4FindDataDir("G4LEDATA") << 175   char* path = getenv("G4LEDATA");
175   if (!path)                                      176   if (!path)
176     {                                             177     { 
177       G4Exception("G4BremsstrahlungParameters: << 178       G4String excep("G4eIonisationParameters - G4LEDATA environment variable not set");
178         "em0006",FatalException,"G4LEDATA envi << 179       G4Exception(excep);
179       return;                                  << 
180     }                                             180     }
181                                                   181     
182   G4String pathString(path);                      182   G4String pathString(path);
183   G4String path2("/ioni/ion-sp-");                183   G4String path2("/ioni/ion-sp-");
184   pathString += path2;                            184   pathString += path2;  
185                                                   185   
186   G4double energy, sum;                           186   G4double energy, sum;
187                                                   187   
188   std::size_t nZ = activeZ.size();             << 188   size_t nZ = activeZ.size();
189                                                   189   
190   for (std::size_t i=0; i<nZ; ++i) {           << 190   for (size_t i=0; i<nZ; i++) {
191                                                   191     
192     G4int Z = (G4int)activeZ[i];                  192     G4int Z = (G4int)activeZ[i];
193     std::ostringstream ost;                       193     std::ostringstream ost;
194     ost << pathString << Z << ".dat";             194     ost << pathString << Z << ".dat";
195     G4String name(ost.str());                     195     G4String name(ost.str());
196                                                   196 
197     std::ifstream file(name);                     197     std::ifstream file(name);
198     std::filebuf* lsdp = file.rdbuf();            198     std::filebuf* lsdp = file.rdbuf();
199                                                   199 
200     if (! (lsdp->is_open()) ) {                   200     if (! (lsdp->is_open()) ) {
201       G4String excep = G4String("data file: ") << 201       G4String excep = G4String("G4IonisationParameters - data file: ")
202       + name + G4String(" not found");         << 202       + name + G4String(" not found. Please check and/or update G4LEDATA");
203       G4Exception("G4eIonisationParameters::Lo << 203       G4Exception(excep);
204         "em0003",FatalException,excep);        << 
205     }                                             204     }
206                                                   205 
207     // The file is organized into:                206     // The file is organized into:
208     // For each shell there are two lines:        207     // For each shell there are two lines:
209     //    1st line:                               208     //    1st line:
210     // 1st column is the energy of incident e-    209     // 1st column is the energy of incident e-,
211     // 2d  column is the parameter of screan t    210     // 2d  column is the parameter of screan term;
212     //    2d line:                                211     //    2d line:
213     // 3 energy (MeV) subdividing different ap    212     // 3 energy (MeV) subdividing different approximation area of the spectrum
214     // 20 point on the spectrum                   213     // 20 point on the spectrum
215     // The shell terminates with the pattern:     214     // The shell terminates with the pattern: -1   -1
216     // The file terminates with the pattern: -    215     // The file terminates with the pattern: -2   -2
217                                                   216 
218     std::vector<G4VEMDataSet*> p;                 217     std::vector<G4VEMDataSet*> p;
219     for (std::size_t k=0; k<length; ++k)       << 218     for (size_t k=0; k<length; k++) 
220       {                                           219       {
221   G4VDataSetAlgorithm* inter = new G4LinLogLog    220   G4VDataSetAlgorithm* inter = new G4LinLogLogInterpolation();
222   G4VEMDataSet* composite = new G4CompositeEMD    221   G4VEMDataSet* composite = new G4CompositeEMDataSet(inter,1.,1.);
223   p.push_back(composite);                         222   p.push_back(composite);
224       }                                           223       }
225                                                   224 
226     G4int shell = 0;                              225     G4int shell = 0;
227     std::vector<G4DataVector*> a;                 226     std::vector<G4DataVector*> a;
228     a.resize(length);                          << 227     for (size_t j=0; j<length; j++) 
                                                   >> 228       {
                                                   >> 229   G4DataVector* aa = new G4DataVector();
                                                   >> 230   a.push_back(aa);
                                                   >> 231       } 
229     G4DataVector e;                               232     G4DataVector e;
230     G4bool isReady = false;                    << 233     e.clear();
231     do {                                          234     do {
232       file >> energy >> sum;                      235       file >> energy >> sum;
233       //Check if energy is valid               << 
234       if (energy < -2)                         << 
235   {                                            << 
236     G4String excep("invalid data file");       << 
237           G4Exception("G4eIonisationParameters << 
238         "em0005",FatalException,excep);        << 
239     return;                                    << 
240   }                                            << 
241                                                << 
242       if (energy == -2) break;                    236       if (energy == -2) break;
243                                                   237 
244       if (energy >  -1) {                         238       if (energy >  -1) {
245   // new energy                                << 
246   if(!isReady) {                               << 
247     isReady = true;                            << 
248     e.clear();                                 << 
249     for (std::size_t j=0; j<length; ++j) {     << 
250       a[j] = new G4DataVector();               << 
251     }                                          << 
252   }                                            << 
253         e.push_back(energy);                      239         e.push_back(energy);
254         a[0]->push_back(sum);                     240         a[0]->push_back(sum);
255         for (std::size_t j=1; j<length; ++j) { << 241         for (size_t j=0; j<length-1; j++) {
256     G4double qRead;                               242     G4double qRead;
257     file >> qRead;                                243     file >> qRead;
258     a[j]->push_back(qRead);                    << 244     a[j + 1]->push_back(qRead);
259   }                                               245   }    
260                                                   246 
261       } else {                                    247       } else {
262                                                   248 
263         // End of set for a shell, fill the ma    249         // End of set for a shell, fill the map
264   for (std::size_t k=0; k<length; ++k) {       << 250   for (size_t k=0; k<length; k++) {
265                                                   251 
266           G4VDataSetAlgorithm* interp;            252           G4VDataSetAlgorithm* interp;
267           if(0 == k) { interp  = new G4LinLogL << 253           if(0 == k) interp  = new G4LinLogLogInterpolation();
268           else       { interp  = new G4LogLogI << 254           else       interp  = new G4LogLogInterpolation();
269                                                   255 
270     G4DataVector* eVector = new G4DataVector;     256     G4DataVector* eVector = new G4DataVector;
271     std::size_t eSize = e.size();              << 257     size_t eSize = e.size();
272     for (std::size_t sLocal=0; sLocal<eSize; + << 258     for (size_t s=0; s<eSize; s++) {
273       eVector->push_back(e[sLocal]);           << 259          eVector->push_back(e[s]);
274     }                                             260     }
275     G4VEMDataSet* set = new G4EMDataSet(shell,    261     G4VEMDataSet* set = new G4EMDataSet(shell,eVector,a[k],interp,1.,1.);
276                                                   262 
277     p[k]->AddComponent(set);                      263     p[k]->AddComponent(set);
278   }                                               264   } 
279                                                   265     
280   // next shell                                << 266   // clear vectors
281         ++shell;                               << 267         for (size_t j2=0; j2<length; j2++) {
282         isReady = false;                       << 268     a[j2] = new G4DataVector();
                                                   >> 269   } 
                                                   >> 270         shell++;
                                                   >> 271         e.clear();
283       }                                           272       }
284     } while (energy > -2);                        273     } while (energy > -2);
285                                                   274     
286     file.close();                                 275     file.close();
287                                                   276 
288     for (G4int kk=0; kk<(G4int)length; ++kk)   << 277     for (size_t kk=0; kk<length; kk++) 
289       {                                           278       {
290         G4int id = Z*100 + kk;                 << 279   G4int id = Z*100 + kk;
291         param[id] = p[kk];                     << 280   param[id] = p[kk];
292       }                                           281       }
293   }                                               282   }
294                                                   283 
295   G4String pathString_a(path);                    284   G4String pathString_a(path);
296   G4String name_a = pathString_a + G4String("/    285   G4String name_a = pathString_a + G4String("/ioni/ion-ex-av.dat");  
297   std::ifstream file_a(name_a);                   286   std::ifstream file_a(name_a);
298   std::filebuf* lsdp_a = file_a.rdbuf();          287   std::filebuf* lsdp_a = file_a.rdbuf();
299   G4String pathString_b(path);                    288   G4String pathString_b(path);
300   G4String name_b = pathString_b + G4String("/    289   G4String name_b = pathString_b + G4String("/ioni/ion-ex-sig.dat");  
301   std::ifstream file_b(name_b);                   290   std::ifstream file_b(name_b);
302   std::filebuf* lsdp_b = file_b.rdbuf();          291   std::filebuf* lsdp_b = file_b.rdbuf();
303                                                   292   
304   if (! (lsdp_a->is_open()) ) {                   293   if (! (lsdp_a->is_open()) ) {
305      G4String excep = G4String("cannot open fi << 294      G4String excep = G4String("G4eIonisationParameters: cannot open file ")
306                     + name_a;                     295                     + name_a;
307      G4Exception("G4eIonisationParameters::Loa << 296      G4Exception(excep);
308         "em0003",FatalException,excep);        << 
309   }                                               297   }  
310   if (! (lsdp_b->is_open()) ) {                   298   if (! (lsdp_b->is_open()) ) {
311      G4String excep = G4String("cannot open fi << 299      G4String excep = G4String("G4eIonisationParameters: cannot open file ")
312                     + name_b;                     300                     + name_b;
313      G4Exception("G4eIonisationParameters::Loa << 301      G4Exception(excep);
314         "em0003",FatalException,excep);        << 
315   }                                               302   }  
316                                                   303 
317   // The file is organized into two columns:      304   // The file is organized into two columns:
318   // 1st column is the energy                     305   // 1st column is the energy
319   // 2nd column is the corresponding value        306   // 2nd column is the corresponding value
320   // The file terminates with the pattern: -1     307   // The file terminates with the pattern: -1   -1
321   //                                       -2     308   //                                       -2   -2
322                                                   309 
323   G4double ener, ener1, sig, sig1;                310   G4double ener, ener1, sig, sig1;
324   G4int z    = 0;                                 311   G4int z    = 0;
325                                                   312 
326   G4DataVector e;                                 313   G4DataVector e;
327   e.clear();                                      314   e.clear();
328   G4DataVector d;                                 315   G4DataVector d;
329   d.clear();                                      316   d.clear();
330                                                   317 
331   do {                                            318   do {
332     file_a >> ener >> sig;                        319     file_a >> ener >> sig;
333     file_b >> ener1 >> sig1;                      320     file_b >> ener1 >> sig1;
334                                                   321     
335     if(ener != ener1) {                           322     if(ener != ener1) {
336       G4cout << "G4eIonisationParameters: prob    323       G4cout << "G4eIonisationParameters: problem in excitation data "
337              << "ener= " << ener                  324              << "ener= " << ener
338              << " ener1= " << ener1               325              << " ener1= " << ener1
339              << G4endl;                           326              << G4endl;
340     }                                             327     }
341                                                   328 
342     // End of file                                329     // End of file
343     if (ener == -2) {                             330     if (ener == -2) {
344       break;                                      331       break;
345                                                   332 
346       // End of next element                      333       // End of next element
347     } else if (ener == -1) {                      334     } else if (ener == -1) {
348                                                   335 
349       z++;                                        336       z++;
350       G4double Z = (G4double)z;                   337       G4double Z = (G4double)z;
351                                                   338     
352   // fill map if Z is used                        339   // fill map if Z is used
353       if (activeZ.contains(Z)) {                  340       if (activeZ.contains(Z)) {
354                                                   341 
355   G4VDataSetAlgorithm* inter  = new G4LinInter    342   G4VDataSetAlgorithm* inter  = new G4LinInterpolation();
356   G4DataVector* eVector = new G4DataVector;       343   G4DataVector* eVector = new G4DataVector;
357   G4DataVector* dVector = new G4DataVector;       344   G4DataVector* dVector = new G4DataVector;
358   std::size_t eSize = e.size();                << 345   size_t eSize = e.size();
359   for (std::size_t sLocal2=0; sLocal2<eSize; + << 346   for (size_t s=0; s<eSize; s++) {
360            eVector->push_back(e[sLocal2]);     << 347            eVector->push_back(e[s]);
361            dVector->push_back(d[sLocal2]);     << 348            dVector->push_back(d[s]);
362   }                                               349   }
363   G4VEMDataSet* set = new G4EMDataSet(z,eVecto    350   G4VEMDataSet* set = new G4EMDataSet(z,eVector,dVector,inter,1.,1.);
364       excit[z] = set;                             351       excit[z] = set; 
365       }                                           352       }
366       e.clear();                                  353       e.clear();
367       d.clear();                                  354       d.clear();
368                                                   355   
369     } else {                                      356     } else {
370                                                   357 
371       e.push_back(ener*MeV);                      358       e.push_back(ener*MeV);
372       d.push_back(sig1*sig*barn*MeV);             359       d.push_back(sig1*sig*barn*MeV);
373     }                                             360     }
374   } while (ener != -2);                           361   } while (ener != -2);
375                                                   362   
376   file_a.close();                                 363   file_a.close();
377                                                   364 
378 }                                                 365 }
379                                                   366 
380 //....oooOO0OOooo........oooOO0OOooo........oo << 
381                                                   367 
382 void G4eIonisationParameters::PrintData() cons    368 void G4eIonisationParameters::PrintData() const
383 {                                                 369 {
384   G4cout << G4endl;                               370   G4cout << G4endl;
385   G4cout << "===== G4eIonisationParameters ===    371   G4cout << "===== G4eIonisationParameters =====" << G4endl;
386   G4cout << G4endl;                               372   G4cout << G4endl;
387                                                   373 
388   std::size_t nZ = activeZ.size();             << 374   size_t nZ = activeZ.size();
389   std::map<G4int,G4VEMDataSet*,std::less<G4int    375   std::map<G4int,G4VEMDataSet*,std::less<G4int> >::const_iterator pos;
390                                                   376 
391   for (std::size_t i=0; i<nZ; i++) {           << 377   for (size_t i=0; i<nZ; i++) {
392     G4int Z = (G4int)activeZ[i];                  378     G4int Z = (G4int)activeZ[i];      
393                                                   379 
394     for (G4int j=0; j<(G4int)length; ++j) {    << 380     for (size_t j=0; j<length; j++) {
395                                                   381     
396       G4int index = Z*100 + j;                    382       G4int index = Z*100 + j;
397                                                   383 
398       pos = param.find(index);                    384       pos = param.find(index);
399       if (pos!= param.cend()) {                << 385       if (pos!= param.end()) {
400         G4VEMDataSet* dataSet = (*pos).second;    386         G4VEMDataSet* dataSet = (*pos).second;
401         std::size_t nShells = dataSet->NumberO << 387         size_t nShells = dataSet->NumberOfComponents();
402                                                   388 
403         for (G4int k=0; k<(G4int)nShells; ++k) << 389         for (size_t k=0; k<nShells; k++) {
404                                                   390 
405           G4cout << "===== Z= " << Z << " shel    391           G4cout << "===== Z= " << Z << " shell= " << k 
406                  << " parameter[" << j << "]      392                  << " parameter[" << j << "]  =====" 
407                  << G4endl;                       393                  << G4endl;
408           const G4VEMDataSet* comp = dataSet->    394           const G4VEMDataSet* comp = dataSet->GetComponent(k);
409           comp->PrintData();                      395           comp->PrintData();
410   }                                               396   }
411       }                                           397       }
412     }                                             398     }
413   }                                               399   }
414   G4cout << "=================================    400   G4cout << "====================================" << G4endl;
415 }                                                 401 }
416                                                   402 
417                                                   403 
418                                                   404