Update of /cvsroot/boost-sandbox/boost-sandbox/boost/units/systems/si/codata In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16467/systems/si/codata Modified Files: atomic_and_nuclear_constants.hpp electromagnetic_constants.hpp physico-chemical_constants.hpp universal_constants.hpp Log Message: CODATA constants now include measurement uncertainties and are updated to latest values as of 2007/03/30 Index: universal_constants.hpp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/boost/units/systems/si/codata/universal_constants.hpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- universal_constants.hpp 16 Mar 2007 18:12:46 -0000 1.1.1.1 +++ universal_constants.hpp 30 Mar 2007 23:49:14 -0000 1.2 @@ -11,14 +11,15 @@ #ifndef BOOST_UNITS_CODATA_UNIVERSAL_CONSTANTS_HPP #define BOOST_UNITS_CODATA_UNIVERSAL_CONSTANTS_HPP -#include <boost/units/systems/si.hpp> - #if BOOST_UNITS_HAS_TYPEOF +#include <boost/units/measurement.hpp> #include <boost/units/static_constant.hpp> +#include <boost/units/systems/si.hpp> /// \file -/// CODATA recommended values of fundamental universal constants: NIST SP 961 +/// CODATA recommended values of fundamental universal constants +/// CODATA 2006 values as of 2007/03/30 namespace boost { @@ -34,27 +35,27 @@ // UNIVERSAL /// speed of light -BOOST_UNITS_AUTO_STATIC_CONSTANT(c,(299792458.0*meters/second)); -/// magnetic constant -BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_0,(12.566370614e-7*newtons/ampere/ampere)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(c,(measurement<double>(299792458.0,0.0)*meters/second)); +/// magnetic constant (exactly 4 pi x 10^(-7) - error is due to finite precision of pi) +BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_0,(measurement<double>(12.56637061435917295385057353311801153679e-7,0.0)*newtons/ampere/ampere)); /// electric constant -BOOST_UNITS_AUTO_STATIC_CONSTANT(epsilon_0,(8.854187817e-12*farad/meter)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(epsilon_0,(measurement<double>(8.854187817620389850536563031710750260608e-12,0.0)*farad/meter)); /// characteristic impedance of vacuum -BOOST_UNITS_AUTO_STATIC_CONSTANT(Z_0,(376.730313461*ohm)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(Z_0,(measurement<double>(376.7303134617706554681984004203193082686,0.0)*ohm)); /// Newtonian constant of gravitation -BOOST_UNITS_AUTO_STATIC_CONSTANT(G,(6.6742e-11*cubic_meters/kilogram/second/second)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(G,(measurement<double>(6.67428e-11,6.7e-15)*cubic_meters/kilogram/second/second)); /// Planck constant -BOOST_UNITS_AUTO_STATIC_CONSTANT(h,(6.6260693e-34*joule*seconds)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(h,(measurement<double>(6.62606896e-34,3.3e-41)*joule*seconds)); /// Dirac constant -BOOST_UNITS_AUTO_STATIC_CONSTANT(hbar,(1.05457168e-34*joule*seconds)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(hbar,(measurement<double>(1.054571628e-34,5.3e-42)*joule*seconds)); /// Planck mass -BOOST_UNITS_AUTO_STATIC_CONSTANT(m_P,(2.17645e-8*kilograms)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_P,(measurement<double>(2.17644e-8,1.1e-12)*kilograms)); /// Planck temperature -BOOST_UNITS_AUTO_STATIC_CONSTANT(T_P,(1.41679e32*kelvin)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(T_P,(measurement<double>(1.416785e32,7.1e27)*kelvin)); /// Planck length -BOOST_UNITS_AUTO_STATIC_CONSTANT(l_P,(1.61624e-35*meters)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(l_P,(measurement<double>(1.616252e-35,8.1e-40)*meters)); /// Planck time -BOOST_UNITS_AUTO_STATIC_CONSTANT(t_P,(5.39121e-44*seconds)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(t_P,(measurement<double>(5.39124e-44,2.7e-48)*seconds)); } // namespace CODATA Index: physico-chemical_constants.hpp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/boost/units/systems/si/codata/physico-chemical_constants.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- physico-chemical_constants.hpp 30 Mar 2007 18:56:47 -0000 1.2 +++ physico-chemical_constants.hpp 30 Mar 2007 23:49:14 -0000 1.3 @@ -11,15 +11,15 @@ #ifndef BOOST_UNITS_CODATA_PHYSICO_CHEMICAL_CONSTANTS_HPP #define BOOST_UNITS_CODATA_PHYSICO_CHEMICAL_CONSTANTS_HPP -#include <boost/units/systems/si.hpp> - #if BOOST_UNITS_HAS_TYPEOF #include <boost/units/measurement.hpp> #include <boost/units/static_constant.hpp> +#include <boost/units/systems/si.hpp> /// \file -/// CODATA recommended values of fundamental physico-chemical constants: NIST SP 961 +/// CODATA recommended values of fundamental physico-chemical constants +/// CODATA 2006 values as of 2007/03/30 namespace boost { @@ -33,25 +33,25 @@ // PHYSICO-CHEMICAL /// Avogadro constant -BOOST_UNITS_AUTO_STATIC_CONSTANT(N_A,(6.0221415e23/mole)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(N_A,(measurement<double>(6.02214179e23,3.0e16)/mole)); /// atomic mass constant -BOOST_UNITS_AUTO_STATIC_CONSTANT(m_u,(1.66053886e-27*kilograms)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_u,(measurement<double>(1.660538782e-27,8.3e-35)*kilograms)); /// Faraday constant -BOOST_UNITS_AUTO_STATIC_CONSTANT(F,(96485.3383*coulombs/mole)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(F,(measurement<double>(96485.3399,2.4e-3)*coulombs/mole)); /// molar gas constant -BOOST_UNITS_AUTO_STATIC_CONSTANT(R,(measurement<double>(8.314472)*joules/kelvin/mole)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(R,(measurement<double>(8.314472,1.5e-5)*joules/kelvin/mole)); /// Boltzmann constant -BOOST_UNITS_AUTO_STATIC_CONSTANT(k_B,(1.3806505e-23*joules/kelvin)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(k_B,(measurement<double>(1.3806504e-23,2.4e-29)*joules/kelvin)); /// molar volume of ideal gas -BOOST_UNITS_AUTO_STATIC_CONSTANT(V_m,(22.413996e-3*cubic_meters/mole)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(V_m,(measurement<double>(22.413996e-3,3.9e-8)*cubic_meters/mole)); /// Stefan-Boltzmann constant -BOOST_UNITS_AUTO_STATIC_CONSTANT(sigma_SB,(5.670400e-8*watts/square_meter/pow<4>(kelvin))); +BOOST_UNITS_AUTO_STATIC_CONSTANT(sigma_SB,(measurement<double>(5.670400e-8,4.0e-13)*watts/square_meter/pow<4>(kelvin))); /// first radiation constant -BOOST_UNITS_AUTO_STATIC_CONSTANT(c_1,(3.74177138e-16*watt*square_meters)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(c_1,(measurement<double>(3.74177118e-16,1.9e-23)*watt*square_meters)); /// second radiation constant -BOOST_UNITS_AUTO_STATIC_CONSTANT(c_2,(1.4387752e-2*meter*kelvin)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(c_2,(measurement<double>(1.4387752e-2,2.5e-8)*meter*kelvin)); /// Wien displacement law constant -BOOST_UNITS_AUTO_STATIC_CONSTANT(b,(2.8977685e-3*meter*kelvin)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(b,(measurement<double>(2.8977685e-3,5.1e-9)*meter*kelvin)); } // namespace CODATA Index: atomic_and_nuclear_constants.hpp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/boost/units/systems/si/codata/atomic_and_nuclear_constants.hpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- atomic_and_nuclear_constants.hpp 16 Mar 2007 18:12:46 -0000 1.1.1.1 +++ atomic_and_nuclear_constants.hpp 30 Mar 2007 23:49:14 -0000 1.2 @@ -11,14 +11,15 @@ #ifndef BOOST_UNITS_CODATA_ATOMIC_AND_NUCLEAR_CONSTANTS_HPP #define BOOST_UNITS_CODATA_ATOMIC_AND_NUCLEAR_CONSTANTS_HPP -#include <boost/units/systems/si.hpp> - #if BOOST_UNITS_HAS_TYPEOF +#include <boost/units/measurement.hpp> #include <boost/units/static_constant.hpp> +#include <boost/units/systems/si.hpp> /// \file -/// CODATA recommended values of fundamental atomic and nuclear constants: NIST SP 961 +/// CODATA recommended values of fundamental atomic and nuclear constants +/// CODATA 2006 values as of 2007/03/30 namespace boost { @@ -31,179 +32,178 @@ namespace CODATA { /// CODATA recommended values of the fundamental physical constants: NIST SP 961 -typedef dimensionless_quantity<SI::system,double>::type dimensionless_constant; // ATOMIC AND NUCLEAR /// fine structure constant -BOOST_UNITS_STATIC_CONSTANT(alpha,dimensionless_constant) = 7.297352568e-3; +BOOST_UNITS_AUTO_STATIC_CONSTANT(alpha,(measurement<double>(7.2973525376e-3,5.0e-12)*dimensionless())); /// Rydberg constant -BOOST_UNITS_AUTO_STATIC_CONSTANT(R_infinity,(10973731.568525/meter)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(R_infinity,(measurement<double>(10973731.568527,7.3e-5)/meter)); /// Bohr radius -BOOST_UNITS_AUTO_STATIC_CONSTANT(a_0,(0.5291772108e-10*meters)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(a_0,(measurement<double>(0.52917720859e-10,3.6e-20)*meters)); /// Hartree energy -BOOST_UNITS_AUTO_STATIC_CONSTANT(E_h,(4.35974417e-18*joules)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(E_h,(measurement<double>(4.35974394e-18,2.2e-25)*joules)); /// electron mass -BOOST_UNITS_AUTO_STATIC_CONSTANT(m_e,(9.1093826e-31*kilograms)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_e,(measurement<double>(9.10938215e-31,4.5e-38)*kilograms)); /// electron-muon mass ratio -BOOST_UNITS_STATIC_CONSTANT(m_e_over_m_mu,dimensionless_constant) = 4.83633167e-3; +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_e_over_m_mu,(measurement<double>(4.83633171e-3,1.2e-10)*dimensionless())); /// electron-tau mass ratio -BOOST_UNITS_STATIC_CONSTANT(m_e_over_m_tau,dimensionless_constant) = 2.87564e-4; +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_e_over_m_tau,(measurement<double>(2.87564e-4,4.7e-8)*dimensionless())); /// electron-proton mass ratio -BOOST_UNITS_STATIC_CONSTANT(m_e_over_m_p,dimensionless_constant) = 5.4461702173e-4; +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_e_over_m_p,(measurement<double>(5.4461702177e-4,2.4e-13)*dimensionless())); /// electron-neutron mass ratio -BOOST_UNITS_STATIC_CONSTANT(m_e_over_m_n,dimensionless_constant) = 5.4386734481e-4; +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_e_over_m_n,(measurement<double>(5.4386734459e-4,3.3e-13)*dimensionless())); /// electron-deuteron mass ratio -BOOST_UNITS_STATIC_CONSTANT(m_e_over_m_d,dimensionless_constant) = 2.7244371095e-4; +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_e_over_m_d,(measurement<double>(2.7244371093e-4,1.2e-13)*dimensionless())); /// electron-alpha particle mass ratio -BOOST_UNITS_STATIC_CONSTANT(m_e_over_m_alpha,dimensionless_constant) = 1.37093355575e-4; +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_e_over_m_alpha,(measurement<double>(1.37093355570e-4,5.8e-14)*dimensionless())); /// electron charge to mass ratio -BOOST_UNITS_AUTO_STATIC_CONSTANT(e_over_m_e,(1.75882012e11*coulombs/kilogram)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(e_over_m_e,(measurement<double>(1.758820150e11,4.4e3)*coulombs/kilogram)); /// electron molar mass -BOOST_UNITS_AUTO_STATIC_CONSTANT(M_e,(5.4857990945e-7*kilograms/mole)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(M_e,(measurement<double>(5.4857990943e-7,2.3e-16)*kilograms/mole)); /// Compton wavelength -BOOST_UNITS_AUTO_STATIC_CONSTANT(lambda_C,(2.426310238e-12*meters)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(lambda_C,(measurement<double>(2.4263102175e-12,3.3e-21)*meters)); /// classical electron radius -BOOST_UNITS_AUTO_STATIC_CONSTANT(r_e,(2.817940325e-15*meters)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(r_e,(measurement<double>(2.8179402894e-15,5.8e-24)*meters)); /// Thompson cross section -BOOST_UNITS_AUTO_STATIC_CONSTANT(sigma_e,(0.665245873e-28*square_meters)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(sigma_e,(measurement<double>(0.6652458558e-28,2.7e-37)*square_meters)); /// electron magnetic moment -BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_e,(-928.476412e-26*joules/tesla)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_e,(measurement<double>(-928.476377e-26,2.3e-31)*joules/tesla)); /// electron magnetic moment anomaly -BOOST_UNITS_STATIC_CONSTANT(a_e,dimensionless_constant) = 1.1596521859e-3; +BOOST_UNITS_AUTO_STATIC_CONSTANT(a_e,(measurement<double>(1.15965218111e-3,7.4e-13)*dimensionless())); /// electron g-factor -BOOST_UNITS_STATIC_CONSTANT(g_e,dimensionless_constant) = -2.0023193043718; +BOOST_UNITS_AUTO_STATIC_CONSTANT(g_e,(measurement<double>(-2.0023193043622,1.5e-12)*dimensionless())); /// electron-muon magnetic moment ratio -BOOST_UNITS_STATIC_CONSTANT(mu_e_over_mu_mu,dimensionless_constant) = 206.7669894; +BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_e_over_mu_mu,(measurement<double>(206.7669877,5.2e-6)*dimensionless())); /// electron-proton magnetic moment ratio -BOOST_UNITS_STATIC_CONSTANT(mu_e_over_mu_p,dimensionless_constant) = -658.2106862; +BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_e_over_mu_p,(measurement<double>(-658.2106848,5.4e-6)*dimensionless())); /// electron-shielded proton magnetic moment ratio -BOOST_UNITS_STATIC_CONSTANT(mu_e_over_mu_p_prime,dimensionless_constant) = -658.2275956; +BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_e_over_mu_p_prime,(measurement<double>(-658.2275971,7.2e-6)*dimensionless())); /// electron-neutron magnetic moment ratio -BOOST_UNITS_STATIC_CONSTANT(mu_e_over_mu_n,dimensionless_constant) = 960.92050; +BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_e_over_mu_n,(measurement<double>(960.92050,2.3e-4)*dimensionless())); /// electron-deuteron magnetic moment ratio -BOOST_UNITS_STATIC_CONSTANT(mu_e_over_mu_d,dimensionless_constant) = -2143.923493; +BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_e_over_mu_d,(measurement<double>(-2143.923498,1.8e-5)*dimensionless())); /// electron-shielded helion magnetic moment ratio -BOOST_UNITS_STATIC_CONSTANT(mu_e_over_mu_h_prime,dimensionless_constant) = 864.058255; +BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_e_over_mu_h_prime,(measurement<double>(864.058257,1.0e-5)*dimensionless())); /// electron gyromagnetic ratio -BOOST_UNITS_AUTO_STATIC_CONSTANT(gamma_e,(1.76085974/second/tesla)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(gamma_e,(measurement<double>(1.760859770e11,4.4e3)/second/tesla)); /// muon mass -BOOST_UNITS_AUTO_STATIC_CONSTANT(m_mu,(1.88353140e-28*kilograms)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_mu,(measurement<double>(1.88353130e-28,1.1e-35)*kilograms)); /// muon-electron mass ratio -BOOST_UNITS_STATIC_CONSTANT(m_mu_over_m_e,dimensionless_constant) = 206.7682838; +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_mu_over_m_e,(measurement<double>(206.7682823,5.2e-6)*dimensionless())); /// muon-tau mass ratio -BOOST_UNITS_STATIC_CONSTANT(m_mu_over_m_tau,dimensionless_constant) = 5.94592e-2; +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_mu_over_m_tau,(measurement<double>(5.94592e-2,9.7e-6)*dimensionless())); /// muon-proton mass ratio -BOOST_UNITS_STATIC_CONSTANT(m_mu_over_m_p,dimensionless_constant) = 0.1126095269; +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_mu_over_m_p,(measurement<double>(0.1126095261,2.9e-9)*dimensionless())); /// muon-neutron mass ratio -BOOST_UNITS_STATIC_CONSTANT(m_mu_over_m_n,dimensionless_constant) = 0.1124545175; +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_mu_over_m_n,(measurement<double>(0.1124545167,2.9e-9)*dimensionless())); /// muon molar mass -BOOST_UNITS_AUTO_STATIC_CONSTANT(M_mu,(0.1134289264e-3*kilograms/mole)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(M_mu,(measurement<double>(0.1134289256e-3,2.9e-12)*kilograms/mole)); /// muon Compton wavelength -BOOST_UNITS_AUTO_STATIC_CONSTANT(lambda_C_mu,(11.73444105e-15*meters)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(lambda_C_mu,(measurement<double>(11.73444104e-15,3.0e-22)*meters)); /// muon magnetic moment -BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_m,(-4.49044799e-26*joules/tesla)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_m,(measurement<double>(-4.49044786e-26,1.6e-33)*joules/tesla)); /// muon magnetic moment anomaly -BOOST_UNITS_STATIC_CONSTANT(a_mu,dimensionless_constant) = 1.16591981e-3; +BOOST_UNITS_AUTO_STATIC_CONSTANT(a_mu,(measurement<double>(1.16592069e-3,6.0e-10)*dimensionless())); /// muon g-factor -BOOST_UNITS_STATIC_CONSTANT(g_mu,dimensionless_constant) = -2.0023318396; +BOOST_UNITS_AUTO_STATIC_CONSTANT(g_mu,(measurement<double>(-2.0023318414,1.2e-9)*dimensionless())); /// muon-proton magnetic moment ratio -BOOST_UNITS_STATIC_CONSTANT(mu_mu_over_mu_p,dimensionless_constant) = -3.183345118; +BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_mu_over_mu_p,(measurement<double>(-3.183345118)*dimensionless())); /// tau mass -BOOST_UNITS_AUTO_STATIC_CONSTANT(m_tau,(3.16777e-27*kilograms)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_tau,(measurement<double>(3.16777e-27,5.2e-31)*kilograms)); /// tau-electron mass ratio -BOOST_UNITS_STATIC_CONSTANT(m_tau_over_m_e,dimensionless_constant) = 3477.48; +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_tau_over_m_e,(measurement<double>(3477.48,5.7e-1)*dimensionless())); /// tau-muon mass ratio -BOOST_UNITS_STATIC_CONSTANT(m_tau_over_m_mu,dimensionless_constant) = 16.8183; +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_tau_over_m_mu,(measurement<double>(16.8183,2.7e-3)*dimensionless())); /// tau-proton mass ratio -BOOST_UNITS_STATIC_CONSTANT(m_tau_over_m_p,dimensionless_constant) = 1.89390; +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_tau_over_m_p,(measurement<double>(1.89390,3.1e-4)*dimensionless())); /// tau-neutron mass ratio -BOOST_UNITS_STATIC_CONSTANT(m_tau_over_m_n,dimensionless_constant) = 1.89129; +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_tau_over_m_n,(measurement<double>(1.89129,3.1e-4)*dimensionless())); /// tau molar mass -BOOST_UNITS_AUTO_STATIC_CONSTANT(M_tau,(1.907698e-3*kilograms/mole)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(M_tau,(measurement<double>(1.90768e-3,3.1e-7)*kilograms/mole)); /// tau Compton wavelength -BOOST_UNITS_AUTO_STATIC_CONSTANT(lambda_C_tau,(0.69772e-15*meters)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(lambda_C_tau,(measurement<double>(0.69772e-15,1.1e-19)*meters)); /// proton mass -BOOST_UNITS_AUTO_STATIC_CONSTANT(m_p,(1.67262171e-27*kilograms)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_p,(measurement<double>(1.672621637e-27,8.3e-35)*kilograms)); /// proton-electron mass ratio -BOOST_UNITS_STATIC_CONSTANT(m_p_over_m_e,dimensionless_constant) = 1836.15267261; +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_p_over_m_e,(measurement<double>(1836.15267247,8.0e-7)*dimensionless())); /// proton-muon mass ratio -BOOST_UNITS_STATIC_CONSTANT(m_p_over_m_mu,dimensionless_constant) = 8.88024333; +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_p_over_m_mu,(measurement<double>(8.88024339,2.3e-7)*dimensionless())); /// proton-tau mass ratio -BOOST_UNITS_STATIC_CONSTANT(m_p_over_m_tau,dimensionless_constant) = 0.528012; +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_p_over_m_tau,(measurement<double>(0.528012,8.6e-5)*dimensionless())); /// proton-neutron mass ratio -BOOST_UNITS_STATIC_CONSTANT(m_p_over_m_n,dimensionless_constant) = 0.99862347872; +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_p_over_m_n,(measurement<double>(0.99862347824,4.6e-10)*dimensionless())); /// proton charge to mass ratio -BOOST_UNITS_AUTO_STATIC_CONSTANT(e_over_m_p,(9.57883376e7*coulombs/kilogram)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(e_over_m_p,(measurement<double>(9.57883392e7,2.4e0)*coulombs/kilogram)); /// proton molar mass -BOOST_UNITS_AUTO_STATIC_CONSTANT(M_p,(1.00727646688e-3*kilograms/mole)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(M_p,(measurement<double>(1.00727646677e-3,1.0e-13)*kilograms/mole)); /// proton rms charge radius -BOOST_UNITS_AUTO_STATIC_CONSTANT(R_p,(0.8750e-15*meters)) = 0.8750e-15*meters; +BOOST_UNITS_AUTO_STATIC_CONSTANT(R_p,(measurement<double>(0.8768e-15,6.9e-18)*meters)); /// proton magnetic moment -BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_p,(1.41060671e-26*joules/tesla)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_p,(measurement<double>(1.410606662e-26,3.7e-34)*joules/tesla)); /// proton g-factor -BOOST_UNITS_STATIC_CONSTANT(g_p,dimensionless_constant) = 5.585694701; +BOOST_UNITS_AUTO_STATIC_CONSTANT(g_p,(measurement<double>(5.585694713,4.6e-8)*dimensionless())); /// proton-neutron magnetic moment ratio -BOOST_UNITS_STATIC_CONSTANT(mu_p_over_mu_n,dimensionless_constant) = -1.45989805; +BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_p_over_mu_n,(measurement<double>(-1.45989806,3.4e-7)*dimensionless())); /// shielded proton magnetic moment -BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_p_prime,(1.41057047e-26*joules/tesla)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_p_prime,(measurement<double>(1.41057041e-26,3.8e-34)*joules/tesla)); /// proton gyromagnetic ratio -BOOST_UNITS_AUTO_STATIC_CONSTANT(gamma_p,(2.67522205e8/second/tesla)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(gamma_p,(measurement<double>(2.675222099e8,7.0e0)/second/tesla)); /// shielded proton gyromagnetic ratio -BOOST_UNITS_AUTO_STATIC_CONSTANT(gamma_p_prime,(2.67515333e8/second/tesla)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(gamma_p_prime,(measurement<double>(2.675153362e8,7.3e0)/second/tesla)); /// neutron mass -BOOST_UNITS_AUTO_STATIC_CONSTANT(m_n,(1.67492728e-27*kilograms)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_n,(measurement<double>(1.674927211e-27,8.4e-35)*kilograms)); /// neutron-electron mass ratio -BOOST_UNITS_STATIC_CONSTANT(m_n_over_m_e,dimensionless_constant) = 1838.6836598; +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_n_over_m_e,(measurement<double>(1838.6836605,1.1e-6)*dimensionless())); /// neutron-muon mass ratio -BOOST_UNITS_STATIC_CONSTANT(m_n_over_m_mu,dimensionless_constant) = 8.89248402; +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_n_over_m_mu,(measurement<double>(8.89248409,2.3e-7)*dimensionless())); /// neutron-tau mass ratio -BOOST_UNITS_STATIC_CONSTANT(m_n_over_m_tau,dimensionless_constant) = 0.528740; +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_n_over_m_tau,(measurement<double>(0.528740,8.6e-5)*dimensionless())); /// neutron-proton mass ratio -BOOST_UNITS_STATIC_CONSTANT(m_n_over_m_p,dimensionless_constant) = 1.00137841870; +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_n_over_m_p,(measurement<double>(1.00137841918,4.6e-10)*dimensionless())); /// neutron Compton wavelength -BOOST_UNITS_AUTO_STATIC_CONSTANT(lambda_C_n,(1.3195909067e-15*meters)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(lambda_C_n,(measurement<double>(1.3195908951e-15,2.0e-24)*meters)); /// neutron molar mass -BOOST_UNITS_AUTO_STATIC_CONSTANT(M_n,(1.00866491560e-3*kilograms/mole)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(M_n,(measurement<double>(1.00866491597e-3,4.3e-13)*kilograms/mole)); /// neutron magnetic moment -BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_n,(-0.96623645e-26*joules/tesla)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_n,(measurement<double>(-0.96623641e-26,2.3e-33)*joules/tesla)); /// neutron g-factor -BOOST_UNITS_STATIC_CONSTANT(g_n,dimensionless_constant) = -3.82608546; +BOOST_UNITS_AUTO_STATIC_CONSTANT(g_n,(measurement<double>(-3.82608545,9.0e-7)*dimensionless())); /// neutron-proton magnetic moment ratio -BOOST_UNITS_STATIC_CONSTANT(mu_n_over_mu_p,dimensionless_constant) = -0.68497934; +BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_n_over_mu_p,(measurement<double>(-0.68497934,1.6e-7)*dimensionless())); /// neutron-shielded proton magnetic moment ratio -BOOST_UNITS_STATIC_CONSTANT(mu_n_over_mu_p_prime,dimensionless_constant) = -0.68499694; +BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_n_over_mu_p_prime,(measurement<double>(-0.68499694,1.6e-7)*dimensionless())); /// neutron gyromagnetic ratio -BOOST_UNITS_AUTO_STATIC_CONSTANT(gamma_n,(1.83247183e8/second/tesla)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(gamma_n,(measurement<double>(1.83247185e8,4.3e1)/second/tesla)); /// deuteron mass -BOOST_UNITS_AUTO_STATIC_CONSTANT(m_d,(3.34358335e-27*kilograms)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_d,(measurement<double>(3.34358320e-27,1.7e-34)*kilograms)); /// deuteron-electron mass ratio -BOOST_UNITS_AUTO_STATIC_CONSTANT(m_d_over_m_e,(1.0*kilograms/kilograms)) = 3670.4829652; +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_d_over_m_e,(measurement<double>(3670.4829654,1.6e-6)*kilograms/kilograms)); /// deuteron-proton mass ratio -BOOST_UNITS_AUTO_STATIC_CONSTANT(m_d_over_m_p,(1.0*kilograms/kilograms)) = 1.99900750082; +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_d_over_m_p,(measurement<double>(1.99900750108,2.2e-10)*kilograms/kilograms)); /// deuteron molar mass -BOOST_UNITS_AUTO_STATIC_CONSTANT(M_d,(2.01355321270e-3*kilograms/mole)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(M_d,(measurement<double>(2.013553212724e-3,7.8e-14)*kilograms/mole)); /// deuteron rms charge radius -BOOST_UNITS_AUTO_STATIC_CONSTANT(R_d,(2.1394e-15*meters)) = 2.1394e-15*meters; +BOOST_UNITS_AUTO_STATIC_CONSTANT(R_d,(measurement<double>(2.1402e-15,2.8e-18)*meters)); /// deuteron magnetic moment -BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_d,(0.43307073482e-26*joules/tesla)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_d,(measurement<double>(0.433073465e-26,1.1e-34)*joules/tesla)); /// deuteron-electron magnetic moment ratio -BOOST_UNITS_STATIC_CONSTANT(mu_d_over_mu_e,dimensionless_constant) = -4.664345584e-4; +BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_d_over_mu_e,(measurement<double>(-4.664345537e-4,3.9e-12)*dimensionless())); /// deuteron-proton magnetic moment ratio -BOOST_UNITS_STATIC_CONSTANT(mu_d_over_mu_p,dimensionless_constant) = 0.3070122084; +BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_d_over_mu_p,(measurement<double>(0.3070122070,2.4e-9)*dimensionless())); /// deuteron-neutron magnetic moment ratio -BOOST_UNITS_STATIC_CONSTANT(mu_d_over_mu_n,dimensionless_constant) = -0.44820652; +BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_d_over_mu_n,(measurement<double>(-0.44820652,1.1e-7)*dimensionless())); /// helion mass -BOOST_UNITS_AUTO_STATIC_CONSTANT(m_h,(5.00641214e-27*kilograms)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_h,(measurement<double>(5.00641192e-27,2.5e-34)*kilograms)); /// alpha particle mass -BOOST_UNITS_AUTO_STATIC_CONSTANT(m_alpha,(6.6446565e-27*kilograms)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(m_alpha,(measurement<double>(6.64465620e-27,3.3e-34)*kilograms)); } // namespace CODATA Index: electromagnetic_constants.hpp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/boost/units/systems/si/codata/electromagnetic_constants.hpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- electromagnetic_constants.hpp 16 Mar 2007 18:12:46 -0000 1.1.1.1 +++ electromagnetic_constants.hpp 30 Mar 2007 23:49:14 -0000 1.2 @@ -11,14 +11,15 @@ #ifndef BOOST_UNITS_CODATA_ELECTROMAGNETIC_CONSTANTS_HPP #define BOOST_UNITS_CODATA_ELECTROMAGNETIC_CONSTANTS_HPP -#include <boost/units/systems/si.hpp> - #if BOOST_UNITS_HAS_TYPEOF +#include <boost/units/measurement.hpp> #include <boost/units/static_constant.hpp> +#include <boost/units/systems/si.hpp> /// \file -/// CODATA recommended values of fundamental electromagnetic constants: NIST SP 961 +/// CODATA recommended values of fundamental electromagnetic constants +/// CODATA 2006 values as of 2007/03/30 namespace boost { @@ -34,21 +35,21 @@ // ELECTROMAGNETIC /// elementary charge -BOOST_UNITS_AUTO_STATIC_CONSTANT(e,(1.60217653e-19*coulombs)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(e,(measurement<double>(1.602176487e-19,4.0e-27)*coulombs)); /// elementary charge to Planck constant ratio -BOOST_UNITS_AUTO_STATIC_CONSTANT(e_over_h,(2.41798940*amperes/joule)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(e_over_h,(measurement<double>(2.417989454e14,6.0e6)*amperes/joule)); /// magnetic flux quantum -BOOST_UNITS_AUTO_STATIC_CONSTANT(Phi_0,(2.06783372*webers)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(Phi_0,(measurement<double>(2.067833667e-15,5.2e-23)*webers)); /// conductance quantum -BOOST_UNITS_AUTO_STATIC_CONSTANT(G_0,(7.748091733e-5*siemens)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(G_0,(measurement<double>(7.7480917004e-5,5.3e-14)*siemens)); /// Josephson constant -BOOST_UNITS_AUTO_STATIC_CONSTANT(K_J,(483597.879e9*hertz/volt)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(K_J,(measurement<double>(483597.891e9,1.2e7)*hertz/volt)); /// von Klitzing constant -BOOST_UNITS_AUTO_STATIC_CONSTANT(R_K,(25812.807449*ohms)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(R_K,(measurement<double>(25812.807557,1.8e-5)*ohms)); /// Bohr magneton -BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_B,(927.400949e-26*joules/tesla)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_B,(measurement<double>(927.400915e-26,2.3e-31)*joules/tesla)); /// nuclear magneton -BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_N,(5.05078343e-27*joules/tesla)); +BOOST_UNITS_AUTO_STATIC_CONSTANT(mu_N,(measurement<double>(5.05078324e-27,1.3e-34)*joules/tesla)); } // namespace CODATA |