More user functions and improvements #94
Conversation
| @@ -59,7 +69,7 @@ def pol_L(pol, epu_cal_offset=None, epu_table_number=None): | |||
|
|
|||
|
|
|||
| yield from bps.mv(diag6_pid.enable,1) # finepitch feedback ON | |||
| yield from bps.sleep(1) | |||
| yield from bps.sleep(0.1) | |||
There was a problem hiding this comment.
Sleeps frighten me, although less so to see an existing one reduced, is there something this is waiting on?
There was a problem hiding this comment.
we can reduce the time because we are able to run the diag6 prosilica much faster. diag6_pid is the pid loop that keeps the m1 finepitch under constant control to keep the beam on the exit slit. There could be some instability in the beginning of the feedback loop when we turn it back on. The sleep is to allow that instability to happen without letting the user collect data. the daig6_pid knows nothing about the output error that is running at dt = 0.005 seconds or faster.
| @@ -166,3 +184,19 @@ def wait_for_peaks(pool_interval, timeout, peaks, peaks_fields=None): | |||
| break | |||
| else: | |||
| yield from bps.sleep(pool_interval) | |||
|
|
|||
| def _block_beam(block_beam_bit): ##TODO move this to a child of inout | |||
There was a problem hiding this comment.
| def _block_beam(block_beam_bit): ##TODO move this to a child of inout | |
| def _block_beam(block_beam_bit): ##TODO move this to a child of inout | |
| """Protective inout function that only moves if necessary. The EPS will always actuate on bps.mv. | |
| Parameters: | |
| ------------ | |
| block_beam_bit : int, bool | |
| """ |
| if inout.status.get() =="Inserted": | ||
| yield from mv(inout, "Out") | ||
|
|
||
| def block_beam(): |
There was a problem hiding this comment.
| def block_beam(): | |
| def block_beam(): | |
| """Helper plan to move inout to block beam. Aliased to beam_block().""" |
There was a problem hiding this comment.
The alias info might be difficult to keep consistent with future changes. Consider moving that info to a comment where the aliases are defined.
| def block_beam(): | |
| def block_beam(): | |
| """Helper plan to move inout to block beam.""" |
|
|
||
| def block_beam(): | ||
| yield from _block_beam(1) | ||
| def show_beam(): |
There was a problem hiding this comment.
| def show_beam(): | |
| def show_beam(): | |
| """Helper plan to move inout to show beam. Aliased to beam_show().""" |
There was a problem hiding this comment.
| def show_beam(): | |
| def show_beam(): | |
| """Helper plan to move inout to show beam.""" |
| @@ -34,7 +34,17 @@ def ct_dark_all_patch(frames=None): | |||
|
|
|||
|
|
|||
| def pol_L(pol, epu_cal_offset=None, epu_table_number=None): | |||
|
|
|||
| """A helper bluesky plan to change vertical and horizontal poloarization | |||
There was a problem hiding this comment.
| """A helper bluesky plan to change vertical and horizontal poloarization | |
| """A helper bluesky plan to change vertical and horizontal polarization |
| pol : string | ||
| 'H' or 'V' for horizontal (epu phase = 0) or vertical (epu phase = 24.6) polarization for CSX's undulator | ||
| epu_cal_offset : float | ||
| offset to tune the precice epu gap for a paricular energy using a particular epu calibration table |
There was a problem hiding this comment.
| offset to tune the precice epu gap for a paricular energy using a particular epu calibration table | |
| offset to tune the precise epu gap for a particular energy using a particular epu calibration table |
| if block_beam_bit: | ||
| if inout.status.get() =="Not Inserted": | ||
| yield from mv(inout, "In") | ||
| else: | ||
| if inout.status.get() =="Inserted": | ||
| yield from mv(inout, "Out") |
There was a problem hiding this comment.
| if block_beam_bit: | |
| if inout.status.get() =="Not Inserted": | |
| yield from mv(inout, "In") | |
| else: | |
| if inout.status.get() =="Inserted": | |
| yield from mv(inout, "Out") | |
| if block_beam_bit: | |
| if inout.status.get() == "Not Inserted": | |
| yield from mv(inout, "In") | |
| else: | |
| if inout.status.get() == "Inserted": | |
| yield from mv(inout, "Out") |
| if inout.status.get() =="Inserted": | ||
| yield from mv(inout, "Out") | ||
|
|
||
| def block_beam(): |
There was a problem hiding this comment.
The alias info might be difficult to keep consistent with future changes. Consider moving that info to a comment where the aliases are defined.
| def block_beam(): | |
| def block_beam(): | |
| """Helper plan to move inout to block beam.""" |
|
|
||
| def block_beam(): | ||
| yield from _block_beam(1) | ||
| def show_beam(): |
There was a problem hiding this comment.
| def show_beam(): | |
| def show_beam(): | |
| """Helper plan to move inout to show beam.""" |
| beam_block = block_beam | ||
| beam_show = show_beam |
There was a problem hiding this comment.
| beam_block = block_beam | |
| beam_show = show_beam | |
| # Convenience aliases: Don't need to memorize order of noun/verb | |
| beam_block = block_beam | |
| beam_show = show_beam |
| def relabel_fig(fig, new_label): | ||
| fig.set_label(new_label) | ||
| fig.canvas.manager.set_window_title(fig.get_label()) | ||
|
|
||
| # fccd.hints = {'fields': ['fccd_stats1_total']} | ||
| for i in [1, 2, 3, 4, 5]: | ||
| getattr(fccd, f'stats{i}').total.kind = 'hinted' | ||
| fccd.mcs.read_attrs = fccd.mcs.read_attrs[0:7] #silences the channels we do not use (7-32) |
There was a problem hiding this comment.
Pre-line comments are generally easier to read when they are more than 1-2 words.
| fccd.mcs.read_attrs = fccd.mcs.read_attrs[0:7] #silences the channels we do not use (7-32) | |
| # Silence the channels we do not use (7-32) | |
| fccd.mcs.read_attrs = fccd.mcs.read_attrs[0:7] |
mv(inout, "In")ormv(inout, "Out"). Unlikely the EPS programming will be fixed anytime soon.