Skip to content

Commit f8b7526

Browse files
committed
Merge remote-tracking branch 'upstream/dev' into update-swapi-ialirt-fitting-algorithm
2 parents 0c3d17e + e954987 commit f8b7526

151 files changed

Lines changed: 19308 additions & 4536 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

codecov.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,6 @@ coverage:
1414
# Ignore coverage of fixtures
1515
ignore:
1616
- "**/conftest.py"
17+
- "**/test_spacecraft_pset.py"
18+
- "**/test_helio_pset.py"
19+
- "**/*make_helio_index_maps.py"

imap_processing/cdf/config/imap_codice_l1a_variable_attrs.yaml

Lines changed: 39 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# <=== Useful Variables ===>
22
int_fillval: &int_fillval -9223372036854775808
33
uint32_fillval: &uint32_fillval 4294967295
4-
real_fillval: &real_fillval -1.0e+31
4+
real_fillval: &real_fillval -1.0E+31
55

66
min_int: &min_int -9223372036854775808
77
min_epoch: &min_epoch -315575942816000000
@@ -98,7 +98,7 @@ spin_sector_pairs:
9898
priority:
9999
CATDESC: Priority Level
100100
FIELDNAM: Priority Level
101-
FILLVAL: -1
101+
FILLVAL: *uint32_fillval
102102
FORMAT: I2
103103
LABLAXIS: " "
104104
SCALETYP: linear
@@ -172,8 +172,9 @@ energy_species_label:
172172
VAR_TYPE: metadata
173173

174174
# <=== Dataset Variable Attributes ===>
175-
acquisition_time_per_step:
175+
acquisition_time_per_esa_step:
176176
CATDESC: Acquisition time for each step of energy
177+
DEPEND_0: epoch
177178
DEPEND_1: esa_step
178179
FIELDNAM: Acquisition Time
179180
FILLVAL: *real_fillval
@@ -185,6 +186,19 @@ acquisition_time_per_step:
185186
VALIDMAX: 625.000000
186187
VAR_TYPE: support_data
187188

189+
half_spin_per_esa_step:
190+
CATDESC: Half spin number for each step of energy
191+
DEPEND_0: epoch
192+
DEPEND_1: esa_step
193+
FIELDNAM: Half Spin Number
194+
FILLVAL: 63
195+
FORMAT: I3
196+
LABLAXIS: Half Spin Number
197+
SCALETYP: linear
198+
UNITS: half spin number
199+
VALIDMIN: 0
200+
VALIDMAX: 63
201+
VAR_TYPE: support_data
188202

189203
data_quality:
190204
CATDESC: Indicates whether data quality is suspect (1).
@@ -303,8 +317,8 @@ sw_bias_gain_mode:
303317
counters_base: &counters_base
304318
DEPEND_0: epoch
305319
DISPLAY_TYPE: time_series
306-
FILLVAL: *uint32_fillval
307-
FORMAT: I7
320+
FILLVAL: *real_fillval
321+
FORMAT: F32.9
308322
SCALETYP: linear
309323
UNITS: counts
310324
VALIDMIN: 0
@@ -398,8 +412,8 @@ hi-species-attrs:
398412
DEPEND_1: energy_{species}
399413
DISPLAY_TYPE: time_series
400414
FIELDNAM: Species {species}
401-
FILLVAL: *uint32_fillval
402-
FORMAT: I7
415+
FILLVAL: *real_fillval
416+
FORMAT: F32.9
403417
LABL_PTR_1: energy_{species}_label
404418
SCALETYP: linear
405419
UNITS: counts
@@ -413,13 +427,13 @@ hi-species-unc-attrs:
413427
DEPEND_1: energy_{species}
414428
DISPLAY_TYPE: time_series
415429
FIELDNAM: Species {species}
416-
FILLVAL: *uint32_fillval
417-
FORMAT: I7
430+
FILLVAL: *real_fillval
431+
FORMAT: F32.9
418432
LABL_PTR_1: energy_{species}_label
419433
SCALETYP: linear
420434
UNITS: counts
421435
VALIDMAX: *max_uint32
422-
VALIDMIN: 0
436+
VALIDMIN: 0.0
423437
VAR_TYPE: data
424438

425439
hi-energy-attrs:
@@ -456,11 +470,11 @@ hi-energy-delta-attrs:
456470
hi_priorities_attrs: &hi_priorities_default
457471
DEPEND_0: epoch
458472
DISPLAY_TYPE: time_series
459-
FILLVAL: *uint32_fillval
460-
FORMAT: I5
473+
FILLVAL: *real_fillval
474+
FORMAT: F32.9
461475
LABLAXIS: "events"
462476
UNITS: events
463-
VALIDMAX: *max_uint32
477+
VALIDMAX: *real_fillval
464478
VALIDMIN: 0
465479
VAR_TYPE: data
466480

@@ -518,11 +532,6 @@ lo-low_tof_cutoff:
518532
CATDESC: Low TOF Cutoff
519533
FIELDNAM: Low TOF Cutoff
520534

521-
lo-low_tof_cutoff:
522-
<<: *lo_counters_aggregated_default
523-
CATDESC: Low TOF Cutoff
524-
FIELDNAM: Low TOF Cutoff
525-
526535
lo-asic1_flag_invalid:
527536
<<: *lo_counters_aggregated_default
528537
CATDESC: ASIC 1 Flag Invalid Count
@@ -646,8 +655,8 @@ lo_counters_singles:
646655
DEPEND_3: inst_az
647656
DISPLAY_TYPE: time_series
648657
FIELDNAM: Rates - Single (APD)
649-
FILLVAL: *uint32_fillval
650-
FORMAT: I7
658+
FILLVAL: *real_fillval
659+
FORMAT: F32.9
651660
LABL_PTR_1: esa_step_label
652661
LABL_PTR_2: spin_sector_pairs_label
653662
LABL_PTR_3: inst_az_label
@@ -666,8 +675,8 @@ lo-angular-attrs:
666675
DEPEND_3: inst_az
667676
DISPLAY_TYPE: time_series
668677
FIELDNAM: "SW - {species}"
669-
FILLVAL: *int_fillval
670-
FORMAT: I7
678+
FILLVAL: *real_fillval
679+
FORMAT: F32.9
671680
LABL_PTR_1: esa_step_label
672681
LABL_PTR_2: spin_sector_label
673682
LABL_PTR_3: inst_az_label
@@ -684,8 +693,8 @@ lo-angular-unc-attrs:
684693
DEPEND_3: inst_az
685694
DISPLAY_TYPE: time_series
686695
FIELDNAM: "NSW - {species}"
687-
FILLVAL: *int_fillval
688-
FORMAT: I7
696+
FILLVAL: *real_fillval
697+
FORMAT: F19
689698
LABL_PTR_1: esa_step_label
690699
LABL_PTR_2: spin_sector_label
691700
LABL_PTR_3: inst_az_label
@@ -700,8 +709,8 @@ lo_priority_base: &lo_priority_base
700709
DEPEND_1: esa_step
701710
DEPEND_2: spin_sector
702711
DISPLAY_TYPE: time_series
703-
FILLVAL: *uint32_fillval
704-
FORMAT: I7
712+
FILLVAL: *real_fillval
713+
FORMAT: F32.9
705714
LABL_PTR_1: esa_step_label
706715
LABL_PTR_2: spin_sector_label
707716
SCALETYP: linear
@@ -755,8 +764,8 @@ lo-species-attrs:
755764
DEPEND_2: spin_sector
756765
DISPLAY_TYPE: time_series
757766
FIELDNAM: "{direction} - {species}"
758-
FILLVAL: *int_fillval
759-
FORMAT: I7
767+
FILLVAL: *real_fillval
768+
FORMAT: F32.9
760769
LABL_PTR_1: esa_step_label
761770
LABL_PTR_2: spin_sector_label
762771
UNITS: counts
@@ -771,8 +780,8 @@ lo-pui-species-attrs:
771780
DEPEND_2: spin_sector
772781
DISPLAY_TYPE: time_series
773782
FIELDNAM: "{direction} - {species}"
774-
FILLVAL: *int_fillval
775-
FORMAT: I7
783+
FILLVAL: *real_fillval
784+
FORMAT: F32.9
776785
LABL_PTR_1: esa_step_label
777786
LABL_PTR_2: spin_sector_label
778787
UNITS: counts

0 commit comments

Comments
 (0)