Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/extended/electromagnetic/TestEm7/src/PhysicsList.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 /examples/extended/electromagnetic/TestEm7/src/PhysicsList.cc (Version 11.3.0) and /examples/extended/electromagnetic/TestEm7/src/PhysicsList.cc (Version 10.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 /// \file electromagnetic/TestEm7/src/PhysicsL     26 /// \file electromagnetic/TestEm7/src/PhysicsList.cc
 27 /// \brief Implementation of the PhysicsList c     27 /// \brief Implementation of the PhysicsList class
 28 //                                                 28 //
                                                   >>  29 // $Id: PhysicsList.cc 101250 2016-11-10 08:54:02Z gcosmo $
 29 //                                                 30 //
 30 //....oooOO0OOooo........oooOO0OOooo........oo     31 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 31 //....oooOO0OOooo........oooOO0OOooo........oo     32 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 32                                                    33 
 33 #include "PhysicsList.hh"                          34 #include "PhysicsList.hh"
                                                   >>  35 #include "PhysicsListMessenger.hh"
 34                                                    36 
 35 #include "PhysListEmStandard.hh"                   37 #include "PhysListEmStandard.hh"
 36 #include "PhysListEmStandardNR.hh"                 38 #include "PhysListEmStandardNR.hh"
 37 #include "PhysicsListMessenger.hh"             << 
 38 #include "StepMax.hh"                          << 
 39                                                << 
 40 #include "G4BetheBlochIonGasModel.hh"          << 
 41 #include "G4BraggIonGasModel.hh"               << 
 42 #include "G4Decay.hh"                          << 
 43 #include "G4DecayPhysics.hh"                   << 
 44 #include "G4EmConfigurator.hh"                 << 
 45 #include "G4EmLivermorePhysics.hh"             << 
 46 #include "G4EmLowEPPhysics.hh"                 << 
 47 #include "G4EmPenelopePhysics.hh"              << 
 48 #include "G4EmStandardPhysics.hh"                  39 #include "G4EmStandardPhysics.hh"
 49 #include "G4EmStandardPhysicsGS.hh"            << 
 50 #include "G4EmStandardPhysicsSS.hh"            << 
 51 #include "G4EmStandardPhysicsWVI.hh"           << 
 52 #include "G4EmStandardPhysics_option1.hh"          40 #include "G4EmStandardPhysics_option1.hh"
 53 #include "G4EmStandardPhysics_option2.hh"          41 #include "G4EmStandardPhysics_option2.hh"
 54 #include "G4EmStandardPhysics_option3.hh"          42 #include "G4EmStandardPhysics_option3.hh"
 55 #include "G4EmStandardPhysics_option4.hh"          43 #include "G4EmStandardPhysics_option4.hh"
 56 #include "G4HadronDElasticPhysics.hh"          <<  44 #include "G4EmStandardPhysicsWVI.hh"
                                                   >>  45 #include "G4EmStandardPhysicsGS.hh"
                                                   >>  46 #include "G4EmStandardPhysicsSS.hh"
                                                   >>  47 
                                                   >>  48 #include "G4EmLivermorePhysics.hh"
                                                   >>  49 #include "G4EmPenelopePhysics.hh"
                                                   >>  50 #include "G4EmLowEPPhysics.hh"
                                                   >>  51 
                                                   >>  52 #include "G4DecayPhysics.hh"
                                                   >>  53 
 57 #include "G4HadronElasticPhysics.hh"               54 #include "G4HadronElasticPhysics.hh"
                                                   >>  55 #include "G4HadronDElasticPhysics.hh"
 58 #include "G4HadronHElasticPhysics.hh"              56 #include "G4HadronHElasticPhysics.hh"
 59 #include "G4HadronInelasticQBBC.hh"                57 #include "G4HadronInelasticQBBC.hh"
 60 #include "G4IonFluctuations.hh"                << 
 61 #include "G4IonParametrisedLossModel.hh"       << 
 62 #include "G4IonPhysics.hh"                         58 #include "G4IonPhysics.hh"
                                                   >>  59 
 63 #include "G4LossTableManager.hh"                   60 #include "G4LossTableManager.hh"
 64 #include "G4PhysicalConstants.hh"              <<  61 #include "G4EmConfigurator.hh"
 65 #include "G4ProcessManager.hh"                 << 
 66 #include "G4SystemOfUnits.hh"                  << 
 67 #include "G4UnitsTable.hh"                         62 #include "G4UnitsTable.hh"
                                                   >>  63 
                                                   >>  64 #include "G4ProcessManager.hh"
                                                   >>  65 #include "G4Decay.hh"
                                                   >>  66 
                                                   >>  67 #include "StepMax.hh"
                                                   >>  68 
                                                   >>  69 #include "G4IonFluctuations.hh"
                                                   >>  70 #include "G4IonParametrisedLossModel.hh"
 68 #include "G4UniversalFluctuation.hh"               71 #include "G4UniversalFluctuation.hh"
 69                                                    72 
                                                   >>  73 #include "G4BraggIonGasModel.hh"
                                                   >>  74 #include "G4BetheBlochIonGasModel.hh"
                                                   >>  75 
                                                   >>  76 #include "G4PhysicalConstants.hh"
                                                   >>  77 #include "G4SystemOfUnits.hh"
                                                   >>  78 
 70 //....oooOO0OOooo........oooOO0OOooo........oo     79 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 71                                                    80 
 72 PhysicsList::PhysicsList() : G4VModularPhysics <<  81 PhysicsList::PhysicsList() : G4VModularPhysicsList(),
                                                   >>  82   fStepMaxProcess(nullptr)
 73 {                                                  83 {
 74   fHelIsRegisted = false;                      <<  84   fHelIsRegisted  = false;
 75   fBicIsRegisted = false;                      <<  85   fBicIsRegisted  = false;
 76   fBiciIsRegisted = false;                         86   fBiciIsRegisted = false;
 77                                                    87 
 78   // protected member of the base class            88   // protected member of the base class
 79   verboseLevel = 1;                                89   verboseLevel = 1;
 80                                                    90 
 81   fMessenger = new PhysicsListMessenger(this);     91   fMessenger = new PhysicsListMessenger(this);
 82                                                    92 
 83   // EM physics                                    93   // EM physics
 84   fEmName = G4String("emstandard_opt0");       <<  94   fEmName = G4String("emstandard_opt0");  
 85   fEmPhysicsList = new G4EmStandardPhysics(ver     95   fEmPhysicsList = new G4EmStandardPhysics(verboseLevel);
 86                                                    96 
 87   // Deacy physics and all particles               97   // Deacy physics and all particles
 88   fDecPhysicsList = new G4DecayPhysics(verbose     98   fDecPhysicsList = new G4DecayPhysics(verboseLevel);
 89 }                                                  99 }
 90                                                   100 
 91 //....oooOO0OOooo........oooOO0OOooo........oo    101 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 92                                                   102 
 93 PhysicsList::~PhysicsList()                       103 PhysicsList::~PhysicsList()
 94 {                                                 104 {
 95   delete fMessenger;                              105   delete fMessenger;
 96   delete fEmPhysicsList;                          106   delete fEmPhysicsList;
 97   delete fDecPhysicsList;                         107   delete fDecPhysicsList;
 98   for (size_t i = 0; i < fHadronPhys.size(); i << 108   for(size_t i=0; i<fHadronPhys.size(); i++) {delete fHadronPhys[i];}
 99     delete fHadronPhys[i];                     << 
100   }                                            << 
101 }                                                 109 }
102                                                   110 
103 //....oooOO0OOooo........oooOO0OOooo........oo    111 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
104                                                   112 
105 void PhysicsList::ConstructParticle()             113 void PhysicsList::ConstructParticle()
106 {                                                 114 {
107   fDecPhysicsList->ConstructParticle();           115   fDecPhysicsList->ConstructParticle();
108 }                                                 116 }
109                                                   117 
110 //....oooOO0OOooo........oooOO0OOooo........oo    118 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
111                                                   119 
112 void PhysicsList::ConstructProcess()              120 void PhysicsList::ConstructProcess()
113 {                                                 121 {
114   // transportation                               122   // transportation
115   //                                              123   //
116   AddTransportation();                            124   AddTransportation();
117                                                << 125   
118   // electromagnetic physics list                 126   // electromagnetic physics list
119   //                                              127   //
120   fEmPhysicsList->ConstructProcess();             128   fEmPhysicsList->ConstructProcess();
121                                                   129 
122   // decay physics list                           130   // decay physics list
123   //                                              131   //
124   fDecPhysicsList->ConstructProcess();            132   fDecPhysicsList->ConstructProcess();
125                                                << 133   
126   // hadronic physics lists                       134   // hadronic physics lists
127   for (size_t i = 0; i < fHadronPhys.size(); i << 135   for(size_t i=0; i<fHadronPhys.size(); i++) {
128     fHadronPhys[i]->ConstructProcess();           136     fHadronPhys[i]->ConstructProcess();
129   }                                               137   }
130                                                << 138   
131   // step limitation (as a full process)          139   // step limitation (as a full process)
132   //                                           << 140   //  
133   AddStepMax();                                << 141   AddStepMax();  
134 }                                                 142 }
135                                                   143 
136 //....oooOO0OOooo........oooOO0OOooo........oo    144 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
137                                                   145 
138 void PhysicsList::AddPhysicsList(const G4Strin    146 void PhysicsList::AddPhysicsList(const G4String& name)
139 {                                                 147 {
140   if (verboseLevel > 1) {                      << 148   if (verboseLevel>1) {
141     G4cout << "PhysicsList::AddPhysicsList: <"    149     G4cout << "PhysicsList::AddPhysicsList: <" << name << ">" << G4endl;
142   }                                               150   }
143                                                   151 
144   if (name == fEmName) return;                    152   if (name == fEmName) return;
145                                                   153 
146   if (name == "local") {                          154   if (name == "local") {
                                                   >> 155 
147     fEmName = name;                               156     fEmName = name;
148     delete fEmPhysicsList;                        157     delete fEmPhysicsList;
149     fEmPhysicsList = new PhysListEmStandard(na    158     fEmPhysicsList = new PhysListEmStandard(name);
150   }                                            << 159 
151   else if (name == "emstandard_opt0") {        << 160   } else if (name == "emstandard_opt0") {
                                                   >> 161 
152     fEmName = name;                               162     fEmName = name;
153     delete fEmPhysicsList;                        163     delete fEmPhysicsList;
154     fEmPhysicsList = new G4EmStandardPhysics(v    164     fEmPhysicsList = new G4EmStandardPhysics(verboseLevel);
155   }                                            << 165 
156   else if (name == "emstandard_opt1") {        << 166   } else if (name == "emstandard_opt1") {
                                                   >> 167 
157     fEmName = name;                               168     fEmName = name;
158     delete fEmPhysicsList;                        169     delete fEmPhysicsList;
159     fEmPhysicsList = new G4EmStandardPhysics_o    170     fEmPhysicsList = new G4EmStandardPhysics_option1(verboseLevel);
160   }                                            << 171 
161   else if (name == "emstandard_opt2") {        << 172   } else if (name == "emstandard_opt2") {
                                                   >> 173 
162     fEmName = name;                               174     fEmName = name;
163     delete fEmPhysicsList;                        175     delete fEmPhysicsList;
164     fEmPhysicsList = new G4EmStandardPhysics_o    176     fEmPhysicsList = new G4EmStandardPhysics_option2(verboseLevel);
165   }                                            << 177     
166   else if (name == "emstandard_opt3") {        << 178   } else if (name == "emstandard_opt3") {
                                                   >> 179 
167     fEmName = name;                               180     fEmName = name;
168     delete fEmPhysicsList;                        181     delete fEmPhysicsList;
169     fEmPhysicsList = new G4EmStandardPhysics_o    182     fEmPhysicsList = new G4EmStandardPhysics_option3(verboseLevel);
170   }                                            << 183     
171   else if (name == "emstandard_opt4") {        << 184   } else if (name == "emstandard_opt4") {
                                                   >> 185 
172     fEmName = name;                               186     fEmName = name;
173     delete fEmPhysicsList;                        187     delete fEmPhysicsList;
174     fEmPhysicsList = new G4EmStandardPhysics_o    188     fEmPhysicsList = new G4EmStandardPhysics_option4(verboseLevel);
175   }                                            << 189 
176   else if (name == "ionGasModels") {           << 190   } else if (name == "ionGasModels") {
                                                   >> 191 
177     AddPhysicsList("emstandard_opt0");            192     AddPhysicsList("emstandard_opt0");
178     fEmName = name;                               193     fEmName = name;
179     AddIonGasModels();                            194     AddIonGasModels();
180   }                                            << 195 
181   else if (name == "standardNR") {             << 196   } else if (name == "standardNR") {
                                                   >> 197 
182     fEmName = name;                               198     fEmName = name;
183     delete fEmPhysicsList;                        199     delete fEmPhysicsList;
184     fEmPhysicsList = new PhysListEmStandardNR(    200     fEmPhysicsList = new PhysListEmStandardNR(name);
185   }                                            << 201 
186   else if (name == "emlivermore") {            << 202   } else if (name == "emlivermore") {
187     fEmName = name;                               203     fEmName = name;
188     delete fEmPhysicsList;                        204     delete fEmPhysicsList;
189     fEmPhysicsList = new G4EmLivermorePhysics(    205     fEmPhysicsList = new G4EmLivermorePhysics(verboseLevel);
190   }                                            << 206 
191   else if (name == "empenelope") {             << 207   } else if (name == "empenelope") {
192     fEmName = name;                               208     fEmName = name;
193     delete fEmPhysicsList;                        209     delete fEmPhysicsList;
194     fEmPhysicsList = new G4EmPenelopePhysics(v    210     fEmPhysicsList = new G4EmPenelopePhysics(verboseLevel);
195   }                                            << 211 
196   else if (name == "emlowenergy") {            << 212   } else if (name == "emlowenergy") {
197     fEmName = name;                               213     fEmName = name;
198     delete fEmPhysicsList;                        214     delete fEmPhysicsList;
199     fEmPhysicsList = new G4EmLowEPPhysics(verb    215     fEmPhysicsList = new G4EmLowEPPhysics(verboseLevel);
200   }                                            << 216 
201   else if (name == "emstandardSS") {           << 217   } else if (name == "emstandardSS") {
                                                   >> 218 
202     fEmName = name;                               219     fEmName = name;
203     delete fEmPhysicsList;                        220     delete fEmPhysicsList;
204     fEmPhysicsList = new G4EmStandardPhysicsSS    221     fEmPhysicsList = new G4EmStandardPhysicsSS(verboseLevel);
205   }                                            << 222 
206   else if (name == "emstandardWVI") {          << 223   } else if (name == "emstandardWVI") {
                                                   >> 224 
207     fEmName = name;                               225     fEmName = name;
208     delete fEmPhysicsList;                        226     delete fEmPhysicsList;
209     fEmPhysicsList = new G4EmStandardPhysicsWV    227     fEmPhysicsList = new G4EmStandardPhysicsWVI(verboseLevel);
210   }                                            << 228 
211   else if (name == "emstandardGS") {           << 229   } else if (name == "emstandardGS") {
                                                   >> 230 
212     fEmName = name;                               231     fEmName = name;
213     delete fEmPhysicsList;                        232     delete fEmPhysicsList;
214     fEmPhysicsList = new G4EmStandardPhysicsGS    233     fEmPhysicsList = new G4EmStandardPhysicsGS(verboseLevel);
215   }                                            << 234 
216   else if (name == "elastic" && !fHelIsRegiste << 235   } else if (name == "elastic" && !fHelIsRegisted) {
217     fHadronPhys.push_back(new G4HadronElasticP << 236     fHadronPhys.push_back( new G4HadronElasticPhysics(verboseLevel));
218     fHelIsRegisted = true;                        237     fHelIsRegisted = true;
219   }                                            << 238 
220   else if (name == "DElastic" && !fHelIsRegist << 239   } else if (name == "DElastic" && !fHelIsRegisted) {
221     fHadronPhys.push_back(new G4HadronDElastic << 240     fHadronPhys.push_back( new G4HadronDElasticPhysics(verboseLevel));
222     fHelIsRegisted = true;                        241     fHelIsRegisted = true;
223   }                                            << 242 
224   else if (name == "HElastic" && !fHelIsRegist << 243   } else if (name == "HElastic" && !fHelIsRegisted) {
225     fHadronPhys.push_back(new G4HadronHElastic << 244     fHadronPhys.push_back( new G4HadronHElasticPhysics(verboseLevel));
226     fHelIsRegisted = true;                        245     fHelIsRegisted = true;
227   }                                            << 246 
228   else if (name == "binary" && !fBicIsRegisted << 247   } else if (name == "binary" && !fBicIsRegisted) {
229     fHadronPhys.push_back(new G4HadronInelasti    248     fHadronPhys.push_back(new G4HadronInelasticQBBC(verboseLevel));
230     fBicIsRegisted = true;                        249     fBicIsRegisted = true;
231   }                                            << 250 
232   else if (name == "binary_ion" && !fBiciIsReg << 251   } else if (name == "binary_ion" && !fBiciIsRegisted) {
233     fHadronPhys.push_back(new G4IonPhysics(ver    252     fHadronPhys.push_back(new G4IonPhysics(verboseLevel));
234     fBiciIsRegisted = true;                       253     fBiciIsRegisted = true;
235   }                                            << 254 
236   else {                                       << 255   } else {
                                                   >> 256 
237     G4cout << "PhysicsList::AddPhysicsList: <"    257     G4cout << "PhysicsList::AddPhysicsList: <" << name << ">"
238            << " is not defined" << G4endl;     << 258            << " is not defined"
                                                   >> 259            << G4endl;
239   }                                               260   }
240 }                                                 261 }
241                                                   262 
242 //....oooOO0OOooo........oooOO0OOooo........oo    263 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
243                                                   264 
244 void PhysicsList::AddStepMax()                    265 void PhysicsList::AddStepMax()
245 {                                                 266 {
246   // Step limitation seen as a process            267   // Step limitation seen as a process
247   fStepMaxProcess = new StepMax();                268   fStepMaxProcess = new StepMax();
248                                                   269 
249   auto particleIterator = GetParticleIterator( << 270   auto particleIterator=GetParticleIterator();
250   particleIterator->reset();                      271   particleIterator->reset();
251   while ((*particleIterator)()) {              << 272   while ((*particleIterator)()){
252     G4ParticleDefinition* particle = particleI    273     G4ParticleDefinition* particle = particleIterator->value();
253     G4ProcessManager* pmanager = particle->Get    274     G4ProcessManager* pmanager = particle->GetProcessManager();
254                                                   275 
255     if (fStepMaxProcess->IsApplicable(*particl << 276     if (fStepMaxProcess->IsApplicable(*particle) && pmanager)
256       pmanager->AddDiscreteProcess(fStepMaxPro << 277       {
257     }                                          << 278         pmanager ->AddDiscreteProcess(fStepMaxProcess);
                                                   >> 279       }
258   }                                               280   }
259 }                                                 281 }
260                                                   282 
261 //....oooOO0OOooo........oooOO0OOooo........oo    283 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
262                                                   284 
263 void PhysicsList::AddIonGasModels()               285 void PhysicsList::AddIonGasModels()
264 {                                                 286 {
265   G4EmConfigurator* em_config = G4LossTableMan << 287   G4EmConfigurator* em_config = 
266   auto particleIterator = GetParticleIterator( << 288     G4LossTableManager::Instance()->EmConfigurator();
                                                   >> 289   auto particleIterator=GetParticleIterator();
267   particleIterator->reset();                      290   particleIterator->reset();
268   while ((*particleIterator)()) {              << 291   while ((*particleIterator)())
                                                   >> 292   {
269     G4ParticleDefinition* particle = particleI    293     G4ParticleDefinition* particle = particleIterator->value();
270     G4String partname = particle->GetParticleN    294     G4String partname = particle->GetParticleName();
271     if (partname == "alpha" || partname == "He << 295     if(partname == "alpha" || partname == "He3" || partname == "GenericIon") {
272       G4BraggIonGasModel* mod1 = new G4BraggIo    296       G4BraggIonGasModel* mod1 = new G4BraggIonGasModel();
273       G4BetheBlochIonGasModel* mod2 = new G4Be    297       G4BetheBlochIonGasModel* mod2 = new G4BetheBlochIonGasModel();
274       G4double eth = 2. * MeV * particle->GetP << 298       G4double eth = 2.*MeV*particle->GetPDGMass()/proton_mass_c2;
275       em_config->SetExtraEmModel(partname, "io << 299       em_config->SetExtraEmModel(partname,"ionIoni",mod1,"",0.0,eth,
276       em_config->SetExtraEmModel(partname, "io << 300                                  new G4IonFluctuations());
                                                   >> 301       em_config->SetExtraEmModel(partname,"ionIoni",mod2,"",eth,100*TeV,
277                                  new G4Univers    302                                  new G4UniversalFluctuation());
                                                   >> 303 
278     }                                             304     }
279   }                                               305   }
280 }                                                 306 }
281                                                   307 
282 //....oooOO0OOooo........oooOO0OOooo........oo    308 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
                                                   >> 309 
283                                                   310