Skip to content

Commit 040cbe8

Browse files
sdhoytsdhoyt
committed
rebased dev
2 parents 0531eee + a43fede commit 040cbe8

73 files changed

Lines changed: 5945 additions & 2150 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.

‎imap_processing/cdf/config/imap_codice_l1a_variable_attrs.yaml‎

Lines changed: 29 additions & 27 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
@@ -187,15 +188,16 @@ acquisition_time_per_step:
187188

188189
half_spin_per_esa_step:
189190
CATDESC: Half spin number for each step of energy
191+
DEPEND_0: epoch
190192
DEPEND_1: esa_step
191193
FIELDNAM: Half Spin Number
192-
FILLVAL: 255
194+
FILLVAL: 63
193195
FORMAT: I3
194196
LABLAXIS: Half Spin Number
195197
SCALETYP: linear
196198
UNITS: half spin number
197199
VALIDMIN: 0
198-
VALIDMAX: 255
200+
VALIDMAX: 63
199201
VAR_TYPE: support_data
200202

201203
data_quality:
@@ -315,8 +317,8 @@ sw_bias_gain_mode:
315317
counters_base: &counters_base
316318
DEPEND_0: epoch
317319
DISPLAY_TYPE: time_series
318-
FILLVAL: *uint32_fillval
319-
FORMAT: I7
320+
FILLVAL: *real_fillval
321+
FORMAT: F32.9
320322
SCALETYP: linear
321323
UNITS: counts
322324
VALIDMIN: 0
@@ -410,8 +412,8 @@ hi-species-attrs:
410412
DEPEND_1: energy_{species}
411413
DISPLAY_TYPE: time_series
412414
FIELDNAM: Species {species}
413-
FILLVAL: *uint32_fillval
414-
FORMAT: I7
415+
FILLVAL: *real_fillval
416+
FORMAT: F32.9
415417
LABL_PTR_1: energy_{species}_label
416418
SCALETYP: linear
417419
UNITS: counts
@@ -425,13 +427,13 @@ hi-species-unc-attrs:
425427
DEPEND_1: energy_{species}
426428
DISPLAY_TYPE: time_series
427429
FIELDNAM: Species {species}
428-
FILLVAL: *uint32_fillval
429-
FORMAT: I7
430+
FILLVAL: *real_fillval
431+
FORMAT: F32.9
430432
LABL_PTR_1: energy_{species}_label
431433
SCALETYP: linear
432434
UNITS: counts
433435
VALIDMAX: *max_uint32
434-
VALIDMIN: 0
436+
VALIDMIN: 0.0
435437
VAR_TYPE: data
436438

437439
hi-energy-attrs:
@@ -468,11 +470,11 @@ hi-energy-delta-attrs:
468470
hi_priorities_attrs: &hi_priorities_default
469471
DEPEND_0: epoch
470472
DISPLAY_TYPE: time_series
471-
FILLVAL: *uint32_fillval
472-
FORMAT: I5
473+
FILLVAL: *real_fillval
474+
FORMAT: F32.9
473475
LABLAXIS: "events"
474476
UNITS: events
475-
VALIDMAX: *max_uint32
477+
VALIDMAX: *real_fillval
476478
VALIDMIN: 0
477479
VAR_TYPE: data
478480

@@ -653,8 +655,8 @@ lo_counters_singles:
653655
DEPEND_3: inst_az
654656
DISPLAY_TYPE: time_series
655657
FIELDNAM: Rates - Single (APD)
656-
FILLVAL: *uint32_fillval
657-
FORMAT: I7
658+
FILLVAL: *real_fillval
659+
FORMAT: F32.9
658660
LABL_PTR_1: esa_step_label
659661
LABL_PTR_2: spin_sector_pairs_label
660662
LABL_PTR_3: inst_az_label
@@ -673,8 +675,8 @@ lo-angular-attrs:
673675
DEPEND_3: inst_az
674676
DISPLAY_TYPE: time_series
675677
FIELDNAM: "SW - {species}"
676-
FILLVAL: *int_fillval
677-
FORMAT: I7
678+
FILLVAL: *real_fillval
679+
FORMAT: F32.9
678680
LABL_PTR_1: esa_step_label
679681
LABL_PTR_2: spin_sector_label
680682
LABL_PTR_3: inst_az_label
@@ -691,8 +693,8 @@ lo-angular-unc-attrs:
691693
DEPEND_3: inst_az
692694
DISPLAY_TYPE: time_series
693695
FIELDNAM: "NSW - {species}"
694-
FILLVAL: *int_fillval
695-
FORMAT: I7
696+
FILLVAL: *real_fillval
697+
FORMAT: F19
696698
LABL_PTR_1: esa_step_label
697699
LABL_PTR_2: spin_sector_label
698700
LABL_PTR_3: inst_az_label
@@ -707,8 +709,8 @@ lo_priority_base: &lo_priority_base
707709
DEPEND_1: esa_step
708710
DEPEND_2: spin_sector
709711
DISPLAY_TYPE: time_series
710-
FILLVAL: *uint32_fillval
711-
FORMAT: I7
712+
FILLVAL: *real_fillval
713+
FORMAT: F32.9
712714
LABL_PTR_1: esa_step_label
713715
LABL_PTR_2: spin_sector_label
714716
SCALETYP: linear
@@ -762,8 +764,8 @@ lo-species-attrs:
762764
DEPEND_2: spin_sector
763765
DISPLAY_TYPE: time_series
764766
FIELDNAM: "{direction} - {species}"
765-
FILLVAL: *int_fillval
766-
FORMAT: I7
767+
FILLVAL: *real_fillval
768+
FORMAT: F32.9
767769
LABL_PTR_1: esa_step_label
768770
LABL_PTR_2: spin_sector_label
769771
UNITS: counts
@@ -778,8 +780,8 @@ lo-pui-species-attrs:
778780
DEPEND_2: spin_sector
779781
DISPLAY_TYPE: time_series
780782
FIELDNAM: "{direction} - {species}"
781-
FILLVAL: *int_fillval
782-
FORMAT: I7
783+
FILLVAL: *real_fillval
784+
FORMAT: F32.9
783785
LABL_PTR_1: esa_step_label
784786
LABL_PTR_2: spin_sector_label
785787
UNITS: counts

‎imap_processing/cdf/config/imap_enamaps_l2-common_variable_attrs.yaml‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,10 +189,10 @@ bg_rate:
189189
FORMAT: F6.3
190190
DICT_KEY: SPASE>Particle>ParticleType:Atom,ParticleQuantity:NumberFlux,Qualifier:Incident,CoordinateSystemName:HAE,CoordinateRepresentation:Spherical
191191

192-
bg_rate_uncert:
192+
bg_rate_stat_uncert:
193193
<<: *default_float32
194-
CATDESC: Uncertainty in the background count rate from non-ENA (non-heliospheric) sources.
195-
FIELDNAM: Background Rate Uncertainty
194+
CATDESC: Statistical uncertainty in the background count rate from non-ENA (non-heliospheric) sources.
195+
FIELDNAM: Background Rate Stat Uncertainty
196196
UNITS: count s-1
197197
DEPEND_0: epoch
198198
VAR_TYPE: support_data
@@ -201,6 +201,18 @@ bg_rate_uncert:
201201
FORMAT: F6.3
202202
DICT_KEY: SPASE>Particle>ParticleType:Atom,ParticleQuantity:NumberFlux,Qualifier:Uncertainty,CoordinateSystemName:HAE,CoordinateRepresentation:Spherical
203203

204+
bg_rate_sys_err:
205+
<<: *default_float32
206+
CATDESC: Systematic error in the background count rate from non-ENA (non-heliospheric) sources.
207+
FIELDNAM: Background Rate Sys Error
208+
UNITS: count s-1
209+
DEPEND_0: epoch
210+
VAR_TYPE: support_data
211+
LABLAXIS: Rate Error
212+
DISPLAY_TYPE: map_image
213+
FORMAT: F6.3
214+
DICT_KEY: SPASE>Particle>ParticleType:Atom,ParticleQuantity:NumberFlux,Qualifier:Uncertainty,CoordinateSystemName:HAE,CoordinateRepresentation:Spherical
215+
204216
bg_intensity:
205217
<<: *default_float32
206218
CATDESC: Total background intensity from non-ENA (non-heliospheric) sources

‎imap_processing/cdf/config/imap_enamaps_l2-healpix_variable_attrs.yaml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,22 @@ positional_uncert_phi:
104104
LABL_PTR_2: pixel_index_label
105105

106106
bg_rate:
107-
DEPEND_1: energy
108-
DEPEND_2: pixel_index
109-
LABL_PTR_1: energy_label
110-
LABL_PTR_2: pixel_index_label
107+
DEPEND_1: energy
108+
DEPEND_2: pixel_index
109+
LABL_PTR_1: energy_label
110+
LABL_PTR_2: pixel_index_label
111+
112+
bg_rate_stat_uncert:
113+
DEPEND_1: energy
114+
DEPEND_2: pixel_index
115+
LABL_PTR_1: energy_label
116+
LABL_PTR_2: pixel_index_label
117+
118+
bg_rate_sys_err:
119+
DEPEND_1: energy
120+
DEPEND_2: pixel_index
121+
LABL_PTR_1: energy_label
122+
LABL_PTR_2: pixel_index_label
111123
# These data variables will have an extra (energy) dimension
112124
# only if the energy dimension is present in the L1C data.
113125
# The default is energy-independent.

‎imap_processing/cdf/config/imap_enamaps_l2-rectangular_variable_attrs.yaml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,15 @@ bg_rate:
139139
LABL_PTR_2: longitude_label
140140
LABL_PTR_3: latitude_label
141141

142-
bg_rate_uncert:
142+
bg_rate_stat_uncert:
143+
DEPEND_1: energy
144+
DEPEND_2: longitude
145+
DEPEND_3: latitude
146+
LABL_PTR_1: energy_label
147+
LABL_PTR_2: longitude_label
148+
LABL_PTR_3: latitude_label
149+
150+
bg_rate_sys_err:
143151
DEPEND_1: energy
144152
DEPEND_2: longitude
145153
DEPEND_3: latitude

‎imap_processing/cdf/config/imap_ialirt_global_cdf_attrs.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ instrument_base: &instrument_base
99
HIT (High-energy Ion Telescope), MAG (Magnetometer),
1010
and SWAPI (Solar Wind and Pickup Ion).
1111
See https://imap.princeton.edu for more details.
12-
Instrument_type: "Multiple Instruments"
12+
Instrument_type: Particles (space), Magnetic Fields (space), Plasma and Solar Wind (space), Ephemeris/Attitude/Ancillary
1313

1414
imap_ialirt_l1_realtime:
1515
<<: *instrument_base
1616
Data_type: L1_REALTIME>Level-1 Realtime
1717
Logical_source: imap_ialirt_l1_realtime
18-
Logical_source_description: IMAP-IALiRT Instrument Level-1 Realtime Data.
18+
Logical_source_description: IMAP Active Link for Real-Time (I-ALiRT) Level-1 Data.

0 commit comments

Comments
 (0)