Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/processes/electromagnetic/lowenergy/src/G4ShellEMDataSet.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/G4ShellEMDataSet.cc (Version 11.3.0) and /processes/electromagnetic/lowenergy/src/G4ShellEMDataSet.cc (Version 10.7)


  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 // Author: Maria Grazia Pia (Maria.Grazia.Pia@     28 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
 29 //                                                 29 //
 30 // History:                                        30 // History:
 31 // -----------                                     31 // -----------
 32 //  1 Aug 2001   MGP         Created               32 //  1 Aug 2001   MGP         Created
 33 //                                                 33 //
 34 //  09.10.01   V.Ivanchenko  Add case z=0          34 //  09.10.01   V.Ivanchenko  Add case z=0
 35 //                                                 35 //
 36 //  9 Mar 2008   MGP         Cleaned up unread     36 //  9 Mar 2008   MGP         Cleaned up unreadable code modified by former developer
 37 //                           (Further clean-up     37 //                           (Further clean-up needed)
 38 //                                                 38 //
 39 //  15 Jul 2009   Nicolas A. Karakatsanis          39 //  15 Jul 2009   Nicolas A. Karakatsanis
 40 //                                                 40 //
 41 //                           - LoadNonLogData      41 //                           - LoadNonLogData method was created to load only the non-logarithmic data from G4EMLOW
 42 //                             dataset. It is      42 //                             dataset. It is essentially performing the data loading operations as in the past.
 43 //                                                 43 //
 44 //                           - LoadData method     44 //                           - LoadData method was revised in order to calculate the logarithmic values of the data
 45 //                             It retrieves th     45 //                             It retrieves the data values from the G4EMLOW data files but, then, calculates the
 46 //                             respective log      46 //                             respective log values and loads them to seperate data structures. 
 47 //                                                 47 //
 48 //                           - SetLogEnergiesD     48 //                           - SetLogEnergiesData method was cretaed to set logarithmic values to G4 data vectors.
 49 //                             The EM data set     49 //                             The EM data sets, initialized this way, contain both non-log and log values.
 50 //                             These initializ     50 //                             These initialized data sets can enhance the computing performance of data interpolation
 51 //                             operations          51 //                             operations
 52 //                                                 52 // 
 53 //                                                 53 //
 54 // -------------------------------------------     54 // -------------------------------------------------------------------
 55                                                    55 
 56 #include "G4ShellEMDataSet.hh"                     56 #include "G4ShellEMDataSet.hh"
 57 #include "G4EMDataSet.hh"                          57 #include "G4EMDataSet.hh"
 58 #include "G4VDataSetAlgorithm.hh"                  58 #include "G4VDataSetAlgorithm.hh"
 59 #include <fstream>                                 59 #include <fstream>
 60 #include <sstream>                                 60 #include <sstream>
 61                                                    61 
 62 //....oooOO0OOooo........oooOO0OOooo........oo <<  62 
 63 G4ShellEMDataSet::G4ShellEMDataSet(G4int zeta,     63 G4ShellEMDataSet::G4ShellEMDataSet(G4int zeta, G4VDataSetAlgorithm* algo, 
 64            G4double eUnit,                         64            G4double eUnit, 
 65            G4double dataUnit)                      65            G4double dataUnit)
 66   :                                            <<  66   :
                                                   >>  67   z(zeta),
 67   algorithm(algo),                                 68   algorithm(algo),
 68   unitEnergies(eUnit),                             69   unitEnergies(eUnit),
 69   unitData(dataUnit),                          <<  70   unitData(dataUnit)
 70   z(zeta)                                      << 
 71 {                                                  71 {
 72   if (algorithm == nullptr)                    <<  72   if (algorithm == 0) G4Exception("G4ShellEMDataSet::G4ShellEMDataSet()","em0007",FatalErrorInArgument, "Interpolation == 0");
 73     G4Exception("G4ShellEMDataSet::G4ShellEMDa << 
 74     FatalErrorInArgument, "Interpolation == 0" << 
 75 }                                                  73 }
 76                                                    74 
 77 //....oooOO0OOooo........oooOO0OOooo........oo <<  75 
 78 G4ShellEMDataSet::~G4ShellEMDataSet()              76 G4ShellEMDataSet::~G4ShellEMDataSet()
 79 {                                                  77 {
 80   CleanUpComponents();                             78   CleanUpComponents();
 81   if (algorithm) delete algorithm;                 79   if (algorithm) delete algorithm;
 82 }                                                  80 }
 83                                                    81 
 84 //....oooOO0OOooo........oooOO0OOooo........oo <<  82 
 85 G4double G4ShellEMDataSet::FindValue(G4double      83 G4double G4ShellEMDataSet::FindValue(G4double energy, G4int /* componentId */) const
 86 {                                                  84 {
 87   // Returns the sum over the shells correspon     85   // Returns the sum over the shells corresponding to e
 88   G4double value = 0.;                             86   G4double value = 0.;
 89                                                    87 
 90   std::vector<G4VEMDataSet *>::const_iterator      88   std::vector<G4VEMDataSet *>::const_iterator i(components.begin());
 91   std::vector<G4VEMDataSet *>::const_iterator      89   std::vector<G4VEMDataSet *>::const_iterator end(components.end());
 92                                                    90 
 93   while (i != end)                                 91   while (i != end)
 94     {                                              92     {
 95       value += (*i)->FindValue(energy);            93       value += (*i)->FindValue(energy);
 96       i++;                                         94       i++;
 97     }                                              95     }
 98                                                    96 
 99   return value;                                    97   return value;
100 }                                                  98 }
101                                                    99 
102 //....oooOO0OOooo........oooOO0OOooo........oo << 
103                                                   100 
104 void G4ShellEMDataSet::PrintData() const       << 101 void G4ShellEMDataSet::PrintData(void) const
105 {                                                 102 {
106   const G4int n = (G4int)NumberOfComponents(); << 103   const size_t n = NumberOfComponents();
107                                                   104 
108   G4cout << "The data set has " << n << " comp    105   G4cout << "The data set has " << n << " components" << G4endl;
109   G4cout << G4endl;                               106   G4cout << G4endl;
110                                                   107  
111   G4int i = 0;                                 << 108   size_t i = 0;
112                                                   109  
113   while (i < n)                                   110   while (i < n)
114     {                                             111     {
115       G4cout << "--- Component " << i << " ---    112       G4cout << "--- Component " << i << " ---" << G4endl;
116       GetComponent(i)->PrintData();               113       GetComponent(i)->PrintData();
117       ++i;                                     << 114       i++;
118     }                                             115     }
119 }                                                 116 }
120                                                   117 
121 //....oooOO0OOooo........oooOO0OOooo........oo << 
122                                                   118 
123 void G4ShellEMDataSet::SetEnergiesData(G4DataV    119 void G4ShellEMDataSet::SetEnergiesData(G4DataVector* energies, 
124                G4DataVector* data,                120                G4DataVector* data, 
125                G4int componentId)                 121                G4int componentId)
126 {                                                 122 {
127   G4VEMDataSet* component = components[compone << 123   G4VEMDataSet* component = components[componentId];
                                                   >> 124  
128   if (component)                                  125   if (component)
129     {                                             126     {
130       component->SetEnergiesData(energies, dat    127       component->SetEnergiesData(energies, data, 0);
131       return;                                     128       return;
132     }                                             129     }
133                                                   130 
134   G4String msg = "component ";                 << 131   G4String msg = "component " + (G4String)componentId + " not found";
135   msg += static_cast<char>(componentId);       << 
136   msg += " not found";                         << 
137                                                   132  
138   G4Exception("G4ShellEMDataSet::SetEnergiesDa    133   G4Exception("G4ShellEMDataSet::SetEnergiesData()","em0008", FatalErrorInArgument ,msg);
139 }                                                 134 }
140                                                   135 
141 //....oooOO0OOooo........oooOO0OOooo........oo << 
142                                                   136 
143 void G4ShellEMDataSet::SetLogEnergiesData(G4Da    137 void G4ShellEMDataSet::SetLogEnergiesData(G4DataVector* energies,
144                                           G4Da    138                                           G4DataVector* data,
145                                           G4Da    139                                           G4DataVector* log_energies,
146                                           G4Da    140                                           G4DataVector* log_data,
147                                           G4in    141                                           G4int componentId)
148 {                                                 142 {
149   G4VEMDataSet* component = components[compone << 143   G4VEMDataSet* component = components[componentId];
                                                   >> 144  
150   if (component)                                  145   if (component)
151     {                                             146     {
152       component->SetLogEnergiesData(energies,     147       component->SetLogEnergiesData(energies, data, log_energies, log_data, 0);
153       return;                                     148       return;
154     }                                             149     }
155                                                   150 
156   G4String msg = "component ";                 << 151   G4String msg = "component " + (G4String)componentId + " not found";
157   msg += static_cast<char>(componentId);       << 152  
158   msg += " not found";                         << 153   G4Exception("G4ShellEMDataSet::SetLogEnergiesData()","em0008", FatalErrorInArgument ,msg);
159   G4Exception("G4ShellEMDataSet::SetLogEnergie << 154 
160         FatalErrorInArgument ,msg);            << 
161 }                                                 155 }
162                                                   156 
163 //....oooOO0OOooo........oooOO0OOooo........oo << 157 
164                                                   158 
165 G4bool G4ShellEMDataSet::LoadData(const G4Stri    159 G4bool G4ShellEMDataSet::LoadData(const G4String& file)
166 {                                                 160 {
167   CleanUpComponents();                            161   CleanUpComponents();
168                                                   162 
169   G4String fullFileName = FullFileName(file);     163   G4String fullFileName = FullFileName(file);
170   std::ifstream in(fullFileName);                 164   std::ifstream in(fullFileName);
171                                                   165 
172   if (!in.is_open())                              166   if (!in.is_open())
173     {                                             167     {
174       G4String message("Data file \"");           168       G4String message("Data file \"");
175       message += fullFileName;                    169       message += fullFileName;
176       message += "\" not found";                  170       message += "\" not found";
177       G4Exception("G4ShellEMDataSet::LoadData(    171       G4Exception("G4ShellEMDataSet::LoadData()", "em0003",FatalException, message);
178       return 0;                                   172       return 0;
179     }                                             173     }
180                                                << 174 
181   G4DataVector* orig_shell_energies = 0;          175   G4DataVector* orig_shell_energies = 0;
182   G4DataVector* orig_shell_data = 0;              176   G4DataVector* orig_shell_data = 0;
183   G4DataVector* log_shell_energies = 0;           177   G4DataVector* log_shell_energies = 0;
184   G4DataVector* log_shell_data = 0;               178   G4DataVector* log_shell_data = 0;
185                                                   179 
186   G4double a = 0.;                                180   G4double a = 0.;
187   G4int shellIndex = 0;                           181   G4int shellIndex = 0;
188   G4int k = 0;                                    182   G4int k = 0;
189   G4int nColumns = 2;                             183   G4int nColumns = 2;
190                                                   184 
191   do                                              185   do
192     {                                             186     {
193       in >> a;                                    187       in >> a;
194                                                   188 
195       if (a==0.) a=1e-300;                        189       if (a==0.) a=1e-300;
196                                                   190 
197       // The file is organized into four colum    191       // The file is organized into four columns:
198       // 1st column contains the values of ene    192       // 1st column contains the values of energy
199       // 2nd column contains the corresponding    193       // 2nd column contains the corresponding data value
200       // The file terminates with the pattern:    194       // The file terminates with the pattern: -1   -1
201       //                                          195       //                                       -2   -2
202       //                                          196       //
203       if (a == -1)                                197       if (a == -1)
204   {                                               198   {
205     if ((k%nColumns == 0) && (orig_shell_energ    199     if ((k%nColumns == 0) && (orig_shell_energies != 0) )
206       {                                           200       {
207        AddComponent(new G4EMDataSet(shellIndex << 201        AddComponent(new G4EMDataSet(shellIndex, orig_shell_energies, orig_shell_data, log_shell_energies, log_shell_data, algorithm->Clone(), unitEnergies, unitData));
208             orig_shell_data, log_shell_energie << 
209             log_shell_data, algorithm->Clone() << 
210             unitEnergies, unitData));          << 
211         orig_shell_energies = 0;                  202         orig_shell_energies = 0;
212         orig_shell_data = 0;                      203         orig_shell_data = 0;
213               log_shell_energies = 0;             204               log_shell_energies = 0;
214               log_shell_data = 0;                 205               log_shell_data = 0;
215       }                                           206       }
216   }                                               207   }
217       else if (a != -2)                           208       else if (a != -2)
218   {                                               209   {
219     if (orig_shell_energies == 0)                 210     if (orig_shell_energies == 0)
220       {                                           211       {
221        orig_shell_energies = new G4DataVector;    212        orig_shell_energies = new G4DataVector;
222        orig_shell_data = new G4DataVector;        213        orig_shell_data = new G4DataVector;
223              log_shell_energies = new G4DataVe    214              log_shell_energies = new G4DataVector;
224              log_shell_data = new G4DataVector    215              log_shell_data = new G4DataVector;
225       }                                           216       }
226     if (k%nColumns == 0)                          217     if (k%nColumns == 0)
227             {                                     218             {
228        orig_shell_energies->push_back(a*unitEn    219        orig_shell_energies->push_back(a*unitEnergies);
229        log_shell_energies->push_back(std::log1    220        log_shell_energies->push_back(std::log10(a) + std::log10(unitEnergies));
230             }                                     221             }
231     else if (k%nColumns == 1)                     222     else if (k%nColumns == 1)
232             {                                     223             {
233        orig_shell_data->push_back(a*unitData);    224        orig_shell_data->push_back(a*unitData);
234              log_shell_data->push_back(std::lo    225              log_shell_data->push_back(std::log10(a) + std::log10(unitData));
235             }                                     226             }
236           k++;                                    227           k++;
237   }                                               228   }
238       else k = 1;                                 229       else k = 1;
239     }                                             230     }
240   while (a != -2);  // End of file                231   while (a != -2);  // End of file
                                                   >> 232  
241                                                   233 
242   delete orig_shell_energies;                     234   delete orig_shell_energies;
243   delete orig_shell_data;                         235   delete orig_shell_data;
244   delete log_shell_energies;                      236   delete log_shell_energies;
245   delete log_shell_data;                          237   delete log_shell_data;
246                                                   238 
247   return true;                                    239   return true;
248 }                                                 240 }
249                                                   241 
250 //....oooOO0OOooo........oooOO0OOooo........oo << 
251                                                   242 
252 G4bool G4ShellEMDataSet::LoadNonLogData(const     243 G4bool G4ShellEMDataSet::LoadNonLogData(const G4String& file)
253 {                                                 244 {
254   CleanUpComponents();                            245   CleanUpComponents();
255                                                   246 
256   G4String fullFileName = FullFileName(file);     247   G4String fullFileName = FullFileName(file);
257   std::ifstream in(fullFileName);                 248   std::ifstream in(fullFileName);
258                                                   249 
259   if (!in.is_open())                              250   if (!in.is_open())
260     {                                             251     {
261       G4String message("G4ShellEMDataSet::Load    252       G4String message("G4ShellEMDataSet::LoadData - data file \"");
262       message += fullFileName;                    253       message += fullFileName;
263       message += "\" not found";                  254       message += "\" not found";
264       G4Exception("G4ShellEMDataSet::LoadNonLo    255       G4Exception("G4ShellEMDataSet::LoadNonLogData()", "em0003",FatalException, message);
265       return 0;                                   256       return 0;
266     }                                             257     }
267                                                   258 
268   G4DataVector* orig_shell_energies = 0;          259   G4DataVector* orig_shell_energies = 0;
269   G4DataVector* orig_shell_data = 0;              260   G4DataVector* orig_shell_data = 0;
270                                                   261 
271   G4double a = 0.;                                262   G4double a = 0.;
272   G4int shellIndex = 0;                           263   G4int shellIndex = 0;
273   G4int k = 0;                                    264   G4int k = 0;
274   G4int nColumns = 2;                             265   G4int nColumns = 2;
275                                                   266 
276   do                                              267   do
277     {                                             268     {
278       in >> a;                                    269       in >> a;
                                                   >> 270 
279       // The file is organized into four colum    271       // The file is organized into four columns:
280       // 1st column contains the values of ene    272       // 1st column contains the values of energy
281       // 2nd column contains the corresponding    273       // 2nd column contains the corresponding data value
282       // The file terminates with the pattern:    274       // The file terminates with the pattern: -1   -1
283       //                                          275       //                                       -2   -2
284       //                                          276       //
285       if (a == -1)                                277       if (a == -1)
286   {                                               278   {
287     if ((k%nColumns == 0) && (orig_shell_energ    279     if ((k%nColumns == 0) && (orig_shell_energies != 0) )
288       {                                           280       {
289        AddComponent(new G4EMDataSet(shellIndex << 281        AddComponent(new G4EMDataSet(shellIndex, orig_shell_energies, orig_shell_data, algorithm->Clone(), unitEnergies, unitData));
290             orig_shell_data, algorithm->Clone( << 
291             unitEnergies, unitData));          << 
292         orig_shell_energies = 0;                  282         orig_shell_energies = 0;
293         orig_shell_data = 0;                      283         orig_shell_data = 0;
294       }                                           284       }
295   }                                               285   }
296       else if (a != -2)                           286       else if (a != -2)
297   {                                               287   {
298     if (orig_shell_energies == 0)                 288     if (orig_shell_energies == 0)
299       {                                           289       {
300        orig_shell_energies = new G4DataVector;    290        orig_shell_energies = new G4DataVector;
301        orig_shell_data = new G4DataVector;        291        orig_shell_data = new G4DataVector;
302       }                                           292       }
303     if (k%nColumns == 0)                          293     if (k%nColumns == 0)
304             {                                     294             {
305        orig_shell_energies->push_back(a*unitEn    295        orig_shell_energies->push_back(a*unitEnergies);
306             }                                     296             }
307     else if (k%nColumns == 1)                     297     else if (k%nColumns == 1)
308             {                                     298             {
309        orig_shell_data->push_back(a*unitData);    299        orig_shell_data->push_back(a*unitData);
310             }                                     300             }
311           k++;                                    301           k++;
312   }                                               302   }
313       else k = 1;                                 303       else k = 1;
314     }                                             304     }
315   while (a != -2);  // End of file                305   while (a != -2);  // End of file
316                                                   306 
317                                                   307 
318   delete orig_shell_energies;                     308   delete orig_shell_energies;
319   delete orig_shell_data;                         309   delete orig_shell_data;
320                                                   310 
321   return true;                                    311   return true;
322 }                                                 312 }
323                                                   313 
324 //....oooOO0OOooo........oooOO0OOooo........oo << 314 
325                                                   315 
326 G4bool G4ShellEMDataSet::SaveData(const G4Stri    316 G4bool G4ShellEMDataSet::SaveData(const G4String& file) const
327 {                                                 317 {
328   G4String fullFileName = FullFileName(file);     318   G4String fullFileName = FullFileName(file);
329   std::ofstream out(fullFileName);                319   std::ofstream out(fullFileName);
330                                                   320 
331   if (!out.is_open())                             321   if (!out.is_open())
332     {                                             322     {
333       G4String message("Cannot open \"");         323       G4String message("Cannot open \"");
334       message += fullFileName;                    324       message += fullFileName;
335       message += "\"";                            325       message += "\"";
336       G4Exception("G4EMDataSet::SaveData()","e    326       G4Exception("G4EMDataSet::SaveData()","em0005",FatalException,message);
337     }                                             327     }
338                                                   328  
339   const G4int n = (G4int)NumberOfComponents(); << 329   const size_t n = NumberOfComponents();
340   G4int k = 0;                                 << 330   size_t k = 0;
341                                                   331  
342   while (k < n)                                   332   while (k < n)
343     {                                             333     {
344       const G4VEMDataSet* component = GetCompo    334       const G4VEMDataSet* component = GetComponent(k);
345                                                   335   
346       if (component)                              336       if (component)
347   {                                               337   {
348     const G4DataVector& energies = component->    338     const G4DataVector& energies = component->GetEnergies(0);
349     const G4DataVector& data = component->GetD    339     const G4DataVector& data = component->GetData(0);
350                                                   340  
351     G4DataVector::const_iterator i = energies. << 341     G4DataVector::const_iterator i = energies.begin();
352     G4DataVector::const_iterator endI = energi << 342     G4DataVector::const_iterator endI = energies.end();
353     G4DataVector::const_iterator j = data.cbeg << 343     G4DataVector::const_iterator j = data.begin();
354                                                   344   
355     while (i != endI)                             345     while (i != endI)
356       {                                           346       {
357         out.precision(10);                        347         out.precision(10);
358         out.width(15);                            348         out.width(15);
359         out.setf(std::ofstream::left);            349         out.setf(std::ofstream::left);
360         out << ((*i)/unitEnergies) << ' ';        350         out << ((*i)/unitEnergies) << ' ';
361                                                   351 
362         out.precision(10);                        352         out.precision(10);
363         out.width(15);                            353         out.width(15);
364         out.setf(std::ofstream::left);            354         out.setf(std::ofstream::left);
365         out << ((*j)/unitData) << std::endl;      355         out << ((*j)/unitData) << std::endl;
366         i++;                                      356         i++;
367         j++;                                      357         j++;
368       }                                           358       }
369   }                                               359   }
370                                                   360   
371       out.precision(10);                          361       out.precision(10);
372       out.width(15);                              362       out.width(15);
373       out.setf(std::ofstream::left);              363       out.setf(std::ofstream::left);
374       out << -1.f << ' ';                         364       out << -1.f << ' ';
375                                                   365 
376       out.precision(10);                          366       out.precision(10);
377       out.width(15);                              367       out.width(15);
378       out.setf(std::ofstream::left);              368       out.setf(std::ofstream::left);
379       out << -1.f << std::endl;                   369       out << -1.f << std::endl;
380                                                   370   
381       k++;                                        371       k++;
382     }                                             372     }
383                                                   373  
384   out.precision(10);                              374   out.precision(10);
385   out.width(15);                                  375   out.width(15);
386   out.setf(std::ofstream::left);                  376   out.setf(std::ofstream::left);
387   out << -2.f << ' ';                             377   out << -2.f << ' ';
388                                                   378 
389   out.precision(10);                              379   out.precision(10);
390   out.width(15);                                  380   out.width(15);
391   out.setf(std::ofstream::left);                  381   out.setf(std::ofstream::left);
392   out << -2.f << std::endl;                       382   out << -2.f << std::endl;
393                                                   383 
394   return true;                                    384   return true;
395 }                                                 385 }
396                                                   386 
397 //....oooOO0OOooo........oooOO0OOooo........oo << 
398                                                   387 
399 void G4ShellEMDataSet::CleanUpComponents()     << 388 void G4ShellEMDataSet::CleanUpComponents(void)
400 {                                                 389 {
401   while (!components.empty())                     390   while (!components.empty())
402     {                                             391     {
403       if (components.back()) delete components    392       if (components.back()) delete components.back();
404       components.pop_back();                      393       components.pop_back();
405     }                                             394     }
406 }                                                 395 }
407                                                   396 
408 //....oooOO0OOooo........oooOO0OOooo........oo << 
409                                                   397 
410 G4String G4ShellEMDataSet::FullFileName(const     398 G4String G4ShellEMDataSet::FullFileName(const G4String& fileName) const
411 {                                                 399 {
412   const char* path = G4FindDataDir("G4LEDATA") << 400   char* path = std::getenv("G4LEDATA");
413                                                   401   
414   if (!path)                                      402   if (!path)
415   {                                               403   {
416     G4Exception("G4ShellEMDataSet::FullFileNam    404     G4Exception("G4ShellEMDataSet::FullFileName()","em0006",JustWarning,"Please set G4LEDATA");
417     return "";                                    405     return "";
418   }                                               406   }
419                                                   407   
420   std::ostringstream fullFileName;                408   std::ostringstream fullFileName;
421                                                   409  
422   fullFileName << path << '/' << fileName << z    410   fullFileName << path << '/' << fileName << z << ".dat";
423                                                   411                       
424   return G4String(fullFileName.str().c_str());    412   return G4String(fullFileName.str().c_str());
425 }                                                 413 }
426                                                   414