Replaced djr scripts paths to tools/mfx/scripts.

pcdshub · Aug 30, 2024 · d1dadaf · d1dadaf
1 parent cce60e4
commit d1dadaf
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/mfx/cctbx.py b/mfx/cctbx.py
@@ -12,7 +12,7 @@ def xfel_gui(self, user):
 
         proc = [
             f"ssh -YAC {user}@s3dflogin "
-            f"/sdf/group/lcls/ds/tools/mfx/scripts/cctbx_step1.sh {user} {self.experiment}"
+            f"/sdf/group/lcls/ds/tools/mfx/scripts/cctbx/cctbx_step1.sh {user} {self.experiment}"
             ]
 
         logging.info(proc)
@@ -40,7 +40,7 @@ def notch_check(self, user, runs=[]):
 
         proc = [
             f'ssh -YAC {user}@s3dflogin '
-            f'/sdf/group/lcls/ds/tools/mfx/scripts/cctbx_notch_check.sh "{self.runlist}"'
+            f'/sdf/group/lcls/ds/tools/mfx/scripts/cctbx/cctbx_notch_check.sh "{self.runlist}"'
             ]
 
         logging.info(proc)

diff --git a/scripts/cctbx/cctbx_notch_check.sh b/scripts/cctbx/cctbx_notch_check.sh
@@ -0,0 +1,5 @@
+#! /bin/bash
+
+runlist="mfxl1027922:294 mfxl1027922:295 mfxl1027922:296 mfxl1027922:297 mfxl1027922:298"
+
+ssh -YAC psana /sdf/group/lcls/ds/tools/mfx/scripts/cctbx/cctbx_step2.sh notch $runlist
diff --git a/scripts/cctbx/cctbx_start.py b/scripts/cctbx/cctbx_start.py
@@ -113,7 +113,7 @@ def main(args):
     logging.info("Starting up cctbx")
     proc = [
         f"ssh -YAC psana "
-        f"/sdf/group/lcls/ds/tools/mfx/scripts/cctbx_step2.sh"
+        f"/sdf/group/lcls/ds/tools/mfx/scripts/cctbx/cctbx_step2.sh"
         ]
 
     logging.info(proc)

diff --git a/scripts/cctbx/cctbx_step1.sh b/scripts/cctbx/cctbx_step1.sh
@@ -4,4 +4,4 @@ user=$1
 experiment=$2
 
 source /sdf/group/lcls/ds/ana/sw/conda1/manage/bin/psconda.sh
-python /sdf/group/lcls/ds/tools/mfx/scripts/cctbx_start.py -u $user -e $experiment
+python /sdf/group/lcls/ds/tools/mfx/scripts/cctbx/cctbx_start.py -u $user -e $experiment