Refactor unit tests and code update to deal with split of L2 and L3 f…

…iles.
spacetelescope · Apr 4, 2024 · 6baa3b6 · 6baa3b6
1 parent 0d55b2e
commit 6baa3b6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/romancal/outlier_detection/tests/test_outlier_detection.py b/romancal/outlier_detection/tests/test_outlier_detection.py
@@ -89,7 +89,10 @@ def test_outlier_valid_input_asn(tmp_path, base_image, create_mock_asn_file):
     asn_filepath = create_mock_asn_file(tmp_path)
 
     res = OutlierDetectionStep.call(
-        asn_filepath, output_dir=tmp_path.as_posix(), in_memory=True
+        asn_filepath,
+        output_dir=tmp_path.as_posix(),
+        in_memory=True,
+        resample_data=False,
     )
 
     # assert step.skip is False
@@ -107,7 +110,11 @@ def test_outlier_valid_input_modelcontainer(tmp_path, base_image):
 
     mc = ModelContainer([img_1, img_2])
 
-    res = OutlierDetectionStep.call(mc, in_memory=True)
+    res = OutlierDetectionStep.call(
+        mc,
+        in_memory=True,
+        resample_data=False,
+    )
 
     assert all(x.meta.cal_step.outlier_detection == "COMPLETE" for x in res)
 
@@ -192,22 +199,18 @@ def test_outlier_do_detection_write_files_to_custom_location(
         "backg": 0.0,
         "kernel_size": "7 7",
         "save_intermediate_results": False,
-        "resample_data": True,
+        "resample_data": False,
         "good_bits": 0,
         "allowed_memory": None,
         "in_memory": outlier_step.in_memory,
         "make_output_path": outlier_step.make_output_path,
         "resample_suffix": "i2d",
     }
 
-    blot_path_1 = tmp_path / img_1.meta.filename.replace(".asdf", "_blot.asdf")
-    blot_path_2 = tmp_path / img_2.meta.filename.replace(".asdf", "_blot.asdf")
     # meta.filename for the median image created by OutlierDetection.do_detection()
     median_path = tmp_path / "drizzled_median.asdf"
 
     outlier_files_path = [
-        blot_path_1,
-        blot_path_2,
         median_path,
     ]
 
@@ -264,7 +267,7 @@ def test_outlier_do_detection_find_outliers(tmp_path, base_image, clean_up_after
         "backg": 0.0,
         "kernel_size": "7 7",
         "save_intermediate_results": False,
-        "resample_data": True,
+        "resample_data": False,
         "good_bits": 0,
         "allowed_memory": None,
         "in_memory": outlier_step.in_memory,
@@ -338,7 +341,7 @@ def test_outlier_do_detection_do_not_find_outliers_in_identical_images(
         "backg": 0.0,
         "kernel_size": "7 7",
         "save_intermediate_results": False,
-        "resample_data": True,
+        "resample_data": False,
         "good_bits": 0,
         "allowed_memory": None,
         "in_memory": outlier_step.in_memory,

diff --git a/romancal/resample/tests/test_resample_step.py b/romancal/resample/tests/test_resample_step.py
@@ -9,6 +9,7 @@
 from gwcs import coordinate_frames as cf
 from roman_datamodels import datamodels, maker_utils
 
+from romancal.datamodels import ModelContainer
 from romancal.resample import ResampleStep, resample_utils