diff --git a/cfg/dilsc.cfg b/cfg/dilsc.cfg index c2bf7bf..b568b23 100644 --- a/cfg/dilsc.cfg +++ b/cfg/dilsc.cfg @@ -119,6 +119,12 @@ description = pressure on the back side of the pump slot = P4 io = triton +[p_ovc] +class = secop_psi.mercury.PressureSensor +description = outer vacuum pressure +slot = P6 +io = triton + #[itc] #class = secop_psi.mercury.IO #description = connection to MercuryiTC @@ -243,8 +249,8 @@ description = vector field x = mfx y = mfy z = mfz -sphere_radius = 0.06 -cylinders = ((0.023, 0.52), (0.045, 0.08)) +sphere_radius = 0.6 +cylinders = ((0.23, 5.2), (0.45, 0.8)) [mfx] class = secop_psi.ips_mercury.SimpleField diff --git a/secop/modules.py b/secop/modules.py index db6d296..1f5e578 100644 --- a/secop/modules.py +++ b/secop/modules.py @@ -46,6 +46,14 @@ Done = UniqueObject('Done') indicating that the setter is triggered already""" +class DummyLock: + def __enter__(self): + return self + + def __exit__(self, *args, **kwds): + return True + + class HasAccessibles(HasProperties): """base class of Module @@ -327,6 +335,7 @@ class Module(HasAccessibles): self.initModuleDone = False self.startModuleDone = False self.remoteLogHandler = None + # self.accessLock = self.updateLock = DummyLock() self.accessLock = threading.RLock() # for read_* / write_* methods self.updateLock = threading.RLock() # for announceUpdate self.polledModules = [] # modules polled by thread started in self.startModules diff --git a/secop_psi/dilsc.py b/secop_psi/dilsc.py index bc9d493..f39a91a 100644 --- a/secop_psi/dilsc.py +++ b/secop_psi/dilsc.py @@ -31,7 +31,7 @@ INCREASE = 2 class VectorField(HasStates, Vector, Drivable): - sphere_radius = Parameter('max. spehere', datatype=FloatRange(0, 0.7, unit='T'), readonly=True, default=0.6) + sphere_radius = Parameter('max. sphere', datatype=FloatRange(0, 0.7, unit='T'), readonly=True, default=0.6) cylinders = Parameter('allowed cylinders (list of radius and height)', datatype=ArrayOf(TupleOf(FloatRange(0, 0.6, unit='T'), FloatRange(0, 5.2, unit='T')), 1, 9), readonly=True, default=((0.23, 5.2), (0.45, 0.8)))