Replaced djr scripts paths to tools/mfx/scripts.

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

Hide file tree

Showing 4 changed files with 19 additions and 5 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/home/d/djr/scripts/cctbx_step1.sh {user} {self.experiment}"
+            f"/sdf/group/lcls/ds/tools/mfx/scripts/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/home/d/djr/scripts/cctbx_notch_check.sh "{self.runlist}"'
+            f'/sdf/group/lcls/ds/tools/mfx/scripts/cctbx_notch_check.sh "{self.runlist}"'
             ]
 
         logging.info(proc)

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/home/d/djr/scripts/cctbx_step2.sh"
+        f"/sdf/group/lcls/ds/tools/mfx/scripts/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/home/d/djr/scripts/cctbx_start.py -u $user -e $experiment
+python /sdf/group/lcls/ds/tools/mfx/scripts/cctbx_start.py -u $user -e $experiment
diff --git a/scripts/cctbx/cctbx_step2.sh b/scripts/cctbx/cctbx_step2.sh
@@ -1,4 +1,18 @@
 #! /bin/bash
 
+option=$1
+
 source /sdf/group/lcls/ds/tools/cctbx/setup.sh
-cctbx.xfel
+
+if [[ "$option" == "notch" ]]
+then
+  echo Selected $option
+  runlist=$2
+  libtbx.python /sdf/group/lcls/ds/tools/cctbx/energy/fee_spec.py $runlist
+fi
+
+if [[ "$option" == "gui" ]]
+then
+  echo Selected $option
+  cctbx.xfel
+fi