imap-processing 0.19.4__py3-none-any.whl → 1.0.1__py3-none-any.whl

imap_processing/cdf/config/imap_enamaps_l2-healpix_variable_attrs.yaml

@@ -39,10 +39,12 @@ pixel_index_label:
 # (longitude, latitude are not dimension coordinates for healpix tiling, but rather
 # describe the lon/lat coordinate of the Healpix pixel center)
 longitude:
+  CATDESC: "HEALPix Pixel center longitude in {frame} reference frame in the range [0, 360]"
   DEPEND_1: pixel_index
   LABL_PTR_1: pixel_index_label
 
 latitude:
+  CATDESC: "HEALPix Pixel center latitude in {frame} reference frame in the range [-90, 90]"
   DEPEND_1: pixel_index
   LABL_PTR_1: pixel_index_label
 
@@ -52,9 +54,8 @@ ena_intensity:
   DEPEND_2: pixel_index
   LABL_PTR_1: energy_label
   LABL_PTR_2: pixel_index_label
-  DISPLAY_TYPE: image
 
-ena_intensity_stat_unc:
+ena_intensity_stat_uncert:
   DEPEND_1: energy
   DEPEND_2: pixel_index
   LABL_PTR_1: energy_label

imap_processing/cdf/config/imap_enamaps_l2-rectangular_variable_attrs.yaml

@@ -19,9 +19,10 @@ longitude_label:
   DEPEND_1: longitude
 
 longitude_delta:
-  VAR_TYPE: metadata
+  VAR_TYPE: support_data
   dtype: float32
   CATDESC: Half-width of longitude pixel
+  DEPEND_1: longitude
   FORMAT: F12.6
   UNITS: degrees
   FIELDNAM: longitude delta
@@ -35,9 +36,10 @@ latitude_label:
   DEPEND_1: latitude
 
 latitude_delta:
-  VAR_TYPE: metadata
+  VAR_TYPE: support_data
   dtype: float32
   CATDESC: Half-width of latitude pixel
+  DEPEND_1: latitude
   FORMAT: F12.6
   UNITS: degrees
   FIELDNAM: latitude delta
@@ -47,14 +49,24 @@ latitude_delta:
 # attributes file, imap_enamaps_l2-common_variable_attrs.yaml
 
 longitude:
+  CATDESC: "Pixel center longitude in {frame} reference frame in the range [0, 360]"
   DELTA_MINUS_VAR: longitude_delta
   DELTA_PLUS_VAR: longitude_delta
-  SCALE_TYP: linear
+  SCALETYP: linear
+  LABL_PTR_1: longitude_label
+  MONOTON: INCREASE
+  FORMAT: I3
+
 
 latitude:
+  CATDESC: "Pixel center latitude in {frame} reference frame in the range [-90, 90]"
   DELTA_MINUS_VAR: latitude_delta
   DELTA_PLUS_VAR: latitude_delta
-  SCALE_TYP: linear
+  SCALETYP: linear
+  LABL_PTR_1: latitude_label
+  MONOTON: INCREASE
+  BIN_LOCATION: 0.5
+  FORMAT: I2
 
 # Define Data variables
 ena_intensity:
@@ -65,7 +77,7 @@ ena_intensity:
   LABL_PTR_2: longitude_label
   LABL_PTR_3: latitude_label
 
-ena_intensity_stat_unc:
+ena_intensity_stat_uncert:
   DEPEND_1: energy
   DEPEND_2: longitude
   DEPEND_3: latitude

imap_processing/cli.py

@@ -632,13 +632,7 @@ class Codice(ProcessInstrument):
             datasets = [codice_l1b.process_codice_l1b(science_files[0])]
 
         if self.data_level == "l2":
-            science_files = dependencies.get_file_paths(source="codice")
-            if len(science_files) != 1:
-                raise ValueError(
-                    f"CoDICE L2 requires exactly one input science file, received: "
-                    f"{science_files}."
-                )
-            datasets = [codice_l2.process_codice_l2(science_files[0])]
+            datasets = [codice_l2.process_codice_l2(self.descriptor, dependencies)]
 
         return datasets
 
@@ -1212,8 +1206,9 @@ class Mag(ProcessInstrument):
             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."
+                logger.warning(
+                    f"Timestamps for output file {ds.attrs['Logical_source']} are not "
+                    f"monotonically increasing."
                 )
         return datasets
 
@@ -1255,7 +1250,7 @@ class Spacecraft(ProcessInstrument):
             )
             ah_paths = [path for path in spice_inputs if ".ah" in path.suffixes]
             pointing_kernel_paths = pointing_frame.generate_pointing_attitude_kernel(
-                ah_paths[-1]
+                ah_paths
             )
             processed_dataset.extend(pointing_kernel_paths)
         else:
@@ -1305,7 +1300,7 @@ class Swapi(ProcessInstrument):
                 )
 
             # process science or housekeeping data
-            datasets = swapi_l1(dependencies)
+            datasets = swapi_l1(dependencies, descriptor=self.descriptor)
         elif self.data_level == "l2":
             if len(dependency_list) != 3:
                 raise ValueError(

imap_processing/codice/codice_l1a.py

@@ -89,7 +89,7 @@ class CoDICEL1aPipeline:
         self.plan_step = plan_step
         self.view_id = view_id
 
-    def apply_despinning(self) -> None:
+    def apply_despinning(self) -> None:  # noqa: PLR0912 (too many branches)
         """
         Apply the despinning algorithm to lo- angular and priority products.
 
@@ -108,10 +108,10 @@ class CoDICEL1aPipeline:
         # The dimensions are dependent on the specific data product
         if "angular" in self.config["dataset_name"]:
             despun_dims: tuple[int, ...] = (
+                num_counters,
                 num_energies,
                 num_positions,
                 num_spins,
-                num_counters,
             )
         elif "priority" in self.config["dataset_name"]:
             despun_dims = (num_energies, num_spins, num_counters)
@@ -130,23 +130,33 @@ class CoDICEL1aPipeline:
             for energy_index in range(num_energies):
                 pixel_orientation = constants.PIXEL_ORIENTATIONS[energy_index]
                 for spin_sector_index in range(num_spin_sectors):
-                    for azimuth_index in range(num_spins):
-                        if pixel_orientation == "A" and azimuth_index < 12:
+                    for azimuth_index in range(num_positions):
+                        if "-sw-" in self.config["dataset_name"]:
+                            # do something
+                            position_index = constants.SW_INDEX_TO_POSITION[
+                                azimuth_index
+                            ]
+                        elif "-nsw-" in self.config["dataset_name"]:
+                            position_index = constants.NSW_INDEX_TO_POSITION[
+                                azimuth_index
+                            ]
+
+                        if pixel_orientation == "A" and position_index < 12:
                             despun_spin_sector = spin_sector_index
-                        elif pixel_orientation == "A" and azimuth_index >= 12:
+                        elif pixel_orientation == "A" and position_index >= 12:
                             despun_spin_sector = spin_sector_index + 12
-                        elif pixel_orientation == "B" and azimuth_index < 12:
+                        elif pixel_orientation == "B" and position_index < 12:
                             despun_spin_sector = spin_sector_index + 12
-                        elif pixel_orientation == "B" and azimuth_index >= 12:
+                        elif pixel_orientation == "B" and position_index >= 12:
                             despun_spin_sector = spin_sector_index
 
                         if "angular" in self.config["dataset_name"]:
                             spin_data = epoch_data[
-                                energy_index, :, spin_sector_index, :
-                            ]  # (5, 4)
-                            despun_data[i][energy_index, :, despun_spin_sector, :] = (
-                                spin_data
-                            )
+                                :, energy_index, azimuth_index, spin_sector_index
+                            ]
+                            despun_data[i][
+                                :, energy_index, azimuth_index, despun_spin_sector
+                            ] = spin_data
                         elif "priority" in self.config["dataset_name"]:
                             spin_data = epoch_data[energy_index, spin_sector_index, :]
                             despun_data[i][energy_index, despun_spin_sector, :] = (
@@ -327,7 +337,7 @@ class CoDICEL1aPipeline:
         # each counter's data can be placed in a separate CDF data variable.
         # For Lo SW species, all_data has shape (9, 16, 128, 1) -> (epochs,
         # num_counters, num_energy_steps, num_spin_sectors)
-        if self._is_lo_species_dataset():
+        if self._is_different_dimension():
             # For Lo species datasets, counters are the second dimension (index 1)
             num_counters = all_data.shape[1]
         else:
@@ -338,8 +348,10 @@ class CoDICEL1aPipeline:
             range(num_counters), self.config["variable_names"], strict=False
         ):
             # Extract the counter data
-            if self._is_lo_species_dataset():
+            if self._is_different_dimension():
                 counter_data = all_data[:, counter, :, :]
+            elif "sectored" in self.config["dataset_name"]:
+                counter_data = all_data[:, counter, :, :, :]
             else:
                 counter_data = all_data[..., counter]
 
@@ -720,18 +732,25 @@ class CoDICEL1aPipeline:
 
         # Reshape the data based on how it is written to the data array of
         # the packet data. The number of counters is the last dimension / axis.
-        if self._is_lo_species_dataset():
+        if self._is_different_dimension():
             # For Lo species datasets, counters are the first dimension
             reshape_dims = (
                 self.config["num_counters"],
                 *self.config["dims"].values(),
             )
+        elif "sectored" in self.config["dataset_name"]:
+            # For sectored datasets, counters are the second dimension
+            reshape_dims = (
+                self.config["num_counters"],
+                *self.config["dims"].values(),
+            )
         else:
             # For all other datasets, counters are the last dimension
             reshape_dims = (
                 *self.config["dims"].values(),
                 self.config["num_counters"],
             )
+
         for packet_data in self.raw_data:
             reshaped_packet_data = np.array(packet_data, dtype=np.uint32).reshape(
                 reshape_dims
@@ -745,7 +764,7 @@ class CoDICEL1aPipeline:
         # No longer need to keep the raw data around
         del self.raw_data
 
-    def _is_lo_species_dataset(self) -> bool:
+    def _is_different_dimension(self) -> bool:
         """
         Check if the current dataset is a Lo species dataset.
 
@@ -761,6 +780,8 @@ class CoDICEL1aPipeline:
         return self.config["dataset_name"] in [
             "imap_codice_l1a_lo-sw-species",
             "imap_codice_l1a_lo-nsw-species",
+            "imap_codice_l1a_lo-sw-angular",
+            "imap_codice_l1a_lo-nsw-angular",
         ]
 
     def set_data_product_config(self, apid: int, dataset: xr.Dataset) -> None:
@@ -1653,23 +1674,23 @@ def process_codice_l1a(file_path: Path) -> list[xr.Dataset]:
         # Housekeeping data
         if apid == CODICEAPID.COD_NHK:
             processed_dataset = create_hskp_dataset(dataset)
-            logger.info(f"\nFinal data product:\n{processed_dataset}\n")
+            logger.info(f"\nProcessed {CODICEAPID(apid).name} packet\n")
 
         # Event data
         elif apid in [CODICEAPID.COD_LO_PHA, CODICEAPID.COD_HI_PHA]:
             processed_dataset = create_direct_event_dataset(apid, dataset)
-            logger.info(f"\nFinal data product:\n{processed_dataset}\n")
+            logger.info(f"\nProcessed {CODICEAPID(apid).name} packet\n")
 
         # I-ALiRT data
         elif apid in [CODICEAPID.COD_LO_IAL, CODICEAPID.COD_HI_IAL]:
             processed_dataset = create_ialirt_dataset(apid, dataset)
-            logger.info(f"\nFinal data product:\n{processed_dataset}\n")
+            logger.info(f"\nProcessed {CODICEAPID(apid).name} packet\n")
 
         # hi-omni data
         elif apid == CODICEAPID.COD_HI_OMNI_SPECIES_COUNTS:
             science_values = [packet.data for packet in dataset.data]
             processed_dataset = create_binned_dataset(apid, dataset, science_values)
-            logger.info(f"\nFinal data product:\n{processed_dataset}\n")
+            logger.info(f"\nProcessed {CODICEAPID(apid).name} packet\n")
 
         # Everything else
         elif apid in constants.APIDS_FOR_SCIENCE_PROCESSING:
@@ -1687,7 +1708,7 @@ def process_codice_l1a(file_path: Path) -> list[xr.Dataset]:
             pipeline.define_coordinates()
             processed_dataset = pipeline.define_data_variables()
 
-            logger.info(f"\nFinal data product:\n{processed_dataset}\n")
+            logger.info(f"\nProcessed {CODICEAPID(apid).name} packet\n")
 
         # For APIDs that don't require processing
         else: