Skip to content

Commit fff2120

Browse files
nabobalisnabobalis
committed
Tweak values
1 parent 031b3cd commit fff2120

File tree

5 files changed

+47
-34
lines changed

5 files changed

+47
-34
lines changed

‎docs/dev_guide/query.rst‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,13 @@ Using the example below,
3131
<sunpy.net.fido_factory.UnifiedResponse object at ...>
3232
Results from 1 Provider:
3333
<BLANKLINE>
34-
357 Results from the SOARClient:
34+
680 Results from the SOARClient:
3535
<BLANKLINE>
3636
Instrument Data product Level Start time End time Filesize SOOP Name
3737
Mbyte
3838
---------- ------------------- ----- ----------------------- ----------------------- -------- ---------
39-
RPW rpw-tds-surv-tswf-b L2 2022-10-09 00:00:00.000 2022-10-10 00:00:00.000 13.748 None
40-
RPW rpw-lfr-surv-bp1 L2 2022-10-09 00:00:00.000 2022-10-10 00:00:00.000 61.818 None
41-
RPW rpw-tds-surv-tswf-e L2 2022-10-09 00:00:00.000 2022-10-10 00:00:00.000 95.65 None
42-
RPW rpw-lfr-surv-bp2 L2 2022-10-09 00:00:00.000 2022-10-10 00:00:00.000 145.551 None
43-
RPW rpw-lfr-surv-swf-e L2 2022-10-09 00:00:00.000 2022-10-10 00:00:00.000 47.452 None
44-
... ... ... ... ... ... ...
45-
RPW rpw-tds-surv-stat L2 2023-10-10 00:00:00.000 2023-10-11 00:00:00.000 0.531 None
46-
RPW rpw-tds-surv-hist2d L2 2023-10-10 00:00:00.000 2023-10-11 00:00:00.000 3.382 None
47-
RPW rpw-tnr-surv L2 2023-10-10 00:00:00.000 2023-10-11 00:00:00.000 341.182 None
48-
RPW rpw-lfr-surv-swf-e L2 2023-10-10 00:00:00.000 2023-10-11 00:00:00.000 200.206 None
49-
RPW rpw-tds-surv-tswf-e L2 2023-10-10 00:00:00.000 2023-10-11 00:00:00.000 173.184 None
50-
Length = 357 rows
39+
RPW rpw-tds-surv-hist2d L2 2022-10-09 00:00:00.000 2022-10-10 00:00:00.000 0.084 none
40+
...
5141
<BLANKLINE>
5242
<BLANKLINE>
5343

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies = [
2020
"matplotlib>=3.8.0",
2121
"astropy>=6.1.0",
2222
"sunpy[net]>=7.0.0",
23-
"requests>=2.28.0",
23+
"requests>=2.32.0",
2424
]
2525
dynamic = ["version"]
2626

‎sunpy_soar/data/attrs.json‎

Lines changed: 41 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
"RPW-SBM2": "Solar Orbiter Radio/Plasma Wave, LL01 parameters",
44
"RPW-TNR": "Solar Orbiter Radio/Plasma Wave, LL01 parameters",
55
"SOC-ORBIT": "Solar Orbiter SOC Ancillary Orbit Data",
6+
"epd-ept-1day": "Solar Orbiter, Level 3 Data, Energetic Particle Detector, Electron Proton Telescope, 1 day resolution data",
7+
"epd-ept-1hour": "Solar Orbiter, Level 3 Data, Energetic Particle Detector, Electron Proton Telescope, 1 hour resolution data",
68
"epd-ept-1min": "Solar Orbiter, Level 3 Data, Energetic Particle Detector, Electron Proton Telescope, 1 minute resolution data",
79
"epd-ept-asun-burst-ele-close": "Solar Orbiter, Level 2 Data, Energetic Particle Detector, Electron Proton Telescope, Anti-Sun direction, Burst, Electrons, Close mode",
810
"epd-ept-asun-burst-ion": "Solar Orbiter, Level 2 Data, Energetic Particle Detector, Electron Proton Telescope, Anti-Sun direction, Burst, Ions",
@@ -87,6 +89,7 @@
8789
"eui-hrieuvopn-image": "",
8890
"eui-hrieuvopn-image-dark": "",
8991
"eui-hrieuvopn-image-led": "",
92+
"eui-hrieuvopn-image-short": "",
9093
"eui-hrieuvzer-image": "",
9194
"eui-hrieuvzer-image-dark": "",
9295
"eui-hrieuvzer-image-led": "",
@@ -114,6 +117,10 @@
114117
"metis-vl-pol-angle": "",
115118
"metis-vl-stokes": "",
116119
"metis-vl-tb": "",
120+
"multi-mag-rpw-scm-merged-rtn-256": "Solar Orbiter, Level 3, MAG and RPW, Merged magnetic data sampled at 256 Hz",
121+
"multi-mag-rpw-scm-merged-rtn-4096": "Solar Orbiter, Level 3, MAG and RPW, Merged magnetic data sampled at 4096 Hz",
122+
"multi-mag-rpw-scm-merged-srf-256": "Solar Orbiter, Level 3, MAG and RPW, Merged magnetic data sampled at 256 Hz",
123+
"multi-mag-rpw-scm-merged-srf-4096": "Solar Orbiter, Level 3, MAG and RPW, Merged magnetic data sampled at 4096 Hz",
117124
"phi-fdt-bazi": "",
118125
"phi-fdt-binc": "",
119126
"phi-fdt-blos": "",
@@ -142,33 +149,33 @@
142149
"rpw-bia-scpot-10-seconds-cdag": "Solar Orbiter Radio/Plasma Wave, LFR L3 spacecraft potential, downsampled",
143150
"rpw-bia-scpot-cdag": "Solar Orbiter Radio/Plasma Wave, LFR L3 spacecraft potential",
144151
"rpw-bia-vht": "Solar Orbiter Radio/Plasma Wave, LFR L3 de Hoffmann-Teller solar wind velocity",
145-
"rpw-hfr-surv": "Solar Orbiter Radio/Plasma Wave, HFR L2 parameters",
146-
"rpw-lfr-surv-asm": "Solar Orbiter Radio/Plasma Wave, LFR L2 parameters",
147-
"rpw-lfr-surv-bp1": "Solar Orbiter Radio/Plasma Wave, LFR L2 parameters",
148-
"rpw-lfr-surv-bp2": "Solar Orbiter Radio/Plasma Wave, LFR L2 parameters",
149-
"rpw-lfr-surv-cwf": "Solar Orbiter Radio/Plasma Wave, LFR L1 parameters",
152+
"rpw-hfr-surv": "Solar Orbiter, Level 2, Radio and Plasma Waves, High Frequency Receiver, Spectral data in survey mode (calibrated)",
153+
"rpw-lfr-surv-asm": "Solar Orbiter, Level L1, Radio and Plasma Waves, Low Frequency Receiver, Averaged spectral matrices in survey mode (uncalibrated)",
154+
"rpw-lfr-surv-bp1": "Solar Orbiter, Level L2, Radio and Plasma Waves, Low Frequency Receiver, Basic Parameters set 1 in survey mode (calibrated)",
155+
"rpw-lfr-surv-bp2": "Solar Orbiter, Level L2, Radio and Plasma Waves, Low Frequency Receiver, Basic Parameters set 2 in survey mode (calibrated)",
156+
"rpw-lfr-surv-cwf": "Solar Orbiter, Level L1, Radio and Plasma Waves, Low Frequency Receiver, Continuous waveforms in survey mode (uncalibrated)",
150157
"rpw-lfr-surv-cwf-b": "Solar Orbiter, Level 2, Radio and Plasma Waves, Low Frequency Receiver, Continous Waveform of magnetic data in survey mode",
151-
"rpw-lfr-surv-cwf-e": "Solar Orbiter Radio/Plasma Wave, LFR L2 electric parameters",
158+
"rpw-lfr-surv-cwf-e": "Solar Orbiter, Level 2, Radio and Plasma Waves, Low Frequency Reciever, Survey mode, Continuous Waveform, Electric component",
152159
"rpw-lfr-surv-cwf-e-cdag": "Solar Orbiter Radio/Plasma Wave, LFR L2 electric parameters",
153-
"rpw-lfr-surv-swf": "Solar Orbiter Radio/Plasma Wave, LFR L1 parameters",
160+
"rpw-lfr-surv-swf": "Solar Orbiter, Level L1, Radio and Plasma Waves, Low Frequency Receiver, Snapshot waveforms in survey mode (uncalibrated)",
154161
"rpw-lfr-surv-swf-b": "Solar Orbiter, Level 2, Radio and Plasma Waves, Low Frequency Receiver, Snapshot Waveform of magnetic data in survey mode",
155-
"rpw-lfr-surv-swf-e": "Solar Orbiter Radio/Plasma Wave, LFR L2 electric parameters",
162+
"rpw-lfr-surv-swf-e": "Solar Orbiter, Level 2, Radio and Plasma Waves, Low Frequency Reciever, Survey mode, Snapshot Waveform, Electric component",
156163
"rpw-lfr-surv-swf-e-cdag": "Solar Orbiter Radio/Plasma Wave, LFR L2 electric parameters",
157164
"rpw-sbm1": "Solar Orbiter Radio/Plasma Wave, LL02 parameters",
158165
"rpw-sbm2": "Solar Orbiter Radio/Plasma Wave, LL02 parameters",
159-
"rpw-tds-surv-hist1d": "Solar Orbiter Radio/Plasma Wave, TDS L2 parameters",
160-
"rpw-tds-surv-hist2d": "Solar Orbiter Radio/Plasma Wave, TDS L2 parameters",
161-
"rpw-tds-surv-mamp": "Solar Orbiter Radio/Plasma Wave, TDS L2 parameters",
162-
"rpw-tds-surv-rswf": "Solar Orbiter Radio/Plasma Wave, TDS L1 parameters",
166+
"rpw-tds-surv-hist1d": "Solar Orbiter, Level L1, Radio and Plasma Waves, Time Domain Sampler, 1D histograms in survey mode (uncalibrated)",
167+
"rpw-tds-surv-hist2d": "Solar Orbiter, Level 2, Radio and Plasma Wave, Time Domain Sampler, 2D histogram, survey",
168+
"rpw-tds-surv-mamp": "Solar Orbiter, Level L1, Radio and Plasma Waves, Time Domain Sampler, Maximum amplitude data in survey mode (uncalibrated)",
169+
"rpw-tds-surv-rswf": "Solar Orbiter, Level L1, Radio and Plasma Waves, Time Domain Sampler, Regular snapshot waveforms in survey mode (uncalibrated)",
163170
"rpw-tds-surv-rswf-b": "Solar Orbiter, Level 2, Radio and Plasma Waves, Time Domain Sampler, Regular Snapshot Waveform of magnetic data in survey mode",
164-
"rpw-tds-surv-rswf-e": "Solar Orbiter Radio/Plasma Wave, TDS L2 waveform snapshots",
165-
"rpw-tds-surv-stat": "Solar Orbiter Radio/Plasma Wave, TDS L2R parameters",
166-
"rpw-tds-surv-tswf": "Solar Orbiter Radio/Plasma Wave, TDS L1 parameters",
171+
"rpw-tds-surv-rswf-e": "Solar Orbiter, Level 2, Radio and Plasma Wave, Time Domain Sampler, waveform snapshots, survey",
172+
"rpw-tds-surv-stat": "Solar Orbiter, Level L1, Radio and Plasma Waves, Time Domain Sampler, statistics data in survey mode (uncalibrated)",
173+
"rpw-tds-surv-tswf": "Solar Orbiter, Level 1, Radio and Plasma Waves, Time Domain Sampler, Triggered snapshot waveforms in survey mode (uncalibrated)",
167174
"rpw-tds-surv-tswf-b": "Solar Orbiter, Level 2, Radio and Plasma Waves, Time Domain Sampler, Triggered Snapshot Waveform of magnetic data in survey mode",
168-
"rpw-tds-surv-tswf-e": "Solar Orbiter Radio/Plasma Wave, TDS L2 waveform snapshots",
175+
"rpw-tds-surv-tswf-e": "Solar Orbiter, Level 2, Radio and Plasma Wave, Time Domain Sampler, waveform snapshots, survey",
169176
"rpw-tnr": "Solar Orbiter Radio/Plasma Wave, LL02 parameters",
170177
"rpw-tnr-fp": "Solar Orbiter Radio/Plasma Wave, data from plasma peak tracking L3",
171-
"rpw-tnr-surv": "Solar Orbiter Radio/Plasma Wave, TNR L2 parameters",
178+
"rpw-tnr-surv": "Solar Orbiter, Level L1, Radio and Plasma Waves, Thermal Noise Receiver, Spectral data in survey mode (uncalibrated)",
172179
"sensorrates": "solo_L1_swa-his-sensor_rates",
173180
"solohi-11s": "",
174181
"solohi-11t": "",
@@ -228,7 +235,7 @@
228235
"stix-sci-xray-vis": "",
229236
"stix-sci-xray-vis-sup1": "",
230237
"swa-eas-PartMoms": "SWA-EAS Partial Moments data",
231-
"swa-eas-nmpad-psd": "SWA-EAS pitch angles from 3D psd data",
238+
"swa-eas-nmpad-psd": "Solar Orbiter, Level L3, Solar Wind Analyser, Electron Analyser System, Nominal mode pitch angle distributions in PSD units",
232239
"swa-eas-pad-def": "Solar Orbiter, Level L2, Solar Wind Analyser, Electron Analyser System, Pitch Angle Distributions, Differential Energy Flux",
233240
"swa-eas-pad-dnf": "Solar Orbiter, Level L2, Solar Wind Analyser, Electron Analyser System, Pitch Angle Distributions, Differential Number Flux",
234241
"swa-eas-pad-psd": "Solar Orbiter, Level L2, Solar Wind Analyser, Electron Analyser System, Pitch Angle Distributions, Phase Space Density",
@@ -237,6 +244,10 @@
237244
"swa-eas1-NM3D": "SWA-EAS1 Nominal Mode 3D data",
238245
"swa-eas1-SSc": "SWA-EAS1 Single Strahl data",
239246
"swa-eas1-eflux": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 1, Energy Flux",
247+
"swa-eas1-hires3d": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 1, High Resolution Nominal Mode 3D",
248+
"swa-eas1-hires3d-def": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 1, High Resolution Nominal Mode 3D, Differential Energy Flux",
249+
"swa-eas1-hires3d-dnf": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 1, High Resolution Nominal Mode 3D, Differential Number Flux",
250+
"swa-eas1-hires3d-psd": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 1, High Resolution Nominal Mode 3D, Phase Space Density",
240251
"swa-eas1-nm3d": "Solar Orbiter, Level L1, Solar Wind Analyzer, Electron Analyser System 1, Nominal Mode 3D",
241252
"swa-eas1-nm3d-def": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 1, Nominal Mode 3D, Differential Energy Flux",
242253
"swa-eas1-nm3d-dnf": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 1, Nominal Mode 3D, Differential Number Flux",
@@ -245,9 +256,17 @@
245256
"swa-eas1-ss-dnf": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 1, Single Energy Strahl, Differential Number Flux",
246257
"swa-eas1-ss-psd": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 1, Single Energy Strahl, Phase Space Density",
247258
"swa-eas1-ssc": "Solar Orbiter, Level L1, Solar Wind Analyzer, Electron Analyser System 1, Single Energy Strahl Counts",
259+
"swa-eas1-tm3d": "Solar Orbiter, Level L1, Solar Wind Analyzer, Electron Analyser System 1, Trigger Mode 3D",
260+
"swa-eas1-tm3d-def": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 1, Trigger Mode 3D, Differential Number Flux",
261+
"swa-eas1-tm3d-dnf": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 1, Trigger Mode 3D, Differential Number Flux",
262+
"swa-eas1-tm3d-psd": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 1, Trigger Mode 3D, Phase Space Density",
248263
"swa-eas2-NM3D": "SWA-EAS2 Nominal Mode 3D data",
249264
"swa-eas2-SSc": "SWA-EAS2 Single Strahl data",
250265
"swa-eas2-eflux": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 2, Energy Flux",
266+
"swa-eas2-hires3d": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 2, High Resolution Nominal Mode 3D",
267+
"swa-eas2-hires3d-def": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 2, High Resolution Nominal Mode 3D, Differential Energy Flux",
268+
"swa-eas2-hires3d-dnf": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 2, High Resolution Nominal mode 3D, Differential Number Flux",
269+
"swa-eas2-hires3d-psd": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 2, High Resolution Nominal Mode 3D, Phase Space Density",
251270
"swa-eas2-nm3d": "Solar Orbiter, Level L1, Solar Wind Analyzer, Electron Analyser System 2, Nominal Mode 3D",
252271
"swa-eas2-nm3d-def": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 2, Nominal Mode 3D, Differential Energy Flux",
253272
"swa-eas2-nm3d-dnf": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 2, Differential Number Flux",
@@ -256,6 +275,10 @@
256275
"swa-eas2-ss-dnf": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 2, Single Energy Strahl, Differential Number Flux",
257276
"swa-eas2-ss-psd": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 2, Single Energy Strahl, Phase Space Density",
258277
"swa-eas2-ssc": "Solar Orbiter, Level L1, Solar Wind Analyzer, Electron Analyser System 2, Single Energy Strahl Counts",
278+
"swa-eas2-tm3d": "Solar Orbiter, Level L1, Solar Wind Analyzer, Electron Analyser System 2, Trigger Mode 3D",
279+
"swa-eas2-tm3d-def": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 2, Trigger Mode 3D, Differential Energy Flux",
280+
"swa-eas2-tm3d-dnf": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 2, Trigger Mode 3D, Differential Number Flux",
281+
"swa-eas2-tm3d-psd": "Solar Orbiter, Level L2, Solar Wind Analyzer, Electron Analyser System 2, Trigger Mode 3D, Phase Space Density",
259282
"swa-his-comp-10min": "Solar Orbiter, Level 3 Data, Solar Wind Analyser, Heavy Ion Sensor Composition 10 Minute Resolution",
260283
"swa-his-hk": "Solar Orbiter Level 2 Solar Wind Analyser Heavy Ion Sensor Housekeeping Parameters",
261284
"swa-his-pha": "Solar Orbiter Level 2 Solar Wind Analyser Heavy Ion Sensor Pulse Height Analyzed",

‎sunpy_soar/tests/test_sunpy_soar.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ def test_distance_search_remote_sensing():
311311
level = a.Level(2)
312312
distance = a.soar.Distance(0.28 * u.AU, 0.30 * u.AU)
313313
res = Fido.search(distance & instrument & product & level)
314-
assert res.file_num == 35
314+
assert res.file_num == 40
315315

316316

317317
def test_distance_search_insitu():

‎tools/update_data.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def get_all_soops():
7979
return soop_names
8080

8181

82-
def main():
82+
if __name__ == "__main__":
8383
attr_file = (
8484
pathlib.Path(__file__).parent.parent / "sunpy_soar" / "data" / "attrs.json"
8585
)

0 commit comments

Comments
 (0)