Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change chanti data urls #90

Merged
merged 2 commits into from
Dec 8, 2022
Merged

Change chanti data urls #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8da2545
Change chianti save urls from hesperia to lmsal
Dec 7, 2022
e52fe06
Update azure template for tox issue
Dec 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
- run: *skip-check
- run: *merge-check
- run: *apt-install
- run: pip install -U tox
- run: pip install -U 'tox<4' tox-pypi-filter
- run: tox -e build_docs
- run:
name: Prepare for upload
Expand Down
8 changes: 4 additions & 4 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ variables:

resources:
repositories:
- repository: samaloney
- repository: OpenAstronomy
type: github
endpoint: sunpy
name: samaloney/azure-pipelines-templates
ref: feat-add-tox-version
name: OpenAstronomy/azure-pipelines-templates
ref: master

trigger:
branches:
Expand All @@ -29,7 +29,7 @@ trigger:
- '*post*'

jobs:
- template: run-tox-env.yml@samaloney
- template: run-tox-env.yml@OpenAstronomy
parameters:
toxverspec: <4
toxdeps: tox-pypi-filter
Expand Down
1 change: 1 addition & 0 deletions changelog/90.trivial.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update SSW data url to point to lmsal server.
6 changes: 3 additions & 3 deletions sunxspex/io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@


@manager.require('chianti_lines',
['https://hesperia.gsfc.nasa.gov/ssw/packages/xray/dbase/chianti/chianti_lines_1_10_v71.sav'],
['https://lmsal.com/solarsoft/ssw/packages/xray/dbase/chianti/chianti_lines_1_10_v71.sav'],
'2046d818efec207a83e9c5cc6ba4a5fa8574bf8c2bd8a6bb9801e4b8a2a0c677')
def load_chianti_lines_lite():
"""
Expand Down Expand Up @@ -124,7 +124,7 @@ def load_chianti_lines_lite():


@manager.require('chianti_continuum',
['https://hesperia.gsfc.nasa.gov/ssw/packages/xray/dbase/chianti/chianti_cont_1_250_v71.sav'],
['https://lmsal.com/solarsoft/ssw/packages/xray/dbase/chianti/chianti_cont_1_250_v71.sav'],
'aadf4355931b4c241ac2cd5669e89928615dc1b55c9fce49a155b70915a454dd')
def load_chianti_continuum():
"""
Expand Down Expand Up @@ -179,7 +179,7 @@ def load_chianti_continuum():


@manager.require('xray_abundances',
['https://hesperia.gsfc.nasa.gov/ssw/packages/xray/dbase/chianti/xray_abun_file.genx'],
['https://lmsal.com/solarsoft/ssw/packages/xray/dbase/chianti/xray_abun_file.genx'],
'92c0e1f9a83da393cc38840752fda5a5b44c5b18a4946e5bf12c208771fe0fd3')
def load_xray_abundances(abundance_type=None):
"""
Expand Down
4 changes: 2 additions & 2 deletions sunxspex/tests/test_thermal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

# Manually load file that was used to compile expected flux values.
thermal.setup_continuum_parameters(
"https://hesperia.gsfc.nasa.gov/ssw/packages/xray/dbase/chianti/chianti_cont_1_250_v71.sav")
"https://lmsal.com/solarsoft/ssw/packages/xray/dbase/chianti/chianti_cont_1_250_v71.sav")
thermal.setup_line_parameters(
"https://hesperia.gsfc.nasa.gov/ssw/packages/xray/dbase/chianti/chianti_lines_1_10_v71.sav")
"https://lmsal.com/solarsoft/ssw/packages/xray/dbase/chianti/chianti_lines_1_10_v71.sav")
SSW_INTENSITY_UNIT = u.ph / u.cm**2 / u.s / u.keV
DEFAULT_ABUNDANCE_TYPE = "sun_coronal_ext"

Expand Down