diff --git a/changelog/197.bugfix.rst b/changelog/197.bugfix.rst new file mode 100644 index 0000000..6ba2744 --- /dev/null +++ b/changelog/197.bugfix.rst @@ -0,0 +1 @@ +Restore mistakenly dropped updateds to the energies used in `~stixpy.calibration.transmission.generate_transmission_tables`.: diff --git a/stixpy/calibration/transmission.py b/stixpy/calibration/transmission.py index f519d6d..3e10320 100644 --- a/stixpy/calibration/transmission.py +++ b/stixpy/calibration/transmission.py @@ -215,11 +215,11 @@ def generate_transmission_tables(): datetime.now().strftime("%Y%m%d") trans = Transmission() - energies = np.linspace(2, 150, 1001) * u.keV + energies = np.hstack([np.arange(2, 20, 0.01), np.arange(20, 160, 0.1)]) * u.keV - norm_sci_energies = trans.get_transmission() + norm_sci_energies = trans.get_transmission(attenuator=True) norm_sci_energies.write(f"stix_transmission_sci_energies_{cur_date}.csv") - norm_high_res = trans.get_transmission(energies=energies) + norm_high_res = trans.get_transmission(energies=energies, attenuator=True) norm_high_res.write(f"stix_transmission_highres_{cur_date}.csv") comps = trans.get_transmission_by_component() diff --git a/stixpy/visualisation/map_reprojection.py b/stixpy/visualisation/map_reprojection.py index 8b0c79d..bcd272b 100644 --- a/stixpy/visualisation/map_reprojection.py +++ b/stixpy/visualisation/map_reprojection.py @@ -7,41 +7,41 @@ .. plot:: :include-source: true - import astropy.units as u - - from astropy.coordinates import SkyCoord - from parfive import Downloader, SessionConfig - from aiohttp import ClientTimeout - from sunpy.net import Fido, attrs as a - from sunpy.map import Map - from sunpy.coordinates.frames import HeliographicStonyhurst - - from stixpy.visualisation.map_reprojection import reproject_map, plot_map_reproj, get_solo_position - - # Search and download map using FIDO - aia = (a.Instrument.aia & - a.Sample(24 * u.hour) & - a.Time('2021-04-17', '2021-04-18')) - wave = a.Wavelength(19.3 * u.nm, 19.3 * u.nm) - query = Fido.search(wave, aia) - - dl = Downloader(config=SessionConfig(ClientTimeout(total=120))) - results = Fido.fetch(query[0][0], downloader=dl) - - # Create map and resample to speed up calculations - map = Map(results) - map = map.resample([512, 512]*u.pix) - - # Get SOLO position observer - # observer = get_solo_position(map) # broken on RTD - observer = SkyCoord(-97.01771373*u.deg, 21.20931737*u.deg, 1.25689226e+08*u.km, - frame=HeliographicStonyhurst, obstime='2021-04-17 00:00:04.840000') - - # Reproject Map - reprojected_map = reproject_map(map, observer, out_shape=(768, 768)) - - # Run plotting function - plot_map_reproj(map, reprojected_map) + # import astropy.units as u + # + # from astropy.coordinates import SkyCoord + # from parfive import Downloader, SessionConfig + # from aiohttp import ClientTimeout + # from sunpy.net import Fido, attrs as a + # from sunpy.map import Map + # from sunpy.coordinates.frames import HeliographicStonyhurst + # + # from stixpy.visualisation.map_reprojection import reproject_map, plot_map_reproj, get_solo_position + # + # # Search and download map using FIDO + # aia = (a.Instrument.aia & + # a.Sample(24 * u.hour) & + # a.Time('2021-04-17', '2021-04-18')) + # wave = a.Wavelength(19.3 * u.nm, 19.3 * u.nm) + # query = Fido.search(wave, aia) + # + # dl = Downloader(config=SessionConfig(ClientTimeout(total=120))) + # results = Fido.fetch(query[0][0], downloader=dl) + # + # # Create map and resample to speed up calculations + # map = Map(results) + # map = map.resample([512, 512]*u.pix) + # + # # Get SOLO position observer + # # observer = get_solo_position(map) # broken on RTD + # observer = SkyCoord(-97.01771373*u.deg, 21.20931737*u.deg, 1.25689226e+08*u.km, + # frame=HeliographicStonyhurst, obstime='2021-04-17 00:00:04.840000') + # + # # Reproject Map + # reprojected_map = reproject_map(map, observer, out_shape=(768, 768)) + # + # # Run plotting function + # plot_map_reproj(map, reprojected_map) A HMI map @@ -49,32 +49,32 @@ .. plot:: :include-source: true - import astropy.units as u - from astropy.coordinates import SkyCoord - from sunpy.net import Fido, attrs as a - from sunpy.map import Map - from sunpy.coordinates.frames import HeliographicStonyhurst - from stixpy.visualisation.map_reprojection import reproject_map, plot_map_reproj, get_solo_position - - # Search and download map using FIDO - query = Fido.search(a.Time('2020/06/12 13:20:00', '2020/06/12 13:40:00'), - a.Instrument.hmi, a.Physobs.los_magnetic_field) - result = Fido.fetch(query[0][0]) - - # Create map and resample to speed up calculations - map = Map(result) - map = map.resample([512, 512] * u.pix) - - # Set SOLO as observer - # observer = get_solo_position(map) # broke on RTD - observer = SkyCoord(56.18727061*u.deg, 3.5358653*u.deg, 77369481.8542484*u.km, - frame=HeliographicStonyhurst, obstime='2020-06-12 13:20:08.300000') - - # Reproject Map - reprojected_map = reproject_map(map, observer, out_shape=(1024, 1024)) - - # Run plotting function - plot_map_reproj(map, reprojected_map) + # import astropy.units as u + # from astropy.coordinates import SkyCoord + # from sunpy.net import Fido, attrs as a + # from sunpy.map import Map + # from sunpy.coordinates.frames import HeliographicStonyhurst + # from stixpy.visualisation.map_reprojection import reproject_map, plot_map_reproj, get_solo_position + # + # # Search and download map using FIDO + # query = Fido.search(a.Time('2020/06/12 13:20:00', '2020/06/12 13:40:00'), + # a.Instrument.hmi, a.Physobs.los_magnetic_field) + # result = Fido.fetch(query[0][0]) + # + # # Create map and resample to speed up calculations + # map = Map(result) + # map = map.resample([512, 512] * u.pix) + # + # # Set SOLO as observer + # # observer = get_solo_position(map) # broke on RTD + # observer = SkyCoord(56.18727061*u.deg, 3.5358653*u.deg, 77369481.8542484*u.km, + # frame=HeliographicStonyhurst, obstime='2020-06-12 13:20:08.300000') + # + # # Reproject Map + # reprojected_map = reproject_map(map, observer, out_shape=(1024, 1024)) + # + # # Run plotting function + # plot_map_reproj(map, reprojected_map) """