dkist-processing-cryonirsp 0.0.57__tar.gz → 0.0.58__tar.gz

{dkist_processing_cryonirsp-0.0.57 → dkist_processing_cryonirsp-0.0.58}/CHANGELOG.rst

@@ -1,3 +1,13 @@
+v0.0.58 (2024-05-03)
+====================
+
+Bugfixes
+--------
+
+- Some Cryo-NIRSP CI movies were far too large (>1GB).
+  This fix made the movies smaller by scaling down the size of the movies. (`#119 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/119>`__)
+
+
 v0.0.57 (2024-05-02)
 ====================
 

{dkist_processing_cryonirsp-0.0.57 → dkist_processing_cryonirsp-0.0.58}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dkist_processing_cryonirsp
-Version: 0.0.57
+Version: 0.0.58
 Summary: Science processing code for the Cryo-NIRSP instrument on DKIST
 Home-page: https://bitbucket.org/dkistdc/dkist_processing_cryonirsp/src/main/
 Author: NSO / AURA

{dkist_processing_cryonirsp-0.0.57 → dkist_processing_cryonirsp-0.0.58}/dkist_processing_cryonirsp/tasks/assemble_movie.py

@@ -42,7 +42,16 @@ class AssembleCryonirspMovieBase(AssembleMovie):
         raw_L1_shape = random_frame.shape
         flipped_shape = raw_L1_shape[::-1]
 
-        return flipped_shape
+        standard_HD_num_pix = 1920 * 1080
+        frame_num_pix = np.prod(flipped_shape)
+        scale_factor = (
+            np.sqrt(standard_HD_num_pix / frame_num_pix)
+            if frame_num_pix > standard_HD_num_pix
+            else 1.0
+        )
+        scaled_shape = tuple(int(i * scale_factor) for i in flipped_shape)
+
+        return scaled_shape
 
     def pre_run(self) -> None:
         """Set the movie frame shape prior to running."""

{dkist_processing_cryonirsp-0.0.57 → dkist_processing_cryonirsp-0.0.58}/dkist_processing_cryonirsp/tests/test_assemble_movie.py

@@ -13,13 +13,23 @@ from dkist_processing_cryonirsp.tests.conftest import generate_214_l1_fits_frame
 from dkist_processing_cryonirsp.tests.header_models import Cryonirsp122ObserveFrames
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture(
+    scope="function", params=[pytest.param(True, id="shrink"), pytest.param(False, id="noshrink")]
+)
 def assemble_movie_task_with_tagged_movie_frames(
-    tmp_path, recipe_run_id, init_cryonirsp_constants_db
+    request,
+    tmp_path,
+    recipe_run_id,
+    init_cryonirsp_constants_db,
 ):
     num_map_scans = 10
     num_scan_steps = 1
-    frame_shape = (100, 200)
+    if request.param:
+        frame_shape = (1080 * 2, 1920 * 2)  # Intentionally "backward" from normal
+        expected_shape = (1080, 1920)[::-1]
+    else:
+        frame_shape = (100, 235)  # Weird aspect ratio
+        expected_shape = (100, 235)[::-1]
     init_cryonirsp_constants_db(recipe_run_id, CryonirspConstantsDb(NUM_MAP_SCANS=num_map_scans))
     with AssembleCryonirspMovie(
         recipe_run_id=recipe_run_id,
@@ -53,7 +63,7 @@ def assemble_movie_task_with_tagged_movie_frames(
                         ],
                         encoder=fits_hdulist_encoder,
                     )
-            yield task, frame_shape
+            yield task, frame_shape, expected_shape
         finally:
             task._purge()
 
@@ -62,7 +72,7 @@ def test_assemble_movie(assemble_movie_task_with_tagged_movie_frames, mocker):
     mocker.patch(
         "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
     )
-    task, _ = assemble_movie_task_with_tagged_movie_frames
+    task, _, _ = assemble_movie_task_with_tagged_movie_frames
     task()
     movie_file = list(task.read(tags=[CryonirspTag.movie()]))
     assert len(movie_file) == 1
@@ -75,15 +85,15 @@ def test_compute_frame_shape(assemble_movie_task_with_tagged_movie_frames):
     When: Computing the size of the final movie
     Then: The correct size is computed: the size of an L1 output frame
     """
-    task, frame_shape = assemble_movie_task_with_tagged_movie_frames
+    task, frame_shape, expected_shape = assemble_movie_task_with_tagged_movie_frames
 
     # Task starts as polarimetric from fixture constants
-    assert task._compute_frame_shape() == tuple(np.array(frame_shape)[::-1])
+    assert task._compute_frame_shape() == tuple(expected_shape)
 
     # Update constants to be non-polarimetric
     del task.constants._db_dict[CryonirspBudName.num_modstates.value]
     task.constants._db_dict[CryonirspBudName.num_modstates.value] = 1
-    assert task._compute_frame_shape() == tuple(np.array(frame_shape)[::-1])
+    assert task._compute_frame_shape() == tuple(expected_shape)
 
 
 @pytest.fixture(scope="function")

{dkist_processing_cryonirsp-0.0.57 → dkist_processing_cryonirsp-0.0.58}/dkist_processing_cryonirsp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dkist-processing-cryonirsp
-Version: 0.0.57
+Version: 0.0.58
 Summary: Science processing code for the Cryo-NIRSP instrument on DKIST
 Home-page: https://bitbucket.org/dkistdc/dkist_processing_cryonirsp/src/main/
 Author: NSO / AURA