Merge pull request #65 from pcdshub/62-code-for-l10279

62 code for l10279

mfx/beamline.py

@@ -77,7 +77,7 @@
 with safe_load('cctbx'):
     from mfx.cctbx import *
     cctbx = cctbx()
-    
+
 with safe_load('yano-kern_code'):
     from mfx.yano import *
     yano = yano()
@@ -118,13 +118,13 @@ class LXE(LaserEnergyPositioner):
     class LXTTTC(SyncAxis):
         lxt = OCpt(lxt)
         txt = OCpt(txt)
-        
+
         tab_component_names = True
-        scales = {'txt': -1} 
+        scales = {'txt': -1}
         warn_deadband = 5e-14
         fix_sync_keep_still = 'lxt'
         sync_limits = (-10e-6, 10e-6)
-    
+
     lxt_ttc = LXTTTC('', name='lxt_ttc')
 
 with safe_load('add laser motor groups'):
@@ -188,3 +188,6 @@ class las():
     from importlib import reload
     from mfx.transfocator_scan import *
     from mfx.db import mfx_atm as tt
+    lens_v=las.lens_v
+    lens_h=las.lens_h
+    lens_f=las.lens_f

mfxenv

@@ -4,7 +4,7 @@
 # edit this line only
 USE_LOCAL="1"
 #export CONDA_ENVNAME="pcds-5.7.2"
-export CONDA_ENVNAME="pcds-5.8.1"
+export CONDA_ENVNAME="pcds-5.8.2"
 
 export HUTCH="mfx"
 export LOCAL_BASE="/u1/mfxopr/conda_envs"

presets/beamline/mfx_atm_x_motor.yml

@@ -0,0 +1,6 @@
+SiN:
+  active: true
+  history:
+    23 Jun 2024 19:29:33: '    9.4198'
+    25 Jun 2024 14:02:04: '    9.4245'
+  value: 9.42445

presets/beamline/mfx_atm_y_motor.yml

@@ -3,6 +3,12 @@ Out:
   history:
     28 Oct 2023 19:20:12: '   -0.0955'
   value: -0.09555
+SiN:
+  active: true
+  history:
+    23 Jun 2024 19:29:30: '  -41.7309'
+    25 Jun 2024 14:01:59: '  -41.7921'
+  value: -41.79205
 clear_yag:
   active: true
   history:

presets/l1027922/jety.yml

@@ -0,0 +1,5 @@
+half_frosted:
+  active: true
+  history:
+    21 Jun 2024 15:40:51: '    6.0000'
+  value: 6.0