Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class OnMountAvailOptions(Enum):
DEWAR_SECTORS = {'amx':8, 'fmx':8, 'nyx':8}
PUCKS_PER_DEWAR_SECTOR = {'amx':3, 'fmx':3, 'nyx':3}

cryostreamTempPV = {"amx": "XF:17ID1:CS700:TEMP", "fmx": "XF:17ID2:CS700:TEMP", "nyx":"XF:19ID2:CS700:TEMP"}
cryostreamTempPV = {"amx": "XF:17IDB-ES:AMX{CS:1}SAMPLE_TEMP_RBV", "fmx": "XF:17IDC-ES:FMX{CS:1}SAMPLE_TEMP_RBV"}

VALID_EXP_TIMES = {
"amx": {"min": 0.005, "max": 1, "digits": 3},
Expand Down
6 changes: 6 additions & 0 deletions daq_macros.py
Original file line number Diff line number Diff line change
Expand Up @@ -4600,6 +4600,12 @@ def emptyQueue():
def topViewCheckOn():
setBlConfig(TOP_VIEW_CHECK,1)

def set_cryostream_temp(temp):
cs1000.move(float(temp))

def set_cryostream_ramp_rate(ramp_rate):
cs1000.ramp_rate.put(float(ramp_rate))

def anneal(annealTime=1.0):
if daq_utils.beamline == 'fmx':
annealer = fmxAnnealer
Expand Down
4 changes: 3 additions & 1 deletion daq_main_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ def setGovState(state):
backoffDetector,
enableMount,
robotOn,
set_energy
set_energy,
set_cryostream_ramp_rate,
set_cryostream_temp
]

if daq_utils.beamline != "nyx":
Expand Down
27 changes: 27 additions & 0 deletions gui/dialog/user_screen.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,17 @@ def __init__(self, parent: "ControlMain"):
self.slit1YMotor_ledit = QtWidgets.QLineEdit()
self.slit1YMotor_ledit.setText(str(self.parent.slit1YGapSP_pv.get()))
self.slit1YMotor_ledit.returnPressed.connect(self.setSlit1YCB)
temp_change_label = QtWidgets.QLabel("Cryo Temp:")
self.temp_change_ledit = QtWidgets.QLineEdit()
self.temp_change_ledit.returnPressed.connect(self.setTemp)
self.temp_change_button = QtWidgets.QPushButton("Set Temp")
self.temp_change_button.clicked.connect(self.setTemp)

temp_ramp_label = QtWidgets.QLabel("Cryo Ramp Rate:")
self.temp_ramp_ledit = QtWidgets.QLineEdit()
self.temp_ramp_ledit.returnPressed.connect(self.setRamp)
self.temp_ramp_button = QtWidgets.QPushButton("Set Ramp Rate")
self.temp_ramp_button.clicked.connect(self.setRamp)

sampleFluxLabelDesc = QtWidgets.QLabel("Sample Flux:")
sampleFluxLabelDesc.setFixedWidth(80)
Expand All @@ -152,8 +163,18 @@ def __init__(self, parent: "ControlMain"):
hBoxBeam2.addWidget(self.slit1YRBVLabel.getEntry())
hBoxBeam2.addWidget(slit1YSPLabel)
hBoxBeam2.addWidget(self.slit1YMotor_ledit)
hBoxTemp = QtWidgets.QHBoxLayout()
hBoxTemp.addWidget(temp_change_label)
hBoxTemp.addWidget(self.temp_change_ledit)
hBoxTemp.addWidget(self.temp_change_button)
hBoxRamp = QtWidgets.QHBoxLayout()
hBoxRamp.addWidget(temp_ramp_label)
hBoxRamp.addWidget(self.temp_ramp_ledit)
hBoxRamp.addWidget(self.temp_ramp_button)
vBoxBeam.addLayout(hBoxBeam1)
vBoxBeam.addLayout(hBoxBeam2)
vBoxBeam.addLayout(hBoxTemp)
vBoxBeam.addLayout(hBoxRamp)
vBoxBeam.addLayout(hBoxBeam3)
beamGB.setLayout(vBoxBeam)

Expand Down Expand Up @@ -229,6 +250,12 @@ def setSlit1XCB(self):
def setSlit1YCB(self):
self.parent.send_to_server("setSlit1Y", [self.slit1YMotor_ledit.text()])

def setTemp(self):
self.parent.send_to_server("set_cryostream_temp", [self.temp_change_ledit.text()])

def setRamp(self):
self.parent.send_to_server("set_cryostream_ramp_rate", [self.temp_ramp_ledit.text()])

def unmountWarmCB(self):
self.parent.send_to_server("unmountSample")

Expand Down
9 changes: 5 additions & 4 deletions mxbluesky/devices/cryostream.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ class CryoStreamCmd(IntEnum):


class CryoStream(PVPositionerIsClose):
readback = Cpt(EpicsSignalRO, 'TEMP')
setpoint = Cpt(EpicsSignal, 'RTEMP')
actuate = Cpt(EpicsSignal, "RAMP.PROC")
readback = Cpt(EpicsSignalRO, 'SAMPLE_TEMP_RBV')
setpoint = Cpt(EpicsSignal, 'RAMP:TARGET_TEMP')
actuate = Cpt(EpicsSignal, "RAMP:EXECUTE")
actuate_value = CryoStreamCmd.START_RAMP
stop_signal = Cpt(EpicsSignal, "RAMP.PROC")
stop_signal = Cpt(EpicsSignal, "RAMP:EXECUTE")
stop_value = CryoStreamCmd.STOP_RAMP
ramp_rate = Cpt(EpicsSignal, "RAMP:RAMP_RATE")
4 changes: 2 additions & 2 deletions start_bs.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ class SampleXYZ(Device):
dewar = Dewar("XF:17IDB-ES:AMX", name="dewar")
home_pins = home_pins_plan(gov_mon_signal, gonio_mon_signal, pyz_homer, gonio)
robot_arm = RobotArm("XF:17IDB-ES:AMX", name="robot_arm")
cs700 = CryoStream("XF:17ID1:CS700:", name="cs700", atol=0.1)
cs1000 = CryoStream("XF:17IDB-ES:AMX{CS:1}", name="cs1000", atol=0.1)

elif beamline == "fmx":
from mxbluesky.devices import (WorkPositions, TwoClickLowMag, LoopDetector, MountPositions,
Expand Down Expand Up @@ -207,7 +207,7 @@ class SampleXYZ(Device):
dewar = Dewar("XF:17IDC-ES:FMX", name="dewar")
home_pins = home_pins_plan(gov_mon_signal, gonio_mon_signal, pyz_homer, gonio)
robot_arm = RobotArm("XF:17IDC-ES:FMX", name="robot_arm")
cs700 = CryoStream("XF:17ID2:CS700:", name="cs700", atol=0.1)
cs1000 = CryoStream("XF:17IDC-ES:FMX{CS:1}", name="cs1000", atol=0.1)

elif beamline=="nyx":
from mxbluesky.devices.md2 import LightDevice, BeamstopDevice, MD2SimpleHVDevice, MD2Device, ShutterDevice
Expand Down