Skip to content

Codice l2 keep energy_table dim #2648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lacoak21 wants to merge 4 commits into
base: dev
Choose a base branch
from
Open

Codice l2 keep energy_table dim #2648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62754b3
do not drop energy_table
lacoak21 Jan 30, 2026
0cb13ab
remove print statemnt
lacoak21 Jan 30, 2026
6229c72
fix test to handle energy_per_charge / energy_table name diff
lacoak21 Jan 30, 2026
464c562
fix test coverage
lacoak21 Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions imap_processing/cdf/config/imap_codice_l2-hi-omni_variable_attrs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ unc_c:
VAR_TYPE: support_data
SI_CONVERSION: ' > '
SCALETYP: linear
FILLVAL: 1.0e+31
FILLVAL: *real_fillval
DISPLAY_TYPE: time_series
DEPEND_0: epoch
COORDINATE_SYSTEM: instrument frame
Expand All @@ -356,7 +356,7 @@ unc_fe:
VAR_TYPE: support_data
SI_CONVERSION: ' > '
SCALETYP: linear
FILLVAL: 1.0e+31
FILLVAL: *real_fillval
DISPLAY_TYPE: time_series
DEPEND_0: epoch
COORDINATE_SYSTEM: instrument frame
Expand All @@ -373,7 +373,7 @@ unc_h:
VAR_TYPE: support_data
SI_CONVERSION: ' > '
SCALETYP: linear
FILLVAL: 1.0e+31
FILLVAL: *real_fillval
DISPLAY_TYPE: time_series
DEPEND_0: epoch
COORDINATE_SYSTEM: instrument frame
Expand All @@ -390,7 +390,7 @@ unc_he3:
VAR_TYPE: support_data
SI_CONVERSION: ' > '
SCALETYP: linear
FILLVAL: 1.0e+31
FILLVAL: *real_fillval
DISPLAY_TYPE: time_series
DEPEND_0: epoch
COORDINATE_SYSTEM: instrument frame
Expand All @@ -407,7 +407,7 @@ unc_he4:
VAR_TYPE: support_data
SI_CONVERSION: ' > '
SCALETYP: linear
FILLVAL: 1.0e+31
FILLVAL: *real_fillval
DISPLAY_TYPE: time_series
DEPEND_0: epoch
COORDINATE_SYSTEM: instrument frame
Expand All @@ -424,7 +424,7 @@ unc_junk:
VAR_TYPE: support_data
SI_CONVERSION: ' > '
SCALETYP: linear
FILLVAL: 1.0e+31
FILLVAL: *real_fillval
DISPLAY_TYPE: time_series
DEPEND_0: epoch
COORDINATE_SYSTEM: instrument frame
Expand All @@ -441,7 +441,7 @@ unc_ne_mg_si:
VAR_TYPE: support_data
SI_CONVERSION: ' > '
SCALETYP: linear
FILLVAL: 1.0e+31
FILLVAL: *real_fillval
DISPLAY_TYPE: time_series
DEPEND_0: epoch
COORDINATE_SYSTEM: instrument frame
Expand All @@ -458,7 +458,7 @@ unc_o:
VAR_TYPE: support_data
SI_CONVERSION: ' > '
SCALETYP: linear
FILLVAL: 1.0e+31
FILLVAL: *real_fillval
DISPLAY_TYPE: time_series
DEPEND_0: epoch
COORDINATE_SYSTEM: instrument frame
Expand All @@ -475,7 +475,7 @@ unc_uh:
VAR_TYPE: support_data
SI_CONVERSION: ' > '
SCALETYP: linear
FILLVAL: 1.0e+31
FILLVAL: *real_fillval
DISPLAY_TYPE: time_series
DEPEND_0: epoch
COORDINATE_SYSTEM: instrument frame
Expand Down
8 changes: 4 additions & 4 deletions imap_processing/cdf/config/imap_codice_l2-hi-sectored_variable_attrs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ unc_cno:
VAR_TYPE: data
SI_CONVERSION: ' > '
SCALETYP: linear
FILLVAL: 1.0e+31
FILLVAL: *real_fillval
DISPLAY_TYPE: time_series
COORDINATE_SYSTEM: instrument frame

Expand All @@ -256,7 +256,7 @@ unc_fe:
VAR_TYPE: data
SI_CONVERSION: ' > '
SCALETYP: linear
FILLVAL: 1.0e+31
FILLVAL: *real_fillval
DISPLAY_TYPE: spectrogram
COORDINATE_SYSTEM: instrument frame

Expand All @@ -271,7 +271,7 @@ unc_h:
VAR_TYPE: data
SI_CONVERSION: ' > '
SCALETYP: linear
FILLVAL: 1.0e+31
FILLVAL: *real_fillval
DISPLAY_TYPE: spectrogram
DEPEND_0: epoch
COORDINATE_SYSTEM: instrument frame
Expand All @@ -287,7 +287,7 @@ unc_he3he4:
VAR_TYPE: data
SI_CONVERSION: ' > '
SCALETYP: linear
FILLVAL: 1.0e+31
FILLVAL: *real_fillval
DISPLAY_TYPE: spectrogram
COORDINATE_SYSTEM: instrument frame

Expand Down
1 change: 0 additions & 1 deletion imap_processing/codice/codice_l2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1423,7 +1423,6 @@ def process_codice_l2(
"acquisition_time_per_esa_step",
"rgfo_half_spin",
"half_spin_per_esa_step",
"energy_table",
]
)

Expand Down
19 changes: 14 additions & 5 deletions imap_processing/tests/codice/test_codice_l2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
process_lo_species_intensity,
)
from imap_processing.codice.constants import (
LO_NSW_ANGULAR_VARIABLE_NAMES,
LO_SW_ANGULAR_VARIABLE_NAMES,
LO_SW_SOLAR_WIND_SPECIES_VARIABLE_NAMES,
SW_POSITIONS,
Expand Down Expand Up @@ -503,9 +502,14 @@ def test_codice_l2_nsw_angular_intensity(mock_get_file_paths, codice_lut_path):
)
)
l2_val_data = load_cdf(l2_val_data)
for variable in LO_NSW_ANGULAR_VARIABLE_NAMES:
for variable in l2_val_data.variables:
# TODO Ask joey to rename energy_per_charge to energy_table in validation data
if variable in ["energy_per_charge"]:
sdc_var = "energy_table"
else:
sdc_var = variable
np.testing.assert_allclose(
processed_2_ds[variable].values,
processed_2_ds[sdc_var].values,
l2_val_data[variable].values,
rtol=1e-5,
err_msg=f"Mismatch in variable '{variable}'",
Expand Down Expand Up @@ -542,9 +546,14 @@ def test_codice_l2_sw_angular_intensity(mock_get_file_paths, codice_lut_path):
)
)
l2_val_data = load_cdf(l2_val_data)
for variable in LO_SW_ANGULAR_VARIABLE_NAMES:
for variable in l2_val_data.variables:
# TODO Ask joey to rename energy_per_charge to energy_table in validation data
if variable in ["energy_per_charge"]:
sdc_var = "energy_table"
else:
sdc_var = variable
np.testing.assert_allclose(
processed_2_ds[variable].values,
processed_2_ds[sdc_var].values,
l2_val_data[variable].values,
# TODO is 1e-4 ok?
rtol=1e-4,
Expand Down