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

6
adhoc.py
View File

@ -13,7 +13,7 @@ from slic.devices.xoptics.dcm import CoupledDoubleCrystalMonoEnergyWithTimeCorre
from undulator import Undulators
ENERGY_OFFSET = 13 # set the mono-undulators energy offset here!
ENERGY_OFFSET = 0 # set the mono-undulators energy offset here!
laser_pitch = SmarActAxis("SARES11-XICM125:ROX1")
@ -269,8 +269,8 @@ def convert_E_to_distance(E): ### returns a value in mm!
#return 0.0061869 * E ### calibration May 2021, S k-edge, 2450 eV, corresponds to 41.2 fs/eV --> this is InSb111 in the DCM!
#return 0.00524244 * E ### calibration Nov 2021, Rh L-edge, 3000 eV, corresponds to 35 fs/eV
#return 0.0005445 * E ### calibration Mar 2022, Mn K-edge, 6500 eV, corresponds to 3.6 fs/eV
return 0.0004692 * E ### calibration Mar 2022, Fe K-edge, 7100 eV, corresponds to 3.13 fs/eV
#return 0.0148402 * E ### calibration May 2022, S K-edge, 2470 eV, corresponds to 99 fs/eV
#return 0.0004692 * E ### calibration Mar 2022, Fe K-edge, 7100 eV, corresponds to 3.13 fs/eV
return 0.0148402 * E ### calibration May 2022, S K-edge, 2470 eV, corresponds to 99 fs/eV

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)

2
config/config.json
View File

@ -4,7 +4,7 @@
"elog_url": "https://elog-gfa.psi.ch/Alvra",
"user": "gac-alvra",
"screenshot_directory": "/sf/alvra/config/screenshots",
"pgroup": "p20266"
"pgroup": "p20269"
}