slic/alvra
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates for p20269

Browse Source
This commit is contained in:
augustin_s
2022-09-22 14:27:55 +02:00
parent aaac384280
commit e98b56f1f9
3 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
alvra.py
View File

@ -58,8 +58,8 @@ detectors_raw = DetectorConfig("JF06T32V02", "JF02T09V03")
detectors_config = DetectorConfig()
#detectors_config.add("JF06T32V02")
detectors_config.add("JF06T08V02")
#detectors_config.add("JF02T09V03", disabled_modules=[0, 1, 2, 3, 5, 6, 7], remove_raw_files=True)
#detectors_config.add("JF06T08V02")
detectors_config.add("JF02T09V03", disabled_modules=[0, 1, 2, 3, 5, 6, 7], remove_raw_files=True)
detectors = None
@ -67,10 +67,10 @@ detectors = None
#detectors = detectors_raw
#check_intensity = PVCondition("SARFE10-PBPG050:HAMP-INTENSITY-CAL", vmin=0, vmax=1500, wait_time=0.25, required_fraction=0.8)
#check_intensity = PVCondition("SARFE10-PBPG050:PHOTON-ENERGY-PER-PULSE-US", vmin=0, vmax=2000, wait_time=0.5, required_fraction=0.8)
#check_intensity = PVCondition("SARFE10-PBPG050:HAMP-INTENSITY-CAL", vmin=0, vmax=1500, wait_time=0.25, required_fraction=0.8)#
check_intensity = PVCondition("SARFE10-PBPG050:PHOTON-ENERGY-PER-PULSE-US", vmin=0, vmax=2000, wait_time=0.5, required_fraction=0.8)
#check_intensity = PVCondition("SARFE10-PBPS053:INTENSITY", vmin=0.05,vmax=2, wait_time=0.5, required_fraction=0.8)
check_intensity = PVCondition("SAROP11-PBPS110:INTENSITY", vmin=0.05,vmax=5, wait_time=0.5, required_fraction=0.8)
#check_intensity = PVCondition("SAROP11-PBPS110:INTENSITY", vmin=0.05,vmax=5, wait_time=0.5, required_fraction=0.8)
#check_intensity = PVCondition("SAROP11-PBPS122:INTENSITY", vmin=0.1,vmax=10, wait_time=0.5, required_fraction=0.8)
daq = SFAcquisition(cfg.instrument, cfg.pgroup, default_channels=channels, default_pvs=list(pvs), default_detectors=detectors, append_user_tag_to_data_dir=True)
@ -119,14 +119,21 @@ def huber_pos(x, y, z, att=None):
XrayShutter.open()
print("done")
@as_shortcut
def Pscreen():
huber_pos(0, 0, -2.5)
@as_shortcut
def FrostedYAG():
huber_pos(-6, -8.6, 0)
def SiN():
huber_pos(13, -9, -1.1)
@as_shortcut
def ThinYAG():
huber_pos(-6.6, -18.2, 0)
huber_pos(13, 3, 0)
@as_shortcut
def FrostedYAG():
huber_pos(13, 15, 0)
@as_shortcut
def KnifeEdgeX():
@ -136,14 +143,6 @@ def KnifeEdgeX():
def KnifeEdgeY():
huber_pos(-6, 14, 2.5, att=1e-5)
@as_shortcut
def SiN():
huber_pos(12.6, 10, -1.1)
@as_shortcut
def TimingDiode():
huber_pos(10.9, -15.1, 0)
#@as_shortcut
#def JetYAG():
# huber_pos(15.3, 2.2,0)