Skip to content

Commit

Permalink
Merge branch 'main' into version+
Browse files Browse the repository at this point in the history
  • Loading branch information
rot4te authored Jan 16, 2025
2 parents 8f6bebd + b99b165 commit fa00292
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ docs/site/
Manifest.toml



.DS_Store
*.code-workspace
*.code-workspace
*~
*.swp

2 changes: 1 addition & 1 deletion docs/src/constants_used.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Constants are pulled from the NIST table of the **2022 CODATA release**. Note th

## Species Mass
#### Electron Mass: `m_electron` = 0.51099895069 * u"MeV/c^2"
#### Proton Mass: `m_proton` = 9.382720894300001e2 * u"eV/c^2"
#### Proton Mass: `m_proton` = 938.2720894300001 * u"MeV/c^2"
#### Neutron Mass: `m_neutron` = 9.395654219399999e2 * u"MeV/c^2"
#### Muon Mass: `m_muon` = 1.056583755e2 * u"MeV/c^2"
#### Helion Mass He3 nucleus: `m_helion` = 2.80839161112e3 * u"MeV/c^2"
Expand Down
4 changes: 2 additions & 2 deletions src/constants.jl
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

const __b_m_electron = 0.51099895069 * u"MeV/c^2"
# Electron Mass [MeV]/c^2
const __b_m_proton = 9.382720894300001e2 * u"eV/c^2"
const __b_m_proton = 938.2720894300001 * u"MeV/c^2"
# Proton Mass [MeV]/c^2
const __b_m_neutron = 9.395654219399999e2 * u"MeV/c^2"
# Neutron Mass [MeV]/c^2
Expand Down Expand Up @@ -131,4 +131,4 @@ const __b_mu_0_vac = 1.25663706127e-6 * u"N/A^2";



#---------------------------------------------------------------------------------------------------
#---------------------------------------------------------------------------------------------------
4 changes: 2 additions & 2 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ end
@test H_PLANCK 4.135667696e-15
@test H_BAR_PLANCK 6.582119568038699e-16
@test R_E 2.8179403205e-15
@test R_P 1.5346982640795807e-12
@test R_P 1.5346982640795807e-18
@test E_CHARGE 1
@test MU_0_VAC 1.25663706127e-6
@test EPS_0_VAC 8.8541878188e-12
Expand All @@ -43,4 +43,4 @@ end
@test chargeof(Species("Cl-")) -1
@test chargeof(Species("O--")) -2
@test chargeof(Species("N-3")) -3
end
end

0 comments on commit fa00292

Please sign in to comment.