imap-processing 0.16.2__py3-none-any.whl → 0.17.0__py3-none-any.whl

imap_processing/cli.py

@@ -896,27 +896,26 @@ class Idex(ProcessInstrument):
             dependency = load_cdf(science_files[0])
             datasets = [idex_l2a(dependency)]
         elif self.data_level == "l2b":
-            if len(dependency_list) != 3:
+            if len(dependency_list) < 3 or len(dependency_list) > 4:
                 raise ValueError(
                     f"Unexpected dependencies found for IDEX L2B:"
-                    f"{dependency_list}. Expected only three dependencies."
+                    f"{dependency_list}. Expected three or four dependencies."
                 )
             sci_files = dependencies.get_file_paths(
                 source="idex", descriptor="sci-1week"
             )
-            dependency = load_cdf(sci_files[0])
+            sci_dependencies = [load_cdf(f) for f in sci_files]
             hk_files = dependencies.get_file_paths(source="idex", descriptor="evt")
-            hk_dependencies = [load_cdf(dep) for dep in hk_files]
-            datasets = [idex_l2b(dependency, hk_dependencies)]
+            # Remove duplicate housekeeping files
+            hk_dependencies = [load_cdf(dep) for dep in list(set(hk_files))]
+            datasets = [idex_l2b(sci_dependencies, hk_dependencies)]
         elif self.data_level == "l2c":
             if len(dependency_list) != 1:
                 raise ValueError(
                     f"Unexpected dependencies found for IDEX L2C:"
                     f"{dependency_list}. Expected only one dependency."
                 )
-            sci_files = dependencies.get_file_paths(
-                source="idex", descriptor="sci-1week"
-            )
+            sci_files = dependencies.get_file_paths(source="idex", descriptor="sci-1mo")
             dependency = load_cdf(sci_files[0])
             datasets = idex_l2c(dependency)
         return datasets
@@ -1122,6 +1121,13 @@ class Mag(ProcessInstrument):
                 mode=DataMode(descriptor_no_frame.upper()),
             )
 
+        for ds in datasets:
+            if "raw" not in ds.attrs["Logical_source"] and not np.all(
+                ds["epoch"].values[1:] > ds["epoch"].values[:-1]
+            ):
+                raise ValueError(
+                    "Timestamps for output file are not monotonically increasing."
+                )
         return datasets
 
 

imap_processing/codice/codice_l1a.py

@@ -54,8 +54,6 @@ class CoDICEL1aPipeline:
 
     Methods
     -------
-    calculate_epoch_values()
-        Calculate and return the values to be used for `epoch`.
     decompress_data(science_values)
         Perform decompression on the data.
     define_coordinates()
@@ -89,28 +87,6 @@ class CoDICEL1aPipeline:
         self.plan_step = plan_step
         self.view_id = view_id
 
-    def calculate_epoch_values(self) -> NDArray[int]:
-        """
-        Calculate and return the values to be used for `epoch`.
-
-        On CoDICE, the epoch values are derived from the `acq_start_seconds` and
-        `acq_start_subseconds` fields in the packet.
-
-        Note that the `acq_start_subseconds` field needs to be converted from
-        microseconds to seconds.
-
-        Returns
-        -------
-        epoch : NDArray[int]
-            List of epoch values.
-        """
-        epoch = met_to_ttj2000ns(
-            self.dataset["acq_start_seconds"]
-            + self.dataset["acq_start_subseconds"] / 1e6
-        )
-
-        return epoch
-
     def decompress_data(self, science_values: list[NDArray[str]] | list[str]) -> None:
         """
         Perform decompression on the data.
@@ -167,17 +143,30 @@ class CoDICEL1aPipeline:
         self.coords = {}
 
         coord_names = [
-            "epoch",
             *self.config["output_dims"].keys(),
             *[key + "_label" for key in self.config["output_dims"].keys()],
         ]
 
+        # Define epoch coordinates
+        epochs, epoch_delta_minus, epoch_delta_plus = calculate_epoch_values(
+            self.dataset.acq_start_seconds, self.dataset.acq_start_subseconds
+        )
+        for name, var in [
+            ("epoch", epochs),
+            ("epoch_delta_minus", epoch_delta_minus),
+            ("epoch_delta_plus", epoch_delta_plus),
+        ]:
+            coord = xr.DataArray(
+                var,
+                name=name,
+                dims=[name],
+                attrs=self.cdf_attrs.get_variable_attributes(name, check_schema=False),
+            )
+            self.coords[name] = coord
+
         # Define the values for the coordinates
         for name in coord_names:
-            if name == "epoch":
-                values = self.calculate_epoch_values()
-                dims = [name]
-            elif name in [
+            if name in [
                 "esa_step",
                 "inst_az",
                 "spin_sector",
@@ -674,6 +663,54 @@ class CoDICEL1aPipeline:
         self.cdf_attrs.add_instrument_variable_attrs("codice", "l1a")
 
 
+def calculate_epoch_values(
+    acq_start_seconds: xr.DataArray, acq_start_subseconds: xr.DataArray
+) -> tuple[NDArray[int], NDArray[int], NDArray[int]]:
+    """
+    Calculate and return the values to be used for `epoch`.
+
+    On CoDICE, the epoch values are derived from the `acq_start_seconds` and
+    `acq_start_subseconds` fields in the packet.
+
+    Note that the `acq_start_subseconds` field needs to be converted from
+    microseconds to seconds.
+
+    Parameters
+    ----------
+    acq_start_seconds : xarray.DataArray
+        The acquisition times to calculate the epoch values from.
+    acq_start_subseconds : xarray.DataArray
+        The subseconds portion of the acquisition times.
+
+    Returns
+    -------
+    epoch : NDArray[int]
+        List of centered epoch values.
+    epoch_delta_minus: NDArray[int]
+        List of values that represent the length of time from acquisition
+        start to the center of the acquisition time bin.
+    epoch_delta_plus: NDArray[int]
+        List of values that represent the length of time from the center of
+        the acquisition time bin to the end of acquisition.
+    """
+    # First calculate an epoch value based on the acquisition start
+    acq_start = met_to_ttj2000ns(acq_start_seconds + acq_start_subseconds / 1e6)
+
+    # Apply correction to center the epoch bin
+    epoch = (acq_start[:-1] + acq_start[1:]) // 2
+    epoch_delta_minus = epoch - acq_start[:-1]
+    epoch_delta_plus = acq_start[1:] - epoch
+
+    # Since the centers and deltas are determined by averaging sequential bins,
+    # the last elements must be calculated differently. For this, we just use
+    # the last acquisition start and the previous deltas
+    epoch = np.concatenate([epoch, [acq_start[-1]]])
+    epoch_delta_minus = np.concatenate([epoch_delta_minus, [epoch_delta_minus[-1]]])
+    epoch_delta_plus = np.concatenate([epoch_delta_plus, [epoch_delta_plus[-1]]])
+
+    return epoch, epoch_delta_minus, epoch_delta_plus
+
+
 def group_ialirt_data(
     packets: xr.Dataset, data_field_range: range, prefix: str
 ) -> list[bytearray]:
@@ -777,6 +814,8 @@ def create_binned_dataset(
         dims=["epoch"],
         attrs=pipeline.cdf_attrs.get_variable_attributes("epoch", check_schema=False),
     )
+    # TODO: Figure out how to calculate epoch centers and deltas and store them
+    #       in variables here
     dataset = xr.Dataset(
         coords={"epoch": coord},
         attrs=pipeline.cdf_attrs.get_global_attributes(pipeline.config["dataset_name"]),
@@ -869,7 +908,11 @@ def create_direct_event_dataset(apid: int, packets: xr.Dataset) -> xr.Dataset:
     )[0]
     acq_start_seconds = packets.acq_start_seconds[epoch_indices]
     acq_start_subseconds = packets.acq_start_subseconds[epoch_indices]
-    epochs = met_to_ttj2000ns(acq_start_seconds + acq_start_subseconds / 1e6)
+
+    # Calculate epoch variables
+    epochs, epochs_delta_minus, epochs_delta_plus = calculate_epoch_values(
+        acq_start_seconds, acq_start_subseconds
+    )
 
     # Define coordinates
     epoch = xr.DataArray(
@@ -878,6 +921,20 @@ def create_direct_event_dataset(apid: int, packets: xr.Dataset) -> xr.Dataset:
         dims=["epoch"],
         attrs=cdf_attrs.get_variable_attributes("epoch", check_schema=False),
     )
+    epoch_delta_minus = xr.DataArray(
+        epochs_delta_minus,
+        name="epoch_delta_minus",
+        dims=["epoch_delta_minus"],
+        attrs=cdf_attrs.get_variable_attributes(
+            "epoch_delta_minus", check_schema=False
+        ),
+    )
+    epoch_delta_plus = xr.DataArray(
+        epochs_delta_plus,
+        name="epoch_delta_plus",
+        dims=["epoch_delta_plus"],
+        attrs=cdf_attrs.get_variable_attributes("epoch_delta_plus", check_schema=False),
+    )
     event_num = xr.DataArray(
         np.arange(10000),
         name="event_num",
@@ -899,6 +956,8 @@ def create_direct_event_dataset(apid: int, packets: xr.Dataset) -> xr.Dataset:
     dataset = xr.Dataset(
         coords={
             "epoch": epoch,
+            "epoch_delta_minus": epoch_delta_minus,
+            "epoch_delta_plus": epoch_delta_plus,
             "event_num": event_num,
             "event_num_label": event_num_label,
         },

imap_processing/hi/hi_l1a.py

@@ -170,8 +170,8 @@ def finish_de_dataset(packets_data: xr.Dataset) -> xr.Dataset:
         "last_spin_num": "last_spin_num",
         "spin_invalids": "spin_invalids",
         "esa_step_num": "esa_step",
-        "meta_seconds": "meta_seconds",
-        "meta_subseconds": "meta_subseconds",
+        "esa_step_seconds": "esa_step_seconds",
+        "esa_step_milliseconds": "esa_step_milliseconds",
     }.items():
         de_data_dict[to_key] = packets_data[from_key].data
 
@@ -228,8 +228,8 @@ def create_de_dataset(de_data_dict: dict[str, npt.ArrayLike]) -> xr.Dataset:
 
     # Compute the meta-event MET in seconds
     meta_event_met = (
-        np.array(de_data_dict["meta_seconds"]).astype(np.float64)
-        + np.array(de_data_dict["meta_subseconds"]) * MILLISECOND_TO_S
+        np.array(de_data_dict["esa_step_seconds"]).astype(np.float64)
+        + np.array(de_data_dict["esa_step_milliseconds"]) * MILLISECOND_TO_S
     )
     # Compute the MET of each event in seconds
     # event MET = meta_event_met + de_clock

imap_processing/hi/hi_l1b.py

@@ -169,8 +169,8 @@ def annotate_direct_events(l1a_dataset: xr.Dataset) -> xr.Dataset:
             "pkt_len",
             "last_spin_num",
             "spin_invalids",
-            "meta_seconds",
-            "meta_subseconds",
+            "esa_step_seconds",
+            "esa_step_milliseconds",
             "tof_1",
             "tof_2",
             "tof_3",

imap_processing/hi/packet_definitions/TLM_HI_COMBINED_SCI.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <xtce:SpaceSystem xmlns:xtce="http://www.omg.org/space/xtce" name="H45">
-	<xtce:Header date="2024-11-26 00:00:00" version="1" author="IMAP SDC" source_file="TLM_H45_H90_20241126.xlsx" />
+	<xtce:Header date="29/04/2025" version="1.2" author="IMAP SDC" source_file="TLM_H45_H90_20250429.xlsx" />
 	<xtce:TelemetryMetaData>
 		<xtce:ParameterTypeSet>
 			<xtce:IntegerParameterType name="VERSION" signed="false">
@@ -24,6 +24,56 @@
 			<xtce:IntegerParameterType name="PKT_LEN" signed="false">
 				<xtce:IntegerDataEncoding sizeInBits="16" encoding="unsigned" />
 			</xtce:IntegerParameterType>
+			<xtce:IntegerParameterType name="H45_MEMDMP.SHCOARSE" signed="false">
+				<xtce:IntegerDataEncoding sizeInBits="32" encoding="unsigned" />
+			</xtce:IntegerParameterType>
+			<xtce:IntegerParameterType name="H45_MEMDMP.PACKET_VERSION" signed="false">
+				<xtce:IntegerDataEncoding sizeInBits="16" encoding="unsigned" />
+			</xtce:IntegerParameterType>
+			<xtce:IntegerParameterType name="H45_MEMDMP.SPARE" signed="false">
+				<xtce:IntegerDataEncoding sizeInBits="16" encoding="unsigned" />
+			</xtce:IntegerParameterType>
+			<xtce:EnumeratedParameterType name="H45_MEMDMP.MEMORY_ID" signed="false">
+				<xtce:IntegerDataEncoding sizeInBits="32" encoding="unsigned" />
+				<xtce:EnumerationList>
+					<xtce:Enumeration value="16777217" label="MIMEM_RAW" />
+					<xtce:Enumeration value="33554434" label="MIPROM" />
+					<xtce:Enumeration value="67108868" label="MIMRAM" />
+					<xtce:Enumeration value="134217736" label="MISDRAM_CPU" />
+					<xtce:Enumeration value="285212688" label="MISDRAM_SCI" />
+					<xtce:Enumeration value="591733573" label="MICDH_FPGA" />
+					<xtce:Enumeration value="301989920" label="MIHVPSBD1" />
+					<xtce:Enumeration value="335544384" label="MIHVPSBD2" />
+					<xtce:Enumeration value="402653312" label="MIFEEFPGA" />
+					<xtce:Enumeration value="570425856" label="MISCRATCH" />
+					<xtce:Enumeration value="587203328" label="MICPU" />
+					<xtce:Enumeration value="2050814831" label="MIENG_LUT_PRI" />
+					<xtce:Enumeration value="2116893225" label="MIENG_LUT_RED" />
+					<xtce:Enumeration value="1160045761" label="MIENG_LUT_RAM" />
+					<xtce:Enumeration value="763219379" label="MISCI_LUT_PRI" />
+					<xtce:Enumeration value="1973595935" label="MISCI_LUT_RED" />
+					<xtce:Enumeration value="1517368615" label="MISCI_LUT_RAM" />
+				</xtce:EnumerationList>
+			</xtce:EnumeratedParameterType>
+			<xtce:IntegerParameterType name="H45_MEMDMP.START_ADDRESS" signed="false">
+				<xtce:IntegerDataEncoding sizeInBits="32" encoding="unsigned" />
+			</xtce:IntegerParameterType>
+			<xtce:IntegerParameterType name="H45_MEMDMP.NUM_BYTES" signed="false">
+				<xtce:IntegerDataEncoding sizeInBits="32" encoding="unsigned" />
+			</xtce:IntegerParameterType>
+			<xtce:BinaryParameterType name="H45_MEMDMP.DUMP_DATA">
+				<xtce:BinaryDataEncoding bitOrder="mostSignificantBitFirst">
+					<xtce:SizeInBits>
+						<xtce:DynamicValue>
+							<xtce:ParameterInstanceRef parameterRef="PKT_LEN" />
+							<xtce:LinearAdjustment slope="8" intercept="-168" />
+						</xtce:DynamicValue>
+					</xtce:SizeInBits>
+				</xtce:BinaryDataEncoding>
+			</xtce:BinaryParameterType>
+			<xtce:IntegerParameterType name="H45_MEMDMP.CKSUM" signed="false">
+				<xtce:IntegerDataEncoding sizeInBits="16" encoding="unsigned" />
+			</xtce:IntegerParameterType>
 			<xtce:IntegerParameterType name="H45_APP_NHK.SHCOARSE" signed="false">
 				<xtce:IntegerDataEncoding sizeInBits="32" encoding="unsigned" />
 			</xtce:IntegerParameterType>
@@ -970,16 +1020,16 @@
 			<xtce:IntegerParameterType name="H45_SCI_DE.SPARE" signed="false">
 				<xtce:IntegerDataEncoding sizeInBits="20" encoding="unsigned" />
 			</xtce:IntegerParameterType>
-			<xtce:IntegerParameterType name="H45_SCI_DE.META_BITMASK" signed="false">
+			<xtce:IntegerParameterType name="H45_SCI_DE.SPARE1" signed="false">
 				<xtce:IntegerDataEncoding sizeInBits="2" encoding="unsigned" />
 			</xtce:IntegerParameterType>
 			<xtce:IntegerParameterType name="H45_SCI_DE.ESA_STEP_NUM" signed="false">
 				<xtce:IntegerDataEncoding sizeInBits="4" encoding="unsigned" />
 			</xtce:IntegerParameterType>
-			<xtce:IntegerParameterType name="H45_SCI_DE.META_SUBSECONDS" signed="false">
+			<xtce:IntegerParameterType name="H45_SCI_DE.ESA_STEP_MILLISECONDS" signed="false">
 				<xtce:IntegerDataEncoding sizeInBits="10" encoding="unsigned" />
 			</xtce:IntegerParameterType>
-			<xtce:IntegerParameterType name="H45_SCI_DE.META_SECONDS" signed="false">
+			<xtce:IntegerParameterType name="H45_SCI_DE.ESA_STEP_SECONDS" signed="false">
 				<xtce:IntegerDataEncoding sizeInBits="32" encoding="unsigned" />
 			</xtce:IntegerParameterType>
 			<xtce:BinaryParameterType name="H45_SCI_DE.DE_TOF">
@@ -1271,6 +1321,56 @@
 			<xtce:IntegerParameterType name="H45_DIAG_FEE.CKSUM" signed="false">
 				<xtce:IntegerDataEncoding sizeInBits="16" encoding="unsigned" />
 			</xtce:IntegerParameterType>
+			<xtce:IntegerParameterType name="H90_MEMDMP.SHCOARSE" signed="false">
+				<xtce:IntegerDataEncoding sizeInBits="32" encoding="unsigned" />
+			</xtce:IntegerParameterType>
+			<xtce:IntegerParameterType name="H90_MEMDMP.PACKET_VERSION" signed="false">
+				<xtce:IntegerDataEncoding sizeInBits="16" encoding="unsigned" />
+			</xtce:IntegerParameterType>
+			<xtce:IntegerParameterType name="H90_MEMDMP.SPARE" signed="false">
+				<xtce:IntegerDataEncoding sizeInBits="16" encoding="unsigned" />
+			</xtce:IntegerParameterType>
+			<xtce:EnumeratedParameterType name="H90_MEMDMP.MEMORY_ID" signed="false">
+				<xtce:IntegerDataEncoding sizeInBits="32" encoding="unsigned" />
+				<xtce:EnumerationList>
+					<xtce:Enumeration value="16777217" label="MIMEM_RAW" />
+					<xtce:Enumeration value="33554434" label="MIPROM" />
+					<xtce:Enumeration value="67108868" label="MIMRAM" />
+					<xtce:Enumeration value="134217736" label="MISDRAM_CPU" />
+					<xtce:Enumeration value="285212688" label="MISDRAM_SCI" />
+					<xtce:Enumeration value="591733573" label="MICDH_FPGA" />
+					<xtce:Enumeration value="301989920" label="MIHVPSBD1" />
+					<xtce:Enumeration value="335544384" label="MIHVPSBD2" />
+					<xtce:Enumeration value="402653312" label="MIFEEFPGA" />
+					<xtce:Enumeration value="570425856" label="MISCRATCH" />
+					<xtce:Enumeration value="587203328" label="MICPU" />
+					<xtce:Enumeration value="2050814831" label="MIENG_LUT_PRI" />
+					<xtce:Enumeration value="2116893225" label="MIENG_LUT_RED" />
+					<xtce:Enumeration value="1160045761" label="MIENG_LUT_RAM" />
+					<xtce:Enumeration value="763219379" label="MISCI_LUT_PRI" />
+					<xtce:Enumeration value="1973595935" label="MISCI_LUT_RED" />
+					<xtce:Enumeration value="1517368615" label="MISCI_LUT_RAM" />
+				</xtce:EnumerationList>
+			</xtce:EnumeratedParameterType>
+			<xtce:IntegerParameterType name="H90_MEMDMP.START_ADDRESS" signed="false">
+				<xtce:IntegerDataEncoding sizeInBits="32" encoding="unsigned" />
+			</xtce:IntegerParameterType>
+			<xtce:IntegerParameterType name="H90_MEMDMP.NUM_BYTES" signed="false">
+				<xtce:IntegerDataEncoding sizeInBits="32" encoding="unsigned" />
+			</xtce:IntegerParameterType>
+			<xtce:BinaryParameterType name="H90_MEMDMP.DUMP_DATA">
+				<xtce:BinaryDataEncoding bitOrder="mostSignificantBitFirst">
+					<xtce:SizeInBits>
+						<xtce:DynamicValue>
+							<xtce:ParameterInstanceRef parameterRef="PKT_LEN" />
+							<xtce:LinearAdjustment slope="8" intercept="-168" />
+						</xtce:DynamicValue>
+					</xtce:SizeInBits>
+				</xtce:BinaryDataEncoding>
+			</xtce:BinaryParameterType>
+			<xtce:IntegerParameterType name="H90_MEMDMP.CKSUM" signed="false">
+				<xtce:IntegerDataEncoding sizeInBits="16" encoding="unsigned" />
+			</xtce:IntegerParameterType>
 			<xtce:IntegerParameterType name="H90_APP_NHK.SHCOARSE" signed="false">
 				<xtce:IntegerDataEncoding sizeInBits="32" encoding="unsigned" />
 			</xtce:IntegerParameterType>
@@ -1386,7 +1486,7 @@
 				<xtce:IntegerDataEncoding sizeInBits="12" encoding="unsigned">
 					<xtce:DefaultCalibrator>
 						<xtce:PolynomialCalibrator>
-							<xtce:Term coefficient="2.243589743589744" exponent="1" />
+							<xtce:Term coefficient="2.243589744" exponent="1" />
 						</xtce:PolynomialCalibrator>
 					</xtce:DefaultCalibrator>
 				</xtce:IntegerDataEncoding>
@@ -2216,16 +2316,16 @@
 			<xtce:IntegerParameterType name="H90_SCI_DE.SPARE" signed="false">
 				<xtce:IntegerDataEncoding sizeInBits="20" encoding="unsigned" />
 			</xtce:IntegerParameterType>
-			<xtce:IntegerParameterType name="H90_SCI_DE.META_BITMASK" signed="false">
+			<xtce:IntegerParameterType name="H90_SCI_DE.SPARE1" signed="false">
 				<xtce:IntegerDataEncoding sizeInBits="2" encoding="unsigned" />
 			</xtce:IntegerParameterType>
 			<xtce:IntegerParameterType name="H90_SCI_DE.ESA_STEP_NUM" signed="false">
 				<xtce:IntegerDataEncoding sizeInBits="4" encoding="unsigned" />
 			</xtce:IntegerParameterType>
-			<xtce:IntegerParameterType name="H90_SCI_DE.META_SUBSECONDS" signed="false">
+			<xtce:IntegerParameterType name="H90_SCI_DE.ESA_STEP_MILLISECONDS" signed="false">
 				<xtce:IntegerDataEncoding sizeInBits="10" encoding="unsigned" />
 			</xtce:IntegerParameterType>
-			<xtce:IntegerParameterType name="H90_SCI_DE.META_SECONDS" signed="false">
+			<xtce:IntegerParameterType name="H90_SCI_DE.ESA_STEP_SECONDS" signed="false">
 				<xtce:IntegerDataEncoding sizeInBits="32" encoding="unsigned" />
 			</xtce:IntegerParameterType>
 			<xtce:BinaryParameterType name="H90_SCI_DE.DE_TOF">
@@ -2540,6 +2640,28 @@
 			<xtce:Parameter name="PKT_LEN" parameterTypeRef="PKT_LEN">
 				<xtce:LongDescription>CCSDS Packet Length (number of bytes after Packet length minus 1)</xtce:LongDescription>
 			</xtce:Parameter>
+			<xtce:Parameter name="H45_MEMDMP.SHCOARSE" parameterTypeRef="H45_MEMDMP.SHCOARSE" shortDescription="MISSION ELAPSED TIME">
+				<xtce:LongDescription>MISSION ELAPSED TIME</xtce:LongDescription>
+			</xtce:Parameter>
+			<xtce:Parameter name="H45_MEMDMP.PACKET_VERSION" parameterTypeRef="H45_MEMDMP.PACKET_VERSION" shortDescription="PACKET VERSION">
+				<xtce:LongDescription>PACKET VERSION - THIS WILL BE INCREMENTED EACH TIME THE FORMAT OF THE PACKET CHANGES.</xtce:LongDescription>
+			</xtce:Parameter>
+			<xtce:Parameter name="H45_MEMDMP.SPARE" parameterTypeRef="H45_MEMDMP.SPARE" shortDescription="SPARE FOR ALIGNMENT">
+				<xtce:LongDescription>SPARE FOR ALIGNMENT</xtce:LongDescription>
+			</xtce:Parameter>
+			<xtce:Parameter name="H45_MEMDMP.MEMORY_ID" parameterTypeRef="H45_MEMDMP.MEMORY_ID" shortDescription="MEMORY ID">
+				<xtce:LongDescription>MEMORY DEVICE/TYPE IDENTIFIER.  INDICATES THE SOURCE FOR THE DATA INCLUDED IN THE DATA FIELD</xtce:LongDescription>
+			</xtce:Parameter>
+			<xtce:Parameter name="H45_MEMDMP.START_ADDRESS" parameterTypeRef="H45_MEMDMP.START_ADDRESS" shortDescription="START ADDRESS">
+				<xtce:LongDescription>START ADDRESS WITHIN THE DEVICE</xtce:LongDescription>
+			</xtce:Parameter>
+			<xtce:Parameter name="H45_MEMDMP.NUM_BYTES" parameterTypeRef="H45_MEMDMP.NUM_BYTES" shortDescription="NUMBER OF BYTES IN THE DATA FIELD">
+				<xtce:LongDescription>NUMBER OF BYTES INCLUDED IN THE DATA FIELD (NOT INCLUDING PAD BYTES AND THE PACKET CHECKSUM)</xtce:LongDescription>
+			</xtce:Parameter>
+			<xtce:Parameter name="H45_MEMDMP.DUMP_DATA" parameterTypeRef="H45_MEMDMP.DUMP_DATA" shortDescription="DUMP DATA">
+				<xtce:LongDescription>DUMPED DATA.  SINCE THIS IS A VARIABLE LENGTH FIELD IT WILL ALSO ENCOMPASS ANY PAD BYTES AND THE PACKET CHECKSUM.</xtce:LongDescription>
+			</xtce:Parameter>
+			<xtce:Parameter name="H45_MEMDMP.CKSUM" parameterTypeRef="H45_MEMDMP.CKSUM" shortDescription="CHECKSUM" />
 			<xtce:Parameter name="H45_APP_NHK.SHCOARSE" parameterTypeRef="H45_APP_NHK.SHCOARSE" shortDescription="MISSION ELAPSED TIME">
 				<xtce:LongDescription>MISSION ELAPSED TIME</xtce:LongDescription>
 			</xtce:Parameter>
@@ -2894,23 +3016,24 @@
 MOS SIGNIFICANT BIT IS ALSO THE HIGHEST SPIN</xtce:LongDescription>
 			</xtce:Parameter>
 			<xtce:Parameter name="H45_SCI_DE.SPARE" parameterTypeRef="H45_SCI_DE.SPARE" shortDescription="SPARE" />
-			<xtce:Parameter name="H45_SCI_DE.META_BITMASK" parameterTypeRef="H45_SCI_DE.META_BITMASK" shortDescription="META_BITMASK IS ALWAYS 0" />
-			<xtce:Parameter name="H45_SCI_DE.ESA_STEP_NUM" parameterTypeRef="H45_SCI_DE.ESA_STEP_NUM" shortDescription="ESA STEP NUMBER" />
-			<xtce:Parameter name="H45_SCI_DE.META_SUBSECONDS" parameterTypeRef="H45_SCI_DE.META_SUBSECONDS" shortDescription="META EVENT FINE CLOCK TICKS" />
-			<xtce:Parameter name="H45_SCI_DE.META_SECONDS" parameterTypeRef="H45_SCI_DE.META_SECONDS" shortDescription="META EVENT COARSE CLOKC TICKS" />
-			<xtce:Parameter name="H45_SCI_DE.DE_TOF" parameterTypeRef="H45_SCI_DE.DE_TOF" shortDescription="VARIABLE LENGTH FIELD FOR DIRECT EVENT TOF DATA. MAX SIZE 665X48 BITS.">
+			<xtce:Parameter name="H45_SCI_DE.SPARE1" parameterTypeRef="H45_SCI_DE.SPARE1" shortDescription="MORE SPARE" />
+			<xtce:Parameter name="H45_SCI_DE.ESA_STEP_NUM" parameterTypeRef="H45_SCI_DE.ESA_STEP_NUM" shortDescription="ONE BASED ESA STEP NUMBER THE PACKET'S DATA CORESPONDS TO">
+				<xtce:LongDescription>ESA STEP NUMBER WHEN THE DATA IS COLLECTED STARTING AT 1</xtce:LongDescription>
+			</xtce:Parameter>
+			<xtce:Parameter name="H45_SCI_DE.ESA_STEP_MILLISECONDS" parameterTypeRef="H45_SCI_DE.ESA_STEP_MILLISECONDS" shortDescription="MILLISECOND PART OF START TIME OF ESA STEP THE PACKET DATA IS FOR">
+				<xtce:LongDescription>TIMESTAMP OF ESA STEP STARTING TIME, MILLISECONDS</xtce:LongDescription>
+			</xtce:Parameter>
+			<xtce:Parameter name="H45_SCI_DE.ESA_STEP_SECONDS" parameterTypeRef="H45_SCI_DE.ESA_STEP_SECONDS" shortDescription="SECOND PART OF START TIME OF ESA STEP THE PACKET DATA IS FOR">
+				<xtce:LongDescription>TIMESTAMP OF ESA STEP STARTING TIME, SECONDS</xtce:LongDescription>
+			</xtce:Parameter>
+			<xtce:Parameter name="H45_SCI_DE.DE_TOF" parameterTypeRef="H45_SCI_DE.DE_TOF" shortDescription="VARIABLE LENGTH FIELD FOR DIRECT EVENT TOF DATA. MAX SIZE 664X48 BITS.">
 				<xtce:LongDescription>DIRECT EVENT TOF DATA.
-LENGTH IS VARIABLE.  MAX IS 665 X 48 BITS
+LENGTH IS VARIABLE.  MAX IS 664 X 48 BITS
 START_BITMASK_DATA - 2 BITS (TA=1, TB=2, TC1=3, META=0)
-IF START_BITMASK != 0
 DE_TAG - 16 BITS
 TOF_1 - 10 BITS
 TOF_2 - 10 BITS
-TOF_3 - 10 BITS
-IF START_BIT_MASK == 0:
-ESA_STEP_NUM - 4 BITS
-MET_SUBSECONDS - 10 BITS
-MET_SECONDS - 32 BITS</xtce:LongDescription>
+TOF_3 - 10 BITS</xtce:LongDescription>
 			</xtce:Parameter>
 			<xtce:Parameter name="H45_SCI_DE.CKSUM" parameterTypeRef="H45_SCI_DE.CKSUM" shortDescription="PACKET CHECKSUM" />
 			<xtce:Parameter name="H45_DIAG_FEE.SHCOARSE" parameterTypeRef="H45_DIAG_FEE.SHCOARSE" shortDescription="MISSION ELAPSED TIME" />
@@ -3005,6 +3128,28 @@ MET_SECONDS - 32 BITS</xtce:LongDescription>
 			<xtce:Parameter name="H45_DIAG_FEE.FEE_RECV_CMD_COUNT" parameterTypeRef="H45_DIAG_FEE.FEE_RECV_CMD_COUNT" shortDescription="SHOWS HOW MANY COMMANDS ARE RECEIVED FROM THE FEE FROM THE C&amp;DH FPGA" />
 			<xtce:Parameter name="H45_DIAG_FEE.SPARE" parameterTypeRef="H45_DIAG_FEE.SPARE" shortDescription="SPARE FIELD" />
 			<xtce:Parameter name="H45_DIAG_FEE.CKSUM" parameterTypeRef="H45_DIAG_FEE.CKSUM" shortDescription="PACKET CHECKSUM" />
+			<xtce:Parameter name="H90_MEMDMP.SHCOARSE" parameterTypeRef="H90_MEMDMP.SHCOARSE" shortDescription="MISSION ELAPSED TIME">
+				<xtce:LongDescription>MISSION ELAPSED TIME</xtce:LongDescription>
+			</xtce:Parameter>
+			<xtce:Parameter name="H90_MEMDMP.PACKET_VERSION" parameterTypeRef="H90_MEMDMP.PACKET_VERSION" shortDescription="PACKET VERSION">
+				<xtce:LongDescription>PACKET VERSION - THIS WILL BE INCREMENTED EACH TIME THE FORMAT OF THE PACKET CHANGES.</xtce:LongDescription>
+			</xtce:Parameter>
+			<xtce:Parameter name="H90_MEMDMP.SPARE" parameterTypeRef="H90_MEMDMP.SPARE" shortDescription="SPARE FOR ALIGNMENT">
+				<xtce:LongDescription>SPARE FOR ALIGNMENT</xtce:LongDescription>
+			</xtce:Parameter>
+			<xtce:Parameter name="H90_MEMDMP.MEMORY_ID" parameterTypeRef="H90_MEMDMP.MEMORY_ID" shortDescription="MEMORY ID">
+				<xtce:LongDescription>MEMORY DEVICE/TYPE IDENTIFIER.  INDICATES THE SOURCE FOR THE DATA INCLUDED IN THE DATA FIELD</xtce:LongDescription>
+			</xtce:Parameter>
+			<xtce:Parameter name="H90_MEMDMP.START_ADDRESS" parameterTypeRef="H90_MEMDMP.START_ADDRESS" shortDescription="START ADDRESS">
+				<xtce:LongDescription>START ADDRESS WITHIN THE DEVICE</xtce:LongDescription>
+			</xtce:Parameter>
+			<xtce:Parameter name="H90_MEMDMP.NUM_BYTES" parameterTypeRef="H90_MEMDMP.NUM_BYTES" shortDescription="NUMBER OF BYTES IN THE DATA FIELD">
+				<xtce:LongDescription>NUMBER OF BYTES INCLUDED IN THE DATA FIELD (NOT INCLUDING PAD BYTES AND THE PACKET CHECKSUM)</xtce:LongDescription>
+			</xtce:Parameter>
+			<xtce:Parameter name="H90_MEMDMP.DUMP_DATA" parameterTypeRef="H90_MEMDMP.DUMP_DATA" shortDescription="DUMP DATA">
+				<xtce:LongDescription>DUMPED DATA.  SINCE THIS IS A VARIABLE LENGTH FIELD IT WILL ALSO ENCOMPASS ANY PAD BYTES AND THE PACKET CHECKSUM.</xtce:LongDescription>
+			</xtce:Parameter>
+			<xtce:Parameter name="H90_MEMDMP.CKSUM" parameterTypeRef="H90_MEMDMP.CKSUM" shortDescription="CHECKSUM" />
 			<xtce:Parameter name="H90_APP_NHK.SHCOARSE" parameterTypeRef="H90_APP_NHK.SHCOARSE" shortDescription="MISSION ELAPSED TIME">
 				<xtce:LongDescription>MISSION ELAPSED TIME</xtce:LongDescription>
 			</xtce:Parameter>
@@ -3359,23 +3504,24 @@ MET_SECONDS - 32 BITS</xtce:LongDescription>
 MOS SIGNIFICANT BIT IS ALSO THE HIGHEST SPIN</xtce:LongDescription>
 			</xtce:Parameter>
 			<xtce:Parameter name="H90_SCI_DE.SPARE" parameterTypeRef="H90_SCI_DE.SPARE" shortDescription="SPARE" />
-			<xtce:Parameter name="H90_SCI_DE.META_BITMASK" parameterTypeRef="H90_SCI_DE.META_BITMASK" shortDescription="META_BITMASK IS ALWAYS 0" />
-			<xtce:Parameter name="H90_SCI_DE.ESA_STEP_NUM" parameterTypeRef="H90_SCI_DE.ESA_STEP_NUM" shortDescription="ESA STEP NUMBER" />
-			<xtce:Parameter name="H90_SCI_DE.META_SUBSECONDS" parameterTypeRef="H90_SCI_DE.META_SUBSECONDS" shortDescription="META EVENT FINE CLOCK TICKS" />
-			<xtce:Parameter name="H90_SCI_DE.META_SECONDS" parameterTypeRef="H90_SCI_DE.META_SECONDS" shortDescription="META EVENT COARSE CLOKC TICKS" />
-			<xtce:Parameter name="H90_SCI_DE.DE_TOF" parameterTypeRef="H90_SCI_DE.DE_TOF" shortDescription="VARIABLE LENGTH FIELD FOR DIRECT EVENT TOF DATA. MAX SIZE 665X48 BITS.">
+			<xtce:Parameter name="H90_SCI_DE.SPARE1" parameterTypeRef="H90_SCI_DE.SPARE1" shortDescription="MORE SPARE" />
+			<xtce:Parameter name="H90_SCI_DE.ESA_STEP_NUM" parameterTypeRef="H90_SCI_DE.ESA_STEP_NUM" shortDescription="ONE BASED ESA STEP NUMBER THE PACKET'S DATA CORESPONDS TO">
+				<xtce:LongDescription>ESA STEP NUMBER WHEN THE DATA IS COLLECTED STARTING AT 1</xtce:LongDescription>
+			</xtce:Parameter>
+			<xtce:Parameter name="H90_SCI_DE.ESA_STEP_MILLISECONDS" parameterTypeRef="H90_SCI_DE.ESA_STEP_MILLISECONDS" shortDescription="MILLISECOND PART OF START TIME OF ESA STEP THE PACKET DATA IS FOR">
+				<xtce:LongDescription>TIMESTAMP OF ESA STEP STARTING TIME, MILLISECONDS</xtce:LongDescription>
+			</xtce:Parameter>
+			<xtce:Parameter name="H90_SCI_DE.ESA_STEP_SECONDS" parameterTypeRef="H90_SCI_DE.ESA_STEP_SECONDS" shortDescription="SECOND PART OF START TIME OF ESA STEP THE PACKET DATA IS FOR">
+				<xtce:LongDescription>TIMESTAMP OF ESA STEP STARTING TIME, SECONDS</xtce:LongDescription>
+			</xtce:Parameter>
+			<xtce:Parameter name="H90_SCI_DE.DE_TOF" parameterTypeRef="H90_SCI_DE.DE_TOF" shortDescription="VARIABLE LENGTH FIELD FOR DIRECT EVENT TOF DATA. MAX SIZE 664X48 BITS.">
 				<xtce:LongDescription>DIRECT EVENT TOF DATA.
-LENGTH IS VARIABLE.  MAX IS 665 X 48 BITS
+LENGTH IS VARIABLE.  MAX IS 664 X 48 BITS
 START_BITMASK_DATA - 2 BITS (TA=1, TB=2, TC1=3, META=0)
-IF START_BITMASK != 0
 DE_TAG - 16 BITS
 TOF_1 - 10 BITS
 TOF_2 - 10 BITS
-TOF_3 - 10 BITS
-IF START_BIT_MASK == 0:
-ESA_STEP_NUM - 4 BITS
-MET_SUBSECONDS - 10 BITS
-MET_SECONDS - 32 BITS</xtce:LongDescription>
+TOF_3 - 10 BITS</xtce:LongDescription>
 			</xtce:Parameter>
 			<xtce:Parameter name="H90_SCI_DE.CKSUM" parameterTypeRef="H90_SCI_DE.CKSUM" shortDescription="PACKET CHECKSUM" />
 			<xtce:Parameter name="H90_DIAG_FEE.SHCOARSE" parameterTypeRef="H90_DIAG_FEE.SHCOARSE" shortDescription="MISSION ELAPSED TIME" />
@@ -3483,6 +3629,23 @@ MET_SECONDS - 32 BITS</xtce:LongDescription>
 					<xtce:ParameterRefEntry parameterRef="PKT_LEN" />
 				</xtce:EntryList>
 			</xtce:SequenceContainer>
+			<xtce:SequenceContainer name="H45_MEMDMP">
+				<xtce:BaseContainer containerRef="CCSDSPacket">
+					<xtce:RestrictionCriteria>
+						<xtce:Comparison parameterRef="PKT_APID" value="740" useCalibratedValue="false" />
+					</xtce:RestrictionCriteria>
+				</xtce:BaseContainer>
+				<xtce:EntryList>
+					<xtce:ParameterRefEntry parameterRef="H45_MEMDMP.SHCOARSE" />
+					<xtce:ParameterRefEntry parameterRef="H45_MEMDMP.PACKET_VERSION" />
+					<xtce:ParameterRefEntry parameterRef="H45_MEMDMP.SPARE" />
+					<xtce:ParameterRefEntry parameterRef="H45_MEMDMP.MEMORY_ID" />
+					<xtce:ParameterRefEntry parameterRef="H45_MEMDMP.START_ADDRESS" />
+					<xtce:ParameterRefEntry parameterRef="H45_MEMDMP.NUM_BYTES" />
+					<xtce:ParameterRefEntry parameterRef="H45_MEMDMP.DUMP_DATA" />
+					<xtce:ParameterRefEntry parameterRef="H45_MEMDMP.CKSUM" />
+				</xtce:EntryList>
+			</xtce:SequenceContainer>
 			<xtce:SequenceContainer name="H45_APP_NHK">
 				<xtce:BaseContainer containerRef="CCSDSPacket">
 					<xtce:RestrictionCriteria>
@@ -3627,10 +3790,10 @@ MET_SECONDS - 32 BITS</xtce:LongDescription>
 					<xtce:ParameterRefEntry parameterRef="H45_SCI_DE.LAST_SPIN_NUM" />
 					<xtce:ParameterRefEntry parameterRef="H45_SCI_DE.SPIN_INVALIDS" />
 					<xtce:ParameterRefEntry parameterRef="H45_SCI_DE.SPARE" />
-					<xtce:ParameterRefEntry parameterRef="H45_SCI_DE.META_BITMASK" />
+					<xtce:ParameterRefEntry parameterRef="H45_SCI_DE.SPARE1" />
 					<xtce:ParameterRefEntry parameterRef="H45_SCI_DE.ESA_STEP_NUM" />
-					<xtce:ParameterRefEntry parameterRef="H45_SCI_DE.META_SUBSECONDS" />
-					<xtce:ParameterRefEntry parameterRef="H45_SCI_DE.META_SECONDS" />
+					<xtce:ParameterRefEntry parameterRef="H45_SCI_DE.ESA_STEP_MILLISECONDS" />
+					<xtce:ParameterRefEntry parameterRef="H45_SCI_DE.ESA_STEP_SECONDS" />
 					<xtce:ParameterRefEntry parameterRef="H45_SCI_DE.DE_TOF" />
 					<xtce:ParameterRefEntry parameterRef="H45_SCI_DE.CKSUM" />
 				</xtce:EntryList>
@@ -3736,6 +3899,23 @@ MET_SECONDS - 32 BITS</xtce:LongDescription>
 					<xtce:ParameterRefEntry parameterRef="H45_DIAG_FEE.CKSUM" />
 				</xtce:EntryList>
 			</xtce:SequenceContainer>
+			<xtce:SequenceContainer name="H90_MEMDMP">
+				<xtce:BaseContainer containerRef="CCSDSPacket">
+					<xtce:RestrictionCriteria>
+						<xtce:Comparison parameterRef="PKT_APID" value="804" useCalibratedValue="false" />
+					</xtce:RestrictionCriteria>
+				</xtce:BaseContainer>
+				<xtce:EntryList>
+					<xtce:ParameterRefEntry parameterRef="H90_MEMDMP.SHCOARSE" />
+					<xtce:ParameterRefEntry parameterRef="H90_MEMDMP.PACKET_VERSION" />
+					<xtce:ParameterRefEntry parameterRef="H90_MEMDMP.SPARE" />
+					<xtce:ParameterRefEntry parameterRef="H90_MEMDMP.MEMORY_ID" />
+					<xtce:ParameterRefEntry parameterRef="H90_MEMDMP.START_ADDRESS" />
+					<xtce:ParameterRefEntry parameterRef="H90_MEMDMP.NUM_BYTES" />
+					<xtce:ParameterRefEntry parameterRef="H90_MEMDMP.DUMP_DATA" />
+					<xtce:ParameterRefEntry parameterRef="H90_MEMDMP.CKSUM" />
+				</xtce:EntryList>
+			</xtce:SequenceContainer>
 			<xtce:SequenceContainer name="H90_APP_NHK">
 				<xtce:BaseContainer containerRef="CCSDSPacket">
 					<xtce:RestrictionCriteria>
@@ -3880,10 +4060,10 @@ MET_SECONDS - 32 BITS</xtce:LongDescription>
 					<xtce:ParameterRefEntry parameterRef="H90_SCI_DE.LAST_SPIN_NUM" />
 					<xtce:ParameterRefEntry parameterRef="H90_SCI_DE.SPIN_INVALIDS" />
 					<xtce:ParameterRefEntry parameterRef="H90_SCI_DE.SPARE" />
-					<xtce:ParameterRefEntry parameterRef="H90_SCI_DE.META_BITMASK" />
+					<xtce:ParameterRefEntry parameterRef="H90_SCI_DE.SPARE1" />
 					<xtce:ParameterRefEntry parameterRef="H90_SCI_DE.ESA_STEP_NUM" />
-					<xtce:ParameterRefEntry parameterRef="H90_SCI_DE.META_SUBSECONDS" />
-					<xtce:ParameterRefEntry parameterRef="H90_SCI_DE.META_SECONDS" />
+					<xtce:ParameterRefEntry parameterRef="H90_SCI_DE.ESA_STEP_MILLISECONDS" />
+					<xtce:ParameterRefEntry parameterRef="H90_SCI_DE.ESA_STEP_SECONDS" />
 					<xtce:ParameterRefEntry parameterRef="H90_SCI_DE.DE_TOF" />
 					<xtce:ParameterRefEntry parameterRef="H90_SCI_DE.CKSUM" />
 				</xtce:EntryList>