diff --git a/main/ori7test_cfg.py b/main/ori7test_cfg.py index 7c64ae9..89799d0 100644 --- a/main/ori7test_cfg.py +++ b/main/ori7test_cfg.py @@ -3,7 +3,7 @@ Node('ori7test.psi.ch', 'tcp://5000' ) -Include('racktools') +include('racktools') LsSensor('Ts', channel='C', calcurve='x186350') LsLoop('T', channel='B', calcurve='x174786', output_module='htr', target=10) diff --git a/racktools.py b/racktools.py index 0872b15..1a675ad 100644 --- a/racktools.py +++ b/racktools.py @@ -2,7 +2,7 @@ in a config file: -Include('racktools') +include('racktools') """ @@ -20,7 +20,7 @@ class Rack: # contains # Rack('', ls_type=336, ls_io='...') -Include('racklist') +include('racklist') # contains either rack='' # or rack = """ @@ -28,7 +28,7 @@ Include('racklist') # prep9=... # """ rack = None -Include('rack') +include('rack') class RackConfig: @@ -53,7 +53,7 @@ class RackConfig: self.props = {} # dict (, ) of value self.mods = {} # dict (, ) of list of self.ccu_cfg = {} - log = Include.log + self.log = include.log self.ls_dev = None def set_props(self, mod, **kwds):