Merge pull request #96 from bmad-sim/new-setunits

New setunits

src/AtomicAndPhysicalConstants.jl

@@ -7,6 +7,7 @@ using JSON
 using Reexport
 @reexport using Unitful
 
+include("units_definition.jl")
 include("physical_constants.jl")
 include("atomic_isotopes.jl")
 include("subatomic_species.jl")
@@ -17,13 +18,10 @@ include("update_iso_masses.jl")
 include("particle_functions.jl")
 include("set_units.jl")
 
-export setunits, printunits
-export PARTICLE_PHYSICS, MKS, CGS
-export mass, charge
-export c_light, m_electron, m_proton, m_neutron, m_muon, m_helion, m_deuteron, m_pion_0, m_pion_charged
-export r_e, e_charge, h_planck, mu_0_vac, eps_0_vac
-export kg_per_amu, eV_per_amu, N_avogadro, fine_structure, classical_radius_factor, r_p, h_bar_planck, kg_per_eV, eps_0_vac
-export mu_deuteron, mu_electron, mu_helion, mu_muon, mu_neutron, mu_proton, mu_triton
+export setunits
+export ACCELERATOR, MKS, CGS
+export massof, chargeof
+export C_LIGHT, H_PLANCK, H_BAR_PLANCK, R_E, R_P, E_CHARGE, MU_0_VAC, EPS_0_VAC, CLASSICAL_RADIUS_FACTOR, FINE_STRUCTURE, N_AVOGADRO
 export SubatomicSpecies
 export AtomicSpecies
 export SUBATOMIC_SPECIES

src/physical_constants.jl

@@ -2,24 +2,6 @@
 # Constants pulled from the NIST table of
 # the 2022 CODATA release
 
-const __b_e_charge = 1.602176634e-19 * u"C"
-# elementary charge [C]
-const __b_N_avogadro = 6.02214076e23
-# Avogadro's constant: Number / mole (exact)
-
-module NewUnits
-using Unitful
-AA = parentmodule(NewUnits)
-@unit e "e" elementary_charge AA.__b_e_charge false
-@unit amu "amu" Amu (1 / (AA.__b_N_avogadro)) * u"g" false
-end
-
-Unitful.register(NewUnits);
-using .NewUnits
-
-function __init__()
-    Unitful.register(NewUnits)
-end
 
 
 # Format is:
@@ -49,6 +31,10 @@ const __b_mu_0_vac = 1.25663706127e-6 * u"N/A^2"
 # Vacuum permeability in [N/A^2] (newtons per ampere squared)
 
 
+const __b_e_charge = 1.602176634e-19 * u"C"
+# elementary charge [C]
+const __b_N_avogadro = 6.02214076e23
+# Avogadro's constant: Number / mole (exact)