imap-processing 1.0.34__tar.gz → 1.0.35__tar.gz

{imap_processing-1.0.34 → imap_processing-1.0.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: imap-processing
-Version: 1.0.34
+Version: 1.0.35
 Summary: IMAP Science Operations Center Processing
 License-Expression: MIT
 License-File: LICENSE
@@ -29,7 +29,7 @@ Provides-Extra: tools
 Requires-Dist: astropy-healpix (>=1.0)
 Requires-Dist: cdflib (>=1.3.11)
 Requires-Dist: healpy (>=1.18.0,<2) ; extra == "map-visualization"
-Requires-Dist: imap-data-access (>=0.37.0)
+Requires-Dist: imap-data-access (>=0.42.0)
 Requires-Dist: mypy (==1.10.1) ; extra == "dev"
 Requires-Dist: netcdf4 (>=1.7.2,<2) ; extra == "test"
 Requires-Dist: numpy (>=2,<3)

{imap_processing-1.0.34 → imap_processing-1.0.35}/imap_processing/_version.py

@@ -1,3 +1,3 @@
 # These version placeholders will be replaced later during substitution.
-__version__ = "1.0.34"
-__version_tuple__ = (1, 0, 34)
+__version__ = "1.0.35"
+__version_tuple__ = (1, 0, 35)

{imap_processing-1.0.34 → imap_processing-1.0.35}/imap_processing/cdf/config/imap_codice_l2-hi-direct-events_variable_attrs.yaml

@@ -74,7 +74,7 @@ num_events:
   DEPEND_0: epoch
   DEPEND_1: priority
   DICT_KEY: SPASE>Support>SupportQuantity:Other
-  DISPLAY_TYPE: time_series
+  DISPLAY_TYPE: spectrogram
   FIELDNAM: Number of Events
   FILLVAL: *uint16_fillval
   FORMAT: I5

{imap_processing-1.0.34 → imap_processing-1.0.35}/imap_processing/cdf/config/imap_codice_l2-hi-omni_variable_attrs.yaml

@@ -365,7 +365,7 @@ unc_c:
   COORDINATE_SYSTEM: instrument frame
   DEPEND_0: epoch
   DEPEND_1: energy_c
-  DISPLAY_TYPE: time_series
+  DISPLAY_TYPE: spectrogram
   FIELDNAM: Uncertainty - C
   FILLVAL: *real_fillval
   FORMAT: F32.1
@@ -382,7 +382,7 @@ unc_fe:
   COORDINATE_SYSTEM: instrument frame
   DEPEND_0: epoch
   DEPEND_1: energy_fe
-  DISPLAY_TYPE: time_series
+  DISPLAY_TYPE: spectrogram
   FIELDNAM: Uncertainty - Fe
   FILLVAL: *real_fillval
   FORMAT: F32.1
@@ -399,7 +399,7 @@ unc_h:
   COORDINATE_SYSTEM: instrument frame
   DEPEND_0: epoch
   DEPEND_1: energy_h
-  DISPLAY_TYPE: time_series
+  DISPLAY_TYPE: spectrogram
   FIELDNAM: Uncertainty - H
   FILLVAL: *real_fillval
   FORMAT: F32.1
@@ -416,7 +416,7 @@ unc_he3:
   COORDINATE_SYSTEM: instrument frame
   DEPEND_0: epoch
   DEPEND_1: energy_he3
-  DISPLAY_TYPE: time_series
+  DISPLAY_TYPE: spectrogram
   FIELDNAM: Uncertainty - He3
   FILLVAL: *real_fillval
   FORMAT: F32.1
@@ -433,7 +433,7 @@ unc_he4:
   COORDINATE_SYSTEM: instrument frame
   DEPEND_0: epoch
   DEPEND_1: energy_he4
-  DISPLAY_TYPE: time_series
+  DISPLAY_TYPE: spectrogram
   FIELDNAM: Uncertainty - He4
   FILLVAL: *real_fillval
   FORMAT: F32.1
@@ -450,7 +450,7 @@ unc_junk:
   COORDINATE_SYSTEM: instrument frame
   DEPEND_0: epoch
   DEPEND_1: energy_junk
-  DISPLAY_TYPE: time_series
+  DISPLAY_TYPE: spectrogram
   FIELDNAM: Uncertainty - Junk
   FILLVAL: *real_fillval
   FORMAT: F32.1
@@ -470,7 +470,7 @@ unc_ne_mg_si:
   COORDINATE_SYSTEM: instrument frame
   DEPEND_0: epoch
   DEPEND_1: energy_ne_mg_si
-  DISPLAY_TYPE: time_series
+  DISPLAY_TYPE: spectrogram
   FIELDNAM: Uncertainty - Ne+Mg+Si
   FILLVAL: *real_fillval
   FORMAT: F32.1
@@ -487,7 +487,7 @@ unc_o:
   COORDINATE_SYSTEM: instrument frame
   DEPEND_0: epoch
   DEPEND_1: energy_o
-  DISPLAY_TYPE: time_series
+  DISPLAY_TYPE: spectrogram
   FIELDNAM: Uncertainty - O
   FILLVAL: *real_fillval
   FORMAT: F32.1
@@ -504,7 +504,7 @@ unc_uh:
   COORDINATE_SYSTEM: instrument frame
   DEPEND_0: epoch
   DEPEND_1: energy_uh
-  DISPLAY_TYPE: time_series
+  DISPLAY_TYPE: spectrogram
   FIELDNAM: Uncertainty - Ultra-Heavy
   FILLVAL: *real_fillval
   FORMAT: F32.1
@@ -522,7 +522,7 @@ c:
   DEPEND_0: epoch
   DEPEND_1: energy_c
   DICT_KEY: SPASE>Particle>ParticleType:Ion,ParticleQuantity:NumberFlux,Qualifier:Differential
-  DISPLAY_TYPE: time_series
+  DISPLAY_TYPE: spectrogram
   FIELDNAM: Differential Intensity - C
   FILLVAL: *real_fillval
   FORMAT: F32.1
@@ -540,7 +540,7 @@ fe:
   DEPEND_0: epoch
   DEPEND_1: energy_fe
   DICT_KEY: SPASE>Particle>ParticleType:Ion,ParticleQuantity:NumberFlux,Qualifier:Differential
-  DISPLAY_TYPE: time_series
+  DISPLAY_TYPE: spectrogram
   FIELDNAM: Differential Intensity - Fe
   FILLVAL: *real_fillval
   FORMAT: F32.1
@@ -558,7 +558,7 @@ h:
   DEPEND_0: epoch
   DEPEND_1: energy_h
   DICT_KEY: SPASE>Particle>ParticleType:Ion,ParticleQuantity:NumberFlux,Qualifier:Differential
-  DISPLAY_TYPE: time_series
+  DISPLAY_TYPE: spectrogram
   FIELDNAM: Differential Intensity - H
   FILLVAL: *real_fillval
   FORMAT: F32.1
@@ -576,7 +576,7 @@ he3:
   DEPEND_0: epoch
   DEPEND_1: energy_he3
   DICT_KEY: SPASE>Particle>ParticleType:Ion,ParticleQuantity:NumberFlux,Qualifier:Differential
-  DISPLAY_TYPE: time_series
+  DISPLAY_TYPE: spectrogram
   FIELDNAM: Differential Intensity - He3
   FILLVAL: *real_fillval
   FORMAT: F32.1
@@ -594,7 +594,7 @@ he4:
   DEPEND_0: epoch
   DEPEND_1: energy_he4
   DICT_KEY: SPASE>Particle>ParticleType:Ion,ParticleQuantity:NumberFlux,Qualifier:Differential
-  DISPLAY_TYPE: time_series
+  DISPLAY_TYPE: spectrogram
   FIELDNAM: Differential Intensity - He4
   FILLVAL: *real_fillval
   FORMAT: F32.1
@@ -612,7 +612,7 @@ junk:
   DEPEND_0: epoch
   DEPEND_1: energy_junk
   DICT_KEY: SPASE>Particle>ParticleType:Ion,ParticleQuantity:NumberFlux,Qualifier:Differential
-  DISPLAY_TYPE: time_series
+  DISPLAY_TYPE: spectrogram
   FIELDNAM: Differential Intensity - Junk
   FILLVAL: *real_fillval
   FORMAT: F32.1
@@ -633,7 +633,7 @@ ne_mg_si:
   DEPEND_0: epoch
   DEPEND_1: energy_ne_mg_si
   DICT_KEY: SPASE>Particle>ParticleType:Ion,ParticleQuantity:NumberFlux,Qualifier:Differential
-  DISPLAY_TYPE: time_series
+  DISPLAY_TYPE: spectrogram
   FIELDNAM: Differential Intensity - Ne+Mg+Si
   FILLVAL: *real_fillval
   FORMAT: F32.1
@@ -651,7 +651,7 @@ o:
   DEPEND_0: epoch
   DEPEND_1: energy_o
   DICT_KEY: SPASE>Particle>ParticleType:Ion,ParticleQuantity:NumberFlux,Qualifier:Differential
-  DISPLAY_TYPE: time_series
+  DISPLAY_TYPE: spectrogram
   FIELDNAM: Differential Intensity - O
   FILLVAL: *real_fillval
   FORMAT: F32.1
@@ -669,7 +669,7 @@ uh:
   DEPEND_0: epoch
   DEPEND_1: energy_uh
   DICT_KEY: SPASE>Particle>ParticleType:Ion,ParticleQuantity:NumberFlux,Qualifier:Differential
-  DISPLAY_TYPE: time_series
+  DISPLAY_TYPE: spectrogram
   FIELDNAM: Differential Intensity - Ultra-Heavy
   FILLVAL: *real_fillval
   FORMAT: F32.1

{imap_processing-1.0.34 → imap_processing-1.0.35}/imap_processing/cdf/config/imap_codice_l2-hi-sectored_variable_attrs.yaml

@@ -68,7 +68,7 @@ spin_sector:
   CATDESC: Spin Sector Index
   FIELDNAM: Spin Sector Index
   FILLVAL: *uint8_fillval
-  FORMAT: I2
+  FORMAT: I3
   LABLAXIS: " "
   SCALETYP: linear
   UNITS: " "
@@ -193,6 +193,8 @@ species_dim_attrs: &species_dim_attrs
 cno:
   <<: *species_dim_attrs
   CATDESC: Differential intensity for CNO by energy, spin sector, and elevation at x2-spaced energy-per-nucleon channels
+  DELTA_MINUS_VAR: unc_cno
+  DELTA_PLUS_VAR: unc_cno
   DICT_KEY: SPASE>Particle>ParticleType:Ion,ParticleQuantity:NumberFlux,Qualifier:Differential
   DISPLAY_TYPE: spectrogram
   FIELDNAM: Differential Intensity - CNO
@@ -207,6 +209,8 @@ cno:
 fe:
   <<: *species_dim_attrs
   CATDESC: Differential intensity for Fe by energy, spin sector, and elevation at x2-spaced energy-per-nucleon channels
+  DELTA_MINUS_VAR: unc_fe
+  DELTA_PLUS_VAR: unc_fe
   DICT_KEY: SPASE>Particle>ParticleType:Ion,ParticleQuantity:NumberFlux,Qualifier:Differential
   DISPLAY_TYPE: spectrogram
   FIELDNAM: Differential Intensity - Fe
@@ -221,6 +225,8 @@ fe:
 h:
   <<: *species_dim_attrs
   CATDESC: Differential intensity for H by energy, spin sector, and elevation at x2-spaced energy-per-nucleon channels
+  DELTA_MINUS_VAR: unc_h
+  DELTA_PLUS_VAR: unc_h
   DICT_KEY: SPASE>Particle>ParticleType:Ion,ParticleQuantity:NumberFlux,Qualifier:Differential
   DISPLAY_TYPE: spectrogram
   FIELDNAM: Differential Intensity - H
@@ -235,6 +241,8 @@ h:
 he3he4:
   <<: *species_dim_attrs
   CATDESC: Differential intensity for He3+He4 by energy, spin sector, and elevation at x2-spaced energy-per-nucleon channels
+  DELTA_MINUS_VAR: unc_he3he4
+  DELTA_PLUS_VAR: unc_he3he4
   DICT_KEY: SPASE>Particle>ParticleType:Ion,ParticleQuantity:NumberFlux,Qualifier:Differential
   DISPLAY_TYPE: spectrogram
   FIELDNAM: Differential Intensity - He3+He4
@@ -260,7 +268,7 @@ unc_cno:
   UNITS: '# / cm2 s sr MeV/nuc'
   VALIDMAX: 4096.0
   VALIDMIN: 0.0
-  VAR_TYPE: data
+  VAR_TYPE: support_data
 
 unc_fe:
   <<: *species_dim_attrs
@@ -275,7 +283,7 @@ unc_fe:
   UNITS: '# / cm2 s sr MeV/nuc'
   VALIDMAX: 4096.0
   VALIDMIN: 0.0
-  VAR_TYPE: data
+  VAR_TYPE: support_data
 
 unc_h:
   <<: *species_dim_attrs
@@ -291,7 +299,7 @@ unc_h:
   UNITS: '# / cm2 s sr MeV/nuc'
   VALIDMAX: 4096.0
   VALIDMIN: 0.0
-  VAR_TYPE: data
+  VAR_TYPE: support_data
 
 unc_he3he4:
   <<: *species_dim_attrs
@@ -306,7 +314,7 @@ unc_he3he4:
   UNITS: '# / cm2 s sr MeV/nuc'
   VALIDMAX: 4096.0
   VALIDMIN: 0.0
-  VAR_TYPE: data
+  VAR_TYPE: support_data
 
 # energy deltas:
 energy_cno_minus:

{imap_processing-1.0.34 → imap_processing-1.0.35}/imap_processing/cdf/config/imap_codice_l2-lo-angular_variable_attrs.yaml

@@ -52,12 +52,14 @@ elevation_angle_label:
 # lo-angular attribute templates (combined versions of the previous entries)
 lo-angular-attrs:
     CATDESC: "{species} {direction} species"
+    DELTA_MINUS_VAR: unc_{species}
+    DELTA_PLUS_VAR: unc_{species}
     DEPEND_0: epoch
     DEPEND_1: esa_step
     DEPEND_2: spin_sector
     DEPEND_3: elevation_angle
     DICT_KEY: SPASE>Particle>ParticleType:Ion,ParticleQuantity:NumberFlux,Qualifier:Differential
-    DISPLAY_TYPE: time_series
+    DISPLAY_TYPE: spectrogram
     FIELDNAM: "{direction} - {species}"
     FILLVAL: *real_fillval
     FORMAT: F13.4
@@ -76,7 +78,7 @@ lo-angular-unc-attrs:
     DEPEND_2: spin_sector
     DEPEND_3: elevation_angle
     DICT_KEY: SPASE>Particle>ParticleType:Ion,ParticleQuantity:NumberFlux,Qualifier:Uncertainty
-    DISPLAY_TYPE: time_series
+    DISPLAY_TYPE: spectrogram
     FIELDNAM: "{direction} - {species}"
     FILLVAL: *real_fillval
     FORMAT: F13.4
@@ -86,4 +88,4 @@ lo-angular-unc-attrs:
     UNITS: "#/(cm^2-s-sr-keV/q)"
     VALIDMAX: 16777216.0
     VALIDMIN: 0.0
-    VAR_TYPE: data
+    VAR_TYPE: support_data

{imap_processing-1.0.34 → imap_processing-1.0.35}/imap_processing/cdf/config/imap_codice_l2-lo-direct-events_variable_attrs.yaml

@@ -73,7 +73,7 @@ num_events:
   DEPEND_0: epoch
   DEPEND_1: priority
   DICT_KEY: SPASE>Support>SupportQuantity:Other
-  DISPLAY_TYPE: time_series
+  DISPLAY_TYPE: spectrogram
   FIELDNAM: Number of Events
   FILLVAL: *uint16_fillval
   FORMAT: I5

{imap_processing-1.0.34 → imap_processing-1.0.35}/imap_processing/cdf/config/imap_codice_l2-lo-species_variable_attrs.yaml

@@ -63,6 +63,8 @@ data_quality:
 # lo species attrs
 lo-species-attrs:
     CATDESC: "{species} Non-sunward Species"
+    DELTA_MINUS_VAR: unc_{species}
+    DELTA_PLUS_VAR: unc_{species}
     DEPEND_0: epoch
     DEPEND_1: esa_step
     DEPEND_2: spin_sector
@@ -81,6 +83,8 @@ lo-species-attrs:
 
 lo-pui-species-attrs:
     CATDESC: "{species} Pickup Ion Sunward Species"
+    DELTA_MINUS_VAR: unc_{species}
+    DELTA_PLUS_VAR: unc_{species}
     DEPEND_0: epoch
     DEPEND_1: esa_step
     DEPEND_2: spin_sector
@@ -99,6 +103,8 @@ lo-pui-species-attrs:
 
 lo-sw-species-attrs:
   CATDESC: "Differential intensity from sunward-looking detectors measuring solar-wind {species_display}"
+  DELTA_MINUS_VAR: unc_{species}
+  DELTA_PLUS_VAR: unc_{species}
   DEPEND_0: epoch
   DEPEND_1: esa_step
   DEPEND_2: spin_sector
@@ -131,7 +137,7 @@ lo-species-unc-attrs:
     UNITS: "#/(cm^2-s-sr-keV/q)"
     VALIDMAX: *species_valid_max
     VALIDMIN: 0.0
-    VAR_TYPE: data
+    VAR_TYPE: support_data
 
 lo-pui-species-unc-attrs:
     CATDESC: "{species} Pickup Ion Sunward Species uncertainty"
@@ -149,7 +155,7 @@ lo-pui-species-unc-attrs:
     UNITS: "#/(cm^2-s-sr-keV/q)"
     VALIDMAX: *species_valid_max
     VALIDMIN: 0.0
-    VAR_TYPE: data
+    VAR_TYPE: support_data
 
 lo-sw-species-unc-attrs:
     CATDESC: "Uncertainty in differential intensity from sunward-looking detectors measuring solar-wind {species_display}"
@@ -167,4 +173,4 @@ lo-sw-species-unc-attrs:
     UNITS: "#/(cm^2-s-sr-keV/q)"
     VALIDMAX: *species_valid_max
     VALIDMIN: 0.0
-    VAR_TYPE: data
+    VAR_TYPE: support_data

{imap_processing-1.0.34 → imap_processing-1.0.35}/imap_processing/cdf/config/imap_default_global_cdf_attrs.yaml

@@ -8,7 +8,7 @@ Acknowledgement: >
   Prof. David J. McComas of Princeton University (Contract #80GSFC19C0027).
   IMAP Rules-of-the-Road for data usage can be found in the IMAP CMAD.
 Discipline: Solar Physics>Heliospheric Physics
-File_naming_convention: source_descriptor_datatype_yyyyMMdd_vNNN
+File_naming_convention: source_descriptor_datatype_yyyyMMdd_vMMM.mmmm
 HTTP_LINK: https://imap.princeton.edu/
 LINK_TITLE: IMAP The Interstellar Mapping and Acceleration Probe
 Mission_group: IMAP

{imap_processing-1.0.34 → imap_processing-1.0.35}/imap_processing/cdf/config/imap_enamaps_l2-common_variable_attrs.yaml

@@ -239,6 +239,30 @@ bg_rate_sys_err:
   VAR_NOTES: Systematic error in the background count rate from non-ENA (non-heliospheric) sources.
   VAR_TYPE: support_data
 
+bg_rate_sys_err_minus:
+  <<: *default_float32
+  DEPEND_0: epoch
+  DICT_KEY: SPASE>Particle>ParticleType:Atom,ParticleQuantity:NumberFlux,Qualifier:Uncertainty,CoordinateSystemName:HAE,CoordinateRepresentation:Spherical
+  DISPLAY_TYPE: map_image
+  FIELDNAM: Background Rate Sys Error Lower
+  FORMAT: F6.3
+  LABLAXIS: Rate Error Lower
+  UNITS: count s-1
+  VAR_NOTES: Lower bound of the systematic error in the background count rate from non-ENA (non-heliospheric) sources.
+  VAR_TYPE: support_data
+
+bg_rate_sys_err_plus:
+  <<: *default_float32
+  DEPEND_0: epoch
+  DICT_KEY: SPASE>Particle>ParticleType:Atom,ParticleQuantity:NumberFlux,Qualifier:Uncertainty,CoordinateSystemName:HAE,CoordinateRepresentation:Spherical
+  DISPLAY_TYPE: map_image
+  FIELDNAM: Background Rate Sys Error Upper
+  FORMAT: F6.3
+  LABLAXIS: Rate Error Upper
+  UNITS: count s-1
+  VAR_NOTES: Upper bound of the systematic error in the background count rate from non-ENA (non-heliospheric) sources.
+  VAR_TYPE: support_data
+
 bg_intensity:
   <<: *default_float32
   DEPEND_0: epoch
@@ -275,6 +299,30 @@ bg_intensity_sys_err:
   VAR_NOTES: Non-statistical error in the background intensity from non-ENA (non-heliospheric) sources.
   VAR_TYPE: support_data
 
+bg_intensity_sys_err_minus:
+  <<: *default_float32
+  DEPEND_0: epoch
+  DICT_KEY: SPASE>Particle>ParticleType:Atom,ParticleQuantity:NumberFlux,Qualifier:Uncertainty,CoordinateSystemName:HAE,CoordinateRepresentation:Spherical
+  DISPLAY_TYPE: map_image
+  FIELDNAM: Background Intensity Non-statistical Error Lower
+  FORMAT: F8.3
+  LABLAXIS: Intensity Non-statistical Error Lower
+  UNITS: cm -2 s -1 sr -1 keV -1
+  VAR_NOTES: Lower bound of the non-statistical error in the background intensity from non-ENA (non-heliospheric) sources.
+  VAR_TYPE: support_data
+
+bg_intensity_sys_err_plus:
+  <<: *default_float32
+  DEPEND_0: epoch
+  DICT_KEY: SPASE>Particle>ParticleType:Atom,ParticleQuantity:NumberFlux,Qualifier:Uncertainty,CoordinateSystemName:HAE,CoordinateRepresentation:Spherical
+  DISPLAY_TYPE: map_image
+  FIELDNAM: Background Intensity Non-statistical Error Upper
+  FORMAT: F8.3
+  LABLAXIS: Intensity Non-statistical Error Upper
+  UNITS: cm -2 s -1 sr -1 keV -1
+  VAR_NOTES: Upper bound of the non-statistical error in the background intensity from non-ENA (non-heliospheric) sources.
+  VAR_TYPE: support_data
+
 ena_count:
   <<: *default_float32
   DEPEND_0: epoch

{imap_processing-1.0.34 → imap_processing-1.0.35}/imap_processing/cdf/config/imap_ialirt_global_cdf_attrs.yaml

@@ -1,5 +1,6 @@
 instrument_base: &instrument_base
   Descriptor: IALiRT>IMAP I-ALiRT (IMAP Active Link in Real Time)
+  File_naming_convention: source_descriptor_datatype_yyyyMMdd_vNNN
   TEXT: >
     The Interstellar Mapping and Acceleration Probe (IMAP) mission includes the Active Link
     for Real-Time (I-ALiRT) system, which provides continuous, low-latency space weather data.

{imap_processing-1.0.34 → imap_processing-1.0.35}/imap_processing/cdf/config/imap_mag_l2_variable_attrs.yaml

@@ -141,9 +141,10 @@ pri_sens:
 qf_bitmask:
   <<: *support_default
   CATDESC: Bitmask indicating when spacecraft related activities influenced the measurement.
+  CDF_DATA_TYPE: CDF_UINT2
   DICT_KEY: SPASE>Support>SupportQuantity:DataQuality
   FIELDNAM: Quality Bitmask
-  FILLVAL: 255
+  FILLVAL: 65535
   FORMAT: I3
   LABLAXIS: QB
   VALIDMAX: 255

{imap_processing-1.0.34 → imap_processing-1.0.35}/imap_processing/cdf/utils.py

@@ -14,6 +14,7 @@ import xarray as xr
 from cdflib.logging import logger as cdflib_logger
 from cdflib.xarray import cdf_to_xarray, xarray_to_cdf
 from cdflib.xarray.cdf_to_xarray import ISTP_TO_XARRAY_ATTRS
+from imap_data_access.file_validation import Version
 
 import imap_processing
 from imap_processing._version import __version__, __version_tuple__  # noqa: F401
@@ -121,16 +122,22 @@ def write_cdf(
     version = dataset.attrs.get("Data_version", None)
     if version is None:
         warnings.warn(
-            "No Data_version attribute found in dataset. Using default v999.",
+            "No Data_version attribute found in dataset. Using default 001.0001",
             stacklevel=2,
         )
-        version = "999"
+        version = "001.0001"
         dataset.attrs["Data_version"] = version
-    elif not re.match(r"\d{3}", version):
-        raise ValueError(
-            f"The Data_version attribute {version} does not match expected format XXX."
-        )
 
+    # Data_version may be stored without the leading 'v'; add it before validating.
+    version_string = version if str(version).startswith("v") else f"v{version}"
+    try:
+        version_obj = Version.from_version(version_string)
+    except ValueError as e:
+        raise ValueError(
+            f"The Data_version attribute {version} is not a valid version string. "
+            f"Please use the format matching the pattern "
+            f"'{Version.science_version_pattern}' instead."
+        ) from e
     repointing = dataset.attrs.get("Repointing", None)
 
     repointing_int = int(repointing[-5:]) if repointing else None
@@ -139,7 +146,8 @@ def write_cdf(
         data_level=data_level,
         descriptor=descriptor,
         start_time=start_date,
-        version=f"v{version}",  # Ensure version is prefixed with 'v'
+        major_version=version_obj.major,
+        minor_version=version_obj.minor,
         repointing=repointing_int,
     )
     file_path = Path(science_file.construct_path())
@@ -218,7 +226,7 @@ def parse_filename_like(filename_like: str) -> re.Match:
         r"(?P<descriptor>[^_]+)"  # Required descriptor
         r"(_(?P<start_date>\d{8}))?"  # Optional start date
         r"(-repoint(?P<repointing>\d{5}))?"  # Optional repointing field
-        r"(?:_(?P<version>v\d{3}))?"  # Optional version
+        rf"(?:_(?P<version>{Version.version_regex()}))?"  # Optional version
         r"(?:\.(?P<extension>cdf|pkts))?$"  # Optional extension
     )
     match = re.match(regex_str, filename_like)