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 11.2.2)


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