Skip to content

Commit c80117d

Browse files
nicHochnicHoch
authored
Ddpdupdates2 (#380)
* bump all product versions to 2 * prep for L2 ddpd * integrate IDB release 2.26.38 * update for common CONF submodule * fir text for latest IDB to 2.26.38
1 parent d59afa1 commit c80117d

File tree

8 files changed

+53
-36
lines changed

8 files changed

+53
-36
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,3 +163,4 @@ stixcore/data/soop/
163163
stixcore/data/publish/
164164
stixcore/data/test/products/end2end/
165165
monitor_status.json
166+
stixcore/data/test/idb/v2.26.38/idb.sqlite

‎stixcore/config/data/common‎

‎stixcore/data/idb/idbVersionHistory.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@
140140
]
141141
},
142142
{
143-
"version": "2.26.37",
144-
"aswVersion": 184,
143+
"version": "2.26.38",
144+
"aswVersion": 185,
145145
"validityPeriodUTC": [
146146
[
147147
"2024-02-15T00:00:00.000+00:00",

‎stixcore/data/test/ddpd.in.csv‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,3 +99,13 @@ counter name description
9999
1 live_time "live time"
100100
1 delta_time "delta time"
101101
1 cpu_load "cpu load"
102+
1 roll_angle_rpy "Spacecraft attitude (roll, pitch, yaw)"
103+
1 sas_error "Description of error type when SAS processing failed"
104+
1 sas_ok "Was the SAS processing successful?"
105+
1 solo_loc_carrington_dist "Spacecraft distance from Sun"
106+
1 solo_loc_carrington_lonlat "Spacecraft heliographic coordinates in Carrington frame"
107+
1 solo_loc_heeq_zxy "Spacecraft coordinates in Heliocentric Earth Ecliptic"
108+
1 spice_disc_size "Apparent photospheric solar radius"
109+
1 time_utc "UTC time at spacecraft"
110+
1 y_srf "Apparent location of solar center along Y_srf axis"
111+
1 z_srf "Apparent location of solar center along Z_srf axis"

‎stixcore/idb/tests/test_manager.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def test_find_version(idb_manager):
7575

7676
# fall back to the default
7777
idb = idb_manager.get_idb(obt=SCETime(coarse=2 ** 31 - 1, fine=0))
78-
assert idb.get_idb_version() == "2.26.37"
78+
assert idb.get_idb_version() == "2.26.38"
7979

8080
assert idb_manager.find_version(obt=None) == "2.26.32"
8181

‎stixcore/processing/pipeline_cli.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ def main():
170170
spicemeta = Path(args.spice_file)
171171
else:
172172
_spm = SpiceKernelManager(Path(CONFIG.get('Paths', 'spice_kernels')))
173-
spicemeta = _spm.get_latest_mk(top_n=10)
173+
spicemeta = _spm.get_latest_mk_and_pred()
174174

175175
Spice.instance = Spice(spicemeta)
176176

‎stixcore/processing/sswidl.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ def __init__(self, *, script="", work_dir=".", params=None):
130130
!PATH=!PATH+':'+Expand_Path('+{{ gsw_path }}')
131131
setenv, "IDL_PROJECT_NAME=stix ppl"
132132
setenv, "IDL_WORKSPACE_PATH={{ gsw_path }}"
133+
setenv, "SSW_STIX={{ gsw_path }}/stix"
133134
134135
d = get_delim()
135136

‎stixcore/util/scripts/ddpd.py‎

Lines changed: 36 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
run the script (best on pub099).
1010
It will generate output in stixcore/util/scripts/ddpd.html
1111
12+
replace V02U.fit with V02.fits
13+
1214
Descriptions are derived from defferent sources doc strings, idb, fits files
1315
last override is from stixcore/data/test/ddpd.in.csv
1416
@@ -285,50 +287,53 @@ def product(file_in):
285287
# "LL/solo_LL01_stix-ql-flareflag_0628185012-0628186272_V202203231133.fits",
286288
# L0
287289
# science
288-
"L0/21/6/20/solo_L0_stix-sci-xray-rpd_0678187309-0678187429_V01_2106280011-54760.fits", # noqa
289-
"L0/21/6/21/solo_L0_stix-sci-xray-cpd_0688454771-0688455372_V01_2110250007-65280.fits", # noqa
290-
"L0/21/6/22/solo_L0_stix-sci-xray-scpd_0642038387-0642038407_V01_0087031810-50884.fits", # noqa
291-
"L0/21/6/23/solo_L0_stix-sci-xray-vis_0678187308-0678187429_V01_2106280004-54716.fits", # noqa
292-
"L0/21/6/42/solo_L0_stix-sci-aspect-burst_0687412111-0687419343_V01_2110130059.fits", # noqa
293-
"L0/21/6/24/solo_L0_stix-sci-xray-spec_0689786926-0689801914_V01_2111090002-50819.fits", # noqa
290+
"L0/21/6/20/solo_L0_stix-sci-xray-rpd_0678187309-0678187429_V02_2106280011-54760.fits", # noqa
291+
"L0/21/6/21/solo_L0_stix-sci-xray-cpd_0688454771-0688455372_V02_2110250007-65280.fits", # noqa
292+
"L0/21/6/22/solo_L0_stix-sci-xray-scpd_0642038387-0642038407_V02_0087031810-50884.fits", # noqa
293+
"L0/21/6/23/solo_L0_stix-sci-xray-vis_0678187308-0678187429_V02_2106280004-54716.fits", # noqa
294+
"L0/21/6/42/solo_L0_stix-sci-aspect-burst_0687412111-0687419343_V02_2110130059.fits", # noqa
295+
"L0/21/6/24/solo_L0_stix-sci-xray-spec_0689786926-0689801914_V02_2111090002-50819.fits", # noqa
294296
# QL
295-
"L0/21/6/31/solo_L0_stix-ql-background_0668822400_V01.fits",
296-
"L0/21/6/34/solo_L0_stix-ql-flareflag_0684547200_V01.fits",
297-
"L0/21/6/30/solo_L0_stix-ql-lightcurve_0684892800_V01.fits",
298-
"L0/21/6/33/solo_L0_stix-ql-variance_0687484800_V01.fits",
299-
"L0/21/6/32/solo_L0_stix-ql-spectra_0680400000_V01.fits",
300-
"L0/21/6/41/solo_L0_stix-cal-energy_0683856000_V01.fits",
297+
"L0/21/6/31/solo_L0_stix-ql-background_0668822400_V02U.fits",
298+
"L0/21/6/34/solo_L0_stix-ql-flareflag_0684547200_V02U.fits",
299+
"L0/21/6/30/solo_L0_stix-ql-lightcurve_0684892800_V02U.fits",
300+
"L0/21/6/33/solo_L0_stix-ql-variance_0687484800_V02U.fits",
301+
"L0/21/6/32/solo_L0_stix-ql-spectra_0680400000_V02U.fits",
302+
"L0/21/6/41/solo_L0_stix-cal-energy_0683856000_V02U.fits",
301303
# HK
302-
"L0/3/25/2/solo_L0_stix-hk-maxi_0647913600_V01.fits",
303-
"L0/3/25/1/solo_L0_stix-hk-mini_0643507200_V01.fits",
304+
"L0/3/25/2/solo_L0_stix-hk-maxi_0647913600_V02U.fits",
305+
"L0/3/25/1/solo_L0_stix-hk-mini_0643507200_V02U.fits",
304306
# CAL
305-
"L0/21/6/41/solo_L0_stix-cal-energy_0640137600_V01.fits",
307+
"L0/21/6/41/solo_L0_stix-cal-energy_0640137600_V02U.fits",
306308

307309
# L1
308310
# science
309-
"L1/2021/06/28/SCI/solo_L1_stix-sci-xray-rpd_20210628T092301-20210628T092501_V01_2106280010-54759.fits", # noqa
310-
"L1/2021/06/28/SCI/solo_L1_stix-sci-xray-cpd_20210628T190505-20210628T191459_V01_2106280009-54755.fits", # noqa
311-
"L1/2021/06/28/SCI/solo_L1_stix-sci-xray-scpd_20210628T092301-20210628T092502_V01_2106280006-54720.fits", # noqa
312-
"L1/2021/06/28/SCI/solo_L1_stix-sci-xray-vis_20210628T092301-20210628T092502_V01_2106280004-54716.fits", # noqa
313-
"L1/2021/10/13/SCI/solo_L1_stix-sci-aspect-burst_20211013T034959-20211013T055031_V01_2110130059.fits", # noqa
314-
"L1/2021/06/28/SCI/solo_L1_stix-sci-xray-spec_20210628T230132-20210628T234143_V01_2106280041-54988.fits", # noqa
311+
"L1/2021/06/28/SCI/solo_L1_stix-sci-xray-rpd_20210628T092301-20210628T092501_V02_2106280010-54759.fits", # noqa
312+
"L1/2021/06/28/SCI/solo_L1_stix-sci-xray-cpd_20210628T190505-20210628T191459_V02_2106280009-54755.fits", # noqa
313+
"L1/2021/06/28/SCI/solo_L1_stix-sci-xray-scpd_20210628T092301-20210628T092502_V02_2106280006-54720.fits", # noqa
314+
"L1/2021/06/28/SCI/solo_L1_stix-sci-xray-vis_20210628T092301-20210628T092502_V02_2106280004-54716.fits", # noqa
315+
"L1/2021/10/13/SCI/solo_L1_stix-sci-aspect-burst_20211013T034959-20211013T055031_V02_2110130059.fits", # noqa
316+
"L1/2021/06/28/SCI/solo_L1_stix-sci-xray-spec_20210628T230132-20210628T234123_V02_2106280041-54988.fits", # noqa
315317
# QL
316-
"L1/2020/06/16/QL/solo_L1_stix-ql-background_20200616_V01.fits",
317-
"L1/2020/06/16/QL/solo_L1_stix-ql-flareflag_20200616_V01.fits",
318-
"L1/2020/06/16/QL/solo_L1_stix-ql-lightcurve_20200616_V01.fits",
319-
"L1/2020/06/16/QL/solo_L1_stix-ql-variance_20200616_V01.fits",
320-
"L1/2021/11/16/QL/solo_L1_stix-ql-spectra_20211116_V01.fits",
321-
"L1/2021/11/16/CAL/solo_L1_stix-cal-energy_20211116_V01.fits",
318+
"L1/2020/06/16/QL/solo_L1_stix-ql-background_20200616_V02U.fits",
319+
"L1/2020/06/16/QL/solo_L1_stix-ql-flareflag_20200616_V02U.fits",
320+
"L1/2020/06/16/QL/solo_L1_stix-ql-lightcurve_20200616_V02U.fits",
321+
"L1/2020/06/16/QL/solo_L1_stix-ql-variance_20200616_V02U.fits",
322+
"L1/2021/11/16/QL/solo_L1_stix-ql-spectra_20211116_V02U.fits",
323+
"L1/2021/11/16/CAL/solo_L1_stix-cal-energy_20211116_V02U.fits",
322324
# HK
323-
"L1/2020/06/16/HK/solo_L1_stix-hk-maxi_20200616_V01.fits",
324-
"L1/2021/09/20/HK/solo_L1_stix-hk-mini_20210920_V01.fits",
325+
"L1/2020/06/16/HK/solo_L1_stix-hk-maxi_20200616_V02U.fits",
326+
"L1/2021/09/20/HK/solo_L1_stix-hk-mini_20210920_V02U.fits",
325327
# CAL
326-
"L1/2023/02/13/CAL/solo_L1_stix-cal-energy_20230213_V01.fits"
328+
"L1/2023/02/13/CAL/solo_L1_stix-cal-energy_20230213_V02U.fits",
329+
330+
# L2
331+
"L2/2023/06/06/AUX/solo_L2_stix-aux-ephemeris_20230606_V02U.fits"
327332
]
328333

329334
remote = ["https://pub099.cs.technik.fhnw.ch/data/fits/" + x for x in files]
330335
# files = ["/home/shane/fits_test/" + x for x in files]
331-
files = [("/data/stix/out/fits_v1.0.0/" + x, remote[i]) for i, x in enumerate(files)]
336+
files = [("/data/stix/out/fits_v1.2.0/" + x, remote[i]) for i, x in enumerate(files)]
332337

333338
with tempfile.TemporaryDirectory() as tempdir:
334339
temppath = Path(tempdir)

0 commit comments

Comments
 (0)