Skip to content

Commit

Permalink
Merge pull request NSLS-II-PDF#5 from NSLS-II-XPD/enh_flash_sinter
Browse files Browse the repository at this point in the history
Enh flash sinter
  • Loading branch information
CJ-Wright authored Apr 17, 2019
2 parents 3eadd4d + a19e00a commit 95a596f
Show file tree
Hide file tree
Showing 3 changed files with 557 additions and 2 deletions.
24 changes: 23 additions & 1 deletion startup/80-areadetector.py
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ class XPDPerkinElmer(PerkinElmerDetector):
stats3 = C(StatsPluginV33, 'Stats3:')
stats4 = C(StatsPluginV33, 'Stats4:')
stats5 = C(StatsPluginV33, 'Stats5:', kind = 'hinted')
stats5.total.kind = 'hinted'
#stats5.total.kind = 'hinted'

roi1 = C(ROIPlugin, 'ROI1:')
roi2 = C(ROIPlugin, 'ROI2:')
Expand Down Expand Up @@ -261,6 +261,28 @@ class PerkinElmerStandardV33(SingleTriggerV33, XPDPerkinElmer):
class PerkinElmerMulti(MultiTrigger, XPDPerkinElmer):
shutter = C(EpicsSignal, 'XF:28IDC-ES:1{Sh:Exp}Cmd-Cmd')

class PerkinElmerContinuousStage(PerkinElmerContinuous):
stage_tries = 6
def stage(self):
for i in range(stage_tries):
try:
super().stage()
except TimeoutError as e:
if i == self.stage_tries-1:
raise
print(e)

def unstage(self):
for i in range(stage_tries):
try:
super().unstage()
except TimeoutError as e:
if i == self.stage_tries-1:
raise
print(e)




# PE1/2/3 PV prefixes in one place:
pe1_pv_prefix = 'XF:28IDC-ES:1{Det:PE1}'
Expand Down
Loading

0 comments on commit 95a596f

Please sign in to comment.