Continued changes for geant4.10, still not yet finished

This commit is contained in:
nemu
2014-08-14 17:31:31 +02:00
parent 040457f56e
commit b5072a3e20
15 changed files with 266 additions and 245 deletions

View File

@ -101,7 +101,7 @@ inline G4double MuDecayChannelWithSpin::F_c(G4double x, G4double x0)
f_c = (5.+17.*x-34.*x*x)*(omega+std::log(x))-22.*x+34.*x*x;
f_c = (1.-x)/(3.*x*x)*f_c;
f_c = (6.-4.*x)*R_c(x)+(6.-6.*x)*std::log(x) + f_c;
f_c = (fine_structure_const/twopi) * (x*x-x0*x0) * f_c;
f_c = ( CLHEP::fine_structure_const/CLHEP::twopi) * (x*x-x0*x0) * f_c;
return f_c;
}
@ -116,7 +116,7 @@ inline G4double MuDecayChannelWithSpin::F_theta(G4double x, G4double x0)
f_theta = f_theta + ((4.*(1.-x)*(1.-x))/x)*std::log(1.-x);
f_theta = (1.-x)/(3.*x*x) * f_theta;
f_theta = (2.-4.*x)*R_c(x)+(2.-6.*x)*std::log(x)-f_theta;
f_theta = (fine_structure_const/twopi) * (x*x-x0*x0) * f_theta;
f_theta = (CLHEP::fine_structure_const/CLHEP::twopi) * (x*x-x0*x0) * f_theta;
return f_theta;
}