DAMA commits uncommitted files

NSLS-II-CSX · Jan 13, 2021 · a94dd0f · a94dd0f
1 parent 356c7a0
commit a94dd0f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/profile_collection/startup/csx1/devices/epu.py b/profile_collection/startup/csx1/devices/epu.py
@@ -29,7 +29,7 @@ class Interpolator(Device):
     output_deadband = Cpt(EpicsSignal, 'Val:DBand1-SP')
     output_drive = Cpt(EpicsSignalRO, 'Val:OutDrv1-I')
     interpolation_status = Cpt(EpicsSignalRO, 'Sts:Interp1-Sts', string=True)
-#    table = Cpt(EpicsSignal, 'Val:Table-Sel', name='table')
+    #table = Cpt(EpicsSignal, 'Val:Table-Sel', name='table')# this pv has no FLT
 
 
 class EPU(Device):
@@ -41,6 +41,7 @@ class EPU(Device):
     y_ang = FmCpt(EpicsSignalRO,'{self._ai_prefix}:FPGA:y_mrad-I')
     flt = Cpt(Interpolator, '-FLT}')
     rlt = Cpt(Interpolator, '-RLT}')
+    table = Cpt(EpicsSignal, '}Val:Table-Sel', name='table')# this pv has no FLT
 
     def __init__(self, *args, ai_prefix=None, epu_prefix=None, **kwargs):
         self._ai_prefix = ai_prefix

diff --git a/profile_collection/startup/csx1/startup/detectors.py b/profile_collection/startup/csx1/startup/detectors.py
@@ -54,8 +54,8 @@ def _setup_stats(cam_in):
 #diag6 = NoStatsCam('XF:23ID1-BI{Diag:6-Cam:1}', name='diag6') #TODO revert above test
 
 ## 20180726 needed to comment due to IOC1 problems
-cube_beam = StandardCam('XF:23ID1-BI{Diag:5-Cam:1}', name='cube_beam')
-_setup_stats(cube_beam)
+#cube_beam = StandardCam('XF:23ID1-BI{Diag:5-Cam:1}', name='cube_beam')
+#_setup_stats(cube_beam)
 
 dif_beam = StandardCam('XF:23ID1-ES{Dif-Cam:Beam}', name='dif_beam')
 _setup_stats(dif_beam)
@@ -70,6 +70,9 @@ def _setup_stats(cam_in):
 #dif_cam3 = StandardCam('XF:23ID1-ES{Dif-Cam:3}', name='dif_cam3')
 #_setup_stats(dif_cam3)
 
+## 20201219 - Machine studies for source characterization
+fs_cam = StandardCam('XF:23IDA-BI:1{FS:1-Cam:1}', name='fs_cam')
+
 #
 # FastCCD
 #
@@ -109,7 +112,8 @@ def _setup_stats(cam_in):
                             'fccd1.overscan_cols',
                             ]
 
-roi_params = ['.min_xyz.min_y', '.min_xyz.min_x','.size.y', '.size.x','.name_']
+roi_params = ['.min_xyz', '.min_xyz.min_y', '.min_xyz.min_x',
+              '.size', '.size.y', '.size.x', '.name_']
 configuration_attrs_list.extend(['roi' + str(i) + string for i in range(1,5) for string in roi_params])
 
 for attr in configuration_attrs_list:

diff --git a/profile_collection/startup/csx1/startup/settings.py b/profile_collection/startup/csx1/startup/settings.py
@@ -46,8 +46,8 @@ def relabel_fig(fig, new_label):
 
 ## 20180726 needed to comment due to IOC1 problems
 #cube_beam.hints = {'fields': ['cube_beam_stats2_total', 'cube_beam_stats1_total']}
-for i in [1, 2]:
-     getattr(cube_beam, f'stats{i}').total.kind = 'hinted'
+#for i in [1, 2]:
+#     getattr(cube_beam, f'stats{i}').total.kind = 'hinted'
 
 # This was imported in 00-startup.py #  used to generate the list: [thing.name for thing in get_all_positioners()]
 """