Code indexing in gitaly is broken and leads to code not being visible to the user. We work on the issue with highest priority.

Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • slic/maloja
1 result
Show changes
Commits on Source (4)
Hide whitespace changes
Inline Side-by-side
CameraTagging.py
View file @ 00d19610
......@@ -101,7 +101,8 @@ def camera_tag(daq):
cam1 = create_cam('SATES21-CAMS154-M1')
cam2 = create_cam('SATES24-CAMS161-M1')
cam1 = create_cam('SATES21-CAMS-PATT1')
#cam1 = create_cam('SARFE10-PSSS059')
cam1["scanPoints"]=[10,25,40,50,65,80]
cam2["scanPoints"]=[10,25,40,50,65,80]
......@@ -117,8 +118,9 @@ def camera_tag(daq):
mode = 0
n_shots = 2500
scantype=0 #0 2 camera scan
scantype=2 #0 two camera scan
#1 mode scan with 1 camera
#2 spot measurement
if scantype==0:
for i in cam1['scanPoints']:
......@@ -170,6 +172,11 @@ def camera_tag(daq):
time.sleep(5)
if scantype==2: #single point
fn = f"test_cam1_single_pt_"
daq.acquire(fn, n_pulses=n_shots)
#xs,xe,ys,ye=calcROI(cam1,2,20)
#print(xs, xe, ys, ye)
#print('Width ', xe-xs)
......
channels.py
View file @ 00d19610
from slic.core.acquisition import DetectorConfig
detectors = [
"JF15T08V01"
]
#detectors = [
# "JF15T08V01"
#]
detectors = DetectorConfig()
detectors.add("JF15T08V01", save_dap_results=True)
......@@ -64,22 +66,26 @@ channels_events = [
#]
channels_cam_gige = [
# "SATES21-CAMS154-GIGE1:FPICTURE"
# "SATES21-CAMS154-GIGE3:FPICTURE"
# "SATES21-CAMS154-GIGE2:FPICTURE"
# "SATES21-CAMS154-GIGE4:FPICTURE"
# "SLAAT01-LCAM-C603:FPICTURE"
]
channels_cam_pco = [
"SATES21-CAMS154-M1:FPICTURE",
"SATES24-CAMS161-M1:FPICTURE",
# "SATES21-CAMS-PATT1:FPICTURE",
# "SATES21-CAMS154-M1:FPICTURE",
# "SATES24-CAMS161-M1:FPICTURE",
"SATES21-CAMS-PATT1:FPICTURE",
# "SARFE10-PSSS059:FPICTURE",
]
names_cam_pco = [
"SATES21-CAMS154-M1",
"SATES24-CAMS161-M1",
# "SATES21-CAMS-PATT1",
# "SATES21-CAMS154-M1",
# "SATES24-CAMS161-M1",
"SATES21-CAMS-PATT1",
# "SARFE10-PSSS059",
]
suffices_proc = [
"processing_parameters",
......
maloja.py
View file @ 00d19610
......@@ -44,7 +44,7 @@ source_delay = PVAdjustable("SATES20-CVME-EVR0:Pul14-Delay-SP", "SATES20-CVME-EV
mono = PVAdjustable("SATOP11-OSGM087:SetEnergy", "SATOP11-OSGM087:photonenergy", accuracy=0.1, process_time=3, name="Mono Coupled")
waveplate = Motor("SLAAT21-LMOT-M712:MOT", name="Laser Waveplate")
#waveplate = Motor("SLAAT21-LMOT-M712:MOT", name="Laser Waveplate")
TT_delay = Motor("SLAAT21-LMOT-M704:MOT", name="TT_delay")
#laser_comp21 = Motor("SLAAT21-LMOT-M701:MOT", name="Laser Comp T2")
#laser_comp11 = Motor("SLAAT21-LMOT-M705:MOT", name="Laser Comp T1 1")
......@@ -59,6 +59,7 @@ source_x = Motor("SATES20-MANIP2:MOTOR_1", name="Needle x")
injector_x = Motor("SATES20-MANIP1:MOTOR_1", name="Injector X")
injector_y = Motor("SATES20-MANIP1:MOTOR_2", name="Injector Y")
pump_pulse_energy = Motor("SLAAT21-LMOT-M702:MOT", name="Pump Pulse Energy (Waveplate)")
......@@ -135,6 +136,10 @@ xota3_y_trans = Motor("SATES23-XOTA169:W_Y", name="Table 3: Y coordinated")
mot3_x = SmarActAxis("SATES23-XSMA169:MOT7", name="Table 3: sma x")
mot3_y = SmarActAxis("SATES23-XSMA169:MOT8", name="Table 3: sma y")
mirror_tilt = PVAdjustable("SATES20-XSMA165:MOT17:DRIVE", name="Mirror_tilt")
mirror_tip = PVAdjustable("SATES20-XSMA165:MOT16:DRIVE", name="Mirror_tip")
jet_rot = SmarActAxis("SATES24-XSMA171:MOT1", name="Jet Rotation degrees")
jet_X = SmarActAxis("SATES24-XSMA171:MOT4", name="Jet X mm")
jet_Z = SmarActAxis("SATES24-XSMA171:MOT6", name="Jet Z mm")
......@@ -206,10 +211,14 @@ instrument = "maloja"
#pgroup = "p20562" # Circular dichroism -- Woerner
#pgroup = "p20560" # Four-wave-mixing -- Knopp
#pgroup = "p20279" # SPI -- Ban
pgroup = "p20848" # Holo -- Boris
#pgroup = "p20851" # Camera test Edwin
#pgroup = "p20848" # Holo -- Boris
#pgroup = "p20851" # Camera test Edwin, use below instead
pgroup = "p21011" # Camera test Edwin
#pgroup = "p20823" # SPI - Issendorf
#pgroup = "p21108" # SPI commisioning multi-stage
daq = SFAcquisition(instrument, pgroup, default_channels=channels, default_pvs=pvs, default_detectors=detectors, rate_multiplicator=1, append_user_tag_to_data_dir=True, spreadsheet=spreadsheet)
daq = SFAcquisition(instrument, pgroup, default_channels=channels, default_pvs=pvs, default_detectors=None, rate_multiplicator=1, append_user_tag_to_data_dir=True, spreadsheet=spreadsheet)
#daq = FakeAcquisition(instrument, pgroup)
#daqPV = PVAcquisition(instrument, pgroup, default_channels=channels_ks) # workaround for KS not going to DB
......
spreadsheet.py
View file @ 00d19610
......@@ -20,7 +20,7 @@ for i in n_unds:
undulator_info[f"polarisation{i}"] = PVEnumAdjustable(f"SATUN{i:02}-UIND030:POL-SET", internal=True)
overview_info = dict(
spreadsheet_info = dict(
# standa = standa,
# exp_delay = exp_delay,
# laser_delay = laser_delay,
......@@ -37,7 +37,7 @@ overview_info = dict(
# AttenuationLaser = PVAdjustable("SLAAT21-LMOT-M702:MOT.RBV", internal=True),
# Timedelay = PVAdjustable("SLAAT01-LTIM-PDLY:DELAY", internal=True),
# Timedelay = PVAdjustable("SLAAT01-LTIM-PDLY:DELAY", internal=True),
# SmartActTTx = PVAdjustable("SATES22-XSMA168:MOT10:MOTRBV", internal=True),
# SmartActTTy = PVAdjustable("SATES22-XSMA168:MOT11:MOTRBV", internal=True),
......@@ -57,13 +57,13 @@ overview_info = dict(
# manip2needleESz = PVAdjustable("SATES20-MANIP2:MOTOR_3.VAL", internal=True),
# pol1 = PVEnumAdjustable("SATUN06-UIND030:POL-SET", internal=True),
# pol2 = PVEnumAdjustable("SATUN15-UIND030:POL-SET", internal=True),
# Manip1_x = PVAdjustable("SATES20-MANIP1:MOTOR_1.RBV", internal = True),
# Manip1_y = PVAdjustable("SATES20-MANIP1:MOTOR_2.RBV", internal = True),
Manip1_x = PVAdjustable("SATES20-MANIP1:MOTOR_1.RBV", internal = True),
Manip1_y = PVAdjustable("SATES20-MANIP1:MOTOR_2.RBV", internal = True),
# Manip1_z = PVAdjustable("SATES20-MANIP1:MOTOR_3.RBV", internal = True),
# Manip4_x = PVAdjustable("SATES20-MANIP4:MOTOR_1.RBV", internal = True),
# Manip4_y = PVAdjustable("SATES20-MANIP4:MOTOR_3.RBV", internal = True),
# pressChamb1 = PVAdjustable("SATES21-VM-VT1010:PRESSURE", internal=True),
# pressJF = PVAdjustable("SATES21-VM-VT1020:PRESSURE", internal=True),
pressChamb1 = PVAdjustable("SATES21-VM-VT1010:PRESSURE", internal=True),
pressJF = PVAdjustable("SATES21-VM-VT1020:PRESSURE", internal=True),
# pressChamb2 = PVAdjustable("SATES21-VM-VT2020:PRESSURE", internal=True),
# pressChamb3 = PVAdjustable("SATES21-VM-VT3010:PRESSURE", internal=True),
# pressSmallChamber = PVAdjustable("SATES21-VM-VT3030:PRESSURE", internal=True),
......@@ -78,6 +78,7 @@ overview_info = dict(
# YagX = PVAdjustable("SATES24-XSMA171:MOT9:MOTRBV", internal=True),
# YagY = PVAdjustable("SATES24-XSMA171:MOT10:MOTRBV", internal=True),
timeStamp = PVAdjustable("SF-CPCL-TIM:TIME", internal=True),
# empty="", # just an example!
photonEnergy = PVAdjustable("SATUN:FELPHOTENE", internal=True),
pulse_energy = PVAdjustable("SATFE10-PEPG046:PHOTON-ENERGY-PER-PULSE-AVG", internal=True),
......@@ -90,12 +91,6 @@ overview_info = dict(
# chicane_current_rb = PVAdjustable("SATUN14-MBND100:I-READ", internal=True),
# chicane_current_sv = PVAdjustable("SATUN14-MBND100:I-SET", internal=True),
pulse_energy_attgas = PVStringAdjustable("SATFE10-OGAT053:pulseenergy", internal=True),
transmission_attgas = PVStringAdjustable("SATFE10-OGAT053:transmission", internal=True),
att64 = PVStringAdjustable("SATFE10-OATT064:MOT2TRANS.VALD", internal=True),
att65 = PVStringAdjustable("SATFE10-OATT065:MOT2TRANS.VALD", internal=True),
# TOF_ext_neg = PVAdjustable("SATES21-XSHV166:V-0-S-CH13", internal=True),
# TOF_Behlke_lessneg = PVAdjustable("SATES21-XSHV166:V-0-S-CH14", internal=True),
# TOF_MCP_front = PVAdjustable("SATES21-XSHV166:V-0-S-CH15", internal=True),
......@@ -117,147 +112,47 @@ overview_info = dict(
#
# inc_mirror_tip = PVAdjustable("SATES20-XSMA165:MOT16:MOTRBV", internal=True),
# inc_mirror_tilt = PVAdjustable("SATES20-XSMA165:MOT17:MOTRBV", internal=True),
# mic_linear = PVAdjustable("SATES21-XSMA166:MOT2:MOTRBV", internal=True),
# mic_paddle_y = PVAdjustable("SATES21-XSMA166:MOT4:MOTRBV", internal=True),
# mic_paddle_x = PVAdjustable("SATES21-XSMA166:MOT5:MOTRBV", internal=True),
# mic_paddle_z = PVAdjustable("SATES21-XSMA166:MOT6:MOTRBV", internal=True),
# zigzag_y = PVAdjustable("SATES21-XSMA166:MOT7:MOTRBV", internal=True),
# zigzag_x = PVAdjustable("SATES21-XSMA166:MOT8:MOTRBV", internal=True),
# zigzag_z = PVAdjustable("SATES21-XSMA166:MOT9:MOTRBV", internal=True),
# slit_downstream_top = PVAdjustable("SATES21-XSMA166:MOT10:MOTRBV", internal=True),
# slit_downstream_x = PVAdjustable("SATES21-XSMA166:MOT11:MOTRBV", internal=True),
# slit_downstream_bottom = PVAdjustable("SATES21-XSMA166:MOT12:MOTRBV", internal=True),
# slit_front_xneg = PVAdjustable("SATES21-XSMA166:MOT13:MOTRBV", internal=True),
# slit_front_xpos = PVAdjustable("SATES21-XSMA166:MOT14:MOTRBV", internal=True),
mic_linear = PVAdjustable("SATES21-XSMA166:MOT2:MOTRBV", internal=True),
mic_paddle_y = PVAdjustable("SATES21-XSMA166:MOT4:MOTRBV", internal=True),
mic_paddle_x = PVAdjustable("SATES21-XSMA166:MOT5:MOTRBV", internal=True),
mic_paddle_z = PVAdjustable("SATES21-XSMA166:MOT6:MOTRBV", internal=True),
zigzag_y = PVAdjustable("SATES21-XSMA166:MOT7:MOTRBV", internal=True),
zigzag_x = PVAdjustable("SATES21-XSMA166:MOT8:MOTRBV", internal=True),
zigzag_z = PVAdjustable("SATES21-XSMA166:MOT9:MOTRBV", internal=True),
slit_downstream_top = PVAdjustable("SATES21-XSMA166:MOT10:MOTRBV", internal=True),
slit_downstream_x = PVAdjustable("SATES21-XSMA166:MOT11:MOTRBV", internal=True),
slit_downstream_bottom = PVAdjustable("SATES21-XSMA166:MOT12:MOTRBV", internal=True),
slit_front_xneg = PVAdjustable("SATES21-XSMA166:MOT13:MOTRBV", internal=True),
slit_front_xpos = PVAdjustable("SATES21-XSMA166:MOT14:MOTRBV", internal=True),
# Holography beamtime
sample_stage_x = PVAdjustable("SATES23-XSMA169:MOT7:MOTRBV", internal=True),
sample_stage_y = PVAdjustable("SATES23-XSMA169:MOT8:MOTRBV", internal=True),
sample_stage_z = PVAdjustable("SATES23-XSMA169:MOT9:MOTRBV", internal=True),
diode_x = PVAdjustable("SATES23-XSMA169:MOT10:MOTRBV", internal=True),
diode_y = PVAdjustable("SATES23-XSMA169:MOT11:MOTRBV", internal=True),
diode_z = PVAdjustable("SATES23-XSMA169:MOT12:MOTRBV", internal=True),
beam_block = PVAdjustable("SATES23-XSMA169:MOT6:MOTRBV", internal=True),
pressChamb3 = PVAdjustable("SATES21-VM-VT3010:PRESSURE", internal=True),
pressChamb3bis = PVAdjustable("SATES21-VM-VT3012:PRESSURE", internal=True),
pulse_energy_attgas = PVStringAdjustable("SATFE10-OGAT053:pulseenergy", internal=True),
transmission_attgas = PVStringAdjustable("SATFE10-OGAT053:transmission", internal=True),
**undulator_info
)
att64 = PVStringAdjustable("SATFE10-OATT064:MOT2TRANS.VALD", internal=True),
att65 = PVStringAdjustable("SATFE10-OATT065:MOT2TRANS.VALD", internal=True),
# LaserIn = PVAdjustable("SLAAT21-LDIO-LAS6291:SET_BO01.DESC", internal=True),
overview = SimpleDevice("Maloja Overview", **overview_info)
spreadsheet_line = [
"FEL", "UV",
"timeStamp", "fileName", "Comments",
# "timeStamp", "name", "Comments",
# "pressJF",
# "pressattn40",
# "SourceTemp",
# "skimmerRuppUpstream",
# "skimmerRuppDownstream",
"Manip1_x",
"Manip1_y",
"Manip1_z",
"Manip4_x",
"Manip4_y", "type", "core size AAC", "core size measured", "core size estimated", "coating thickness AAC", "coating thickness expected", "uppernozzleskimmer", "lowernozzleskimmer", "entrancepressure",
# "trigger14Delay",
# "Gas cell / TOF","Sample","shots", "Two colors (Y/N)", "energy1",
# "polarisation10", "energy2",
# "polarisation19",
"photonEnergy",
"pulse_energy",
"pulse_energy_attgas",
"transmission_attgas",
"FELrepRate",
"AttenuationLaser",
"Timedelay",
# "VoltsSetGasAtt",
# "PressureGasAtt",
"pressChamb1",
"pressJF", "anotherpressure", "andanotherpressure","anotherpressure2", "andanotherpressure2",
# "PaddleChamber1MaskX",
# "PaddleChamber1MaskY",
# "PaddleChamber1FrameX",
# "PaddleChamber1YagX",
# "PaddleChamber1YagY",
# "pressChamb2", "Gas", "Slit", "Ek", "Ep", "mode",
# "manip2needleESy",
# "manip7ESy",
# "pressChamb3",
# "pressChamb3GasCell",
# "ToFV1p",
# "ToFV2p",
# "ToFV3p",
# "ToFV1m",
# "ToFV2m",
# "ToFV3m",
# "pressSmallChamber",
# "LshapeRakX",
# "LshapeRakY",
# "LshapeRakZ",
# "LshapeDoorX",
# "LshapeDoorY",
# "YagX",
# "YagY", "PhotonSpec Det", "PhotonSpec X", "PhotonSpec Y", "PhotonSpec order", "PhotonSpec slit",
# "manip3ESy",
# "chicane_current_rb",
# "chicane_current_sv",
"TOF_ext_neg",
"TOF_Behlke_lessneg",
"TOF_MCP_front",
"TOF_ext_pos",
"TOF_rep_pos",
"TOF_unused",
"att64",
"att65",
"inc_mirror_tip",
"inc_mirror_tilt",
"standaChamber3",
"mic_linear",
"mic_paddle_y",
"mic_paddle_x",
"mic_paddle_z",
"zigzag_y",
"zigzag_x",
"zigzag_z",
"slit_downstream_top",
"slit_downstream_x",
"slit_downstream_bottom",
"slit_front_xneg",
"slit_front_xpos",
"energy6",
"energy7",
"energy8",
"energy9",
"energy10",
"energy11",
"energy12",
"energy13",
"energy14",
"energy15",
"energy16",
"energy17",
"energy18",
"energy19",
"energy20",
"energy21",
"energy22",
# Holography beamtime
# sample_stage_x = PVAdjustable("SATES23-XSMA169:MOT7:MOTRBV", internal=True),
# sample_stage_y = PVAdjustable("SATES23-XSMA169:MOT8:MOTRBV", internal=True),
# sample_stage_z = PVAdjustable("SATES23-XSMA169:MOT9:MOTRBV", internal=True),
# diode_x = PVAdjustable("SATES23-XSMA169:MOT10:MOTRBV", internal=True),
# diode_y = PVAdjustable("SATES23-XSMA169:MOT11:MOTRBV", internal=True),
# diode_z = PVAdjustable("SATES23-XSMA169:MOT12:MOTRBV", internal=True),
# beam_block = PVAdjustable("SATES23-XSMA169:MOT6:MOTRBV", internal=True),
# pressChamb3 = PVAdjustable("SATES21-VM-VT3010:PRESSURE", internal=True),
# pressChamb3bis = PVAdjustable("SATES21-VM-VT3012:PRESSURE", internal=True),
**undulator_info
)
]
spreadsheet_info = {n: v for n, v in overview_info.items() if n in spreadsheet_line}
overview = SimpleDevice("Maloja Overview", **spreadsheet_info)
......