Cannot remove success file if job failed, plus test fix

DiamondLightSource · Nov 7, 2023 · c34504d · c34504d
1 parent 4260d11
commit c34504d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/relion/zocalo/class2d_wrapper.py b/src/relion/zocalo/class2d_wrapper.py
@@ -195,7 +195,7 @@ def run(self):
             class2d_command, cwd=str(project_dir), capture_output=True
         )
         if not job_is_rerun:
-            (job_dir / "RELION_JOB_EXIT_SUCCESS").unlink()
+            (job_dir / "RELION_JOB_EXIT_SUCCESS").unlink(missing_ok=True)
 
         # Register the Class2D job with the node creator
         self.log.info(f"Sending {job_type} to node creator")

diff --git a/src/relion/zocalo/class3d_wrapper.py b/src/relion/zocalo/class3d_wrapper.py
@@ -398,7 +398,7 @@ def run(self):
             class3d_command, cwd=str(project_dir), capture_output=True
         )
         if not job_is_rerun:
-            (job_dir / "RELION_JOB_EXIT_SUCCESS").unlink()
+            (job_dir / "RELION_JOB_EXIT_SUCCESS").unlink(missing_ok=True)
 
         # Register the Class3D job with the node creator
         self.log.info(f"Sending {job_type} to node creator")

diff --git a/tests/zocalo/test_motioncorr_service.py b/tests/zocalo/test_motioncorr_service.py
@@ -133,6 +133,8 @@ def test_motioncorr_service_spa(
         "1.0",
         "-Patch",
         "5 5",
+        "-Gpu",
+        "0",
         "-Gain",
         motioncorr_test_message["parameters"]["gain_ref"],
         "-RotGain",
@@ -157,8 +159,6 @@ def test_motioncorr_service_spa(
         "1",
         "-Kv",
         "300",
-        "-FmIntFile",
-        "fm_int_file",
         "-Mag",
         "mag1 mag2",
         "-FtBin",
@@ -400,6 +400,8 @@ def test_motioncorr_service_tomo(
             "1.0",
             "-Patch",
             "5 5",
+            "-Gpu",
+            "0",
             "-Gain",
             motioncorr_test_message["parameters"]["gain_ref"],
             "-FmRef",