Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/processes/electromagnetic/standard/src/G4WentzelOKandVIxSection.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/standard/src/G4WentzelOKandVIxSection.cc (Version 11.3.0) and /processes/electromagnetic/standard/src/G4WentzelOKandVIxSection.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 // $Id: G4WentzelOKandVIxSection.cc 98737 2016-08-09 12:51:38Z gcosmo $
 26 //                                                 27 //
 27 // -------------------------------------------     28 // -------------------------------------------------------------------
 28 //                                                 29 //
 29 // GEANT4 Class file                               30 // GEANT4 Class file
 30 //                                                 31 //
 31 //                                                 32 //
 32 // File name:   G4WentzelOKandVIxSection           33 // File name:   G4WentzelOKandVIxSection
 33 //                                                 34 //
 34 // Author:      V.Ivanchenko                       35 // Author:      V.Ivanchenko 
 35 //                                                 36 //
 36 // Creation date: 09.04.2008 from G4MuMscModel     37 // Creation date: 09.04.2008 from G4MuMscModel
 37 //                                                 38 //
 38 // Modifications:                                  39 // Modifications:
 39 //                                                 40 //
 40 // -------------------------------------------     41 // -------------------------------------------------------------------
 41 //                                                 42 //
 42                                                    43 
 43 //....oooOO0OOooo........oooOO0OOooo........oo     44 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 44 //....oooOO0OOooo........oooOO0OOooo........oo     45 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 45                                                    46 
 46 #include "G4WentzelOKandVIxSection.hh"             47 #include "G4WentzelOKandVIxSection.hh"
 47 #include "G4ScreeningMottCrossSection.hh"      << 
 48 #include "G4PhysicalConstants.hh"                  48 #include "G4PhysicalConstants.hh"
 49 #include "G4SystemOfUnits.hh"                      49 #include "G4SystemOfUnits.hh"
 50 #include "Randomize.hh"                            50 #include "Randomize.hh"
 51 #include "G4Electron.hh"                           51 #include "G4Electron.hh"
 52 #include "G4Positron.hh"                           52 #include "G4Positron.hh"
 53 #include "G4Proton.hh"                             53 #include "G4Proton.hh"
 54 #include "G4EmParameters.hh"                       54 #include "G4EmParameters.hh"
 55 #include "G4Log.hh"                                55 #include "G4Log.hh"
 56 #include "G4Exp.hh"                                56 #include "G4Exp.hh"
 57 #include "G4AutoLock.hh"                       << 
 58                                                    57 
 59 //....oooOO0OOooo........oooOO0OOooo........oo     58 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 60                                                    59 
 61 G4double G4WentzelOKandVIxSection::ScreenRSqua     60 G4double G4WentzelOKandVIxSection::ScreenRSquareElec[] = {0.0};
 62 G4double G4WentzelOKandVIxSection::ScreenRSqua     61 G4double G4WentzelOKandVIxSection::ScreenRSquare[]     = {0.0};
 63 G4double G4WentzelOKandVIxSection::FormFactor[     62 G4double G4WentzelOKandVIxSection::FormFactor[]        = {0.0};
 64                                                    63 
 65 namespace                                      << 
 66 {                                              << 
 67   G4Mutex theWOKVIMutex = G4MUTEX_INITIALIZER; << 
 68 }                                              << 
 69                                                << 
 70 const G4double alpha2 = CLHEP::fine_structure_ << 
 71 const G4double factB1= 0.5*CLHEP::pi*CLHEP::fi << 
 72 const G4double numlimit = 0.1;                 << 
 73 const G4int nwarnlimit = 50;                   << 
 74                                                << 
 75 using namespace std;                               64 using namespace std;
 76                                                    65 
 77 G4WentzelOKandVIxSection::G4WentzelOKandVIxSec <<  66 G4WentzelOKandVIxSection::G4WentzelOKandVIxSection(G4bool combined) :
 78   temp(0.,0.,0.),                                  67   temp(0.,0.,0.),
 79   isCombined(comb)                             <<  68   numlimit(0.1),
                                                   >>  69   nwarnings(0),
                                                   >>  70   nwarnlimit(50),
                                                   >>  71   isCombined(combined),
                                                   >>  72   cosThetaMax(-1.0),
                                                   >>  73   alpha2(fine_structure_const*fine_structure_const)
 80 {                                                  74 {
 81   fNistManager = G4NistManager::Instance();        75   fNistManager = G4NistManager::Instance();
 82   fG4pow = G4Pow::GetInstance();                   76   fG4pow = G4Pow::GetInstance();
 83                                                << 
 84   theElectron = G4Electron::Electron();            77   theElectron = G4Electron::Electron();
 85   thePositron = G4Positron::Positron();            78   thePositron = G4Positron::Positron();
 86   theProton   = G4Proton::Proton();                79   theProton   = G4Proton::Proton();
                                                   >>  80   lowEnergyLimit = 1.0*eV;
                                                   >>  81   G4double p0 = electron_mass_c2*classic_electr_radius;
                                                   >>  82   coeff = twopi*p0*p0;
                                                   >>  83   particle = nullptr;
                                                   >>  84 
                                                   >>  85   fNucFormfactor = fExponentialNF;
                                                   >>  86 
                                                   >>  87   // Thomas-Fermi screening radii
                                                   >>  88   // Formfactors from A.V. Butkevich et al., NIM A 488 (2002) 282
                                                   >>  89 
                                                   >>  90   if(0.0 == ScreenRSquare[0]) {
                                                   >>  91     G4double a0 = electron_mass_c2/0.88534; 
                                                   >>  92     G4double constn = 6.937e-6/(MeV*MeV);
 87                                                    93 
 88   G4double p0 = CLHEP::electron_mass_c2*CLHEP: <<  94     ScreenRSquare[0] = alpha2*a0*a0;
 89   coeff = CLHEP::twopi*p0*p0;                  <<  95     ScreenRSquareElec[0] = ScreenRSquare[0];
 90   targetMass = CLHEP::proton_mass_c2;          <<  96     for(G4int j=1; j<100; ++j) {
                                                   >>  97       G4double x = a0*fG4pow->Z13(j);
                                                   >>  98       if(1 == j) { ScreenRSquare[j] = 0.5*alpha2*a0*a0; }
                                                   >>  99       else {
                                                   >> 100         ScreenRSquare[j] = 0.5*(1 + G4Exp(-j*j*0.001))*alpha2*x*x;
                                                   >> 101         ScreenRSquareElec[j] = 0.5*alpha2*x*x;
                                                   >> 102       }
                                                   >> 103       x = fNistManager->GetA27(j);
                                                   >> 104       FormFactor[j] = constn*x*x;
                                                   >> 105     } 
                                                   >> 106   }
                                                   >> 107   currentMaterial = 0;
                                                   >> 108   factB = factD = formfactA = screenZ = 0.0;
                                                   >> 109   cosTetMaxElec = cosTetMaxNuc = invbeta2 = kinFactor = gam0pcmp = pcmp2 = 1.0;
                                                   >> 110 
                                                   >> 111   factB1= 0.5*CLHEP::pi*fine_structure_const;
                                                   >> 112 
                                                   >> 113   tkin = mom2 = momCM2 = factorA2 = mass = spin = chargeSquare = charge3 = 0.0;
                                                   >> 114   ecut = etag = DBL_MAX;
                                                   >> 115   targetZ = 0;
                                                   >> 116   targetMass = proton_mass_c2;
                                                   >> 117   particle = nullptr;
 91 }                                                 118 }
 92                                                   119 
 93 //....oooOO0OOooo........oooOO0OOooo........oo    120 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 94                                                   121 
 95 G4WentzelOKandVIxSection::~G4WentzelOKandVIxSe    122 G4WentzelOKandVIxSection::~G4WentzelOKandVIxSection()
 96 {                                              << 123 {}
 97   delete fMottXSection;                        << 
 98 }                                              << 
 99                                                   124 
100 //....oooOO0OOooo........oooOO0OOooo........oo    125 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
101                                                   126 
102 void G4WentzelOKandVIxSection::Initialise(cons    127 void G4WentzelOKandVIxSection::Initialise(const G4ParticleDefinition* p, 
103                                           G4do    128                                           G4double cosThetaLim)
104 {                                                 129 {
105   SetupParticle(p);                               130   SetupParticle(p);
106   tkin = mom2 = momCM2 = 0.0;                     131   tkin = mom2 = momCM2 = 0.0;
107   ecut = etag = DBL_MAX;                          132   ecut = etag = DBL_MAX;
108   targetZ = 0;                                    133   targetZ = 0;
109                                                   134 
110   // cosThetaMax is below 1.0 only when MSC is    135   // cosThetaMax is below 1.0 only when MSC is combined with SS
111   if(isCombined) { cosThetaMax = cosThetaLim;  << 136   if(isCombined) { cosThetaMax = cosThetaLim; }
112   G4EmParameters* param = G4EmParameters::Inst << 137   
113   G4double a = param->FactorForAngleLimit()*CL << 138   G4double a = G4EmParameters::Instance()->FactorForAngleLimit()
                                                   >> 139     *CLHEP::hbarc/CLHEP::fermi;
114   factorA2 = 0.5*a*a;                             140   factorA2 = 0.5*a*a;
115   currentMaterial = nullptr;                      141   currentMaterial = nullptr;
116                                                   142 
117   fNucFormfactor = param->NuclearFormfactorTyp << 143   fNucFormfactor = G4EmParameters::Instance()->NuclearFormfactorType();
118   if(0.0 == ScreenRSquare[0]) { InitialiseA(); << 144   
119                                                << 145   //G4cout << "G4WentzelOKandVIxSection::Initialise  mass= " << mass
120   // Mott corrections always added             << 146   //         << "  " << p->GetParticleName() 
121   if((p == theElectron || p == thePositron) && << 147   //     << "  cosThetaMax= " << cosThetaMax << G4endl; 
122     fMottXSection = new G4ScreeningMottCrossSe << 148   
123     fMottXSection->Initialise(p, 1.0);         << 
124   }                                            << 
125   /*                                           << 
126   G4cout << "G4WentzelOKandVIxSection::Initial << 
127    << p->GetParticleName() << " cosThetaMax= " << 
128    << "  " << ScreenRSquare[0] << " coeff= " < << 
129   */                                           << 
130 }                                              << 
131                                                << 
132 //....oooOO0OOooo........oooOO0OOooo........oo << 
133                                                << 
134 void G4WentzelOKandVIxSection::InitialiseA()   << 
135 {                                              << 
136   // Thomas-Fermi screening radii              << 
137   // Formfactors from A.V. Butkevich et al., N << 
138   if(0.0 != ScreenRSquare[0]) { return; }      << 
139   G4AutoLock l(&theWOKVIMutex);                << 
140   if(0.0 == ScreenRSquare[0]) {                << 
141     const G4double invmev2 = 1./(CLHEP::MeV*CL << 
142     G4double a0 = CLHEP::electron_mass_c2/0.88 << 
143     G4double constn = 6.937e-6*invmev2;        << 
144     G4double fct = G4EmParameters::Instance()- << 
145                                                << 
146     G4double afact = 0.5*fct*alpha2*a0*a0;     << 
147     ScreenRSquare[0] = afact;                  << 
148     ScreenRSquare[1] = afact;                  << 
149     ScreenRSquareElec[1] = afact;              << 
150     FormFactor[1] = 3.097e-6*invmev2;          << 
151                                                << 
152     for(G4int j=2; j<100; ++j) {               << 
153       G4double x = fG4pow->Z13(j);             << 
154       ScreenRSquare[j] = afact*(1 + G4Exp(-j*j << 
155       ScreenRSquareElec[j] = afact*x*x;        << 
156       x = fNistManager->GetA27(j);             << 
157       FormFactor[j] = constn*x*x;              << 
158     }                                          << 
159   }                                            << 
160   l.unlock();                                  << 
161 }                                                 149 }
162                                                   150 
163 //....oooOO0OOooo........oooOO0OOooo........oo    151 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
164                                                   152 
165 void G4WentzelOKandVIxSection::SetupParticle(c    153 void G4WentzelOKandVIxSection::SetupParticle(const G4ParticleDefinition* p)
166 {                                                 154 {
167   particle = p;                                   155   particle = p;
168   mass = particle->GetPDGMass();                  156   mass = particle->GetPDGMass();
169   spin = particle->GetPDGSpin();                  157   spin = particle->GetPDGSpin();
170   if(0.0 != spin) { spin = 0.5; }                 158   if(0.0 != spin) { spin = 0.5; }
171   G4double q = std::abs(particle->GetPDGCharge << 159   G4double q = std::fabs(particle->GetPDGCharge()/eplus);
172   chargeSquare = q*q;                             160   chargeSquare = q*q;
173   charge3 = chargeSquare*q;                       161   charge3 = chargeSquare*q;
174   tkin = 0.0;                                     162   tkin = 0.0;
175   currentMaterial = nullptr;                   << 163   currentMaterial = 0;
176   targetZ = 0;                                    164   targetZ = 0;
177 }                                                 165 }
178                                                   166 
179 //....oooOO0OOooo........oooOO0OOooo........oo    167 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
180                                                << 
181 G4double                                       << 
182 G4WentzelOKandVIxSection::SetupKinematic(G4dou << 
183 {                                              << 
184   if(ekin != tkin || mat != currentMaterial) { << 
185     currentMaterial = mat;                     << 
186     tkin  = ekin;                              << 
187     mom2  = tkin*(tkin + 2.0*mass);            << 
188     invbeta2 = 1.0 +  mass*mass/mom2;          << 
189     factB = spin/invbeta2;                     << 
190     cosTetMaxNuc = isCombined ?                << 
191       std::max(cosThetaMax, 1.-factorA2*mat->G << 
192       : cosThetaMax;                           << 
193   }                                            << 
194   return cosTetMaxNuc;                         << 
195 }                                              << 
196                                                << 
197 //....oooOO0OOooo........oooOO0OOooo........oo << 
198                                                   168   
199 G4double                                          169 G4double
200 G4WentzelOKandVIxSection::SetupTarget(G4int Z,    170 G4WentzelOKandVIxSection::SetupTarget(G4int Z, G4double cut)
201 {                                                 171 {
202   G4double cosTetMaxNuc2 = cosTetMaxNuc;          172   G4double cosTetMaxNuc2 = cosTetMaxNuc;
203   if(Z != targetZ || tkin != etag) {              173   if(Z != targetZ || tkin != etag) {
204     etag    = tkin;                               174     etag    = tkin; 
205     targetZ = std::min(Z, 99);                 << 175     targetZ = Z;
206     G4double massT = (1 == Z) ? CLHEP::proton_ << 176     if(targetZ > 99) { targetZ = 99; }
207       fNistManager->GetAtomicMassAmu(Z)*CLHEP: << 177     G4double massT = proton_mass_c2;
                                                   >> 178     if(targetZ > 1) { 
                                                   >> 179       massT = fNistManager->GetAtomicMassAmu(targetZ)*CLHEP::amu_c2;
                                                   >> 180     }
208     SetTargetMass(massT);                         181     SetTargetMass(massT);
209                                                   182 
210     kinFactor = coeff*Z*chargeSquare*invbeta2/    183     kinFactor = coeff*Z*chargeSquare*invbeta2/mom2;
211     if(particle == theElectron && fMottXSectio << 
212       fMottFactor = (1.0 + 2.0e-4*Z*Z);        << 
213     }                                          << 
214                                                   184 
215     if(1 == Z) {                                  185     if(1 == Z) {
216       screenZ = ScreenRSquare[targetZ]/mom2;      186       screenZ = ScreenRSquare[targetZ]/mom2;
217     } else if(mass > MeV) {                       187     } else if(mass > MeV) {
218       screenZ = std::min(Z*1.13,1.13 +3.76*Z*Z    188       screenZ = std::min(Z*1.13,1.13 +3.76*Z*Z*invbeta2*alpha2*chargeSquare)*
219         ScreenRSquare[targetZ]/mom2;              189         ScreenRSquare[targetZ]/mom2;
220     } else {                                      190     } else {
221       G4double tau = tkin/mass;                   191       G4double tau = tkin/mass;
222       screenZ = std::min(Z*1.13,(1.13 +3.76*Z*    192       screenZ = std::min(Z*1.13,(1.13 +3.76*Z*Z
223           *invbeta2*alpha2*std::sqrt(tau/(tau     193           *invbeta2*alpha2*std::sqrt(tau/(tau + fG4pow->Z23(targetZ)))))*
224         ScreenRSquareElec[targetZ]/mom2;          194         ScreenRSquareElec[targetZ]/mom2;
225     }                                             195     }
226     if(targetZ == 1 && particle == theProton & << 196     if(targetZ == 1 && cosTetMaxNuc2 < 0.0 && particle == theProton) {
227       cosTetMaxNuc2 = 0.0;                        197       cosTetMaxNuc2 = 0.0;
228     }                                             198     }
229     formfactA = FormFactor[targetZ]*mom2;         199     formfactA = FormFactor[targetZ]*mom2;
230                                                   200 
231     cosTetMaxElec = 1.0;                          201     cosTetMaxElec = 1.0;
232     ComputeMaxElectronScattering(cut);            202     ComputeMaxElectronScattering(cut); 
233   }                                               203   }
234   //G4cout << "SetupTarget:  Z= " << targetZ < << 
235   //   << " fMottFactor= " << fMottFactor << " << 
236   return cosTetMaxNuc2;                           204   return cosTetMaxNuc2;
237 }                                                 205 } 
238                                                   206 
239 //....oooOO0OOooo........oooOO0OOooo........oo    207 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
240                                                   208 
241 G4double                                          209 G4double 
242 G4WentzelOKandVIxSection::ComputeTransportCros    210 G4WentzelOKandVIxSection::ComputeTransportCrossSectionPerAtom(G4double cosTMax)
243 {                                                 211 {
244   G4double xSection = 0.0;                        212   G4double xSection = 0.0;
245   if(cosTMax >= 1.0) { return xSection; }         213   if(cosTMax >= 1.0) { return xSection; }
                                                   >> 214  
                                                   >> 215   G4double x = 0; 
                                                   >> 216   G4double y = 0;
                                                   >> 217   G4double x1= 0;
                                                   >> 218   G4double x2= 0;
                                                   >> 219   G4double xlog = 0.0;
246                                                   220 
247   G4double costm = std::max(cosTMax,cosTetMaxE    221   G4double costm = std::max(cosTMax,cosTetMaxElec); 
248   G4double fb = screenZ*factB;                    222   G4double fb = screenZ*factB;
249                                                   223 
250   // scattering off electrons                     224   // scattering off electrons
251   if(costm < 1.0) {                               225   if(costm < 1.0) {
252     G4double x = (1.0 - costm)/screenZ;        << 226     x = (1.0 - costm)/screenZ;
253     if(x < numlimit) {                            227     if(x < numlimit) { 
254       G4double x2 = 0.5*x*x;                   << 228       x2 = 0.5*x*x;
255       xSection = x2*((1.0 - 1.3333333*x + 3*x2 << 229       y  = x2*(1.0 - 1.3333333*x + 3*x2);
                                                   >> 230       if(0.0 < factB) { y -= fb*x2*x*(0.6666667 - x); }
256     } else {                                      231     } else { 
257       G4double x1= x/(1 + x);                  << 232       x1= x/(1 + x);
258       G4double xlog = G4Log(1.0 + x);          << 233       xlog = G4Log(1.0 + x);  
259       xSection = xlog - x1 - fb*(x + x1 - 2*xl << 234       y = xlog - x1; 
                                                   >> 235       if(0.0 < factB) { y -= fb*(x + x1 - 2*xlog); }
260     }                                             236     }
261                                                   237 
262     if(xSection < 0.0) {                       << 238     if(y < 0.0) {
263       ++nwarnings;                                239       ++nwarnings;
264       if(nwarnings < nwarnlimit) {                240       if(nwarnings < nwarnlimit) {
265         G4cout << "G4WentzelOKandVIxSection::C    241         G4cout << "G4WentzelOKandVIxSection::ComputeTransportCrossSectionPerAtom"
266                << " scattering on e- <0"          242                << " scattering on e- <0"
267                << G4endl;                         243                << G4endl;
268         G4cout << "cross= " << xSection        << 244         G4cout << "y= " << y 
269                << " e(MeV)= " << tkin << " p(M    245                << " e(MeV)= " << tkin << " p(MeV/c)= " << sqrt(mom2) 
270                << " Z= " << targetZ << "  "       246                << " Z= " << targetZ << "  " 
271                << particle->GetParticleName()     247                << particle->GetParticleName() << G4endl;
272         G4cout << " 1-costm= " << 1.0-costm <<    248         G4cout << " 1-costm= " << 1.0-costm << " screenZ= " << screenZ 
273                << " x= " << x << G4endl;          249                << " x= " << x << G4endl;
274       }                                           250       }
275       xSection = 0.0;                          << 251       y = 0.0;
276     }                                             252     }
                                                   >> 253     xSection = y;
277   }                                               254   }
278   /*                                           << 255   /* 
279       G4cout << "G4WentzelOKandVIxSection::Com << 256        G4cout << "G4WentzelVI:XS per A " << " Z= " << targetZ 
280       << " Z= " << targetZ                     << 257        << " e(MeV)= " << tkin/MeV << " XSel= " << xSection
281       << " e(MeV)= " << tkin/MeV << " XSel= "  << 258          << " cut(MeV)= " << ecut/MeV  
282       << " zmaxE= " << (1.0 - cosTetMaxElec)/s << 259            << " zmaxE= " << (1.0 - cosTetMaxElec)/screenZ 
283       << " zmaxN= " << (1.0 - cosThetaMax)/scr << 260          << " zmaxN= " << (1.0 - cosThetaMax)/screenZ 
284       << " 1-costm= " << 1.0 - cosThetaMax <<  << 261          << " 1-costm= " << 1.0 - cosThetaMax << G4endl;
285   */                                              262   */
286   // scattering off nucleus                       263   // scattering off nucleus
287   if(cosTMax < 1.0) {                             264   if(cosTMax < 1.0) {
288     G4double x = (1.0 - cosTMax)/screenZ;      << 265     x = (1.0 - cosTMax)/screenZ;
289     G4double y;                                << 
290     if(x < numlimit) {                            266     if(x < numlimit) { 
291       G4double x2 = 0.5*x*x;                   << 267       x2 = 0.5*x*x;
292       y = x2*((1.0 - 1.3333333*x + 3*x2) - fb* << 268       y  = x2*(1.0 - 1.3333333*x + 3*x2); 
                                                   >> 269       if(0.0 < factB) { y -= fb*x2*x*(0.6666667 - x); }
293     } else {                                      270     } else { 
294       G4double x1= x/(1 + x);                  << 271       x1= x/(1 + x);
295       G4double xlog = G4Log(1.0 + x);          << 272       xlog = G4Log(1.0 + x);  
296       y = xlog - x1 - fb*(x + x1 - 2*xlog);    << 273       y = xlog - x1; 
                                                   >> 274       if(0.0 < factB) { y -= fb*(x + x1 - 2*xlog); }
297     }                                             275     }
298                                                   276 
299     if(y < 0.0) {                                 277     if(y < 0.0) {
300       ++nwarnings;                                278       ++nwarnings;
301       if(nwarnings < nwarnlimit) {                279       if(nwarnings < nwarnlimit) {
302         G4cout << "G4WentzelOKandVIxSection::C    280         G4cout << "G4WentzelOKandVIxSection::ComputeTransportCrossSectionPerAtom"
303                << " scattering on nucleus <0"     281                << " scattering on nucleus <0"
304                << G4endl;                         282                << G4endl;
305         G4cout << "y= " << y                      283         G4cout << "y= " << y 
306                << " e(MeV)= " << tkin << " Z=     284                << " e(MeV)= " << tkin << " Z= " << targetZ << "  " 
307                << particle->GetParticleName()     285                << particle->GetParticleName() << G4endl;
308         G4cout << " formfactA= " << formfactA     286         G4cout << " formfactA= " << formfactA << " screenZ= " << screenZ 
309                << " x= " << x <<G4endl;        << 287                << " x= " << " x1= " << x1 <<G4endl;
310       }                                           288       }
311       y = 0.0;                                    289       y = 0.0;
312     }                                             290     }
313     xSection += y*targetZ;                        291     xSection += y*targetZ; 
314   }                                               292   }
315   xSection *= kinFactor;                          293   xSection *= kinFactor;
316                                                   294  
317   /*                                           << 295   /*
318   G4cout << "Z= " << targetZ << " XStot= " <<     296   G4cout << "Z= " << targetZ << " XStot= " << xSection/barn 
319          << " screenZ= " << screenZ << " formF    297          << " screenZ= " << screenZ << " formF= " << formfactA 
320          << " for " << particle->GetParticleNa    298          << " for " << particle->GetParticleName() 
321    << " m= " << mass << " 1/v= " << sqrt(invbe << 299            << " m= " << mass << " 1/v= " << sqrt(invbeta2) << " p= " << sqrt(mom2)
322    << " p= " << sqrt(mom2)                     << 300          << " x= " << x 
323          << " x= " << x << G4endl;             << 301          << G4endl;
324   */                                              302   */
325   return xSection;                                303   return xSection; 
326 }                                                 304 }
327                                                   305 
328 //....oooOO0OOooo........oooOO0OOooo........oo    306 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
329                                                   307 
330 G4ThreeVector&                                    308 G4ThreeVector&
331 G4WentzelOKandVIxSection::SampleSingleScatteri    309 G4WentzelOKandVIxSection::SampleSingleScattering(G4double cosTMin,
332                                                   310                                                  G4double cosTMax,
333                                                   311                                                  G4double elecRatio)
334 {                                                 312 {
335   temp.set(0.0,0.0,1.0);                          313   temp.set(0.0,0.0,1.0);
336   CLHEP::HepRandomEngine* rndmEngineMod = G4Ra    314   CLHEP::HepRandomEngine* rndmEngineMod = G4Random::getTheEngine();
337                                                   315  
338   G4double formf = formfactA;                     316   G4double formf = formfactA;
339   G4double cost1 = cosTMin;                       317   G4double cost1 = cosTMin;
340   G4double cost2 = cosTMax;                       318   G4double cost2 = cosTMax;
341   if(elecRatio > 0.0) {                           319   if(elecRatio > 0.0) {
342     if(rndmEngineMod->flat() <= elecRatio) {      320     if(rndmEngineMod->flat() <= elecRatio) {
343       formf = 0.0;                                321       formf = 0.0;
344       cost1 = std::max(cost1,cosTetMaxElec);      322       cost1 = std::max(cost1,cosTetMaxElec);
345       cost2 = std::max(cost2,cosTetMaxElec);      323       cost2 = std::max(cost2,cosTetMaxElec);
346     }                                             324     }
347   }                                               325   }
348   if(cost1 > cost2) {                             326   if(cost1 > cost2) {
349     G4double w1 = 1. - cost1;                  << 327     G4double w1 = 1. - cost1 + screenZ;
350     G4double w2 = 1. - cost2;                  << 328     G4double w2 = 1. - cost2 + screenZ;
351     G4double w3 = rndmEngineMod->flat()*(w2 -  << 329     G4double z1 = w1*w2/(w1 + rndmEngineMod->flat()*(w2 - w1)) - screenZ;
352     G4double z1 = ((w2 - w3)*screenZ + w1*w2)/ << 
353     G4double fm = 1.0;                         << 
354                                                   330 
                                                   >> 331     G4double fm = 1.0;
355     if(fNucFormfactor == fExponentialNF) {        332     if(fNucFormfactor == fExponentialNF) {
356       fm += formf*z1;                             333       fm += formf*z1;
357       fm = 1.0/(fm*fm);                           334       fm = 1.0/(fm*fm);
358     } else if(fNucFormfactor == fGaussianNF) {    335     } else if(fNucFormfactor == fGaussianNF) {
359       fm = G4Exp(-2*formf*z1);                    336       fm = G4Exp(-2*formf*z1);
360     } else if(fNucFormfactor == fFlatNF) {        337     } else if(fNucFormfactor == fFlatNF) {
361       static const G4double ccoef = 0.00508/CL << 338       static const G4double ccoef = 0.00508/MeV;
362       G4double x = std::sqrt(2.*mom2*z1)*ccoef    339       G4double x = std::sqrt(2.*mom2*z1)*ccoef*2.;
363       fm = FlatFormfactor(x);                     340       fm = FlatFormfactor(x);
364       fm *= FlatFormfactor(x*0.6*fG4pow->A13(f << 341       fm *= FlatFormfactor(x*0.6
                                                   >> 342       *fG4pow->A13(fNistManager->GetAtomicMassAmu(targetZ) ) );     
365     }                                             343     }
366     // G4cout << " fm=" << fm << "  " << fMott << 344 
367     G4double grej;                             << 345     G4double grej = (1. - z1*factB + factB1*targetZ*sqrt(z1*factB)*(2. - z1))
368     if(nullptr != fMottXSection) {             << 346       *fm*fm/(1.0 + z1*factD);
369       fMottXSection->SetupKinematic(tkin, targ << 347 
370       grej = fMottXSection->RatioMottRutherfor << 348     if(rndmEngineMod->flat() <= grej) {
371     } else {                                   << 
372       grej = (1. - z1*factB + factB1*targetZ*s << 
373       *fm/(1.0 + z1*factD);                    << 
374     }                                          << 
375     if(fMottFactor*rndmEngineMod->flat() <= gr << 
376       // exclude "false" scattering due to for    349       // exclude "false" scattering due to formfactor and spin effect
377       G4double cost = 1.0 - z1;                   350       G4double cost = 1.0 - z1;
378       if(cost > 1.0)       { cost = 1.0; }        351       if(cost > 1.0)       { cost = 1.0; }
379       else if(cost < -1.0) { cost =-1.0; }        352       else if(cost < -1.0) { cost =-1.0; }
380       G4double sint = sqrt((1.0 - cost)*(1.0 +    353       G4double sint = sqrt((1.0 - cost)*(1.0 + cost));
381       //G4cout << "sint= " << sint << G4endl;     354       //G4cout << "sint= " << sint << G4endl;
382       G4double phi  = twopi*rndmEngineMod->fla    355       G4double phi  = twopi*rndmEngineMod->flat();
383       temp.set(sint*cos(phi),sint*sin(phi),cos    356       temp.set(sint*cos(phi),sint*sin(phi),cost);
384     }                                             357     }
385   }                                               358   }
386   return temp;                                    359   return temp;
387 }                                                 360 }
388                                                   361 
389 //....oooOO0OOooo........oooOO0OOooo........oo    362 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
390                                                   363 
391 void                                              364 void 
392 G4WentzelOKandVIxSection::ComputeMaxElectronSc    365 G4WentzelOKandVIxSection::ComputeMaxElectronScattering(G4double cutEnergy)
393 {                                                 366 {
394   if(mass > MeV) {                                367   if(mass > MeV) {
395     G4double ratio = electron_mass_c2/mass;       368     G4double ratio = electron_mass_c2/mass;
396     G4double tau = tkin/mass;                     369     G4double tau = tkin/mass;
397     G4double tmax = 2.0*electron_mass_c2*tau*(    370     G4double tmax = 2.0*electron_mass_c2*tau*(tau + 2.)/
398       (1.0 + 2.0*ratio*(tau + 1.0) + ratio*rat    371       (1.0 + 2.0*ratio*(tau + 1.0) + ratio*ratio);
                                                   >> 372     //tmax = std::min(tmax, targetZ*targetZ*10*eV); 
399     cosTetMaxElec = 1.0 - std::min(cutEnergy,     373     cosTetMaxElec = 1.0 - std::min(cutEnergy, tmax)*electron_mass_c2/mom2;
400   } else {                                        374   } else {
401                                                   375 
402     G4double tmax = (particle == theElectron)  << 376     G4double tmax = tkin;
                                                   >> 377     if(particle == theElectron) { tmax *= 0.5; }
                                                   >> 378     //tmax = std::min(tmax, targetZ*targetZ*10*eV); 
403     G4double t = std::min(cutEnergy, tmax);       379     G4double t = std::min(cutEnergy, tmax);
404     G4double mom21 = t*(t + 2.0*electron_mass_    380     G4double mom21 = t*(t + 2.0*electron_mass_c2);
405     G4double t1 = tkin - t;                       381     G4double t1 = tkin - t;
406     //G4cout <<"tkin=" <<tkin<<" tmax= "<<tmax    382     //G4cout <<"tkin=" <<tkin<<" tmax= "<<tmax<<" t= " 
407     //<<t<< " t1= "<<t1<<" cut= "<<ecut<<G4end    383     //<<t<< " t1= "<<t1<<" cut= "<<ecut<<G4endl;
408     if(t1 > 0.0) {                                384     if(t1 > 0.0) {
409       G4double mom22 = t1*(t1 + 2.0*mass);        385       G4double mom22 = t1*(t1 + 2.0*mass);
410       G4double ctm = (mom2 + mom22 - mom21)*0.    386       G4double ctm = (mom2 + mom22 - mom21)*0.5/sqrt(mom2*mom22);
411       if(ctm <  1.0) { cosTetMaxElec = ctm; }     387       if(ctm <  1.0) { cosTetMaxElec = ctm; }
412       if(particle == theElectron && cosTetMaxE    388       if(particle == theElectron && cosTetMaxElec < 0.0) { 
413         cosTetMaxElec = 0.0;                      389         cosTetMaxElec = 0.0; 
414       }                                           390       }
415     }                                             391     }
416   }                                               392   }
417 }                                                 393 }
418                                                   394 
419 //....oooOO0OOooo........oooOO0OOooo........oo    395 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
420                                                   396 
421 G4double                                          397 G4double 
422 G4WentzelOKandVIxSection::ComputeSecondTranspo    398 G4WentzelOKandVIxSection::ComputeSecondTransportMoment(G4double /*CosThetaMax*/)
423 {                                                 399 {
424   return 0.0;                                     400   return 0.0;
425 }                                                 401 }
426                                                   402 
427 //....oooOO0OOooo........oooOO0OOooo........oo    403 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
428                                                   404