Skip to content
This repository has been archived by the owner on Apr 19, 2024. It is now read-only.

test mode change commands #59

Closed
19 tasks done
prjemian opened this issue Aug 2, 2018 · 14 comments
Closed
19 tasks done

test mode change commands #59

prjemian opened this issue Aug 2, 2018 · 14 comments
Assignees
@prjemian
Labels
testing
Milestone
2019-01-30 and 31...

Comments

@prjemian
Copy link
Contributor

prjemian commented Aug 2, 2018 •
edited
Loading

  • IfRequestedStopBeforeNextScan()

  • confirmUsaxsSaxsOutOfBeam()

  • move_WAXSOut()

  • move_WAXSOut()

  • move_WAXSIn()

  • move_SAXSOut()

  • move_SAXSIn()

  • move_USAXSOut()

  • move_USAXSIn()

  • DCMfeedbackON()

  • insertScanFilters()

  • confirm_instrument_mode()

  • mode_USAXS()

  • mode_SBUSAXS()

  • mode_SAXS()

  • mode_WAXS()

  • mode_radiography()

  • mode_imaging()

  • mode_OpenBeamPath()
@prjemian prjemian added this to the 2018-08-08 testing milestone Aug 2, 2018
@prjemian prjemian self-assigned this Aug 2, 2018
@prjemian
Copy link
Contributor Author

prjemian commented Aug 8, 2018

first need to test the commands the mode change commands will call

@prjemian
Copy link
Contributor Author

prjemian commented Aug 8, 2018

insertScanFilters() works, can the signals for the filter value be an int?

@prjemian
Copy link
Contributor Author

prjemian commented Aug 8, 2018

def mode_OpenBeamPath() looks OK but need to test move_XXX() code

@prjemian
Copy link
Contributor Author

prjemian commented Aug 8, 2018

the move_XXX() code needs to be modified for global variables now in user_terms

@prjemian
Copy link
Contributor Author

prjemian commented Aug 8, 2018

good to know

In [1]: terms.summary()
data keys (* hints)
-------------------
 terms_FlyScan_asrp_calc_SCAN
 terms_FlyScan_number_points
 terms_FlyScan_order_number
 terms_FlyScan_scan_time
 terms_FlyScan_use_flyscan
 terms_Imaging_I0
 terms_Imaging_I0_gain
 terms_Imaging_ax_in
 terms_Imaging_dark_field
 terms_Imaging_exposure_time
 terms_Imaging_filter_transmission
 terms_Imaging_filters_Al
 terms_Imaging_filters_Ti
 terms_Imaging_flat_field
 terms_Imaging_guard_h_size
 terms_Imaging_guard_v_size
 terms_Imaging_h_size
 terms_Imaging_image_key
 terms_Imaging_title
 terms_Imaging_tomo_rotation_angle
 terms_Imaging_v_size
 terms_Imaging_waxs_x_in
 terms_SAXS_I0
 terms_SAXS_I0_gain
 terms_SAXS_I0_transmission
 terms_SAXS_UsaxsSaxsMode
 terms_SAXS_acquire_time
 terms_SAXS_ax_in
 terms_SAXS_ax_lim_offset
 terms_SAXS_ax_out
 terms_SAXS_base_dir
 terms_SAXS_diode_gain
 terms_SAXS_diode_transmission
 terms_SAXS_dx_in
 terms_SAXS_dx_lim_offset
 terms_SAXS_dx_out
 terms_SAXS_filters_Al
 terms_SAXS_filters_Ti
 terms_SAXS_guard_h_size
 terms_SAXS_guard_v_size
 terms_SAXS_h_size
 terms_SAXS_num_images
 terms_SAXS_transmission_I0_counts
 terms_SAXS_transmission_I0_gain
 terms_SAXS_transmission_ay
 terms_SAXS_transmission_count_time
 terms_SAXS_transmission_diode_counts
 terms_SAXS_transmission_diode_gain
 terms_SAXS_transmission_measure
 terms_SAXS_usaxs_guard_h_size
 terms_SAXS_usaxs_guard_v_size
 terms_SAXS_usaxs_h_size
 terms_SAXS_usaxs_v_size
 terms_SAXS_v_size
 terms_SAXS_y_in
 terms_SAXS_y_lim_offset
 terms_SAXS_y_out
 terms_SAXS_z_in
 terms_SAXS_z_lim_offset
 terms_SAXS_z_out
 terms_USAXS_ASRP0
 terms_USAXS_AY0
 terms_USAXS_DY0
 terms_USAXS_SAD
 terms_USAXS_SDD
 terms_USAXS_ccd_dx
 terms_USAXS_ccd_dy
 terms_USAXS_center_AR
 terms_USAXS_center_ASR
 terms_USAXS_center_MR
 terms_USAXS_center_MSR
 terms_USAXS_diode_dx
 terms_USAXS_diode_dy
 terms_USAXS_finish
 terms_USAXS_img_filters_Al
 terms_USAXS_img_filters_Ti
 terms_USAXS_is2DUSAXSscan
 terms_USAXS_motor_prescaler_wait
 terms_USAXS_num_points
 terms_USAXS_sample_y_step
 terms_USAXS_scan_filters_Al
 terms_USAXS_scan_filters_Ti
 terms_USAXS_start_offset
 terms_USAXS_uaterm
 terms_USAXS_usaxs_minstep
 terms_USAXS_usaxs_time
 terms_WAXS_acquire_time
 terms_WAXS_base_dir
 terms_WAXS_filters_Al
 terms_WAXS_filters_Ti
 terms_WAXS_num_images
 terms_WAXS_x_in
 terms_WAXS_x_limit_offset
 terms_WAXS_x_out
 terms_preUSAXStune_epoch_last_tune
 terms_preUSAXStune_num_scans_last_tune
 terms_preUSAXStune_req_num_scans_between_tune
 terms_preUSAXStune_req_time_between_tune
 terms_preUSAXStune_run_tune_next
 terms_preUSAXStune_run_tune_on_qdo

read attrs
----------
USAXS                Parameters_USAXS    ('terms_USAXS')
USAXS.AY0            EpicsSignal         ('terms_USAXS_AY0')
USAXS.DY0            EpicsSignal         ('terms_USAXS_DY0')
USAXS.ASRP0          EpicsSignal         ('terms_USAXS_ASRP0')
USAXS.SAD            EpicsSignal         ('terms_USAXS_SAD')
USAXS.SDD            EpicsSignal         ('terms_USAXS_SDD')
USAXS.center         GeneralUsaxsParametersCenters('terms_USAXS_center')
USAXS.center.AR      EpicsSignal         ('terms_USAXS_center_AR')
USAXS.center.ASR     EpicsSignal         ('terms_USAXS_center_ASR')
USAXS.center.MR      EpicsSignal         ('terms_USAXS_center_MR')
USAXS.center.MSR     EpicsSignal         ('terms_USAXS_center_MSR')
USAXS.ccd            GeneralParametersCCD('terms_USAXS_ccd')
USAXS.ccd.dx         EpicsSignal         ('terms_USAXS_ccd_dx')
USAXS.ccd.dy         EpicsSignal         ('terms_USAXS_ccd_dy')
USAXS.diode          GeneralUsaxsParametersDiode('terms_USAXS_diode')
USAXS.diode.dx       EpicsSignal         ('terms_USAXS_diode_dx')
USAXS.diode.dy       EpicsSignal         ('terms_USAXS_diode_dy')
USAXS.img_filters    Parameters_Al_Ti_Filters('terms_USAXS_img_filters')
USAXS.img_filters.Al EpicsSignal         ('terms_USAXS_img_filters_Al')
USAXS.img_filters.Ti EpicsSignal         ('terms_USAXS_img_filters_Ti')
USAXS.finish         EpicsSignal         ('terms_USAXS_finish')
USAXS.motor_prescaler_wait EpicsSignal         ('terms_USAXS_motor_prescaler_wait')
USAXS.num_points     EpicsSignal         ('terms_USAXS_num_points')
USAXS.sample_y_step  EpicsSignal         ('terms_USAXS_sample_y_step')
USAXS.scan_filters   Parameters_Al_Ti_Filters('terms_USAXS_scan_filters')
USAXS.scan_filters.Al EpicsSignal         ('terms_USAXS_scan_filters_Al')
USAXS.scan_filters.Ti EpicsSignal         ('terms_USAXS_scan_filters_Ti')
USAXS.start_offset   EpicsSignal         ('terms_USAXS_start_offset')
USAXS.uaterm         EpicsSignal         ('terms_USAXS_uaterm')
USAXS.usaxs_minstep  EpicsSignal         ('terms_USAXS_usaxs_minstep')
USAXS.usaxs_time     EpicsSignal         ('terms_USAXS_usaxs_time')
USAXS.is2DUSAXSscan  EpicsSignal         ('terms_USAXS_is2DUSAXSscan')
SBUSAXS              Parameters_SBUSAXS  ('terms_SBUSAXS')
SAXS                 Parameters_SAXS     ('terms_SAXS')
SAXS.z_in            EpicsSignal         ('terms_SAXS_z_in')
SAXS.z_out           EpicsSignal         ('terms_SAXS_z_out')
SAXS.z_lim_offset    EpicsSignal         ('terms_SAXS_z_lim_offset')
SAXS.y_in            EpicsSignal         ('terms_SAXS_y_in')
SAXS.y_out           EpicsSignal         ('terms_SAXS_y_out')
SAXS.y_lim_offset    EpicsSignal         ('terms_SAXS_y_lim_offset')
SAXS.ax_in           EpicsSignal         ('terms_SAXS_ax_in')
SAXS.ax_out          EpicsSignal         ('terms_SAXS_ax_out')
SAXS.ax_lim_offset   EpicsSignal         ('terms_SAXS_ax_lim_offset')
SAXS.dx_in           EpicsSignal         ('terms_SAXS_dx_in')
SAXS.dx_out          EpicsSignal         ('terms_SAXS_dx_out')
SAXS.dx_lim_offset   EpicsSignal         ('terms_SAXS_dx_lim_offset')
SAXS.usaxs_h_size    EpicsSignal         ('terms_SAXS_usaxs_h_size')
SAXS.usaxs_v_size    EpicsSignal         ('terms_SAXS_usaxs_v_size')
SAXS.v_size          EpicsSignal         ('terms_SAXS_v_size')
SAXS.h_size          EpicsSignal         ('terms_SAXS_h_size')
SAXS.usaxs_guard_h_size EpicsSignal         ('terms_SAXS_usaxs_guard_h_size')
SAXS.usaxs_guard_v_size EpicsSignal         ('terms_SAXS_usaxs_guard_v_size')
SAXS.guard_v_size    EpicsSignal         ('terms_SAXS_guard_v_size')
SAXS.guard_h_size    EpicsSignal         ('terms_SAXS_guard_h_size')
SAXS.filters         Parameters_Al_Ti_Filters('terms_SAXS_filters')
SAXS.filters.Al      EpicsSignal         ('terms_SAXS_filters_Al')
SAXS.filters.Ti      EpicsSignal         ('terms_SAXS_filters_Ti')
SAXS.diode_transmission EpicsSignal         ('terms_SAXS_diode_transmission')
SAXS.I0_transmission EpicsSignal         ('terms_SAXS_I0_transmission')
SAXS.diode_gain      EpicsSignal         ('terms_SAXS_diode_gain')
SAXS.I0_gain         EpicsSignal         ('terms_SAXS_I0_gain')
SAXS.base_dir        EpicsSignal         ('terms_SAXS_base_dir')
SAXS.UsaxsSaxsMode   EpicsSignal         ('terms_SAXS_UsaxsSaxsMode')
SAXS.num_images      EpicsSignal         ('terms_SAXS_num_images')
SAXS.acquire_time    EpicsSignal         ('terms_SAXS_acquire_time')
SAXS.I0              EpicsSignal         ('terms_SAXS_I0')
SAXS.transmission    Parameters_transmission('terms_SAXS_transmission')
SAXS.transmission.measure EpicsSignal         ('terms_SAXS_transmission_measure')
SAXS.transmission.ay EpicsSignal         ('terms_SAXS_transmission_ay')
SAXS.transmission.count_time EpicsSignal         ('terms_SAXS_transmission_count_time')
SAXS.transmission.diode_counts EpicsSignal         ('terms_SAXS_transmission_diode_counts')
SAXS.transmission.diode_gain EpicsSignal         ('terms_SAXS_transmission_diode_gain')
SAXS.transmission.I0_counts EpicsSignal         ('terms_SAXS_transmission_I0_counts')
SAXS.transmission.I0_gain EpicsSignal         ('terms_SAXS_transmission_I0_gain')
WAXS                 Parameters_WAXS     ('terms_WAXS')
WAXS.x_in            EpicsSignal         ('terms_WAXS_x_in')
WAXS.x_out           EpicsSignal         ('terms_WAXS_x_out')
WAXS.x_limit_offset  EpicsSignal         ('terms_WAXS_x_limit_offset')
WAXS.filters         Parameters_Al_Ti_Filters('terms_WAXS_filters')
WAXS.filters.Al      EpicsSignal         ('terms_WAXS_filters_Al')
WAXS.filters.Ti      EpicsSignal         ('terms_WAXS_filters_Ti')
WAXS.base_dir        EpicsSignal         ('terms_WAXS_base_dir')
WAXS.num_images      EpicsSignal         ('terms_WAXS_num_images')
WAXS.acquire_time    EpicsSignal         ('terms_WAXS_acquire_time')
Radiography          Parameters_Radiography('terms_Radiography')
Imaging              Parameters_Imaging  ('terms_Imaging')
Imaging.image_key    EpicsSignal         ('terms_Imaging_image_key')
Imaging.exposure_time EpicsSignal         ('terms_Imaging_exposure_time')
Imaging.tomo_rotation_angle EpicsSignal         ('terms_Imaging_tomo_rotation_angle')
Imaging.I0           EpicsSignal         ('terms_Imaging_I0')
Imaging.I0_gain      EpicsSignal         ('terms_Imaging_I0_gain')
Imaging.ax_in        EpicsSignal         ('terms_Imaging_ax_in')
Imaging.waxs_x_in    EpicsSignal         ('terms_Imaging_waxs_x_in')
Imaging.flat_field   EpicsSignal         ('terms_Imaging_flat_field')
Imaging.dark_field   EpicsSignal         ('terms_Imaging_dark_field')
Imaging.title        EpicsSignal         ('terms_Imaging_title')
Imaging.h_size       EpicsSignal         ('terms_Imaging_h_size')
Imaging.v_size       EpicsSignal         ('terms_Imaging_v_size')
Imaging.guard_h_size EpicsSignal         ('terms_Imaging_guard_h_size')
Imaging.guard_v_size EpicsSignal         ('terms_Imaging_guard_v_size')
Imaging.filters      Parameters_Al_Ti_Filters_Imaging('terms_Imaging_filters')
Imaging.filters.Al   EpicsSignal         ('terms_Imaging_filters_Al')
Imaging.filters.Ti   EpicsSignal         ('terms_Imaging_filters_Ti')
Imaging.filter_transmission EpicsSignal         ('terms_Imaging_filter_transmission')
OutOfBeam            Parameters_OutOfBeam('terms_OutOfBeam')
FlyScan              FlyScanParameters   ('terms_FlyScan')
FlyScan.number_points EpicsSignal         ('terms_FlyScan_number_points')
FlyScan.scan_time    EpicsSignal         ('terms_FlyScan_scan_time')
FlyScan.use_flyscan  EpicsSignal         ('terms_FlyScan_use_flyscan')
FlyScan.asrp_calc_SCAN EpicsSignal         ('terms_FlyScan_asrp_calc_SCAN')
FlyScan.order_number EpicsSignal         ('terms_FlyScan_order_number')
preUSAXStune         PreUsaxsTuneParameters('terms_preUSAXStune')
preUSAXStune.num_scans_last_tune EpicsSignal         ('terms_preUSAXStune_num_scans_last_tune')
preUSAXStune.epoch_last_tune EpicsSignal         ('terms_preUSAXStune_epoch_last_tune')
preUSAXStune.req_num_scans_between_tune EpicsSignal         ('terms_preUSAXStune_req_num_scans_between_tune')
preUSAXStune.req_time_between_tune EpicsSignal         ('terms_preUSAXStune_req_time_between_tune')
preUSAXStune.run_tune_on_qdo EpicsSignal         ('terms_preUSAXStune_run_tune_on_qdo')
preUSAXStune.run_tune_next EpicsSignal         ('terms_preUSAXStune_run_tune_next')

config keys
-----------

configuration attrs
----------
USAXS                Parameters_USAXS    ('terms_USAXS')
USAXS.center         GeneralUsaxsParametersCenters('terms_USAXS_center')
USAXS.ccd            GeneralParametersCCD('terms_USAXS_ccd')
USAXS.diode          GeneralUsaxsParametersDiode('terms_USAXS_diode')
USAXS.img_filters    Parameters_Al_Ti_Filters('terms_USAXS_img_filters')
USAXS.scan_filters   Parameters_Al_Ti_Filters('terms_USAXS_scan_filters')
SBUSAXS              Parameters_SBUSAXS  ('terms_SBUSAXS')
SAXS                 Parameters_SAXS     ('terms_SAXS')
SAXS.filters         Parameters_Al_Ti_Filters('terms_SAXS_filters')
SAXS.transmission    Parameters_transmission('terms_SAXS_transmission')
WAXS                 Parameters_WAXS     ('terms_WAXS')
WAXS.filters         Parameters_Al_Ti_Filters('terms_WAXS_filters')
Radiography          Parameters_Radiography('terms_Radiography')
Imaging              Parameters_Imaging  ('terms_Imaging')
Imaging.filters      Parameters_Al_Ti_Filters_Imaging('terms_Imaging_filters')
OutOfBeam            Parameters_OutOfBeam('terms_OutOfBeam')
FlyScan              FlyScanParameters   ('terms_FlyScan')
preUSAXStune         PreUsaxsTuneParameters('terms_preUSAXStune')

Unused attrs
------------

prjemian pushed a commit that referenced this issue Aug 14, 2018
#59 for move_USAXSIn()
26d358d
@prjemian
Copy link
Contributor Author

for today, test code as-is, without enforcing #73

@prjemian prjemian mentioned this issue Nov 28, 2018
Closed
@prjemian prjemian mentioned this issue Dec 5, 2018
Closed
@prjemian prjemian mentioned this issue Dec 7, 2018
Closed
@prjemian
Copy link
Contributor Author

prjemian commented Dec 7, 2018

RE(insertScanFilters()) works

@prjemian
Copy link
Contributor Author

prjemian commented Dec 7, 2018 

In [7]: terms.SAXS.UsaxsSaxsMode.value
Out[7]: 1

In [8]: terms.SAXS.UsaxsSaxsMode.enum_strs
Out[8]: 
('dirty',
 'out of beam',
 'USAXS in beam',
 'SAXS in beam',
 'WAXS in beam',
 'Imaging in',
 'Imaging tuning')

In [9]: confirm_instrument_mode("USAXS in beam")
Out[9]: False

In [10]: confirm_instrument_mode("out of beam")
Out[10]: True

This was referenced Dec 7, 2018
Closed
Closed
Closed
Closed
Closed
Closed
@prjemian
Copy link
Contributor Author

prjemian commented Dec 7, 2018 

In [24]: RE(move_USAXSIn())
Moving to USAXS mode
USAXS is in position                                                                                                                   
Out[24]: ()                                                                                                                            
                                                                                                                                       
In [25]: RE(move_USAXSOut())
Moving USAXS out of beam
Removed USAXS from beam position                                                                                                       
Out[25]: ()

@prjemian
Copy link
Contributor Author

prjemian commented Dec 7, 2018 

In [33]: RE(move_WAXSOut())
Moving WAXS out of beam
Removed WAXS from beam position                                                                                                        
Out[33]: ()

In [34]: RE(move_WAXSIn())
Moving to WAXS mode
WAXS is in position                                                                                                                    
Out[34]: ()

@prjemian
Copy link
Contributor Author

prjemian commented Dec 7, 2018

Enough for today. Must resolve this in January

@prjemian
Copy link
Contributor Author

move_SAXSIn() and move_SAXSOut() need #96

prjemian added a commit that referenced this issue Jan 24, 2019
@prjemian
#59
a02d352
prjemian added a commit that referenced this issue Jan 24, 2019
@prjemian
#59 these are motors, not just signals
e20cb51
prjemian added a commit that referenced this issue Jan 24, 2019
@prjemian
#59
88af78e
@prjemian
Copy link
Contributor Author

summarize_plan(mode_WAXS()) passes, need to test RE(summarize_plan(mode_WAXS())

prjemian added a commit that referenced this issue Jan 24, 2019
@prjemian
#59
cb7ad77
prjemian added a commit that referenced this issue Jan 30, 2019
@prjemian
#59 SBUSAXS mode the same as USAXS mode, at least for now
c8fd0e9
prjemian added a commit that referenced this issue Jan 31, 2019
@prjemian
#59, fixes #84
a833639
@prjemian
Copy link
Contributor Author

We will defer mode_imaging to next cycle. Needs a new algorithm.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@prjemian prjemian

Labels
testing
Projects
None yet
Milestone
2019-01-30 and 31 beam time
Development

No branches or pull requests
1 participant
@prjemian