changed the xs3 write location

NSLS-II-XFM · Mar 23, 2023 · 39c4d15 · 39c4d15
1 parent 7f068e3
commit 39c4d15
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 22 deletions.
diff --git a/acceptance_tests/test_step_scans.py b/acceptance_tests/test_step_scans.py
@@ -18,10 +18,10 @@ def test_fly_maia():
         fly_maia(
             ystart=130.0,
             ystop=130.02,
-            ynum=2,
+            ynum=3,
             xstart=60.0,
             xstop=60.1,
-            xnum=10,
+            xnum=11,
             dwell=0.1,
             hf_stage=M,
             maia=maia,
@@ -48,10 +48,10 @@ def test_step2d():
         step2d(
             ystart=-5.02,
             ystop=-5.0,
-            ysteps=2,
+            ysteps=3,
             xstart=-17.1,
             xstop=-17.0,
-            xsteps=10,
+            xsteps=11,
             count_time=1.0,
             snake=False,
             x3m=True,
@@ -61,3 +61,6 @@ def test_step2d():
     print("Test 2 complete")
     print("Reading scan from databroker")
     db[uid].table(fill=True)
+
+test_fly_maia()
+test_step2d()
diff --git a/startup/40-maia.py → rvt/bypass40-maia.py b/startup/40-maia.py → rvt/bypass40-maia.py
diff --git a/startup/.30-xspress3.py.swx b/startup/.30-xspress3.py.swx
diff --git a/startup/10-stages.py b/startup/10-stages.py
@@ -10,14 +10,34 @@ class Stage(Device):
 S_y   = S.y
 S_z   = S.z
 
-class MaiaStage(Device):
-    x    = Cpt(EpicsMotor, '{PI180:1-Ax:MaiaX}Mtr')
-    y    = Cpt(EpicsMotor, '{PI180:1-Ax:MaiaY}Mtr')
-    z    = Cpt(EpicsMotor, '{PI180:1-Ax:MaiaZ}Mtr')
-    r    = Cpt(EpicsMotor, '{SR50pp:1-Ax:MaiaR}Mtr')
-
-M = MaiaStage('XF:04BMC-ES:2', name='M')
-M_x   = M.x
-M_y   = M.y
-M_z   = M.z
-M_r   = M.r
+#class MaiaStage(Device):
+    #x    = Cpt(EpicsMotor, '{UTS:1-Ax:X}Mtr')
+    #y    = Cpt(EpicsMotor, '{UTS:1-Ax:Y}Mtr')
+    #z    = Cpt(EpicsMotor, '{UTS:1-Ax:Z}Mtr')
+
+#M = MaiaStage('XF:04BMC-ES:2', name='M')
+#M_x   = M.x
+#M_y   = M.y
+#M_z   = M.z
+
+#class MaiaStage(Device):
+    #x    = Cpt(EpicsMotor, '{X12:1-Ax:X}Mtr')
+    #y    = Cpt(EpicsMotor, '{X12:1-Ax:Y}Mtr')
+    #r    = Cpt(EpicsMotor, '{SR50pp:1-Ax:MaiaR}Mtr')
+
+#M = MaiaStage('XF:04BM-ES:2', name='M')
+#M_x   = M.x
+#M_y   = M.y
+#M_r   = M.r
+
+#class MaiaStage(Device):
+   # x    = Cpt(EpicsMotor, '{PI180:1-Ax:MaiaX}Mtr')
+   # y    = Cpt(EpicsMotor, '{PI180:1-Ax:MaiaY}Mtr')
+   # z    = Cpt(EpicsMotor, '{PI180:1-Ax:MaiaZ}Mtr')
+   # r    = Cpt(EpicsMotor, '{SR50pp:1-Ax:MaiaR}Mtr')
+
+#M = MaiaStage('XF:04BMC-ES:2', name='M')
+#M_x   = M.x
+#M_y   = M.y
+#M_z   = M.z
+#M_r   = M.r
diff --git a/startup/30-xspress3.py b/startup/30-xspress3.py
@@ -32,13 +32,9 @@ class SrxXspress3Detector(XspressTrigger, Xspress3Detector):
     # create_dir = Cpt(EpicsSignal, 'HDF5:FileCreateDir')
 
     hdf5 = Cpt(Xspress3FileStore, 'HDF5:',
-               #read_path_template='/nsls2/xf04bm/data/x3m/%Y/%m/%d/',
-               #root='/nsls2/xf04bm/data/',
-               #write_path_template='/nsls2/xf04bm/data/x3m/%Y/%m/%d/',
-
-               read_path_template='/nsls2/data/xfm/legacy/raw/x3m/%Y/%m/%d/',
-               root='/nsls2/data/xfm/legacy/raw/',
-               write_path_template='/nsls2/data/xfm/legacy/raw/x3m/%Y/%m/%d/',
+               read_path_template='/nsls2/data/xfm/legacy/data/x3m/%Y/%m/%d/',
+               root='/nsls2/data/xfm/legacy/data/',
+               write_path_template='/nsls2/data/xfm/legacy/data/x3m/%Y/%m/%d/',
                )
 
     def __init__(self, prefix, *, configuration_attrs=None, read_attrs=None,