dkist-processing-common 11.7.0rc1__tar.gz → 11.7.0rc3__tar.gz

{dkist_processing_common-11.7.0rc1 → dkist_processing_common-11.7.0rc3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-common
-Version: 11.7.0rc1
+Version: 11.7.0rc3
 Summary: Common task classes used by the DKIST science data processing pipelines
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause

{dkist_processing_common-11.7.0rc1 → dkist_processing_common-11.7.0rc3}/dkist_processing_common/models/constants.py

@@ -79,25 +79,18 @@ class BudName(StrEnum):
     polcal_average_telescope_azimuth = "POLCAL_AVERAGE_TELESCOPE_AZIMUTH"
     dark_gos_level3_status = "DARK_GOS_LEVEL3_STATUS"
     solar_gain_gos_level3_status = "SOLAR_GAIN_GOS_LEVEL3_STATUS"
-    polcal_gos_level3_status = "POLCAL_GOS_LEVEL3_STATUS"
     dark_gos_level3_lamp_status = "DARK_GOS_LEVEL3_LAMP_STATUS"
     solar_gain_gos_level3_lamp_status = "SOLAR_GAIN_GOS_LEVEL3_LAMP_STATUS"
-    polcal_gos_level3_lamp_status = "POLCAL_GOS_LEVEL3_LAMP_STATUS"
     dark_gos_polarizer_status = "DARK_GOS_POLARIZER_STATUS"
     solar_gain_gos_polarizer_status = "SOLAR_GAIN_GOS_POLARIZER_STATUS"
-    polcal_gos_polarizer_status = "POLCAL_GOS_POLARIZER_STATUS"
     dark_gos_polarizer_angle = "DARK_GOS_POLARIZER_ANGLE"
     solar_gain_gos_polarizer_angle = "SOLAR_GAIN_GOS_POLARIZER_ANGLE"
-    polcal_gos_polarizer_angle = "POLCAL_GOS_POLARIZER_ANGLE"
     dark_gos_retarder_status = "DARK_GOS_RETARDER_STATUS"
     solar_gain_gos_retarder_status = "SOLAR_GAIN_GOS_RETARDER_STATUS"
-    polcal_gos_retarder_status = "POLCAL_GOS_RETARDER_STATUS"
     dark_gos_retarder_angle = "DARK_GOS_RETARDER_ANGLE"
     solar_gain_gos_retarder_angle = "SOLAR_GAIN_GOS_RETARDER_ANGLE"
-    polcal_gos_retarder_angle = "POLCAL_GOS_RETARDER_ANGLE"
     dark_gos_level0_status = "DARK_GOS_LEVEL0_STATUS"
     solar_gain_gos_level0_status = "SOLAR_GAIN_GOS_LEVEL0_STATUS"
-    polcal_gos_level0_status = "POLCAL_GOS_LEVEL0_STATUS"
 
 
 class ConstantsBase:
@@ -156,7 +149,7 @@ class ConstantsBase:
         return Sqids(min_length=6, alphabet=ascii_uppercase).encode([self._recipe_run_id])
 
     @property
-    def stokes_params(self) -> [str]:
+    def stokes_params(self) -> list[str]:
         """Return the list of stokes parameter names."""
         return ["I", "Q", "U", "V"]
 
@@ -186,7 +179,7 @@ class ConstantsBase:
         return self._db_dict[BudName.proposal_id]
 
     @property
-    def contributing_proposal_ids(self) -> [str]:
+    def contributing_proposal_ids(self) -> list[str]:
         """Return the list of contributing proposal IDs."""
         proposal_ids = self._db_dict[BudName.contributing_proposal_ids]
         return list(proposal_ids)
@@ -197,7 +190,7 @@ class ConstantsBase:
         return self._db_dict[BudName.experiment_id]
 
     @property
-    def contributing_experiment_ids(self) -> [str]:
+    def contributing_experiment_ids(self) -> list[str]:
         """Return the list of contributing experiment IDs."""
         experiment_ids = self._db_dict[BudName.contributing_experiment_ids]
         return list(experiment_ids)
@@ -233,13 +226,13 @@ class ConstantsBase:
         return self._db_dict[BudName.num_dsps_repeats]
 
     @property
-    def dark_exposure_times(self) -> [float]:
+    def dark_exposure_times(self) -> list[float]:
         """Get a list of exposure times used in the dark calibration."""
         exposure_times = self._db_dict[BudName.dark_exposure_times]
         return list(exposure_times)
 
     @property
-    def dark_readout_exp_times(self) -> [float]:
+    def dark_readout_exp_times(self) -> list[float]:
         """Get a list of readout exp times for all dark frames."""
         readout_times = self._db_dict[BudName.dark_readout_exp_times]
         return list(readout_times)
@@ -292,19 +285,19 @@ class ConstantsBase:
     # Multi-task constants start here:
 
     @property
-    def dark_observing_program_execution_id(self) -> [str]:
+    def dark_observing_program_execution_id(self) -> list[str]:
         """Return the observing program execution id constant for the dark task."""
         observing_programs = self._db_dict[BudName.dark_observing_program_execution_id]
         return list(observing_programs)
 
     @property
-    def solar_gain_observing_program_execution_id(self) -> [str]:
+    def solar_gain_observing_program_execution_id(self) -> list[str]:
         """Return the observing program execution id constant for the solar_gain task."""
         observing_programs = self._db_dict[BudName.solar_gain_observing_program_execution_id]
         return list(observing_programs)
 
     @property
-    def polcal_observing_program_execution_id(self) -> [str]:
+    def polcal_observing_program_execution_id(self) -> list[str]:
         """Return the observing program execution id constant."""
         observing_programs = self._db_dict[BudName.polcal_observing_program_execution_id]
         return list(observing_programs)
@@ -469,11 +462,6 @@ class ConstantsBase:
         """Return the gos level3 status constant for the solar gain task."""
         return self._db_dict[BudName.solar_gain_gos_level3_status]
 
-    @property
-    def polcal_gos_level3_status(self) -> str:
-        """Return the gos level3 status constant for the polcal task."""
-        return self._db_dict[BudName.polcal_gos_level3_status]
-
     @property
     def dark_gos_level3_lamp_status(self) -> str:
         """Return the gos level3 lamp status constant for the dark task."""
@@ -484,11 +472,6 @@ class ConstantsBase:
         """Return the gos level3 lamp status constant for the solar gain task."""
         return self._db_dict[BudName.solar_gain_gos_level3_lamp_status]
 
-    @property
-    def polcal_gos_level3_lamp_status(self) -> str:
-        """Return the gos level3 lamp status constant for the polcal task."""
-        return self._db_dict[BudName.polcal_gos_level3_lamp_status]
-
     @property
     def dark_gos_polarizer_status(self) -> str:
         """Return the gos polarizer status constant for the dark task."""
@@ -499,11 +482,6 @@ class ConstantsBase:
         """Return the gos polarizer status constant for the solar gain task."""
         return self._db_dict[BudName.solar_gain_gos_polarizer_status]
 
-    @property
-    def polcal_gos_polarizer_status(self) -> str:
-        """Return the gos polarizer status constant for the polcal task."""
-        return self._db_dict[BudName.polcal_gos_polarizer_status]
-
     @property
     def dark_gos_polarizer_angle(self) -> float:
         """Return the gos polarizer angle constant for the dark task."""
@@ -514,11 +492,6 @@ class ConstantsBase:
         """Return the gos polarizer angle constant for the solar gain task."""
         return self._db_dict[BudName.solar_gain_gos_polarizer_angle]
 
-    @property
-    def polcal_gos_polarizer_angle(self) -> float:
-        """Return the gos polarizer angle constant for the polcal task."""
-        return self._db_dict[BudName.polcal_gos_polarizer_angle]
-
     @property
     def dark_gos_retarder_status(self) -> str:
         """Return the gos retarder status constant for the dark task."""
@@ -529,11 +502,6 @@ class ConstantsBase:
         """Return the gos retarder status constant for the solar gain task."""
         return self._db_dict[BudName.solar_gain_gos_retarder_status]
 
-    @property
-    def polcal_gos_retarder_status(self) -> str:
-        """Return the gos retarder status constant for the polcal task."""
-        return self._db_dict[BudName.polcal_gos_retarder_status]
-
     @property
     def dark_gos_retarder_angle(self) -> float:
         """Return the gos retarder angle constant for the dark task."""
@@ -544,11 +512,6 @@ class ConstantsBase:
         """Return the gos retarder angle constant for the solar gain task."""
         return self._db_dict[BudName.solar_gain_gos_retarder_angle]
 
-    @property
-    def polcal_gos_retarder_angle(self) -> float:
-        """Return the gos retarder angle constant for the polcal task."""
-        return self._db_dict[BudName.polcal_gos_retarder_angle]
-
     @property
     def dark_gos_level0_status(self) -> str:
         """Return the gos level0 status constant for the dark task."""
@@ -558,8 +521,3 @@ class ConstantsBase:
     def solar_gain_gos_level0_status(self) -> str:
         """Return the gos level0 status constant for the solar gain task."""
         return self._db_dict[BudName.solar_gain_gos_level0_status]
-
-    @property
-    def polcal_gos_level0_status(self) -> str:
-        """Return the gos level0 status constant for the polcal task."""
-        return self._db_dict[BudName.polcal_gos_level0_status]

{dkist_processing_common-11.7.0rc1 → dkist_processing_common-11.7.0rc3}/dkist_processing_common/parsers/id_bud.py

@@ -6,10 +6,8 @@ from typing import Type
 
 from dkist_processing_common.models.flower_pot import SpilledDirt
 from dkist_processing_common.models.flower_pot import Stem
-from dkist_processing_common.models.task_name import TaskName
 from dkist_processing_common.parsers.l0_fits_access import L0FitsAccess
 from dkist_processing_common.parsers.task import passthrough_header_ip_task
-from dkist_processing_common.parsers.unique_bud import TaskUniqueBud
 
 
 class ContributingIdsBud(Stem):

{dkist_processing_common-11.7.0rc1 → dkist_processing_common-11.7.0rc3}/dkist_processing_common/parsers/time.py

@@ -66,7 +66,7 @@ class TaskDatetimeBudBase(Stem):
         stem_name: str,
         metadata_key: str | StrEnum,
         ip_task_types: str | list[str],
-        header_task_parsing_func: Callable = passthrough_header_ip_task,
+        task_type_parsing_function: Callable = passthrough_header_ip_task,
     ):
         super().__init__(stem_name=stem_name)
 
@@ -76,7 +76,7 @@ class TaskDatetimeBudBase(Stem):
         if isinstance(ip_task_types, str):
             ip_task_types = [ip_task_types]
         self.ip_task_types = [task.casefold() for task in ip_task_types]
-        self.header_parsing_function = header_task_parsing_func
+        self.header_parsing_function = task_type_parsing_function
 
     def setter(self, fits_obj: L0FitsAccess) -> float | Type[SpilledDirt]:
         """
@@ -218,11 +218,17 @@ class VarianceCadenceBud(CadenceBudBase):
 class TaskDateBeginBud(TaskDatetimeBudBase):
     """Class for the date begin task Bud."""
 
-    def __init__(self, constant_name: str, ip_task_types: str | list[str]):
+    def __init__(
+        self,
+        constant_name: str,
+        ip_task_types: str | list[str],
+        task_type_parsing_function: Callable = passthrough_header_ip_task,
+    ):
         super().__init__(
             stem_name=constant_name,
             metadata_key=MetadataKey.time_obs,
             ip_task_types=ip_task_types,
+            task_type_parsing_function=task_type_parsing_function,
         )
 
     def getter(self, key) -> str:

{dkist_processing_common-11.7.0rc1 → dkist_processing_common-11.7.0rc3}/dkist_processing_common/tasks/parse_l0_input_data.py

@@ -40,6 +40,7 @@ from dkist_processing_common.parsers.experiment_id_bud import ExperimentIdBud
 from dkist_processing_common.parsers.id_bud import TaskContributingIdsBud
 from dkist_processing_common.parsers.proposal_id_bud import ContributingProposalIdsBud
 from dkist_processing_common.parsers.proposal_id_bud import ProposalIdBud
+from dkist_processing_common.parsers.task import parse_header_ip_task_with_gains
 from dkist_processing_common.parsers.time import AverageCadenceBud
 from dkist_processing_common.parsers.time import MaximumCadenceBud
 from dkist_processing_common.parsers.time import MinimumCadenceBud
@@ -96,6 +97,7 @@ def dataset_extra_bud_factory() -> list[S]:
             constant_name=BudName.solar_gain_observing_program_execution_id,
             metadata_key=MetadataKey.observing_program_execution_id,
             ip_task_types=TaskName.solar_gain,
+            task_type_parsing_function=parse_header_ip_task_with_gains,
         ),
         TaskContributingIdsBud(
             constant_name=BudName.polcal_observing_program_execution_id,
@@ -111,6 +113,7 @@ def dataset_extra_bud_factory() -> list[S]:
             constant_name=BudName.solar_gain_num_raw_frames_per_fpa,
             metadata_key=MetadataKey.num_raw_frames_per_fpa,
             ip_task_types=TaskName.solar_gain,
+            task_type_parsing_function=parse_header_ip_task_with_gains,
         ),
         TaskUniqueBud(
             constant_name=BudName.polcal_num_raw_frames_per_fpa,
@@ -126,6 +129,7 @@ def dataset_extra_bud_factory() -> list[S]:
             constant_name=BudName.solar_gain_telescope_tracking_mode,
             metadata_key=MetadataKey.telescope_tracking_mode,
             ip_task_types=TaskName.solar_gain,
+            task_type_parsing_function=parse_header_ip_task_with_gains,
         ),
         TaskUniqueBud(
             constant_name=BudName.polcal_telescope_tracking_mode,
@@ -141,6 +145,7 @@ def dataset_extra_bud_factory() -> list[S]:
             constant_name=BudName.solar_gain_coude_table_tracking_mode,
             metadata_key=MetadataKey.coude_table_tracking_mode,
             ip_task_types=TaskName.solar_gain,
+            task_type_parsing_function=parse_header_ip_task_with_gains,
         ),
         TaskUniqueBud(
             constant_name=BudName.polcal_coude_table_tracking_mode,
@@ -156,6 +161,7 @@ def dataset_extra_bud_factory() -> list[S]:
             constant_name=BudName.solar_gain_telescope_scanning_mode,
             metadata_key=MetadataKey.telescope_scanning_mode,
             ip_task_types=TaskName.solar_gain,
+            task_type_parsing_function=parse_header_ip_task_with_gains,
         ),
         TaskUniqueBud(
             constant_name=BudName.polcal_telescope_scanning_mode,
@@ -171,11 +177,7 @@ def dataset_extra_bud_factory() -> list[S]:
             constant_name=BudName.solar_gain_gos_level3_status,
             metadata_key=MetadataKey.gos_level3_status,
             ip_task_types=TaskName.solar_gain,
-        ),
-        TaskUniqueBud(
-            constant_name=BudName.polcal_gos_level3_status,
-            metadata_key=MetadataKey.gos_level3_status,
-            ip_task_types=TaskName.polcal,
+            task_type_parsing_function=parse_header_ip_task_with_gains,
         ),
         TaskUniqueBud(
             constant_name=BudName.dark_gos_level3_lamp_status,
@@ -186,11 +188,7 @@ def dataset_extra_bud_factory() -> list[S]:
             constant_name=BudName.solar_gain_gos_level3_lamp_status,
             metadata_key=MetadataKey.gos_level3_lamp_status,
             ip_task_types=TaskName.solar_gain,
-        ),
-        TaskUniqueBud(
-            constant_name=BudName.polcal_gos_level3_lamp_status,
-            metadata_key=MetadataKey.gos_level3_lamp_status,
-            ip_task_types=TaskName.polcal,
+            task_type_parsing_function=parse_header_ip_task_with_gains,
         ),
         TaskUniqueBud(
             constant_name=BudName.dark_gos_polarizer_status,
@@ -201,11 +199,7 @@ def dataset_extra_bud_factory() -> list[S]:
             constant_name=BudName.solar_gain_gos_polarizer_status,
             metadata_key=MetadataKey.gos_polarizer_status,
             ip_task_types=TaskName.solar_gain,
-        ),
-        TaskUniqueBud(
-            constant_name=BudName.polcal_gos_polarizer_status,
-            metadata_key=MetadataKey.gos_polarizer_status,
-            ip_task_types=TaskName.polcal,
+            task_type_parsing_function=parse_header_ip_task_with_gains,
         ),
         TaskUniqueBud(
             constant_name=BudName.dark_gos_polarizer_angle,
@@ -216,11 +210,7 @@ def dataset_extra_bud_factory() -> list[S]:
             constant_name=BudName.solar_gain_gos_polarizer_angle,
             metadata_key=MetadataKey.gos_polarizer_angle,
             ip_task_types=TaskName.solar_gain,
-        ),
-        TaskUniqueBud(
-            constant_name=BudName.polcal_gos_polarizer_angle,
-            metadata_key=MetadataKey.gos_polarizer_angle,
-            ip_task_types=TaskName.polcal,
+            task_type_parsing_function=parse_header_ip_task_with_gains,
         ),
         TaskUniqueBud(
             constant_name=BudName.dark_gos_retarder_status,
@@ -231,11 +221,7 @@ def dataset_extra_bud_factory() -> list[S]:
             constant_name=BudName.solar_gain_gos_retarder_status,
             metadata_key=MetadataKey.gos_retarder_status,
             ip_task_types=TaskName.solar_gain,
-        ),
-        TaskUniqueBud(
-            constant_name=BudName.polcal_gos_retarder_status,
-            metadata_key=MetadataKey.gos_retarder_status,
-            ip_task_types=TaskName.polcal,
+            task_type_parsing_function=parse_header_ip_task_with_gains,
         ),
         TaskUniqueBud(
             constant_name=BudName.dark_gos_retarder_angle,
@@ -246,11 +232,7 @@ def dataset_extra_bud_factory() -> list[S]:
             constant_name=BudName.solar_gain_gos_retarder_angle,
             metadata_key=MetadataKey.gos_retarder_angle,
             ip_task_types=TaskName.solar_gain,
-        ),
-        TaskUniqueBud(
-            constant_name=BudName.polcal_gos_retarder_angle,
-            metadata_key=MetadataKey.gos_retarder_angle,
-            ip_task_types=TaskName.polcal,
+            task_type_parsing_function=parse_header_ip_task_with_gains,
         ),
         TaskUniqueBud(
             constant_name=BudName.dark_gos_level0_status,
@@ -261,11 +243,7 @@ def dataset_extra_bud_factory() -> list[S]:
             constant_name=BudName.solar_gain_gos_level0_status,
             metadata_key=MetadataKey.gos_level0_status,
             ip_task_types=TaskName.solar_gain,
-        ),
-        TaskUniqueBud(
-            constant_name=BudName.polcal_gos_level0_status,
-            metadata_key=MetadataKey.gos_level0_status,
-            ip_task_types=TaskName.polcal,
+            task_type_parsing_function=parse_header_ip_task_with_gains,
         ),
         TaskAverageBud(
             constant_name=BudName.dark_average_light_level,
@@ -276,6 +254,7 @@ def dataset_extra_bud_factory() -> list[S]:
             constant_name=BudName.solar_gain_average_light_level,
             metadata_key=MetadataKey.light_level,
             ip_task_types=TaskName.solar_gain,
+            task_type_parsing_function=parse_header_ip_task_with_gains,
         ),
         TaskAverageBud(
             constant_name=BudName.polcal_average_light_level,
@@ -291,6 +270,7 @@ def dataset_extra_bud_factory() -> list[S]:
             constant_name=BudName.solar_gain_average_telescope_elevation,
             metadata_key=MetadataKey.elevation,
             ip_task_types=TaskName.solar_gain,
+            task_type_parsing_function=parse_header_ip_task_with_gains,
         ),
         TaskAverageBud(
             constant_name=BudName.polcal_average_telescope_elevation,
@@ -306,6 +286,7 @@ def dataset_extra_bud_factory() -> list[S]:
             constant_name=BudName.solar_gain_average_coude_table_angle,
             metadata_key=MetadataKey.table_angle,
             ip_task_types=TaskName.solar_gain,
+            task_type_parsing_function=parse_header_ip_task_with_gains,
         ),
         TaskAverageBud(
             constant_name=BudName.polcal_average_coude_table_angle,
@@ -321,6 +302,7 @@ def dataset_extra_bud_factory() -> list[S]:
             constant_name=BudName.solar_gain_average_telescope_azimuth,
             metadata_key=MetadataKey.azimuth,
             ip_task_types=TaskName.solar_gain,
+            task_type_parsing_function=parse_header_ip_task_with_gains,
         ),
         TaskAverageBud(
             constant_name=BudName.polcal_average_telescope_azimuth,
@@ -334,6 +316,7 @@ def dataset_extra_bud_factory() -> list[S]:
         TaskDateBeginBud(
             constant_name=BudName.solar_gain_date_begin,
             ip_task_types=TaskName.solar_gain,
+            task_type_parsing_function=parse_header_ip_task_with_gains,
         ),
         TaskDateBeginBud(
             constant_name=BudName.polcal_date_begin,

{dkist_processing_common-11.7.0rc1 → dkist_processing_common-11.7.0rc3}/dkist_processing_common/tests/test_parse_l0_input_data.py

@@ -260,7 +260,7 @@ def test_subclass_flowers(visp_parse_inputs_task, max_cs_step_time_sec):
     tag_pot, constant_pot = visp_parse_inputs_task.make_flower_pots()
 
     assert len(tag_pot.stems) == 1
-    assert len(constant_pot.stems) == 71
+    assert len(constant_pot.stems) == 64
     all_flower_names = [StemName.modstate]
     assert sorted([f.stem_name for f in tag_pot.stems]) == sorted(all_flower_names)
     all_bud_names = [b.stem_name for b in default_constant_bud_factory()] + [BudName.num_modstates]
@@ -271,7 +271,7 @@ def test_dataset_extra_bud_factory(visp_parse_inputs_task, max_cs_step_time_sec)
     """
     Given: ParseInputData child class with custom stems
     When: Making the constant pot
-    Then: The multi-task dataset extra buds are all created
+    Then: The multi-task dataset extra buds are created
     """
     _, constant_pot = visp_parse_inputs_task.make_flower_pots()
     stem_names = [f.stem_name.value for f in constant_pot.stems]
@@ -294,11 +294,11 @@ def test_dataset_extra_bud_factory(visp_parse_inputs_task, max_cs_step_time_sec)
         "GOS_RETARDER_ANGLE",
         "GOS_LEVEL0_STATUS",
     ]
-    bud_name_prefix = ["DARK_", "SOLAR_GAIN_", "POLCAL_"]
-    for prefix in bud_name_prefix:
-        for base in bud_name_base:
-            print(prefix + base)
-            assert prefix + base in stem_names
+    for base in bud_name_base:
+        assert "DARK_" + base in stem_names
+        assert "SOLAR_GAIN_" + base in stem_names
+        if "GOS" not in base:
+            assert "POLCAL_" + base in stem_names
 
 
 def test_constants_correct(parse_inputs_task):

{dkist_processing_common-11.7.0rc1 → dkist_processing_common-11.7.0rc3}/dkist_processing_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-common
-Version: 11.7.0rc1
+Version: 11.7.0rc3
 Summary: Common task classes used by the DKIST science data processing pipelines
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause