Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
NicholasWMRitchie committed Jul 28, 2022
2 parents e40990f + 5a91a53 commit 181e7b1
Show file tree
Hide file tree
Showing 52 changed files with 11,738 additions and 1,529 deletions.
11 changes: 11 additions & 0 deletions Citation.bib
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
@article{ritchie_2022,
title={Reproducible Spectrum and Hyperspectrum Data Analysis Using {NeXL}},
volume={28},
DOI={10.1017/S143192762200023X},
number={2},
journal={Microscopy and Microanalysis},
publisher={Cambridge University Press},
author={Ritchie, Nicholas W. M.},
year={2022},
pages={478–495}
}
20 changes: 11 additions & 9 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ name = "NeXLSpectrum"
uuid = "6c578565-ca7f-4012-afc4-b8412d85af92"
authors = ["Nicholas W.M. Ritchie <[email protected]>"]
repo-url = "https://github.com/usnistgov/NeXLSpectrum.jl"
version = "0.3.2"
version = "0.3.3"

[deps]
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
Compose = "a81c6b42-2e10-5240-aca2-a61377ecd94b"
CubicSplines = "9c784101-8907-5a6d-9be6-98f00873c89b"
DataAPI = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a"
DataDeps = "124859b0-ceae-595e-8997-d05f6a7a8dfe"
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
Expand All @@ -27,14 +28,14 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
LoopVectorization = "bdcacae8-1622-11e9-2a5c-532679323890"
LsqFit = "2fda8390-95c7-5789-9bda-21331edee243"
Mmap = "a63ad114-7e13-5084-954f-fe012c677804"
MultivariateStats = "6f286f6a-111f-5878-ab1e-185364afe411"
NeXLCore = "93a0284f-3680-435e-8d39-dd6e52a1dbc8"
NeXLMatrixCorrection = "3ab34fdf-2fe8-473b-9b20-30f5809db337"
NeXLUncertainties = "7127f3d6-1721-46bc-bb38-8fc703dd438e"
OnlineStats = "a15396b6-48d5-5d58-9928-6d29437db91e"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
Polynomials = "f27b6e38-b328-58d1-80ce-0feddd5e7a45"
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
Procrastinate = "3362a694-cdb4-48f5-aa9a-ff559879651c"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
Requires = "ae029012-a4dd-5104-9daa-d747884805df"
Expand All @@ -49,28 +50,29 @@ CSV = "0.9, 0.10"
Cairo = "1.0.3"
Colors = "0.12"
Compose = "0.9"
CubicSplines = "0.2"
DataAPI = "1.6"
DataDeps = "0.7"
DataFrames = "1"
Distributions = "0.25"
EzXML = "1.1"
FileIO = "1.10"
Formatting = "0.4"
FourierTools = "0.2, 0.3"
FourierTools = "0.3.3"
Gadfly = "1.3"
HDF5 = "0.15, 0.16"
ImageAxes = "0.6"
ImageIO = "0.5, 0.6"
Images = "0.25"
Interpolations = "0.13"
Interpolations = "0.13, 0.14"
LoopVectorization = "0.12"
LsqFit = "0.12"
MultivariateStats = "0.8, 0.9"
NeXLCore = "0.3.2"
NeXLMatrixCorrection = "0.3.2"
NeXLUncertainties = "0.2.9"
NeXLCore = "0.3.5"
NeXLMatrixCorrection = "0.3.3"
NeXLUncertainties = "0.2.10"
OnlineStats = "1.5"
Polynomials = "2"
Polynomials = "3"
Procrastinate = "0.1"
Reexport = "1"
Requires = "1"
ThreadsX = "0.1.8"
Expand Down
1 change: 1 addition & 0 deletions docs/make.jl
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ end
pages = [
"Home" => "index.md",
"Spectrum Methods" => "spectrum.md",
"HyperSpectrum Methods" => "hyperspectrum.md",
"Fitting K412 (simple API)" => "k412refs.md",
"Fitting K412 (flexible API)" => "K412fit.md",
"Fitting K412 (quick fit)" => "K412quick.md",
Expand Down
Loading

0 comments on commit 181e7b1

Please sign in to comment.