fix(omny): RT machine renamed mpc3217 -> mpc-omny
CI for csaxs_bec / test (push) Successful in 3m35s
CI for csaxs_bec / test (push) Successful in 3m35s
PSI DHCP updated the DNS on 2026-11-03: mpc-omny.psi.ch -> 129.129.98.87, mpc3217.psi.ch no longer resolves. Device configs (ptycho_omny, simulated), galil/ogalil (host check for the NETIO path, NETIO URL), rt_omny, sim devices, tests, e2e harness, docs. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
eb8bc976c6
commit
1e7b7deea3
12 files changed
+72
-72
No files matched your search
@@ -83,7 +83,7 @@ rtx:
|
||||
deviceClass: csaxs_bec.devices.omny.rt.rt_omny_ophyd.RtOMNYMotor
|
||||
deviceConfig:
|
||||
axis_Id: A
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
port: 3333
|
||||
sign: 1
|
||||
enabled: true
|
||||
@@ -101,7 +101,7 @@ rty:
|
||||
deviceClass: csaxs_bec.devices.omny.rt.rt_omny_ophyd.RtOMNYMotor
|
||||
deviceConfig:
|
||||
axis_Id: B
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
port: 3333
|
||||
sign: 1
|
||||
enabled: true
|
||||
@@ -118,7 +118,7 @@ rtz:
|
||||
deviceClass: csaxs_bec.devices.omny.rt.rt_omny_ophyd.RtOMNYMotor
|
||||
deviceConfig:
|
||||
axis_Id: C
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
port: 3333
|
||||
sign: 1
|
||||
enabled: true
|
||||
@@ -132,7 +132,7 @@ rtz:
|
||||
rt_positions:
|
||||
deviceClass: csaxs_bec.devices.omny.rt.rt_omny_ophyd.RtOMNYFlyer
|
||||
deviceConfig:
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
port: 3333
|
||||
readoutPriority: async
|
||||
connectionTimeout: 20
|
||||
@@ -203,7 +203,7 @@ ofzpx:
|
||||
deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: A
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -224,7 +224,7 @@ ofzpy:
|
||||
deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: B
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -245,7 +245,7 @@ ofzpz:
|
||||
deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: C
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -265,7 +265,7 @@ otransx:
|
||||
deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: D
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -285,7 +285,7 @@ otransy:
|
||||
deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: E
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -306,7 +306,7 @@ otransz:
|
||||
deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: F
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -326,7 +326,7 @@ osamx:
|
||||
deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: A
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -346,7 +346,7 @@ osamz:
|
||||
deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: B
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -366,7 +366,7 @@ oosay:
|
||||
deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: C
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -387,7 +387,7 @@ oosax:
|
||||
deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: D
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -408,7 +408,7 @@ oosaz:
|
||||
deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: E
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -429,7 +429,7 @@ oparkz:
|
||||
deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: F
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -449,7 +449,7 @@ oshuttleopen:
|
||||
deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: G
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -469,7 +469,7 @@ oshuttlealign:
|
||||
deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: H
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -489,7 +489,7 @@ osamy:
|
||||
deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: A
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -509,7 +509,7 @@ otracky:
|
||||
deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: B
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -529,7 +529,7 @@ osamroy:
|
||||
deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: C
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -549,7 +549,7 @@ otrackz:
|
||||
deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: E
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -569,7 +569,7 @@ oeyex:
|
||||
deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: F
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -589,7 +589,7 @@ oeyez:
|
||||
deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: G
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -609,7 +609,7 @@ oeyey:
|
||||
deviceClass: csaxs_bec.devices.omny.galil.ogalil_ophyd.OMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: H
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -634,7 +634,7 @@ ocsx:
|
||||
deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
|
||||
deviceConfig:
|
||||
axis_Id: B
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- -2
|
||||
- 2
|
||||
@@ -654,7 +654,7 @@ ocsy:
|
||||
deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
|
||||
deviceConfig:
|
||||
axis_Id: A
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- -2
|
||||
- 2
|
||||
@@ -674,7 +674,7 @@ oshield:
|
||||
deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
|
||||
deviceConfig:
|
||||
axis_Id: C
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- -14.5
|
||||
- 15.8
|
||||
|
||||
@@ -89,7 +89,7 @@ rtx:
|
||||
deviceClass: csaxs_bec.devices.sim.sim_omny.SimRtOMNYMotor
|
||||
deviceConfig:
|
||||
axis_Id: A
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
port: 3333
|
||||
sign: 1
|
||||
enabled: true
|
||||
@@ -107,7 +107,7 @@ rty:
|
||||
deviceClass: csaxs_bec.devices.sim.sim_omny.SimRtOMNYMotor
|
||||
deviceConfig:
|
||||
axis_Id: B
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
port: 3333
|
||||
sign: 1
|
||||
enabled: true
|
||||
@@ -124,7 +124,7 @@ rtz:
|
||||
deviceClass: csaxs_bec.devices.sim.sim_omny.SimRtOMNYMotor
|
||||
deviceConfig:
|
||||
axis_Id: C
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
port: 3333
|
||||
sign: 1
|
||||
enabled: true
|
||||
@@ -137,7 +137,7 @@ rtz:
|
||||
rt_positions:
|
||||
deviceClass: csaxs_bec.devices.sim.sim_omny.SimRtOMNYFlyer
|
||||
deviceConfig:
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
port: 3333
|
||||
sim_point_dwell_s: 0.02
|
||||
readoutPriority: async
|
||||
@@ -181,7 +181,7 @@ ofzpx:
|
||||
deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: A
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -204,7 +204,7 @@ ofzpy:
|
||||
deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: B
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -227,7 +227,7 @@ ofzpz:
|
||||
deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: C
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -249,7 +249,7 @@ otransx:
|
||||
deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: D
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -271,7 +271,7 @@ otransy:
|
||||
deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: E
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -306,7 +306,7 @@ otransz:
|
||||
deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: F
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -328,7 +328,7 @@ osamx:
|
||||
deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: A
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -350,7 +350,7 @@ osamz:
|
||||
deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: B
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -372,7 +372,7 @@ oosay:
|
||||
deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: C
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -395,7 +395,7 @@ oosax:
|
||||
deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: D
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -418,7 +418,7 @@ oosaz:
|
||||
deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: E
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -441,7 +441,7 @@ oparkz:
|
||||
deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: F
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -463,7 +463,7 @@ oshuttleopen:
|
||||
deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: G
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -493,7 +493,7 @@ oshuttlealign:
|
||||
deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: H
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -527,7 +527,7 @@ osamy:
|
||||
deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: A
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -549,7 +549,7 @@ otracky:
|
||||
deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: B
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -571,7 +571,7 @@ osamroy:
|
||||
deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: C
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -593,7 +593,7 @@ otrackz:
|
||||
deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: E
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -615,7 +615,7 @@ oeyex:
|
||||
deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: F
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -637,7 +637,7 @@ oeyez:
|
||||
deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: G
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -659,7 +659,7 @@ oeyey:
|
||||
deviceClass: csaxs_bec.devices.sim.sim_omny.SimOMNYGalilMotor
|
||||
deviceConfig:
|
||||
axis_Id: H
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- 0
|
||||
- 0
|
||||
@@ -681,7 +681,7 @@ ocsx:
|
||||
deviceClass: csaxs_bec.devices.sim.sim_smaract.SimSmaractMotor
|
||||
deviceConfig:
|
||||
axis_Id: B
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- -2
|
||||
- 2
|
||||
@@ -702,7 +702,7 @@ ocsy:
|
||||
deviceClass: csaxs_bec.devices.sim.sim_smaract.SimSmaractMotor
|
||||
deviceConfig:
|
||||
axis_Id: A
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- -2
|
||||
- 2
|
||||
@@ -723,7 +723,7 @@ oshield:
|
||||
deviceClass: csaxs_bec.devices.sim.sim_smaract.SimSmaractMotor
|
||||
deviceConfig:
|
||||
axis_Id: C
|
||||
host: mpc3217.psi.ch
|
||||
host: mpc-omny.psi.ch
|
||||
limits:
|
||||
- -14.5
|
||||
- 15.8
|
||||
|
||||
@@ -318,14 +318,14 @@ class GalilController(Controller):
|
||||
t.title = f"{self.__class__.__name__} on {self.sock.host}:{self.sock.port}"
|
||||
field_names = ["Axis", "Name", "Referenced", "Motor On", "Limits", "Position"]
|
||||
# in case of OMNY
|
||||
if self.sock.host == "mpc3217.psi.ch":
|
||||
if self.sock.host == "mpc-omny.psi.ch":
|
||||
field_names.append("Temperature")
|
||||
field_names.append("FolErr")
|
||||
t.field_names = field_names
|
||||
for ax in range(self._axes_per_controller):
|
||||
axis = self._axis[ax]
|
||||
if axis is not None:
|
||||
if self.sock.host == "mpc3217.psi.ch":
|
||||
if self.sock.host == "mpc-omny.psi.ch":
|
||||
# case of omny. possibly consider moving to ogalil
|
||||
motor_on = self.is_motor_on(axis.axis_Id)
|
||||
if motor_on == True:
|
||||
|
||||
@@ -143,7 +143,7 @@ class OMNYGalilController(GalilController):
|
||||
raise Exception("Socket number ranges from 1 to 4")
|
||||
else:
|
||||
contents = urllib.request.urlopen(
|
||||
f"http://mpc3217:8091/netio.cgi?pass=24A42C3929C5&output{number}={switch}"
|
||||
f"http://mpc-omny:8091/netio.cgi?pass=24A42C3929C5&output{number}={switch}"
|
||||
).read()
|
||||
# print(contents)
|
||||
if b"OK" in contents:
|
||||
@@ -257,7 +257,7 @@ class OMNYGalilController(GalilController):
|
||||
time.sleep(0.4)
|
||||
|
||||
def _ogalil_switchsocket_status(self):
|
||||
contents = urllib.request.urlopen("http://mpc3217:8091/netio.xml").read()
|
||||
contents = urllib.request.urlopen("http://mpc-omny:8091/netio.xml").read()
|
||||
root = ET.fromstring(contents)
|
||||
returnvalue = []
|
||||
for j in range(0, 4):
|
||||
@@ -319,7 +319,7 @@ class OMNYGalilMotor(Device, PositionerBase):
|
||||
read_attrs=None,
|
||||
configuration_attrs=None,
|
||||
parent=None,
|
||||
host="mpc3217.psi.ch",
|
||||
host="mpc-omny.psi.ch",
|
||||
port=8081,
|
||||
limits=None,
|
||||
sign=1,
|
||||
|
||||
@@ -761,7 +761,7 @@ class RtOMNYController(Controller):
|
||||
|
||||
def _omny_interferometer_switch_open_socket(self):
|
||||
# open a socket connection to the laser interferometer server
|
||||
host = "mpc3217.psi.ch" # as both code is running on same pc
|
||||
host = "mpc-omny.psi.ch" # as both code is running on same pc
|
||||
port = 3335 # socket server port number
|
||||
|
||||
self.switchbox_socket.connect((host, port)) # connect to the server
|
||||
@@ -980,7 +980,7 @@ class RtOMNYMotor(Device, PositionerBase):
|
||||
read_attrs=None,
|
||||
configuration_attrs=None,
|
||||
parent=None,
|
||||
host="mpc3217.psi.ch",
|
||||
host="mpc-omny.psi.ch",
|
||||
port=2222,
|
||||
sign=1,
|
||||
socket_cls=SocketIO,
|
||||
@@ -1201,7 +1201,7 @@ class RtOMNYFlyer(Device):
|
||||
read_attrs=None,
|
||||
configuration_attrs=None,
|
||||
parent=None,
|
||||
host="mpc3217.psi.ch",
|
||||
host="mpc-omny.psi.ch",
|
||||
port=2222,
|
||||
socket_cls=SocketIO,
|
||||
device_manager=None,
|
||||
|
||||
@@ -57,9 +57,9 @@ _DEFAULT_ANALOG_INPUT_V = -8.0
|
||||
# disagreeing with wherever oshield actually simulated-moved to. Computed dynamically
|
||||
# below instead of seeded once, since oshield's position changes during a session.
|
||||
_OSHIELD_OPEN_SWITCH_CHANNEL = 8014
|
||||
_OSHIELD_GALIL_HOST = "mpc3217.psi.ch"
|
||||
_OSHIELD_GALIL_HOST = "mpc-omny.psi.ch"
|
||||
_OSHIELD_GALIL_PORT = 8081 # otransx/otransy's controller
|
||||
_OSHIELD_SMARACT_HOST = "mpc3217.psi.ch"
|
||||
_OSHIELD_SMARACT_HOST = "mpc-omny.psi.ch"
|
||||
_OSHIELD_SMARACT_PORT = 3334
|
||||
_OSHIELD_SMARACT_AXIS = 2 # axis_Id "C"
|
||||
_OSHIELD_OPEN_POSITION_MM = -11.88 # _oshield_ST_open()'s own umv() target
|
||||
|
||||
@@ -320,7 +320,7 @@ class SimOMNYDewar(OMNYDewar):
|
||||
# real OMNY_tempcontroller/tempcontrol.py channel config (name, EGU, ChanHeat, ALARMLIM)
|
||||
# cross-referenced against the per-channel setpoints of the former
|
||||
# OMNYTemperatures._set_TEMP_default_setpoints() (removed 2026-10-27: the defaults live
|
||||
# only in the controllers; values checked against the controllers on mpc3217 the same
|
||||
# only in the controllers; values checked against the controllers on mpc-omny the same
|
||||
# day -- 73.2 K here vs. -199.9 degC = 73.25 K there).
|
||||
# Sentinel setpoints ("no active control": -199.9 degC / 73.2 K, matching
|
||||
# tempcontrol.py's configure_device()'s unused-channel convention) mark monitor-only
|
||||
|
||||
@@ -233,7 +233,7 @@ This part of the manual describes the software structure in more detail.
|
||||
|
||||
The nano-positioning is controlled by a feedback loop running on a real-time linux based computer. With all related hardware connected, this loop has to be started manually.
|
||||
|
||||
1. Open the web interface `http://mpc3217` in a browser and log in with the password of the user `control`. The password is written on the physical machine.
|
||||
1. Open the web interface `http://mpc-omny` in a browser and log in with the password of the user `control`. The password is written on the physical machine.
|
||||
1. On the tab **System status**, click **▶ Start** in the control loop card. If a loop is already running, the button shows **↻ Restart** instead.
|
||||
1. Check that the page shows the loop as running. "loop NOT stepping" means that the loop did not start correctly, for example because the VME crate is off. The reason is shown in the console at the bottom of the tab.
|
||||
|
||||
|
||||
@@ -237,7 +237,7 @@ def run_omny(): # noqa: C901
|
||||
SimOMNYGalilMotor(
|
||||
"C",
|
||||
name="osamroy",
|
||||
host="mpc3217.psi.ch",
|
||||
host="mpc-omny.psi.ch",
|
||||
port=8083,
|
||||
sign=1,
|
||||
device_manager=dm,
|
||||
|
||||
@@ -9,7 +9,7 @@ from csaxs_bec.devices.omny.galil.ogalil_ophyd import OMNYGalilController
|
||||
def _controller(replies: dict) -> mock.MagicMock:
|
||||
"""OMNY controller stand-in with the firmware's MG replies; thread 0 idle by default."""
|
||||
controller = mock.MagicMock(spec=OMNYGalilController)
|
||||
controller.sock = mock.MagicMock(host="mpc3217.psi.ch", port=8081)
|
||||
controller.sock = mock.MagicMock(host="mpc-omny.psi.ch", port=8081)
|
||||
controller.socket_put_and_receive.side_effect = lambda cmd: replies[cmd]
|
||||
controller.is_thread_active.return_value = False
|
||||
return controller
|
||||
|
||||
@@ -7,7 +7,7 @@ from csaxs_bec.devices.omny.galil.ogalil_ophyd import OMNYGalilController
|
||||
from csaxs_bec.devices.sim.sim_omny import SimOMNYGalilMotor
|
||||
from csaxs_bec.devices.sim.sim_socket import SimStateRegistry
|
||||
|
||||
_HOST = "mpc3217.psi.ch"
|
||||
_HOST = "mpc-omny.psi.ch"
|
||||
_PORT = 8082
|
||||
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ from csaxs_bec.devices.omny.galil.ogalil_ophyd import OMNYGalilController
|
||||
from csaxs_bec.devices.sim.sim_omny import SimOMNYGalilMotor
|
||||
from csaxs_bec.devices.sim.sim_socket import SimStateRegistry
|
||||
|
||||
_HOST = "mpc3217.psi.ch"
|
||||
_HOST = "mpc-omny.psi.ch"
|
||||
_PORT = 8082
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user