From 7f7561e4d9cc5bebd812e9c5a7e162f2b932b911 Mon Sep 17 00:00:00 2001
From: JohannesDittloff <Johannes.Dittloff@tum.de>
Date: Thu, 8 May 2025 13:07:22 +0200
Subject: [PATCH] rename prsctrl

---
 .gitignore                                    |   5 +-
 devices/Shutter.py                            |  64 ------
 devices/__pycache__/Shutter.cpython-311.pyc   | Bin 4859 -> 0 bytes
 devices/__pycache__/Xenon.cpython-311.pyc     | Bin 6412 -> 0 bytes
 measurement_device/__init__.py                |  40 ----
 .../__pycache__/__init__.cpython-310.pyc      | Bin 1139 -> 0 bytes
 .../__pycache__/__init__.cpython-311.pyc      | Bin 2063 -> 0 bytes
 .../__pycache__/base.cpython-310.pyc          | Bin 2128 -> 0 bytes
 .../__pycache__/base.cpython-311.pyc          | Bin 2538 -> 0 bytes
 measurement_device/base.py                    |  62 -----
 .../__pycache__/model7260.cpython-311.pyc     | Bin 14303 -> 0 bytes
 .../impl/__pycache__/sr830.cpython-310.pyc    | Bin 4346 -> 0 bytes
 .../impl/__pycache__/sr830.cpython-311.pyc    | Bin 21800 -> 0 bytes
 .../impl/__pycache__/test.cpython-310.pyc     | Bin 2707 -> 0 bytes
 .../impl/__pycache__/test.cpython-311.pyc     | Bin 3397 -> 0 bytes
 measurement_device/impl/test.py               |  61 -----
 Bentham.py => prsctrl/Bentham.py              |   0
 prsctrl/__init__.py                           |   0
 prsctrl/__pycache__/Bentham.cpython-311.pyc   | Bin 0 -> 3877 bytes
 prsctrl/__pycache__/__init__.cpython-311.pyc  | Bin 0 -> 205 bytes
 .../__pycache__/measurement.cpython-311.pyc   | Bin 0 -> 8808 bytes
 .../test_measurement.cpython-311.pyc          | Bin 0 -> 11668 bytes
 .../__pycache__/update_funcs.cpython-311.pyc  | Bin 0 -> 8435 bytes
 prsctrl/devices/__init__.py                   |   0
 .../__pycache__/__init__.cpython-311.pyc      | Bin 0 -> 213 bytes
 prsctrl/devices/lamp/__init__.py              |  34 +++
 .../lamp/__pycache__/__init__.cpython-311.pyc | Bin 0 -> 1776 bytes
 .../lamp/__pycache__/base.cpython-311.pyc     | Bin 0 -> 1129 bytes
 prsctrl/devices/lamp/base.py                  |  15 ++
 prsctrl/devices/lamp/impl/__init__.py         |   0
 .../impl/__pycache__/__init__.cpython-311.pyc | Bin 0 -> 223 bytes
 .../impl/__pycache__/dummy.cpython-311.pyc    | Bin 0 -> 1480 bytes
 .../impl/__pycache__/xenon.cpython-311.pyc    | Bin 0 -> 6788 bytes
 prsctrl/devices/lamp/impl/dummy.py            |  14 ++
 .../devices/lamp/impl/xenon.py                |  46 ++--
 prsctrl/devices/lock_in/__init__.py           |  28 +++
 .../__pycache__/__init__.cpython-311.pyc      | Bin 0 -> 1661 bytes
 .../lock_in/__pycache__/base.cpython-311.pyc  | Bin 0 -> 1736 bytes
 prsctrl/devices/lock_in/base.py               |  34 +++
 prsctrl/devices/lock_in/impl/__init__.py      |   0
 .../impl/__pycache__/__init__.cpython-311.pyc | Bin 0 -> 226 bytes
 .../impl/__pycache__/dummy.cpython-311.pyc    | Bin 0 -> 8156 bytes
 .../impl/__pycache__/sr830.cpython-311.pyc    | Bin 0 -> 23053 bytes
 prsctrl/devices/lock_in/impl/dummy.py         | 134 +++++++++++
 .../devices/lock_in}/impl/model7260.py        |   9 +-
 .../devices/lock_in}/impl/sr830.py            |  40 +++-
 prsctrl/devices/monochromator/__init__.py     |  34 +++
 .../__pycache__/__init__.cpython-311.pyc      | Bin 0 -> 1745 bytes
 .../__pycache__/base.cpython-311.pyc          | Bin 0 -> 1229 bytes
 prsctrl/devices/monochromator/base.py         |  16 ++
 .../devices/monochromator/impl/__init__.py    |   0
 .../impl/__pycache__/__init__.cpython-311.pyc | Bin 0 -> 232 bytes
 .../bentham_tmc300.cpython-311.pyc            | Bin 0 -> 3353 bytes
 .../impl/__pycache__/dummy.cpython-311.pyc    | Bin 0 -> 1892 bytes
 .../monochromator/impl/bentham_tmc300.py      |  59 +++++
 prsctrl/devices/monochromator/impl/dummy.py   |  23 ++
 prsctrl/devices/shutter/__init__.py           |  34 +++
 .../__pycache__/__init__.cpython-311.pyc      | Bin 0 -> 1788 bytes
 .../shutter/__pycache__/base.cpython-311.pyc  | Bin 0 -> 1159 bytes
 prsctrl/devices/shutter/base.py               |  15 ++
 prsctrl/devices/shutter/impl/__init__.py      |   0
 .../impl/__pycache__/__init__.cpython-311.pyc | Bin 0 -> 226 bytes
 .../impl/__pycache__/daq.cpython-311.pyc      | Bin 0 -> 3028 bytes
 .../impl/__pycache__/dummy.cpython-311.pyc    | Bin 0 -> 1515 bytes
 prsctrl/devices/shutter/impl/daq.py           |  41 ++++
 prsctrl/devices/shutter/impl/dummy.py         |  14 ++
 prsctrl/measurement.py                        | 186 +++++++++++++++
 .../prsctrl_interactive.py                    | 148 +++++-------
 system.cfg => prsctrl/system.cfg              |   0
 .../systemAll-1nm.atr                         |   0
 .../systemAll-new.atr                         |   0
 prsctrl/test-measure-xenon.py                 | 211 ++++++++++++++++++
 test.py => prsctrl/test.py                    |  41 ++--
 prsctrl/test_measurement.py                   | 184 +++++++++++++++
 update_funcs.py => prsctrl/update_funcs.py    |   4 +-
 prsctrl/utility/__init__.py                   |   0
 .../__pycache__/__init__.cpython-311.pyc      | Bin 0 -> 213 bytes
 .../__pycache__/config_file.cpython-311.pyc   | Bin 0 -> 4076 bytes
 .../data_collector.cpython-311.pyc            | Bin 0 -> 9583 bytes
 .../__pycache__/device_select.cpython-311.pyc | Bin 0 -> 4965 bytes
 .../__pycache__/file_io.cpython-311.pyc       | Bin 0 -> 2041 bytes
 .../__pycache__/prsdata.cpython-311.pyc       | Bin 0 -> 15571 bytes
 .../utility}/__pycache__/visa.cpython-311.pyc | Bin 1731 -> 1738 bytes
 {utility => prsctrl/utility}/config_file.py   |   0
 .../utility}/data_collector.py                | 152 +++++++------
 prsctrl/utility/device_select.py              |  72 ++++++
 {utility => prsctrl/utility}/file_io.py       |   0
 utility/data.py => prsctrl/utility/prsdata.py |  32 ++-
 {utility => prsctrl/utility}/visa.py          |   0
 utility/__pycache__/visa.cpython-310.pyc      | Bin 1141 -> 0 bytes
 utility/device_select.py                      |  26 ---
 91 files changed, 1388 insertions(+), 490 deletions(-)
 delete mode 100644 devices/Shutter.py
 delete mode 100644 devices/__pycache__/Shutter.cpython-311.pyc
 delete mode 100644 devices/__pycache__/Xenon.cpython-311.pyc
 delete mode 100644 measurement_device/__init__.py
 delete mode 100644 measurement_device/__pycache__/__init__.cpython-310.pyc
 delete mode 100644 measurement_device/__pycache__/__init__.cpython-311.pyc
 delete mode 100644 measurement_device/__pycache__/base.cpython-310.pyc
 delete mode 100644 measurement_device/__pycache__/base.cpython-311.pyc
 delete mode 100644 measurement_device/base.py
 delete mode 100644 measurement_device/impl/__pycache__/model7260.cpython-311.pyc
 delete mode 100644 measurement_device/impl/__pycache__/sr830.cpython-310.pyc
 delete mode 100644 measurement_device/impl/__pycache__/sr830.cpython-311.pyc
 delete mode 100644 measurement_device/impl/__pycache__/test.cpython-310.pyc
 delete mode 100644 measurement_device/impl/__pycache__/test.cpython-311.pyc
 delete mode 100644 measurement_device/impl/test.py
 rename Bentham.py => prsctrl/Bentham.py (100%)
 create mode 100644 prsctrl/__init__.py
 create mode 100644 prsctrl/__pycache__/Bentham.cpython-311.pyc
 create mode 100644 prsctrl/__pycache__/__init__.cpython-311.pyc
 create mode 100644 prsctrl/__pycache__/measurement.cpython-311.pyc
 create mode 100644 prsctrl/__pycache__/test_measurement.cpython-311.pyc
 create mode 100644 prsctrl/__pycache__/update_funcs.cpython-311.pyc
 create mode 100644 prsctrl/devices/__init__.py
 create mode 100644 prsctrl/devices/__pycache__/__init__.cpython-311.pyc
 create mode 100644 prsctrl/devices/lamp/__init__.py
 create mode 100644 prsctrl/devices/lamp/__pycache__/__init__.cpython-311.pyc
 create mode 100644 prsctrl/devices/lamp/__pycache__/base.cpython-311.pyc
 create mode 100644 prsctrl/devices/lamp/base.py
 create mode 100644 prsctrl/devices/lamp/impl/__init__.py
 create mode 100644 prsctrl/devices/lamp/impl/__pycache__/__init__.cpython-311.pyc
 create mode 100644 prsctrl/devices/lamp/impl/__pycache__/dummy.cpython-311.pyc
 create mode 100644 prsctrl/devices/lamp/impl/__pycache__/xenon.cpython-311.pyc
 create mode 100644 prsctrl/devices/lamp/impl/dummy.py
 rename devices/Xenon.py => prsctrl/devices/lamp/impl/xenon.py (85%)
 create mode 100644 prsctrl/devices/lock_in/__init__.py
 create mode 100644 prsctrl/devices/lock_in/__pycache__/__init__.cpython-311.pyc
 create mode 100644 prsctrl/devices/lock_in/__pycache__/base.cpython-311.pyc
 create mode 100644 prsctrl/devices/lock_in/base.py
 create mode 100644 prsctrl/devices/lock_in/impl/__init__.py
 create mode 100644 prsctrl/devices/lock_in/impl/__pycache__/__init__.cpython-311.pyc
 create mode 100644 prsctrl/devices/lock_in/impl/__pycache__/dummy.cpython-311.pyc
 create mode 100644 prsctrl/devices/lock_in/impl/__pycache__/sr830.cpython-311.pyc
 create mode 100644 prsctrl/devices/lock_in/impl/dummy.py
 rename {measurement_device => prsctrl/devices/lock_in}/impl/model7260.py (98%)
 rename {measurement_device => prsctrl/devices/lock_in}/impl/sr830.py (93%)
 create mode 100644 prsctrl/devices/monochromator/__init__.py
 create mode 100644 prsctrl/devices/monochromator/__pycache__/__init__.cpython-311.pyc
 create mode 100644 prsctrl/devices/monochromator/__pycache__/base.cpython-311.pyc
 create mode 100644 prsctrl/devices/monochromator/base.py
 create mode 100644 prsctrl/devices/monochromator/impl/__init__.py
 create mode 100644 prsctrl/devices/monochromator/impl/__pycache__/__init__.cpython-311.pyc
 create mode 100644 prsctrl/devices/monochromator/impl/__pycache__/bentham_tmc300.cpython-311.pyc
 create mode 100644 prsctrl/devices/monochromator/impl/__pycache__/dummy.cpython-311.pyc
 create mode 100644 prsctrl/devices/monochromator/impl/bentham_tmc300.py
 create mode 100644 prsctrl/devices/monochromator/impl/dummy.py
 create mode 100644 prsctrl/devices/shutter/__init__.py
 create mode 100644 prsctrl/devices/shutter/__pycache__/__init__.cpython-311.pyc
 create mode 100644 prsctrl/devices/shutter/__pycache__/base.cpython-311.pyc
 create mode 100644 prsctrl/devices/shutter/base.py
 create mode 100644 prsctrl/devices/shutter/impl/__init__.py
 create mode 100644 prsctrl/devices/shutter/impl/__pycache__/__init__.cpython-311.pyc
 create mode 100644 prsctrl/devices/shutter/impl/__pycache__/daq.cpython-311.pyc
 create mode 100644 prsctrl/devices/shutter/impl/__pycache__/dummy.cpython-311.pyc
 create mode 100644 prsctrl/devices/shutter/impl/daq.py
 create mode 100644 prsctrl/devices/shutter/impl/dummy.py
 create mode 100644 prsctrl/measurement.py
 rename pr_interactive.py => prsctrl/prsctrl_interactive.py (67%)
 rename system.cfg => prsctrl/system.cfg (100%)
 rename systemAll-1nm.atr => prsctrl/systemAll-1nm.atr (100%)
 rename systemAll-new.atr => prsctrl/systemAll-new.atr (100%)
 create mode 100644 prsctrl/test-measure-xenon.py
 rename test.py => prsctrl/test.py (94%)
 create mode 100644 prsctrl/test_measurement.py
 rename update_funcs.py => prsctrl/update_funcs.py (97%)
 create mode 100644 prsctrl/utility/__init__.py
 create mode 100644 prsctrl/utility/__pycache__/__init__.cpython-311.pyc
 create mode 100644 prsctrl/utility/__pycache__/config_file.cpython-311.pyc
 create mode 100644 prsctrl/utility/__pycache__/data_collector.cpython-311.pyc
 create mode 100644 prsctrl/utility/__pycache__/device_select.cpython-311.pyc
 create mode 100644 prsctrl/utility/__pycache__/file_io.cpython-311.pyc
 create mode 100644 prsctrl/utility/__pycache__/prsdata.cpython-311.pyc
 rename {utility => prsctrl/utility}/__pycache__/visa.cpython-311.pyc (91%)
 rename {utility => prsctrl/utility}/config_file.py (100%)
 rename {utility => prsctrl/utility}/data_collector.py (54%)
 create mode 100644 prsctrl/utility/device_select.py
 rename {utility => prsctrl/utility}/file_io.py (100%)
 rename utility/data.py => prsctrl/utility/prsdata.py (90%)
 rename {utility => prsctrl/utility}/visa.py (100%)
 delete mode 100644 utility/__pycache__/visa.cpython-310.pyc
 delete mode 100644 utility/device_select.py

diff --git a/.gitignore b/.gitignore
index 0334bf3..3484455 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,6 @@
 __pychache__/
 __pychache__/**
 cpdctrl
-benhw64.dll
-test2.py
+prsctrl/benhw64.dll
+prsctrl/test2.py
+*benhw64.dll*
diff --git a/devices/Shutter.py b/devices/Shutter.py
deleted file mode 100644
index 2108f95..0000000
--- a/devices/Shutter.py
+++ /dev/null
@@ -1,64 +0,0 @@
-from pylablib.devices import NI
-
-class Shutter():
-    def __init__(self):
-        self.daq_name = 'Dev1'
-
-class DummyShutter(Shutter):
-    def __init__(self):
-        super().__init__()
-    def open_(self): print("Dummy shutter open")
-    def close_(self): print("Dummy shutter close")
-
-class ShutterPump(Shutter):
-    """
-    Controls shutter between opo and sample. 
-    Intended to be used instead of switching laser on and off.
-    Not yet in use.
-    """
-    def __init__(self):
-        super().__init__()    
-    
-    def open_(self):
-        with NI.NIDAQ(self.daq_name) as shutter:
-            shutter.add_voltage_output('vout', 'ao1', (0,5))
-            shutter.set_voltage_outputs('vout', 5)
-        print('Pump shutter opened')
-
-    def close_(self):
-        with NI.NIDAQ(self.daq_name) as shutter:
-            shutter.add_voltage_output('vout', 'ao1', (0,5))
-            shutter.set_voltage_outputs('vout', 0)
-        print('Pump shutter closed')
-
-
-class ShutterProbe(Shutter):
-    """
-    Controls shutter between bentham TMC300 and sample. 
-    Blocks probe light when not needed.
-    """
-    def __init__(self):
-        super().__init__()    
-    
-    def open_(self):
-        with NI.NIDAQ(self.daq_name) as shutter:
-            shutter.add_voltage_output('vout', 'ao0', (0,5))
-            shutter.set_voltage_outputs('vout', 5)
-        print('Probe shutter opened')
-
-    def close_(self):
-        with NI.NIDAQ(self.daq_name) as shutter:
-            shutter.add_voltage_output('vout', 'ao0', (0,5))
-            shutter.set_voltage_outputs('vout', 0)
-        print('Probe shutter closed')
-
-            
-if __name__ == '__main__':
-    from DeviceManager import DeviceManager
-    dm = DeviceManager()
-    
-    #dm.shutter_probe.open_()
-    dm.shutter_probe.close_()
-    
-    #dm.shutter_pump.open_()
-    #dm.shutter_pump.close_()
\ No newline at end of file
diff --git a/devices/__pycache__/Shutter.cpython-311.pyc b/devices/__pycache__/Shutter.cpython-311.pyc
deleted file mode 100644
index f91093763bc1ce00eb9d8d17c893efb20d946d06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4859
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
F{RLitz;FNn

diff --git a/devices/__pycache__/Xenon.cpython-311.pyc b/devices/__pycache__/Xenon.cpython-311.pyc
deleted file mode 100644
index cd22682dd58b898632b0d8a053ad1091f060bf61..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6412
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
VBfq$O`|=WfHiO8sA7;{b`41yZB$ogH

diff --git a/measurement_device/__init__.py b/measurement_device/__init__.py
deleted file mode 100644
index 21d81e9..0000000
--- a/measurement_device/__init__.py
+++ /dev/null
@@ -1,40 +0,0 @@
-
-from .base import MeasurementDevice
-
-TYPENAME_TEST = "Test"
-TYPENAME_SR830 = "SR830"
-TYPENAME_MODEL7260 = "Model7260"
-
-try:
-    from .impl.sr830 import SR830
-except ImportError:
-    pass
-
-from .impl.test import TestVoltageMeasurementDevice
-
-def list_devices() -> dict[str,list[str]]:
-    devices = {
-        TYPENAME_TEST: ["Measurement Dummy Device"],
-    }
-    try:
-        from .impl.sr830 import SR830
-        devices[TYPENAME_SR830] = SR830.enumerate_devices()
-    except ImportError:
-        pass
-    try:
-        from .impl.model7260 import Model7260
-        devices[TYPENAME_MODEL7260] = Model7260.enumerate_devices()
-    except ImportError:
-        pass
-    return devices
-
-def connect_device(type_name: str, device_name: str) -> MeasurementDevice:
-    if type_name == TYPENAME_TEST:
-        return TestVoltageMeasurementDevice()
-    elif type_name == TYPENAME_SR830:
-        try:
-            from .impl.sr830 import SR830
-            return SR830.connect_device(device_name)
-        except ImportError as e:
-            raise ValueError(f"SR830 not available: {e}")
-    raise ValueError(f"Unknown device type {type_name}")
\ No newline at end of file
diff --git a/measurement_device/__pycache__/__init__.cpython-310.pyc b/measurement_device/__pycache__/__init__.cpython-310.pyc
deleted file mode 100644
index 47e1cdedc7da3b3b64dc5ab4dbf7363139820e46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1139
zcmZWo&r2IY6rMLb*=&+cRIsJmQgTfTQs||KNJVq#!5~dkTmoUuOiXZpgxQH{LQ+cY
ze^Cm06iSc%W9HgZ|Aij3Z#G6PonhYYynS!x``-69E*A3y$B&<j-R~A5zs%<0aB%Y$
zSMmW3CmaG2f(Jl2^(ePIYwVzx1uV>X86bxw$}uAB(NiF19+3!!CNC3YL&tM4&lWk6
z7X^`DAsuQK&vNGr^IVR8p2uYi=-9l#UGx@tu}&(b-+<RwKrihIKN(07ib(B<vtC<x
ztRWJmGxhgxUcb5mi6l(mGvhso1LdEH|8le~g&N4Hjj?xw;+tW+jVswiqmb<h^k7QH
z3mmxy5Yj0!pTLE6NhU<G4dgo^b;5|sjGoUK8_$qbSZ(~|!Oi8JK^Tt8Gtkn|kqk}6
z*2TurUbVKhTWvL}^@h&(!hW!pNTidJ(Muv4ghKjCw0KH6(WSeTl(sIs3;VHDRViax
zp<ebjF3rCp(#4DZ1l#M){Y1#5xy8d?)Jqf|8O!F5NKRGUZ`R|E8v0T+_eQE4NAt%?
zPjv^!&3-q=V9^OgTlrC2G{bu#ZecZBEj(7WT5J80b_2X%j<<yOC(CGT%5JFTLJ64V
zUQ=K|uci5_b86HVt;i3BF3ixUo3>G9K1{t#x26hld_fJ!DV13T=U8*xQQW;8yBs(T
ztdLD9szom{6S#!KnNIfT1(2x)WSmu5ZcVJO<QqMQ&%n|9(Hdg6qMuF3++WGm?$sJU
zO6y&YVpaCf{9fQ62V%WEUfz#Rqj(sVXVA-rOu6F7EP|97V+?L-+H0n1sU1fVmh!ej
zvVdQ7{=g3gVkRP!3nqB+E(1g=<IEI|dkM`7uH-Qq2W)VFf{U|+)A>YiN;HkBRZ5y2
z`zXCB<_y!naMJ6&T-taF|C<!DX1v!{+QO}7M$J^H^uz~9OlwI4M>`u~%m;zkG`*c-
Ua)D7)m@XnFeBQX$DqSu71w~B_kN^Mx

diff --git a/measurement_device/__pycache__/__init__.cpython-311.pyc b/measurement_device/__pycache__/__init__.cpython-311.pyc
deleted file mode 100644
index 95edf7a7acbc5158a6b3ac7f1e7dfefabd457128..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2063
zcma)6&1)M+6rb5$NxS;AWy^6(oNVO8K?zAi?A9Mi3&J+VP`hdE1R?}N(T-!qyDKxh
zifbbmQF_QBlw6DrNx`QyX)ZanhxX$CU=>ulEEo)J4!x=5B68}R)t6Pbw2!yHc{4lj
z&CGA!o9{v)KLY9hvv)-k5c-XETH<XQZytiNgA}A-6=^tyF;ch`r|>CW5mJK0{&-Z6
z=1qAq(gVYY_|78AV{{wo!aDkbzm3*0%<-zCCZ#0s_7Oh`kRS=X(^?BHb4P7O{8~tb
z6o~{Bm<jXovR4VfSXc=zqD1Hq42}ux^v;v4QKUp8x;aDc=X1mnmWW|Gp2g26Mz1*1
zd_f`V_|*@tJjc}2@HxpQ+$yMM_AWW@?xn;mQa#t+7#Khd;^BL92(W`pz?LZZF3#gE
z1S9|<D%Q9ypoc>xe2;m!@)Ynz(?+O-OtIZT*TK|#hLP!BLu33nd2Vz;^=iH?4x<vc
z*N)wZgwU~ddOCmq-#R4(<a!o12aoU~&lELnLvFB3IS5I800~T4ek3F(v~>H%>_T#W
zHnTLlxa9cr+M0UVpg_ONxYJAYqDE-eBpJoMBEt!{T^iREnA6q@)SRWXK%KA~Kx<u`
zyNnZUd(3}2Gy4g<(FE`KngQK~+=&KbMwaEb>hx6lra`EYPAXbn&l@J}pg_|z#8@>8
zYw5+pvbmn6Bz<GUTq)?S=5F3xDc(u1trTD~SyoBT%<4Ik);f9CJViQ_fv{#Kb9rsU
z397I_>v*&u_7H*3_z|FtUW+kn@TzrUw8nE0Z~5bzSMY>v@toDIc6@U0Ts1yfiC?S6
zuRZW>hb!V~OFUga2n^H^_JlfMi@^s%jfb&%y<QXCaF;BxOYM>OejQ1^8c9}0rmG{<
z4}8D$#4F;kB@X{rz{5baykHE$-X9KKK;Qev`5*8&|5H493hkfrCol5*7cihBnHy^)
zqh~eZ1R59Nc5*C7TEc41EuG)N*kQ@v`UCB%JClaZBkA0o#EZ;>m0weu9@n5Cu)?Xl
zCa{8la^vo?m0T&|r|>$wU@wF#iwMdq*y<q!<#l3<H`xU>Md3^QWArW8?e`VDSzG*<
z{5o#EVO>5#3H_4~luxHfHe+sn%X-0-v-h)kHG4-TQ}Sm2O?_1_tm|@vHklDACqx>6
z4N>+w&@cnG=|&BOa|K<8Tx_NoWt(^Wx3X%HxJ8o?XpBuBXnSB{Fy5dPWZK6@2U~C&
z4C66C8QH#`?fF-}GnVhnLF8g3a;X|&Ib=)GZT*#W){@TFI6<1Sg9)o!?Y{Gm-mmtZ
ze-^0pjaB=`tl(JvAo4C`s5I4qgXl?XXyWB(0HBrVWHmZz1t%eA>yW(C6tu7X{Z?%J
z*&G09#XnK?Pguf)!A|oub{+lfPY&_>-e_`=-yigVy^x4F!ksKsHcOfYV=h^}tlMU+
z!I0!WB__Q0E~}29<a4IOL)Q^l#k!U1GV>h00e|FD^;WzNuTN1WAJI6Bu|zT|0I+9_
z57DsIt%p4W<&fPwSPt7U*+S8p0B5s>GuAP!+rB8UgQX7Gf>@qmfh9(Y7vV7rjULsS
z5XOCvl-<!?b8q^|#_osJfkX|#*xx~x@Z@f;hM;-LyNxw5=eGX}2BYg6ZwzgFhWICV
Gi2n<m2l6uj

diff --git a/measurement_device/__pycache__/base.cpython-310.pyc b/measurement_device/__pycache__/base.cpython-310.pyc
deleted file mode 100644
index b73bffce871dba709156458735c8d2a93738339a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2128
zcmah~OK;pZ5SFx0uOG1!r)l~Cm{YNUyNC7`ER48zUG&gR5W79B*ATek$SXt=Rg$vn
zy~ckgKcJ`n6J2}iIk%oVL#?#y*hUF($RS7k<}JCo*>iCG_2>5N`?ll!P0Z?OBJ&ET
z{tk(7gd01FJ9ZOq?775yaU*Gto369w{N#v+Xx=!Y3GVyGxFuRAPQU#Re&_VPqH*xU
zVX?)h+9)2F1k6l|zFTw;c^va;3<1fljutYnaOxQnaK^51#vU}pwnb^acgIcSc0^lr
zZd~MAmg|Z&%e9enp#xp$hTd~0^h8gr-_TcUc(WlkZyenBaK9xU+5NikP~XSJ&M&}q
zt{{Qb9KmH2K+#rUa+Qt(7gebS?P(t3{77yRE`IOL;~ra#-#|s-H8V4AkN^|*H5O^6
zO%%s0Q!)b;U$a1_DFg<@p#JvfkfqY>F~uVdnjMxBkxYM7N~&6H^uhVy7EKLtsJf_w
zCI8M2Urv72p!DQGBvBfX&y7@*Bhc@R%qAx?G*?`~<jpmPA+45+$jtKTB%4VTh7e<7
zcpAVYSvtfoZJ12ChCy~+JTjn-ztA7GTSpzVhosq_zqsSb!6(wkK?6mrLHpYdbxzQ_
zk+rGcP?V@eGmrv`&Lya+L<?)16(JW5m8VZ|^U<o{&7a;?0VM*utp@EYRJDnW+9E;^
z_dScLwyT2@&LXuGXfV&{<}s4_vwM(8;=z<r9g8pz>R7%7E*NJzN-ttympsm)w{l4t
zsB8Y)a@72pi4qJ2PqICBDPzMg;Jm&pU8vUXv7@ID)wf_@;&mCjwfR@~nNtY{D0pks
z{wr<b$LQ1={FJ{#Yf6<Ep`m@6@z8)`!zjfC(f3(`6@jUasU-AZY4;nhI5rE+<@&*e
z>A2KK)idlR!)<*`bvVkCDI&@676LPpUGd1UDVQsOv{r0cfq5pl0YAii!Dp*BbvBYI
z?6EV1*<)cWd9|FMGpSg4D>H+&z?YqX6ggn@6kU`Z0oy=;y$>+v))&BoS)~TM!ct^e
zZ95yL{=#+pdu&Ltrgh=f{Q*0*?Iq-SY^cAG8cRzO{)e9|Ygm_F`X6<deyd}KKEr+$
zN|g-Q31Cl?7Kq^qx;?~3W8eW*>X5v(o%BvH>-$pkCA(7LpVa#L!lcvJN3XxZbSzW%
z$^7fPsk<Wia6R6x{d<e0<NMf3eSe5>W!XQ!3$~EK=7IlHXViC(`x`~q_fyPc-!FQ;
zpGc9%wBPXk-*X<9H;Ve7+90w+g!)*~GI<t5(XyGQcIo^nk<W-M9b$LXmlXXqsZr`L
zkaQi--Eh4Q&IZlTU2nbTdb?Y$l^gZjMT1WRMLp2M7j1K$VSOt4pIMpvK#K0LG-00#
OUlaJYgYSF0?f(D*#s_Ht

diff --git a/measurement_device/__pycache__/base.cpython-311.pyc b/measurement_device/__pycache__/base.cpython-311.pyc
deleted file mode 100644
index cc7d7f686db2d733263cbb523442bdd7d169c455..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2538
zcma)8J8v6D5Z*i9Q4~em@k22T+rS2alMrB-BB=~Ph$2}*iqM9oq@buAmUnyN!S~AE
zo)ocCp~C;bE?qe>45UkyKj9*Ua8-a*>1ZgGtIXW-mXgRkR^;sN%<j(2HxKH^X0uLU
z{QAo~!%wS({DGTtn3Kin=dgH69O7s`3ACOT=sjJ-z3x{6qi1Mjk?7=0;#7`_V{q+7
zg^*Y9Ek@6D%q`NY{)yX`o>kVqSkEr8K_UgSWx(Yya#~teTW7w{20phZ_wq^E@H1?m
z5>9%WLwY)|ICaowya4Vib-rf+f5|bAwF`VR=T~R=Rp4uUf!BD=)o-eIT-{lid3zDg
z){e=Am+Qb?oZ&7xI(Xd3u6)f|k_sO1P;T&j&*oWGaG8p*Yimj!A-G1oP9X${v<A2J
zkzc2i@humgdr0MwNg$j$`CHUWXd*q|r?H4)F8o7kM`6fq$(@e6`;|+>NVch9UcwW)
zUYziv@V*d{P{+D2$xAIW67IVRnnT|X*YEYeNw`S*Yfj*W9>z;XqQAkD$1;lhTahad
znBe_~hY-TBoc269Ob7jV7{OugLOdl4ZQc*2P*{ci{Q*mOCqB$BOP)w;VmnwidT$1|
z&V?gOU}CZe<cN$LWU=|gIE4+_v{l-{?jo#Y3w-Pf%=lJCG+@dMJ92oou+POH0(kH?
zU@n>{tB5olEzg<)>}w!DT>x@Key=s27~(RlZ5>EC=I9nzKv-zkbL|43N$^&w(iA-5
za&%*kQWV_42bPiK`cOwXF6t{%$X4-v#F;}GO}uc==X9U>DX*UqVooM%|8X(Yen)x%
zgop)ko9;)xWP5y92@60)9uc%+f?i#KMk`k|x;@XIQhE#Sl%c$uhqCal^bF^@-my)9
zPMNXI9)n+naTIlfrwL`Q<btkvAxvP)Dh;4spb#M0oTM{F;2{$XS`lQsdT;^)Oo~-L
zL+?>oDmGSWHw^}$DRR$gpfaKd%#(D$<pJlRGHhC(Y3wk`EjJBqc(!bUJKZScZMp+$
z+SK(UR!+OSG!nFsMzMryVbeZ=hOAM13I#>KfF@x>XXOz691G6uVQB_EfMTVw@|~`P
z)&#oMHeJD}<2*riwL`b_=Hs%|m)L#KjHxF9`@ssPRh|?m{fD_z+*Hf}Gw5b+B!Ujz
z;?VJ;ToDBh!0tjTlKdY`Q6YJhciEX>DtTe~beorDL9n!n2Cy{oX8Xa$gVCMY96lrd
z5H6KT{K1(d{<ji^b~J4XGxf7zS<rDUYjkr~@kF$Oma2Bp(nSpz-IlfqKRq?e3L&E{
zE2~>p5IL!j>xN~0pEAFY2m|k5LUJ7mc9+bQY3%dN%yUlQZ=%2g6?c$e=gf;U$46iT
z%n9<76Cg+G@5H<|)=jfHCM9`OA=T^0-xb_Tupa9g%1ff;$f*7=dChD-yZ`*|Ps`8S
zzuo?1Okh7H>OJJXo4<Dz<v^4O86TZfr9`D!xq*e#=x?`G%_?kQ3;e0b5zMOcFotF$
z@PCy8lk+&et*sORSQU5S2&P0b1TwB@ns!3oe?9MWLT<f2{}~&GW{ex3Y2d>wc~*IY
L+`s0Ca^wF7bY5*e

diff --git a/measurement_device/base.py b/measurement_device/base.py
deleted file mode 100644
index 2a8d716..0000000
--- a/measurement_device/base.py
+++ /dev/null
@@ -1,62 +0,0 @@
-from abc import ABC, abstractmethod
-from typing import Callable
-
-"""
-Created on Tue Jan 21 16:19:01 2025
-
-@author: Matthias Quintern
-"""
-
-class MeasurementDevice(ABC):
-    @abstractmethod
-    def test_connection(self) -> None:
-        """
-        Verify that the device is still properly connected.
-        If not, raises ConnectionError
-        """
-        pass
-    # RUN COMMANDS ON THE DEVICE
-    @abstractmethod
-    def run(self, code, verbose=False):
-        pass
-
-    @abstractmethod
-    def reset(self, verbose=False):
-        pass
-    
-    @abstractmethod
-    def read_value(self) -> tuple[float, float]:
-        """
-        Read a single value
-
-        Returns
-        -------
-        [timestamp, voltage]
-        """
-        pass
-
-    # def measure(self, interval: int, update_func: Callable[None, [int, float, float]]|None=None, max_measurements:int|None=None):
-    @abstractmethod
-    def measureTODO():
-        """
-        Take voltage readings after <interval> milliseconds.
-
-        Parameters
-        ----------
-        interval : int
-            Number of milliseconds to wait between readings.
-        update_func : Callable[None, [int, float, float]] or None, optional
-            A function that is called after each reading with parameters <n_reading>, <time>, <voltage>. The default is None.
-        max_measurements : int or None, optional
-            Number of readings to perform. Set to None for infinite. The default is None.
-
-        Returns
-        -------
-        None.
-
-        """
-        pass
-     
-    @abstractmethod
-    def __str__(self):
-        pass
\ No newline at end of file
diff --git a/measurement_device/impl/__pycache__/model7260.cpython-311.pyc b/measurement_device/impl/__pycache__/model7260.cpython-311.pyc
deleted file mode 100644
index a3dffd22c1951936e02d54897bb9f56403d9daae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14303
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
AT>t<8

diff --git a/measurement_device/impl/__pycache__/sr830.cpython-310.pyc b/measurement_device/impl/__pycache__/sr830.cpython-310.pyc
deleted file mode 100644
index 7eaadd9b80827ff829f517058c9eeaad32b6ddb4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4346
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
JqflQn{ts`8@`C^X

diff --git a/measurement_device/impl/__pycache__/sr830.cpython-311.pyc b/measurement_device/impl/__pycache__/sr830.cpython-311.pyc
deleted file mode 100644
index af25bee80d183aca6db84133c4b06df706c836f4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21800
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

diff --git a/measurement_device/impl/__pycache__/test.cpython-310.pyc b/measurement_device/impl/__pycache__/test.cpython-310.pyc
deleted file mode 100644
index da7b6e37405af30c89ace1ecbfdf9ddcd9060be7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2707
zcmb7G&2JPp6t`z)KeHPG1PC8$Ed+&?(x?YcC`v&fdSXE&?O|Coa>gEZ!hB(Sl4cc7
zMB?9oV{ZL>=GsGrda1;%r@l9{JG)8Rpn5gW&*QP*&%gKl-X`5{n?QU1+tTRIIw8N~
zV7@spcmR(^A&8(MiRge*A}nEtR%8$CLU%$Zat5_RuZ8tN<0m5OqH#z>L(=#5pebsb
zq}Tjx!8SdbpMNU3&XkN~Y#z(qz>}Y00%w|!co_2SP=fB5Ad-C#XXaaNGSIuANHU;;
z3@ouCY-tNe+P?FF_*B$H{jfW5#8uG}?L)vOu8EH59@0S_v_)|av<7HP;yh?gz}b?p
zgKu3Wz9lY*i?F6Gmc^w*GFT9o#TDo~ABaN+T{y}0{Kl5l=9eTi{IxuFnm<a2fBiU7
z?mfs`JW9jBWJ2aGU&*(bjJ<u&o;w)o$Pf1VCI~~`laKThq2z!b5Z5}eK-$K6PoS>}
zvPq6;zgN#|I!mR>o30zgfpJ~cg2f6Qo7-`+ms{qCo}D{dhW>2oh~_QV^+K+->mHH6
zqeu6LKWnM<@S%ucA8iyji5fnZ`i)7_;b!8SJ+9>N`Mwz?@w9s#m{GPpOh*ZPEd5Y=
zhR2>9Ml%PyqVVuA00M>vSX)c?RTt1T;L%MGZCZz4hmLQbMe5r0e0g0-lc~7xQCK`}
zsN?epo-Y`;NRV0pMO_4OMAgz%FJ7o+80O~?kn1IJ49J5dMqFRe3l1Hxo{8qf!Y8ME
zIR&FGqumNf&n|%Ej+a0zG<K!hPJnmBIETwtS$rN}T?H{_XCi@5|F7`{?WrI&ZpzI_
zU9U_RAPQdEu&G;qgyRy%ov*=|tniS)X+!<LsIW?({2PFpl3JQ8u(-5+^K9Gr@v(5g
zTZEYc!$IEzfw$>^?9dhR4sO$qW$cfRpvK;*EyMkShwRj^lTV<%v*5m2z6JN(8hdRv
zX)h!fj58g?uS3apd6>!e+$2V%uEyV&ts1|?T&4{qfmOC!W{p?Xq(Xjr4YdfJI)?&p
zaBjtEZiBhpN`vA$PeX^AobH~Cn6?6ZZUO5Wtk#guNvFwZla9aQw`!dSOOCav-^%+$
zkr4g_99kjY;%|V8@;nRy06Cg*-$=#QgBUshw85ev3<E9UnhCu&Bkeg?Jd*IyDc*p+
z%EojXcAtS-y+*I}vuGPECH^rB%p`1&2Zn7+vnOR-0b8pUXQ|*ux<1?-*mhcTUiOn%
zuCkY4W|jG2!l&J<S1eJioJ~^96FjW;LLd(rZiN%fjJRQeW*!tW2?0}ZA-Ol2!eD!l
zGg(@lovp|2gu0DYwvK^<{e;zxHMTX9Oh}(+VX-m7n4Kizzq)hDR+lV&1@4Tu%4fhC
z6cImB(Hh&72027S4Bi0kK2{d_A5bbLUKDBhlryXO68UU67s4mf-@@cbThAUpy9*(y
zF^f1C#&^%m0&|Ow<pK=jX(+4jV9>Mr<6E0Sl!Xulf=$Xedpavxto&P2A}q4d34{&T
zg%aty>#$v!p>CatZSr}~QdssBmOaofLD%omC%r{1-!a?<*Uj6m8zmwOQSZ3!+l+^k
znOYH)Me$TCxXld|-=O#wL|!vl8cKB=U)(`~+~wU#o%duI!oP#rL5c!Xq<2gf_~;8D
znq-Bx>uslPx9!Vzb8%@|;asnkJKG#e75XBtoBb3nyTVGVFwqv-E3d^_1m&IK3tTj3
bt*~1Zm*#qTz72GW#y=_@(t-Nlq|4Sn06m;-

diff --git a/measurement_device/impl/__pycache__/test.cpython-311.pyc b/measurement_device/impl/__pycache__/test.cpython-311.pyc
deleted file mode 100644
index 9f90df2cf260a9908b074df1338d987d9ddd7f5e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3397
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

diff --git a/measurement_device/impl/test.py b/measurement_device/impl/test.py
deleted file mode 100644
index fa24978..0000000
--- a/measurement_device/impl/test.py
+++ /dev/null
@@ -1,61 +0,0 @@
-from ..base import MeasurementDevice
-from typing import Callable
-from time import time as now
-import numpy as np
-
-class TestVoltageMeasurementDevice(MeasurementDevice):
-    def __init__(self, amplitude: float=1.0, frequency: float=20.0):
-        super().__init__()
-        self.amplitude = amplitude
-        self.frequency = frequency
-        self.t0 = now()
-
-    def test_connection(self) -> None:
-        pass
-
-    # RUN COMMANDS ON THE DEVICE
-    def run(self, code, verbose=False):
-        pass
-
-    def run_script(self, script_path, verbose=False):
-        pass
-
-    def reset(self, verbose=False):
-        pass
-
-    def read_value(self) -> tuple[float, float]:
-        """
-        Read a single value
-
-        Returns
-        -------
-        [timestamp, voltage]
-        """
-        t = now() - self.t0
-        v = self.amplitude * np.sin(2 * np.pi * t / self.frequency)
-        return t, v
-
-    # def measure(self, interval: int, update_func: Callable[None, [int, float, float]] | None = None,
-    #            max_measurements: int | None = None):
-    def measureTODO():    
-        """
-        Take voltage readings after <interval> milliseconds.
-
-        Parameters
-        ----------
-        interval : int
-            Number of milliseconds to wait between readings.
-        update_func : Callable[None, [int, float, float]] or None, optional
-            A function that is called after each reading with parameters <n_reading>, <time>, <voltage>. The default is None.
-        max_measurements : int or None, optional
-            Number of readings to perform. Set to None for infinite. The default is None.
-
-        Returns
-        -------
-        None.
-
-        """
-        pass
-
-    def __str__(self):
-        return "Simulated Voltage Measurement Device"
diff --git a/Bentham.py b/prsctrl/Bentham.py
similarity index 100%
rename from Bentham.py
rename to prsctrl/Bentham.py
diff --git a/prsctrl/__init__.py b/prsctrl/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/prsctrl/__pycache__/Bentham.cpython-311.pyc b/prsctrl/__pycache__/Bentham.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..715fc1f7f32152c1218aa1f661d4c9ee515a4145
GIT binary patch
literal 3877
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

literal 0
HcmV?d00001

diff --git a/prsctrl/__pycache__/__init__.cpython-311.pyc b/prsctrl/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..7b9ed6b2cb83712b092e96ca80be6f9750ea4fa9
GIT binary patch
literal 205
zcmZ3^%ge<81a48%86f&Gh=2h`DC095kTIPhg&~+hlhJP_LlF~@{~09tE5X?+CbT%U
zs5r(kB{wrKv$&)vu_V7J#wE2lyClCLCOAK>q&%@GH7204BqKi$Mx|$#WRxbw6lCNB
z6{n`<q$Zan<|U`b6ci<w6y?Ok#{-QjiI3MSsQkrYlbfGXnv-f*#0s<!<fLMLAn}2j
Pk&*EO1B@tQ28sayw~;sj

literal 0
HcmV?d00001

diff --git a/prsctrl/__pycache__/measurement.cpython-311.pyc b/prsctrl/__pycache__/measurement.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..e82a8e42c68e99eec0cf2a151771a02b5e5c3946
GIT binary patch
literal 8808
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

literal 0
HcmV?d00001

diff --git a/prsctrl/__pycache__/test_measurement.cpython-311.pyc b/prsctrl/__pycache__/test_measurement.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..fabeff80947966bcc24759d56e7ba4016eb5a8af
GIT binary patch
literal 11668
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
K|7NKAD*p@h%Vfm>

literal 0
HcmV?d00001

diff --git a/prsctrl/__pycache__/update_funcs.cpython-311.pyc b/prsctrl/__pycache__/update_funcs.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..74e577005642d68149b05a14696c8a8bfd6ceb9e
GIT binary patch
literal 8435
zcmc&ZTWlNGm3M|iawrZZT9IX2v1H1kY_nGFq?Y6O5p7*-lSWx9?b_)>QNqxgkwk?e
zr5Q?=xYVwIx+uLMuymlp#8yT5;d*6Q3kZvT<g4iZ`6C}Q!T=%$Fi>E>{Iv?)0^NLc
z_nbSN2T9561`F(Hbml(JJ@?#up7-)!LZKD{&!4ZoIz1aA<Ug=tJzTBud=LuviAY2y
zMP`{XmNCnoF^(ng5Rtt@M9)K(kjL<EK4V^yxj|ywGpvqI)LQAsSF1e#1Pb?wM8+7A
zjIkm!<`LUOPU1wb<du9!YG{N^a-#2!cg!#P?~pNG<N*f60KgWp1z=DN0u)36U`PxB
zY!zDpwuvlo5H|eRGwEbDBj?VyMBu5_B8!nkT8tzkVj`P}B-4>ZWHynVOJ%aD<gLi<
zWLnJJrud_88@{Df;+B*$yojqzcx}!I!Oio)|8p5O>u2nJlK13E+(yWAP-Cp>6oHz(
zMYM)v=~G}Q8IifeX9HFXA=#i)zRNxYI*)By^|fL05Ktf6=rE79%~U-9XH@;x6qI}3
zs%2lXN(9z8<IL^3LpHg3)eyaoXhmNR2CjIs2c7XV_NwdG#E?2H!5WeGiayaV@?v1K
z<sr!Cu`Qo**lXAcP;2vna;sCGvCE*?<fp6{oMau&_Qe$(oJyNT&Hc?Y^|ArJ_mL^=
zl)azzW9n<eq{Mv0ulU?Mn|B$=iXVFH)#Ux|9d@`~;Q`B*SS9S{*(&Gx$^onF{=!IG
zQ=x2g?dAgJ4LP$xt<|Y*wmk&<cx*WoA_kql`n58oex%$1Jhi)dvC56w0pr3BRrw%{
zb7`eDiV%_CW5xrnk!N6JhlB5wU<MbSdkqaeF4@%UK3!eAYpz#eE|>1t&E>*t<haBX
zTSNlx?Um69+a<tYR5V;P_1HgW?h`cAk2+Ss!;0WuL{{_w<ko$6**xR0kpqF=V~YoY
zpjSo*HEQ@Waw0t?-HiDRHnC**mQ5GvNhN0u??fh*kqvH2PKt(?c03|6kHMaK&0vx;
zTEBwo5{aySC0@HU{(&ON%J@}rHknQ;SvdjDczjq=KFwz4#&2XMv$qqnH2%Hi>~tn=
zeWsGx>4jV4bJH0>mL^luL^hG0kjCfaiL9I&Uzh_|EX5}m(i6&=x#h1~uB3qSL}qqw
zC>O1H_%rc1%$JSF&s<4mCK4%S2nrS!T8lCQ;7_Y$myp9hVBJvt`+q3UZw!Cl@q|~$
zK30>n>ftoL^NZ^3C4GKbJG|^hH_Oj~8mW^8?g5ns>TgXJ+zK;=d+ohJ<S;Z-@Q9Vs
z><lKZ;O<8vG7ghb314nG=!lfV09J|GdER`>iIQwrWK^;`=5Qhxb9qn@M<GBF*ijjS
z8|5#?7|f!Aie_^56@Mj_n7t(?hH}SWwA&^QE=@sNt7Kz-t7G%_DxvHERnMo=GM(lb
z5|6RZ(6c;4Cw22}P$>Uoa!N_&B*UjngN`g2er0|^l5!GN(r5n-kBr`3#`VWor!1p<
zWegEAMw3{l5uQyf#pg1~bXJKg)0x|8Be0-I@i`e<3@?OxpzdA50B?Ay<{O@rls5dC
zxok3%R=@yg@CS8IrX|Jj06D`mm&zI*=r(v|;TGl&iopTPuhS(NEsB(l*HQ;xVs1`K
ziw1{ShA$;eL5*?=V*za$?TQXC4J{ThI7LcL${5V3MafYt^#d@tbUd*nqf!|j;E&Fx
zpy@{<pG4?G^~c~X3&@2VrG(hZWzYf8|7zs50;luc)g#9XT(Px!@DO}jYM))U(Kt+P
z|05y8?7J*{M%e3UJfrLl_DihYWdC4(pf=2YfHnM>!=Mdp4VnPLEJBrP>#xuM>nj@{
zJnGu)()tGVzClo1t@FIzc^*)LHAbGcwU-9huBiQQ;M;aVYrCMgUHF{S+ur&eqqSWv
za8LPQ(SJ8k3={%SyCdu48__N1^EaME)gOJNc7LpOf2;%KyMSf@C|#(wcdnf*_tL+s
z<-WB6=<rv0q3AEM#o!L#v(5LE7d8Hb&Yw{E6MyuP_Cr5c%7g2dwL>TMLnpNZr}P7-
zc1bYs%`XuYt|G;O^8DJ_!nNvwgKLM%uas}DAJGr=6~0py!o`stp?h2CF5mjq)IU#E
z#0N85(chf@Jn@?|PdrcF`9e^~<LW0<`uKEtO6y7LJxO)uQ@tmp3A4H|s|vGK*nkVg
z{4QZaN2}rX`+?5__kwG|QV=`dDE=LG^k9eoGk=-87g`IILfCb_n8U71*cJRNSiV;A
zu8&ma*ROA!+gRAVw3XO=OABAr!xz=?MZ|xzxPtiKMEuZaq4GrK)cULz9?-)BYIxwk
zb`QZ?>8eeif_}t$(Ba|#^WOr1T$s#QJ$2rt;tp9hMswZ-<8A6r{!y{B2zw|LnzDht
z$J)8!i^kH(3jPl#kNHev4xp80li8FczYfiYZz7RiOn|+Ma^kijOr{o;>A18gfqwyS
z{wAV$DZ1OE8v;@RM?`ya9hOzPThYRm?*RbAq{;}PeuqE0%^xj)pz(b=->33@*b~tC
z!#jNUHs7uB$8`Rf${%x@`?vXijX$aLCspfxfw=w+rmGj%UmzkFYd(&!DyRfa&mJPO
zaa?0xO1vndN6aXsD^wcbf5A_qaE5@S{8tFRjo>PPItheuufa#xL~zh80=xMeIO=Zz
zm@)|L@Lk({SNXig_v(DF%J(`O{g>{)TlFzfqUMr?f|(yUM@KjelB{bVvo6(jr{ndh
zVSR0nW1&s4rsQ=w0d~4_0-8MTnXt%*0Mos%X0Fm}?WQcjHt&^peGA7~iOOZQ6JIk?
zsa4F(fRj%GqI?QL48dstj~HrKt~>-nHBOWZ)y?}F;3|UvKzg-UM(3eX=H}*yTI`}8
zyQuYD()%vK^jha-z4J0gngaYaTM6zvrX|mLkloj@k`+&#>>3X8!{noDcu-y8R=j!d
zDpTb1UblSnoRgO2Jy(Dc=(TOc-CJ>K2%y!T{b<!|3PXy+c~U`*Y<e2)7BxryYe0+n
zO);H-vJsHd3$qd=_YxJBJU|=K+Gyrv2#|d#*|?dxgIA?4l3Q9#z`e>cK**_*VlAs-
zmKEfrE|<wHN-~@`Bqx`#T2R!=9RMKj*7oAePHWG0Yfm|=wMO;UXu<Qeqq{6=9Z|g_
zx=TEPK??2;7p@lOt8L-Ja`{yCcwb?-_+FVQj+W19!Z8}HOY_C+J3`;K&{r9L@ZJ{l
zU{n*%>B2dczQ5;%9sbBRe?;S7)%jOd>uuH_TnW{mzXd7ZCs~&V0NL2JdU>qCHIm~K
z<q?s|dwxNF$*yo&q*Z(J&AN1+>XH{O3pkOj(-il$i^tKaUl5VY`+zo=gH#&m+t)9k
zX>b>Z7c`=8)8BZIExzIAes9fb4(b03_dl_@_pJ(9`$~hjE-vUb2&S*}$-7py4-dZj
zorNPfnZeUY^LW?Ft$u24`^e}8l<dnXhYqE*C*O_y74Lv0+Lu;t3VT^%j33Q$>Bw7=
z96J!92cet?YxMHcw4kq;5T3Q*#1U&X-6{31{Xkm2jsWAG;iYFG`5czn^qk>IC(@0k
zOb<x%D2{m_05||NV;R#G`TGD2CT%bZJ(|cjpst{@noO7{N5f}2fLyEPvd#Kih&%ur
zy-J=6Z6$84<?j2%_X|ul*j60cC0t;j8ty91ms(0Kg{w~w_g4C~!>9DakbbkF0SfMM
zC8qRxHGDulc&Qv+AAk(^?8ZsG>swHVcWd7KYT-*I=4tp~DN#OgZ>A!u;nQ09v>rYU
z1$Z&AL%M~AU5?s$Rh<Xn(1QSQd5~Y;TAwWUqSv54WJl=T7J4hanh@26s47I8{mF<X
zoYjT1s&KZsugTW{Q!nXj>{yk8t^7K%3N9;MQDhJQvOq1=v%-ND*||jC<xlp>9Jxj<
zuk%gr@viwnDQXX3TSfBHl+g1wJ^S(9NVT{KR_OAz4xzoQ(2R#XjfaL$TFT<_p4t{>
zE;Ja*A7aU|9j|FS)D$Ta9_UT0!7ZRxW1i!M+I3e#mJ`d)slnZf$*S@IfSIvcDhy|U
zh|Wh;K7uMdsde=09sNx~@c&0|ZLbPkqoh!qp8uKZ?Muc;24ra;5apZsy85Ra&?EA@
zZh1qlb#(=!qOG~^ORowYfur0HVB4J5&ya&C;>6K<Jg2=WZhpr-KXCL7;E3HjcWcx%
zz}r)&8}W*#-E-8f@ukMYXj}7LKN;B3%e_C1bMG_Oj<_!xYaP7%04Wx9g{mktnCEbM
zTed`Rp=Aj_t%-$fMuGcXDZZGLZqxH%!znQ4F->jUqEfq^u3fWYBy+6Fou=M|9_2p)
zG)E;p7(qMwkg0rsqeG7kZTAnU{X@U+>{^?`+mjC&6PDO&xMR&<X4ir{;plcaTDkdP
zY>U|%)(79!UVB&XA9*tT#fbXDAANCM3y<mHF_pgbZVJL$044!|_eZV&^xc2_?%k2%
zNMQsj=2a4;s=9DYr7t9;*3H%NZT`5%M|D1`@=<L6dRGOu+QSB*!B7Lmcwe8yy3E66
zj*afrIW&0WGe84=L`Y@ecL6-U%Oe2X$2xyJE=s9*JlAGr3AKg^MC<|p0)gAUKq<Nw
z)A*x0e^j+z^8m??z70S9!UbqLF)PL6MoT<Cn-Ld4N#bx4iO(-2QnenOD>DJj9{6d(
z;P4j$xYS9)&kUE5wQC68LGT^|)Cl=w1PKJFI`TAvFao?}H?Qu|mEcdp1YNoE?*LZq
zzg?E~@*r0LzAi7^r2!}_^s_Oz#cf`q#YXU^#|znx4O;9HZ4+4U6(m^$yx)6tm)M{^
zgjE~#_^@h&a0n^epoj5xgYq^3b9J~T_)X}5^J6*u{$gHgo8Ovr;V?M2EdLm=={7X%
y5Bz{&iepGt00lKo!K;s555q83a!jp%tE64E-d$guVSvHC;g_`i5Bv1eCHxN*dv{a-

literal 0
HcmV?d00001

diff --git a/prsctrl/devices/__init__.py b/prsctrl/devices/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/prsctrl/devices/__pycache__/__init__.cpython-311.pyc b/prsctrl/devices/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..144d757902471c5133cb8fa54d99c4df2a3e52b1
GIT binary patch
literal 213
zcmZ3^%ge<81a48%86f&Gh=2h`DC095kTIPhg&~+hlhJP_LlF~@{~09tE5q3;CbT%U
zs5r(kB{wrKv$&)vu_V7J#wE2lyClCLCOAK>q&%@GH7204BqKi$Mx|$#WRxbw6lCNB
z6{n`<q$Zan<|U`b6ci<w6y?OEq?TnSrxwS=#{-QliI3MSsQkrYlbfGXnv-f*#0s<+
X<g{XbAn}2jk&*EO1B@tQ28say*!eq1

literal 0
HcmV?d00001

diff --git a/prsctrl/devices/lamp/__init__.py b/prsctrl/devices/lamp/__init__.py
new file mode 100644
index 0000000..4ef0818
--- /dev/null
+++ b/prsctrl/devices/lamp/__init__.py
@@ -0,0 +1,34 @@
+from .base import Lamp
+
+TYPENAME_DUMMY = "Dummy"
+TYPENAME_XENON = "Xenon"
+
+try:
+    from .impl.sr830 import SR830
+except ImportError:
+    pass
+
+from .impl.dummy import DummyLamp
+
+def list_devices() -> dict[str,list[str]]:
+    devices = {
+        TYPENAME_DUMMY: ["Dummy Lamp"],
+        TYPENAME_XENON: ["Xenon"]
+    }
+    try:
+        from .impl.daq import ShutterDAQ
+        devices[TYPENAME_XENON] = SR830.enumerate_devices()
+    except ImportError:
+        pass
+    return devices
+
+def connect_device(type_name: str, device_name: str) -> Lamp:
+    if type_name == TYPENAME_DUMMY:
+        return DummyLamp()
+    elif type_name == TYPENAME_XENON:
+        try:
+            from .impl.xenon import Xenon
+            return Xenon()
+        except ImportError as e:
+            raise ValueError(f"Xenon not available: {e}")
+    raise ValueError(f"Unknown device type {type_name}")
\ No newline at end of file
diff --git a/prsctrl/devices/lamp/__pycache__/__init__.cpython-311.pyc b/prsctrl/devices/lamp/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..fcf62f5715c4325a84553aad482ab4028cf9d018
GIT binary patch
literal 1776
zcmZ`(O=ufO6rS1Hm3CLM9Lv9rQz9#dR+mr+seh6dL~Kf+R+G9eu@DGZJC0QEk2<@G
zW5+I{<lsUM4vn$s5A@`=<dReA)z_ZZ!G~o*5GXnHCh$e%)Hf?BmXr1|`{vEt_h#mO
z`@Q|OuTMoF4@=`EgCO)bUvwqZF-~^C*hd=Du#OCz#TaQqR?tY6DBLURq9J7^jLgU-
zL_?E^5sa3RDXydYWErhvh>`TLA!lXC3{i!uG(y#Py62!(q1V>J55;U$lc}mfB*f#@
zkfwsKPm3&~RP-MVi7D)hpB9XYFU?gAW5bv3P}4HOD=mILedPl%l;A}W6Jpe<GPC&l
zKrlpjpkQ>e3u+%Zpu3{syVw!BD+I;f#bsd|L9qmi6%4Ws5ID+d#8*<+J^<rscY(H0
z?>^VTZ=Sn^oapNS^fp*q2#S<4n`&_X1TTQ`?HRuj)TJ(#s*Xe1T>5q@?8m-XzBQjo
zFU;rXmKGM4d)9a6GoNLAxolMQ%Ua=U#=kS;pVS|qX4Rmq;LyBA@0E+x_9Hiqip89H
z#w?Z+{BXw~B-#AnMB<fkV>Y*BQ)cJVno%~(wgX#OEH_8(HOH#t7Ohohy})Sh)`nBE
z%<goz?3Ai2xk|}`V7jW)qEj%7G*@9ohv~V_NjV+r%;od2uanPTu59>G9Zu+8kj3E+
zeel?2P&M>Y9;sib#~Lt=)|IA2`a`u(nzAVMdGh=2+0jV8cbuF#N?tooUfT)p#g62Q
zu6(i8h>SE5mikVWCr5Y0CIMfo)p`+$*D`iLoc3hmL-dE5Cgf1Spnb*JsL;GwFsL7C
z-#%Crdl-ZG2MgHcfw9kd0CQK?f=Cu~ctl6e@@A1|aE5lIlW`Roh&4echPW+YB%m$f
z%{*XN(9rEfVAtq2aX4@t(a0A05&bM2KodRXjTFeY(4yPq8?uhOEqf+M+(Q4A11#;3
zG9c*YaL|JZ({d7pdxf%ISkdWhVsmK8Tr;h8GtmYs!Qo4!!Yl$uvoKe@AAB`n>V4kE
zZN78tef7(NUZrhbifoWa4{^l-_A#|NNC^-&z#XxoWtu>+4s96!t?<Ww4625_@VULr
z^KjA)Cma1^-#vKrz?IK?N_@|Ju1vbhWK$58SudJ$&kk>JZ1?KpsV7rAnO39!JP<~i
zJynhP1^3<QXSYGYIEv34$7kH=3{a>ATvBFXeyI+*!&ATA1O?+rojz8lU2)nThFcx<
z2kaUphbW$olf$@_9wnJn%okS*&}^I{ZKQfYvKjp1f?j5AklIboe}n;`zNnRpj!&RN
zeUZ0O&^`egzoQe_5e0C)lCK+<R@LdpED1i&2Kz5iaBYk|G~%8eF9ybHF^{XJ2!(m#
zg!|TLdEq!fgOyX|iE?d@Z>exZLI@{aG|@YnqKXH1wfdF1^UIB&HtHW8kEEIid~d2T
i1<%xrO$5_35=?)J!Suh%=Ab<a4WjR*aq<HmC;tN7&95>5

literal 0
HcmV?d00001

diff --git a/prsctrl/devices/lamp/__pycache__/base.cpython-311.pyc b/prsctrl/devices/lamp/__pycache__/base.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d8c85b8df1b9a217155f3195a609f09c5ceca5cd
GIT binary patch
literal 1129
zcmbtSJ8#rL5T5np&N<x$AtD+OLZZ5Yh#DcJBuF&qKswP_7K_ij<}CbT?E~ei6fP*~
z@(+Td{29u~RU|69i;gN4GwZvY@{od*wf%W^W_I@bX7^{W*8v<)KRy^gVgSEsvK-dJ
zm_I{f9|Q;%L&98^7_Py<fY%_53WRxJ036}h4A&Ia5c>8Xn)Z#_+}hr$*ZomZDnBR_
zS&lOiEOPbFTukOM8v7u@WddA7nu1kufWD(e0)T6w7x%p6wb5(JR%i&TvM$Bi7_+ae
za6}6^wrlH+pX325KObZhqj?K~R1e{h4Gs}%tB`S6P{QN0Xy>{2zL2W$wnP%85veOP
z<-L-{=Q7K^VHTF(d?meiyC^ta{ys(Jcrx<xafZn<jAc;zX&}8^1*M8TA-_g}EW8+5
zc_Y7&oB3{SWa+d`JU6qH&Sc(3*n<<N``wzO2{-Xq4koEJ0y^zRf$E}Jn^_o6ou+sg
zQem}DaEF2|CCiCQZ&BWk3XbeMdIN0}fz=kbDD7~rWUe@$_H^~-w0B{HL4U2r%+yaL
z=XHnkBomXE>@MeDCVt#R6!lf<rFTiWHOjJBZIJUmf$kmkM0ZWm)zCl}rKk}0&YxrZ
z-ppWjZw3gbCbTxH5882ZQ{YFb*R0^bR<F|ap=nx!zEzw4C{V<&(WWV1lyT;~Xu9!I
jJ;Xe^*Tq|enaLPCh9|$SduLXcp|-1VO1{6>1T?LGffMN8

literal 0
HcmV?d00001

diff --git a/prsctrl/devices/lamp/base.py b/prsctrl/devices/lamp/base.py
new file mode 100644
index 0000000..e481c98
--- /dev/null
+++ b/prsctrl/devices/lamp/base.py
@@ -0,0 +1,15 @@
+from abc import ABC, abstractmethod
+
+class Lamp:
+    @abstractmethod
+    def on(self):
+        pass
+    @abstractmethod
+    def off(self):
+        pass
+    @abstractmethod
+    def is_on(self) -> bool:
+        pass
+    @abstractmethod
+    def __repr__(self):
+        pass
diff --git a/prsctrl/devices/lamp/impl/__init__.py b/prsctrl/devices/lamp/impl/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/prsctrl/devices/lamp/impl/__pycache__/__init__.cpython-311.pyc b/prsctrl/devices/lamp/impl/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..95849599bf98d635fce20c52a16407e06e13d24c
GIT binary patch
literal 223
zcmXv|K?=e!5KI(BgyL231zvoBh#-0vp?F)UwOws6ZNg@&^d&w)e3u_6^ybMF>>Orh
zcZX$OK`<5`)6*<#_0v)Z`8Unbo2N)cDCTni7S!`|(;mOHUBb~JIoPDRDwJc2*%0i|
z-Pl+N&4nK^Asi~sOwq|zaaNweX2yr{qA}sPNDwR~Od3+Ws{|eBIJcm3t09W~bB>~g
et-hmGZqicYng+f?ThdKD)qN>tEjpsU-~9lGm_I%M

literal 0
HcmV?d00001

diff --git a/prsctrl/devices/lamp/impl/__pycache__/dummy.cpython-311.pyc b/prsctrl/devices/lamp/impl/__pycache__/dummy.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..9e8ed6cbad1bfed017078cd3d2bd086a950d7f9d
GIT binary patch
literal 1480
zcmcIj&ubGw6rS1aCX=?YT9MR7Xi`r(SUeXI#flzE5sC`S!kX?*e&}X*o!O`j9&#vH
zMX(pCM^BZ~e<qQDWkC=;^%jW->B;wYleD4r=<M#7_ujnB``)*2zhp8K1lHpxx$0d?
z$WL^JOB)#dM_}v_o7mJLI#CEGPa!v6T-gPCf8^^4Td@<4TGw=qLhe0ctDD5uxVD>s
zJb2=zCvCb$ipfKCR}U4yA`R7*Qr)-Wj2LkPSN}S|8=%37PHmzqTck{Fy2-HMCec+p
z0jOayJ-J0*Q9T96Yhil1QLk@A$BsC{Nq8)B>E8$VNOwqZVs{r}`|!l;^NF2djF9mh
z3hF>Px>{61O*VWkLS~vZw-%TtgjC6$a+o$v%PC1|ni9+BTSwlVCF7ywLK?U2I%La0
zlmbr}%UnJSJl|OJ%E8N$;KqZEpz689pGqyLHr5Tl>OnFuJKPFNuEh;sSb=a1o4=@8
zTpA8&Y1HaIL{Ni8e?z39ZgXZN$>NY>3gU7e;7^NuXPLLD_o;7e_A8t1u(>XqYY*=}
zq!8<*AShxa<PsPlBPI;i*}~a$d|(FBDXYy)#OoTqtGws#DPh9#Dxq3)%ibOpIHwXT
z=fxCYsCqtko9B*uK_B~*a{$=J<OlYSZO?aDq00*G;Vm+-{l8j>=?q#Zm&G*H5;I8Z
z1ar-DJjt8W$JC?1B&Ov6M%>#M3LUo4Wee@$eVRO;8|j|}13psxs6fk!V=ebiGl1C?
z+!v-fJ_~US^^rIbEpjlO+j<?<EHWHuw^Zk*8BUmH-Lo4G+Eb?ayis!EooK$qMfk6{
zgfI&bW(H$#amRtLfr_Y6<b5l8lLDDXfQIA%Fonabr%)}|BWHk0wFTT50JvAt9RRpj
z(ET?=eMNPPsW1hjR;js_FkRun3fNqT%gF0IK&Y;l;44+pkH}`xLY<-pj@XS@j+-J6
zG3-p10eT5a=>a*{imroXwpHmSv!7TeS?DGUt;7$KZI9nQl~Evk8n)G682x?5R>b2k
DQ(->9

literal 0
HcmV?d00001

diff --git a/prsctrl/devices/lamp/impl/__pycache__/xenon.cpython-311.pyc b/prsctrl/devices/lamp/impl/__pycache__/xenon.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..765a608eb7036a29755183db2837d4eed418ba6a
GIT binary patch
literal 6788
zcmds5U2NON9VaDGq9mHO<s@=qJ7#J-jhxkW6vyy9Z)uyfYd-7*R=lRJ29*{mTaLbZ
zq~chxTR#MtVi-s;V2BZ5h%vNjiflk0R$ve7p8H4|1S}9R5MWPv^N<xN^0faQC0exA
zt}FJk9i>0-^MA+tfBo)0Z)yrqkXAqLn49D%>hHKvOH4KMq6C@yltf8%hMLB2SBB2I
zrd_mE=bm<xHqW$&yqRgnMaj&(x5h~JJ)$Y<3H+@z%}Q>`lksN*(*c@tQNN@l<~AjH
z<-j91^n-u3Ur?fBRK)ij7bhaL>3d7gsdHlXxeF?w?71vv3rVZ9MR5a8FRlXl4Xj$G
zrfG?qc9p3VEz!4GSgY$c1uJy}Wh4(!FP?qcCwYOgk`Jg~Vu1!EP72<pr-Nnc7Cp_u
zN}5dOx}3}BlJ=*-EO<)1<QE9Y@96uKTG#pr>Yl*gN*i@8wK|G&_JK{Mm#9STLtwL^
zWN(S&hLWc?R-#~0o{5t0bo9*7;OkL@N6r5E>zjXj_~76h5yoVcVnIeGn@FT{X*H2B
zn+i%okx^RAByz<pw5y^jo6VA(5{nr%kt`wvTO4tj9!1WiOn)Mg%!rDTNGO=Ku=28S
zZZtjx9F+K*QWlshDiYN^il3L28*07~kL6S9f{5h!)kSqKpR2uQ)9PGtCSI7!LuWaa
zk&~*JOUm&AQj#jl#3lJ=Iw>ph3<xxy&K5H9TX>@f3X2FUXo)BLK2ZCPAk-<tK)zj}
zw%MjTzBS(#+rG)R>+BJOJ)*HkDqY9R9>`V>9x8j*0+sGQT<p}y?*)vc974n!OoaFn
zGWV$^Y6IT;(-Jjri_odl%k&bxVGFH(q(nP=(iHTx1?uSOYS6PWPxs!QD!a>Rqh`6g
zRgjZBd&fu&D3fiaM47x3FIz@q@5io<zCAfPdhW{9#I>^}-<7FrSA{DRFBzOUTRKF9
zAz)bv%0gOA&dHLH&ppRm6Y-f%Vxf>(tmzVJf?AXLs3@aFlUYD%&^LD`KWlo@xl|s3
z)1kg_As%;f7nGu<X98-$6|Q`)#9ETi=USmg$pBfQDtu^*7dCle<A8DOjLr`m{BYS_
zVS{)5t9~uitFwIu+o!R8)v9|Do$a)wzn*-Uevp3b(~k}sM+dc|gWE8QU1haa=+keo
z{Tka})tPdj96)$hho)e85KYNJ=DRgzuTiUY5_h&W)*5FY>=eM%U8N@hp_*c<h*U)&
zW+D_&enu8D>Df7zh-E-{Q&EapS+RtaR)l0emjk1dC7Xeo7iQBp<(yE+FUUv$PXSUJ
z5bXA<uNAJ1pF2G`C;$&JqvVBxh;D$mVYHl6iU?)}4}yd|_!&`6gUQ+qCL(Us1)GHM
zr<)!;@C%wqTEUu9l`(cfNG$~|F_S_&v??cotWY}~<!`#{TlL-XuldXVZMGR_?((a=
z&bAwDyH@+{7ZjeA2<ltNIKA?&5raY72Ie#mV$gL$118nf(4cLfT<eA3QX_+I%yYj%
zlfZ0o+pvw)!M(9T`)Ylv294UFqQqJ@{LVY*04|0bns6#bB1nWay)$wSe6s01PaHGC
z4i|+n!NNg@F*$+>wqMi%#9_GZd@5D)S1mV{I)>ZlfPlB=53FU^&l{ZsI{&)Czy7^u
z+pn`-2HT~vUF*uj#RrRz!+Q5Aqx+QBeabdl=yTFwPipMR?=@Rn8w^;+|DZNt0aQ~1
zM~-m-Ghs=(d35sa*xTypTT_!0YC0=h0zY60e5QzUxKco}BC8QE>H(&x7Zaz5O{Rd-
zId#8ic``ClV^p#j4>)U207GR4$O`q1muf!vgGH`|dUUqeV0$&TcO&_E`VZ-+KK=NJ
zaePEOJ_3<m<9D4q_;>hOhHo1&%!y4Ai~Ge>AU{IXE{RrcBcdQ$I~@Z?!^`d^*9M+v
zUs~E{$k4NKJl^jdTp&jGL@78LyD|mQcWQD{c<CkYv-?D4x&eAw)`;yg;;~{VUxjc9
zH4i{fMV-)QvLc#=XpmDCyk;CgNPI<ypj2wJ%+wLI2cbck0MgK4+l0?fZ+xux3>!Ve
zdfRZBt%cbWI@@8e9U9xQ9((xygZDRX>0N_H*PzxlSZNM5il%sHh^#(^%#V=O9!WKp
z$zF%;l&9pn0ds=^_zAeSWrf`*0pE@qfZM1a_dbXTR=fR@VN#jAs9Nr_v3~?Wj*)j!
z*#)*%8Dm=I0+2=<za4D3*LMH#Zx64J=&ij*Yp)*cGlG4O>CIq73q~r3kCe}^T`a@%
zY&ZKof$<s4^TQELJ@%F88^q#JpK9+;!*EA!VCn8l`_PRihA}tR&V32ywdZh3j;0*5
z@3TA!xJH=LH5-wfo0F3_6d|3e!Y05pb@;Uo`&>u~xx89ytf8!Wa6?32x>OfN7eqyv
zFDft!0~%QZ3?{%yC@T~T0&%(dlpq2;lSSw=JP3y;jHv*W$%-PP#bc#zi&@oxEf0-x
zR`qZ;FcI;Ze1deUsgD(YUxhtGIK~o#CV(3WP^^bp0ek?2V_&)?ms%`~->vyM?rg>9
zod5=0O{-0Jn%A1k&6QyD+UR=g>e=$yZLU=dC3NmXgZoh9KCEypcQ3A9ymNW&a+y5O
zxRx#M=q7h`T{XH->)epR4QbpE8Ma%58u$^Ve2!5K*~etPlK7#PxC9o|0bBwUYiYig
zp?=6o8l1Fy7u_v;pk&XpMBgCFhL|OfM3>-<vh1lpx9`pbqinT=yse5$o+Wz8^$5yO
z?7C$}#iyNW0_VXz0yB9+Oa)hh!Zz1hA+RtTb%(aydZ%$XRla`wkKdX9eBKhEQORxX
z**zMy)vx1!?K_se4k>w543Mj79=_8`662`1@z;{qDG{fHF*uOCg!=x-I@>_{^)unf
zK+@ju^#7tIPum>(yyp@Su0g1cI%}!zMuYn>Ke+KgY1ww;Z)P(21x0|{1MrO*aS@KA
zxA1L|<#`8$b7D?_<8V>2&Z#2qPI_Z^T=T}@ezSR$OXp^HPpsqOEsLWNJv}F!`Du2y
ziNyQbv1uWl$>15Po_<uYqCuePJrSI2Zgx~Cv3>83_KlDB#Y#uPlV?S6wz*lM2;e(Y
zzu02I#21-vIBiWtc$1ajFpYzS$*6frTr}O7c;@m&WO^255t&Rj4_BZFyL{6P0NwQC
z?y!(-!Ss-kEa1Wv$$4k97B3|u%LNi4B0d5W(a-RBFT|iCT*q)WX2dfGC0R)$SxVrk
zxmtlR^4njcV1SH)BqZyuhAUV{0J0~gkQHL;>n_3w<@a#%hciKdY8Q;~iLLO!W_Umk
z4;taYGFLhDigD<8IampXjbP`xx*6=zf;|;3ynagOI?I=~!`(3Eai<X({mW%zY(l&G
zf%a=rOQ!Ykyb+!+bL4#R>f=tG9X8lujUC?RTkrj3D|BKrbV3jH8=-!kKWXqM|CIdl
zgb_Wr6}_+-y`V=g8PQ8y(W%YolpcN0h`y%}TsH=;>-=@?gZL&N*ZKH%d&m0at<LCX
zXH@STGCGI!_A^HNnXlYmy=#n(Z;iz^$71@}lrc87HI~>MOXy>wF(&FGGseh_-ab>l
z073BHYoGOg`r6aLSLgqF>1)3}HffAa>aWC%S7Lf7rv2)s9=fS5eXMbx=-ej;_X%XS
zxt6ty_ddEazBXPS|Hel(hyE)c^9@V+`SOf)p;BSFyMfif9d3;)lZQm+hzkvYv@Cer
zgs+ctVpfLh<3J*j%}d1$&U1;xM@2DXwUAp{>$Zmgkv=>ep8_pN62-aGm|$#cHdU{c
zlX51LNJMCaqar~oZ&(KttX&8b?2eT$fxty??b&g8nBzNC1Hv&(c!#nH?_&<{P&NtK
z4WtY2#awLC;$hk_(<%X09hg;>@ImIx4rP-gEzH3k>faKwndCbn964#5&D9I<f$HrV
zxf?@ozz3ocAf^v)MrXlOnEqK=y$pF7A#6D0#>Mo^h;a3e;Ra#)1!YZu?@C{?W0quo
zfnrbuGXrA-vg4*{x<WOrkf%cRXwF}S3a*f+LN%|D=NZMXkf-7eugn_W@H(q|j~U)$
fEA9#v)||f`&sCa+t!PZk=l?-k{`np4WcmLB*Nt#v

literal 0
HcmV?d00001

diff --git a/prsctrl/devices/lamp/impl/dummy.py b/prsctrl/devices/lamp/impl/dummy.py
new file mode 100644
index 0000000..9e89afb
--- /dev/null
+++ b/prsctrl/devices/lamp/impl/dummy.py
@@ -0,0 +1,14 @@
+import logging
+log = logging.getLogger(__name__)
+
+from ..base import Lamp
+
+class DummyLamp(Lamp):
+    def __init__(self):
+        super().__init__()
+    def open(self):
+        log.info("Dummy-Lamp on")
+    def close(self):
+        log.info("Dummy-Lamp off")
+    def __repr__(self):
+        return "Dummy-Lamp"
diff --git a/devices/Xenon.py b/prsctrl/devices/lamp/impl/xenon.py
similarity index 85%
rename from devices/Xenon.py
rename to prsctrl/devices/lamp/impl/xenon.py
index 052c947..2a3550d 100644
--- a/devices/Xenon.py
+++ b/prsctrl/devices/lamp/impl/xenon.py
@@ -1,32 +1,40 @@
 import bendev
-from Bentham import Bentham
+from prsctrl.Bentham import Bentham
 import time
 import datetime
 
-class Xenon():
+import logging
+log = logging.getLogger(__name__)
+from ..base import Lamp
+
+class Xenon(Lamp):
     def __init__(self):
+        super().__init__()
         self.ps_serial_num = '32540/2'
         self.state = 0
         self.default_current = 5.4010
-    
+
+    def on(self):
+        psu = self.apply_current(self.default_current)
+        psu.query(":SYST:ERR:COUNT?")
+        psu.write("OUTP ON"); psu.query("OUTP?")
+        log.info("Xenon lamp switched on")
+        self.state = 1
+
     def start(self):
         """
         Starts xenon probe light lamp. Assumes lamp is connected
         to given power supply. 
         Bentham TMC300 is also parked to ensure later operation.
-        """        
-        psu = self.apply_current(self.default_current)
-        psu.query(":SYST:ERR:COUNT?")
-        psu.write("OUTP ON"); psu.query("OUTP?")
-        print('Xenon lamp switched on')
+        """
+        self.on()
         Bentham().park()
-        self.state = 1
-    
-    def stop(self):       
+
+    def off(self):
         psu = bendev.Device(self.ps_serial_num)
         psu.query(":SYST:ERR:COUNT?")
         psu.write("OUTP OFF"); psu.query("OUTP?")
-        print('Xenon lamp switched off')
+        log.info('Xenon lamp switched off')
         self.state = 0
     
     def reset_burntime(self):
@@ -79,16 +87,4 @@ class Xenon():
             print('\rWaiting: ' + time.strftime('%H:%M:%S', time.gmtime(remaining)) + ' remaining until xenon startup', end='')
             time.sleep(1)
         print('')
-        self.start()
-   
-    
-if __name__ == '__main__':
-    from DeviceManager import DeviceManager 
-    dm = DeviceManager()
-    #dm.xenon.apply_current(5.41)
-    #dm.xenon.initialize()
-    dm.xenon.stop()
-    #dm.xenon.initialize()
-    #dm.xenon.preset_start(8,00)
-
-
+        self.start()
\ No newline at end of file
diff --git a/prsctrl/devices/lock_in/__init__.py b/prsctrl/devices/lock_in/__init__.py
new file mode 100644
index 0000000..7a5aeed
--- /dev/null
+++ b/prsctrl/devices/lock_in/__init__.py
@@ -0,0 +1,28 @@
+from .base import Lock_In_Amp
+
+TYPENAME_DUMMY = "Dummy"
+TYPENAME_SR830 = "SR830"
+
+from .impl.dummy import DummyLockInAmp
+
+def list_devices() -> dict[str,list[str]]:
+    devices = {
+        TYPENAME_DUMMY: ["Dummy Lock-In Amplifier"],
+    }
+    try:
+        from .impl.sr830 import SR830
+        devices[TYPENAME_SR830] = SR830.enumerate_devices()
+    except ImportError:
+        pass
+    return devices
+
+def connect_device(type_name: str, device_name: str) -> Lock_In_Amp:
+    if type_name == TYPENAME_DUMMY:
+        return DummyLockInAmp()
+    elif type_name == TYPENAME_SR830:
+        try:
+            from .impl.sr830 import SR830
+            return SR830.connect_device(device_name)
+        except ImportError as e:
+            raise ValueError(f"SR830 not available: {e}")
+    raise ValueError(f"Unknown device type {type_name}")
diff --git a/prsctrl/devices/lock_in/__pycache__/__init__.cpython-311.pyc b/prsctrl/devices/lock_in/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..9becb0247942a6f5e7a1e474e1b163566fde3b57
GIT binary patch
literal 1661
zcmZ`(&1)N15PxrX^|4xg*i!tF5Z8<1*67f*)P`D$TPk8x47Et>x?m#^vi8|tydUb@
zRa_gXh|oh0ZRy3>&=h=f6LM&dg`WH$tc)OH!C)vk<j^AUMdZ|ZYss;ic6j=|d9yS7
zW@dk*Un7wa0{QEQo0|n5p+DK7C;qN-z6Q!ZQjmf*q~leLk;1KV3ct#OP0$40x9S6%
zkN8P|1WDj}?+s|3yQ(Yx?}SxR36OvSUf_?{{fY>-kP=!#Dd{DKz!Y|+&&<+RVZkV5
z^|I@mtLXZU>s$I_X6k)-81>G~W5Hn0{gl`hYLqVT1Vw-!RD;eR0PG_huqO)Mz$&gG
z5o%C)4eMMD>Z#&G=KqEqf#vC?wTkTE<pIrtY7E>$w%5T6`vjsqMk~k=w$V5I3fjh1
z1eFQ7-4QQsndSZNf+0iZn!2tMN;!ypf~gO-l;4ehxpHqlmtCAM%q=f2uDBr;9B*3`
zYWG~+L1I*NLW?#jDCE9cBG#1{uSc%5pqEW*&r@pB6z2xIeqOxAu9M|gU*FB-mn}lA
zd{)s_L$z#prAhO1#M-jWa(>BNx3`Ow<nQg+o2Jp*HdK4FvX(Dzn&3><HBz#RMv3Ih
z)GFCj%XhEJYwQE6M!o=`+J(aH@{SwU;Fey}bP)1j&9pWE>gYvq*t!0JGdk7gxtPEH
zY1=ROBCX)tPXB5pC!Z(NC&_dpd8e7Y^DwX%Z3M@i;CSa$8g3)(i@b(bF#J$x^I+?A
zI%iV6p0mPm*Z0Zy&~Kqx{trCMyP~~QCIzFY6IZ&(-8+<6mwLj!j7O%wLD@$@g5DF@
zw>(c8wXe{ppEOG>f)TPS-H1<sfLP%)UKeT{5Rf}$_q-uhd;~-BlnsU_O9%+Z%IFFZ
zZluQBvECUWg|G5IqhGlGxCdB4HU3+E8~2FW7b8^Bf5oJHIgg)Ig!k_bdGwME)0T_(
zi>g*!(?~|%y|!#@8RoVjUo=o=EtOM2%Ep4S{}38sATeMyy3vwp7{Ht^7ig3jLthoO
z3c28{K;z6gaT$S$#X2a1&;e#0>H+hy9s$%*D=@H^I|(G6K=L#;)`*QaV~iOsF}`P<
zh!c)D(dGm((+a1Y{?$s1K2J=ZBqkqAjl^^_G3|t>JEyT5KqWEr8cyRkow1o`p98>Z
z#M8}q+6kwDTpeJUn1TI8=$bS1;o}7WSdGw3Gc@A}Gu8+scyuF+(J>BXll-w1&yMlO
zV?NMxDajSqiZF_dK^IM9{pwD>!v6fcF1muEmTZ@YNp%G_O5O;0op^%IAp&`=c@>=1
zO{JodkLftr7;&s00U$+;TWHMbUuT1(^=OO18G6U*Uu{9eiJz2%sRR4)?xUT9kD9}&
dHUitfVOYfJgA%i*pYh)IyX0;E3-m2W=^sDdkgNaz

literal 0
HcmV?d00001

diff --git a/prsctrl/devices/lock_in/__pycache__/base.cpython-311.pyc b/prsctrl/devices/lock_in/__pycache__/base.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..383f9b1af4f202846edace75b1cd67c0f7356c0d
GIT binary patch
literal 1736
zcma)6&1)M+6rb5It!2w5vC~jo%7W=Z;JWt^0*;fEKoF&-J*e9*qur6UWcDL7BM0f^
zgAY08mK<|R8}c{wPblQjgIOpPdg@KVJ>}H*cC{NzHngMNxAT5)-uD~*-08FltUrS7
z(QgJJe<4#Zd%iip1Dh8lA`ulNp?#VdeS;!z2s5$z79|GxnndO)i7ZZEn}ocDw_1HW
zvJXku`5W1;QJDL84~lg*P+GE3CtQ!Rs7nj?fC<3{f`@ax^3z1{64)1nlRk||-{5An
z0^Y3GfWB?c_btHNk$p;+aJ$5vOSl6#<t^@VcW8Xt*clp8>yqsiIP0F0CClx|fZSG#
z)kj(QICz)_`$=9nlIyWddm(L15`ufI$+-grYDq!Qn2NSHU*B^X4=0`;F%5)!5kHPY
z?#0SeIu^pqWtMX(CSI7ODGxP|_8Q%XLodzrt|wWnxbhCF6LFT_mok&hvECc<h8C9M
zVyG}2?}IqF<$tHRRQ`UH#A%E@(V6t`arIbdxqp}q^;0If|IGy2l-8f4SdYd7KObdq
zm=B?6nx!H4a~WzW{3>+i3#>_;`U9r;UOp){G*>#9#}Cm>w=Yy}Z%K%qS1UkH$ZU<Q
zbe>t~z>o)FGg!ba7nK}BhCPWB-8JPJd<rYfB3`tPxg2Cr9Mp!2%MQv+IZme=7lQx*
zCFd<5C*)6e?U^MvU?0NOXx0^8<u#C2evQ(v+yp?OR_)A|TyZ_Uw%`t-QuPMvm!8mi
zy_P*yLlZU~{g$)HW1foBBf-66CdRydL5NeR8ve^_HT(}cPM{$y$#=cuOlWq*e{6(R
z5#=gGQq4+Lv9<({LFs7v$zmooj+xYryIwZ#zw?5=eXQUmr>!7>!3=`w=0%Tl&;xg}
zsb1HRE&#nQeE_%84T6*<JP3+*5F}YN7Pwyvf+u4pDv7jEe;vsdlAAyZTaR<W3wtOs
zrX~I{$ZaGzS7kC~F(eL2NzjJ+705~RJF_=uhHZCdq$cl8;%uG%RH5szpBWV8HEHAs
zIR8uT+MSp8Uw!e*jaR$BfA-ak0RNFR_7L4#u-Axc-(?h4W|&m3>l7v%gc5H{S)szw
zlN_c@;<c<2Uo6H4_jXm_J8}n(;NYqd$jqdao{^n*S3PHB``zL*vp%Pg!)5Y(=RKnT
JTp=ps{uey`i39)u

literal 0
HcmV?d00001

diff --git a/prsctrl/devices/lock_in/base.py b/prsctrl/devices/lock_in/base.py
new file mode 100644
index 0000000..5814f6f
--- /dev/null
+++ b/prsctrl/devices/lock_in/base.py
@@ -0,0 +1,34 @@
+from abc import ABC, abstractmethod
+from typing import Callable
+
+class Lock_In_Amp(ABC):
+    @abstractmethod
+    def test_connection(self) -> None:
+        """
+        Verify that the device is still properly connected.
+        If not, raises ConnectionError
+        """
+        pass
+    # RUN COMMANDS ON THE DEVICE
+    @abstractmethod
+    def run(self, code, verbose=False):
+        pass
+
+    @abstractmethod
+    def reset(self, verbose=False):
+        pass
+    
+    @abstractmethod
+    def read_value(self) -> tuple[float, float]:
+        """
+        Read a single value
+
+        Returns
+        -------
+        [timestamp, voltage]
+        """
+        pass
+
+    @abstractmethod
+    def __str__(self):
+        pass
\ No newline at end of file
diff --git a/prsctrl/devices/lock_in/impl/__init__.py b/prsctrl/devices/lock_in/impl/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/prsctrl/devices/lock_in/impl/__pycache__/__init__.cpython-311.pyc b/prsctrl/devices/lock_in/impl/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..060d4fe6231d03ae4ee756ed76f54f88b0b2d886
GIT binary patch
literal 226
zcmXwzO$x#=5QP&(5kWkF;NFb~5D`SzA{2K6p{An^rcIbkm7c^Si0ASGf;(5HVBg}s
zZ+;f<F&Yg;)KpFKCSQ%Ul7IO0BiuzM5;2pzr=U)pKh5!5Z5D6{NCDPaVM-I2Qg#Ge
z3>S7D5_jTTN(lR!b62);Hk?;S@VSf6c(SNDEj5BC&150NtI-(1I(<>51XFkmDw1KP
f=Dz+8mW9hIi!18I7ERAEj`r?KDc_<s>c-s<YMelO

literal 0
HcmV?d00001

diff --git a/prsctrl/devices/lock_in/impl/__pycache__/dummy.cpython-311.pyc b/prsctrl/devices/lock_in/impl/__pycache__/dummy.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..c8ed839a7b9ad871bbca64f60087cc50ce8d3588
GIT binary patch
literal 8156
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
DcpWqy

literal 0
HcmV?d00001

diff --git a/prsctrl/devices/lock_in/impl/__pycache__/sr830.cpython-311.pyc b/prsctrl/devices/lock_in/impl/__pycache__/sr830.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..67af417639c327354bcd5e0575e3d14a64d2550c
GIT binary patch
literal 23053
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
O{*0yke3f)IXa5)2A~}-)

literal 0
HcmV?d00001

diff --git a/prsctrl/devices/lock_in/impl/dummy.py b/prsctrl/devices/lock_in/impl/dummy.py
new file mode 100644
index 0000000..1ef62d1
--- /dev/null
+++ b/prsctrl/devices/lock_in/impl/dummy.py
@@ -0,0 +1,134 @@
+from ..base import Lock_In_Amp
+from typing import Callable
+from time import time as now
+import numpy as np
+
+class DummyLockInAmp(Lock_In_Amp):
+    def __init__(self):
+        super().__init__()
+
+    def test_connection(self) -> None:
+        pass
+
+    # RUN COMMANDS ON THE DEVICE
+    def run(self, code, verbose=False):
+        pass
+
+    def reset(self, verbose=False):
+        pass
+
+    def read_value(self) -> tuple[float, float]:
+        """
+        Read a single value
+
+        Returns
+        -------
+        [timestamp, voltage]
+        """
+        t = now() - self.t0
+        v = self.amplitude * np.sin(2 * np.pi * t / self.frequency)
+        return t, v
+
+    def query(self, query):
+        return "-1"
+
+    def snap(self, what="3,4,5,7"):
+        vals = [-1.0 for _ in what.split(",")]
+        return vals
+
+    def try_recover_from_communication_error(self, original_error):
+        pass
+
+    def check_overloads(self) -> bool | str:
+        return False
+
+    def read_value(self):
+        """Read the value of R"""
+        return float(self.query("OUTP? 3"))
+
+    def reset(self):
+        pass
+
+    def test_connection(self):
+        pass
+
+    # REFERENCE
+    def set_reference(self, reference):
+        self.reference = reference
+
+
+    def set_frequency_Hz(self, frequency_Hz):
+        self.frequency = frequency_Hz
+
+    def get_frequency_Hz(self) -> float:
+        return self.frequency
+
+    def set_reference_trigger(self, trigger):
+        self.reference_trigger = trigger
+
+    def set_sensitivity_volt(self, volt):
+        self.sensitivity_volt = volt
+
+    def get_sensitivity_volt(self):
+        return self.sensitivity_volt
+
+    def set_time_constant_s(self, dt):
+        self.time_constant_s = dt
+
+    def get_time_constant_s(self):
+        return self.time_constant_s
+
+    def set_filter_slope(self, slope_db_oct):
+        self.filter_slope = slope_db_oct
+
+    def get_filter_slope(self):
+        return self.filter_slope
+
+    def get_wait_time_s(self):
+        """
+        Get the wait time required to reach 99% of the final value.
+        See Manual 3-21
+        :return:
+        """
+        return 1.0
+
+    def set_sync_filter(self, sync):
+        self.sync_filter = sync
+
+    def get_sync_filter(self):
+        return self.sync_filter
+
+    def set_reserve(self, reserve):
+        self.reserve = reserve
+
+    def get_reserve(self):
+        return self.reserve
+
+    max_length = 16383
+    def buffer_setup(self, CH1="R", CH2="Theta", length=None, sample_rate=512):
+        if length is None:
+            length = self.max_length
+        self._buffer_length = length
+
+    def buffer_start_fill(self):
+        if self._buffer_length is None: raise RuntimeError(f"Buffer not set up, call buffer_setup() first.")
+
+    def buffer_is_done(self) -> bool:
+        return True
+
+    def buffer_get_n_points(self) -> int:
+        return self._buffer_length
+
+    def buffer_get_data(self, CH1=True, CH2=True):
+        data = []
+        if CH1:
+            data.append(np.arange(self._buffer_length))
+        if CH2:
+            data.append(np.arange(self._buffer_length))
+        return data
+
+    def auto_gain(self):
+        pass
+
+    def __str__(self):
+        return "Dummy Lock-In"
diff --git a/measurement_device/impl/model7260.py b/prsctrl/devices/lock_in/impl/model7260.py
similarity index 98%
rename from measurement_device/impl/model7260.py
rename to prsctrl/devices/lock_in/impl/model7260.py
index 82ceb9d..5bd74b2 100644
--- a/measurement_device/impl/model7260.py
+++ b/prsctrl/devices/lock_in/impl/model7260.py
@@ -1,18 +1,15 @@
 import pyvisa
-from time import sleep
 # import pkg_resources
-import os
-from typing import Callable
 
-from ..base import MeasurementDevice
-from ...utility.visa import enumerate_devices
+from ..base import Lock_In_Amp
+from prsctrl.util.visa import enumerate_devices
 
 import logging
 log = logging.getLogger(__name__)
 
 import numpy as np
 
-class Model7260(MeasurementDevice):
+class Model7260(Lock_In_Amp):
     """
     Wrapper class for the Model 7260 DSP Lock-In controlled via pyvisa
     """
diff --git a/measurement_device/impl/sr830.py b/prsctrl/devices/lock_in/impl/sr830.py
similarity index 93%
rename from measurement_device/impl/sr830.py
rename to prsctrl/devices/lock_in/impl/sr830.py
index 767598b..8da29e3 100644
--- a/measurement_device/impl/sr830.py
+++ b/prsctrl/devices/lock_in/impl/sr830.py
@@ -1,19 +1,16 @@
 import pyvisa
 import struct   # for converting bytes to float
-from time import sleep
 # import pkg_resources
-import os
-from typing import Callable
 
 import numpy as np
 
-from ..base import MeasurementDevice
-from ...utility.visa import enumerate_devices
+from ..base import Lock_In_Amp
+from prsctrl.utility.visa import enumerate_devices
 
 import logging
 log = logging.getLogger(__name__)
 
-class SR830(MeasurementDevice):
+class SR830(Lock_In_Amp):
     """
     Wrapper class for the SR830 controlled via pyvisa
     """
@@ -145,14 +142,14 @@ class SR830(MeasurementDevice):
             raise RuntimeError(f"Failed to recover from the following exception:\n{original_error}\nThe following exception occurred while querying the device status:\n{e}")
         log.info(f"Recovered from error")
 
-    def check_overloads(self) -> bool:
+    def check_overloads(self) -> bool|str:
         status_lia = int(self.query("LIAS?"))
         if status_lia & (1 << 0):       # input amplifier overload
-            return True
+            return "Input Amplifier"
         elif status_lia & (1 << 1):     # time constant filter overlaid
-            return True
+            return "Time Constant Filter"
         elif status_lia & (1 << 2):     # output overload
-            return True
+            return "Output"
         return False
 
     def measureTODO(self): pass
@@ -166,10 +163,29 @@ class SR830(MeasurementDevice):
     def test_connection(self):
         pass
 
-    # PARAMETERS
-    def get_frequency(self) -> float:
+    # REFERENCE
+    FMOD = ["External", "Internal"]
+    def set_reference(self, reference):
+        if not reference in self.FMOD:
+            raise ValueError(f"Invalid reference: {reference}. Must be one of {self.FMOD}")
+        fmod = self.FMOD.index(reference)
+        self.run(f"FMOD {fmod}")
+
+    def set_frequency_Hz(self, frequency_Hz):
+        self.run(f"FREQ {frequency_Hz}")
+
+    def get_frequency_Hz(self) -> float:
         return float(self.query("FREQ?"))
 
+    RSLP = ["Sine", "Rising Edge", "Falling Edge"]
+    def set_reference_trigger(self, trigger):
+        if not trigger in self.RSLP:
+            raise ValueError(f"Invalid trigger: {trigger}. Must be one of {self.RSLP}")
+        rslp = self.RSLP.index(trigger)
+        self.run(f"RSLP {rslp}")
+
+
+    # PARAMETERS
     SENS = [
         2e-9, 5e-9, 10e-9, 20e-9, 50e-9, 100e-9, 200e-9, 500e-9,
         1e-6, 2e-6, 5e-6, 10e-6, 20e-6, 50e-6, 100e-6, 200e-6, 500e-6,
diff --git a/prsctrl/devices/monochromator/__init__.py b/prsctrl/devices/monochromator/__init__.py
new file mode 100644
index 0000000..55d7f32
--- /dev/null
+++ b/prsctrl/devices/monochromator/__init__.py
@@ -0,0 +1,34 @@
+
+from .base import Monochromator
+
+TYPENAME_DUMMY = "Dummy"
+TYPENAME_BENTHAM = "Bentham"
+
+try:
+    from .impl.sr830 import SR830
+except ImportError:
+    pass
+
+from .impl.dummy import DummyMonochromator
+
+def list_devices() -> dict[str,list[str]]:
+    devices = {
+        TYPENAME_DUMMY: ["Dummy Monochromator"],
+    }
+    try:
+        from .impl.bentham_tmc300 import TMC300
+        devices[TYPENAME_BENTHAM] = ["Bentham TMC300"]
+    except ImportError:
+        pass
+    return devices
+
+def connect_device(type_name: str, device_name: str) -> Monochromator:
+    if type_name == TYPENAME_DUMMY:
+        return DummyMonochromator()
+    elif type_name == TYPENAME_BENTHAM:
+        try:
+            from .impl.bentham_tmc300 import TMC300
+            return TMC300()
+        except ImportError as e:
+            raise ValueError(f"TMC300 not available: {e}")
+    raise ValueError(f"Unknown device type {type_name}")
\ No newline at end of file
diff --git a/prsctrl/devices/monochromator/__pycache__/__init__.cpython-311.pyc b/prsctrl/devices/monochromator/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..7c3bed9bdea0102e4f9a5295444e1459486a0fc8
GIT binary patch
literal 1745
zcmZ`(O-vg{6rR~#+q>&Ou!#dDZI_TDxkv;Fg&IgJ5kPGYcB4WnVOesGcfl6>W6dtO
zAgHXW2M(>2s;NNzQ%|%>E;&`b=G@B?5oxs&5>k~zZ<e@NIrYuj8*tJ-&Axf__Pw1q
z-+pg?i$+BRQa1-H->?Y%O&7idJI2`_82d;@GFFj>^B5zU$ulyWX9eozR89-z0~qPy
zVWb4FA;My`jC8J!K4+Iv9Yah&4QYIyhs>ZND54Tp!~uUFw8~tx<<M7LJ|gpqC_^N~
z<JF)nf-fqE7g0L$4~E1vcB5HCH_8=aXeG-aZeV^x)3)5uEk(B~B@F@si=SjB#=%H<
zue!s7M6ouAUVd2w7#utR0y_H))IPF6`y%5tT*bQx4h#oZvBvCD7`QdOgDf8?2)+rA
z-ZP9W-p@qnbwG9y93+t2PI`q&U6m0AG9O?!xRjln7$4t`bq*x8*Xe*8TUx%ekekge
z6zA_|v&(L>s@2r7mG-%dmR5!|5{9q1Juf3~E##Iyn$5c5+gi;a)&e00Ni%LpRyM0;
z#q`2Wy0av`*qoa#+%*+q7G`Cws#i^mP=pKfin(qXwZfvYYSl|bDcsqzDu(V)YgMbV
zu~Mj23<y?MRi$i|^s-W@k+Mb9LT9IfcJZ$jibdGKDi+6TTW&;!t%`m{2`DB8k68rO
zK+pM<JuqhXUvIKZJlOcK8RP;{hre!j59gg5_O;2q(6b)th##`~q1H(_)kHWDJy#AN
z+2fil_*$*jX*kiynGx9I>)yA}FXAZs5RbC1U~ScuqF&MzH{7nsTa+n8z68MV=;DB}
zkAMjN8<^L<ND{MXL`M!`e&jEJ0+2x|*O5-f4WJm78I{$zT?Qit?J%$A0lmDgZ6^Y~
zF7L8d)c+1bGP}e6h<;`cp;I2wZt>(x=)+z13$~8^zU<23cF=$208Kqc61wAds!c*k
zH!P{NS*og~6;+v*w)^ht>$*|br8ZU)MNdkH2*s6zsG`4;&>B6ekvLec_-RSqP}*GN
zNRqzn^CMiWm=qidg!IzrSlQ5ZAXSGUq#vC0-Z1ZjY9J@n^L_4V=&BvMdJ-QxiVq*h
zhi!h?5faZ*BTt19TNr6FoG{}=ChYFvBnR$Iew(?U+55P45`P1TBFvntlf)JK&8f#F
zP%w@X)5nQvJ2DN_X#t0X8JM4oefFjIe!mS0#*vsg7Be=NF)u-3hw(}Dhd6tgeS#9R
z3HC`M0Cp}NbGelg^cZDF8zl;mD|)SL61cYry;V9md0v^`ZyuN~Cs)gs%R*zi9Bmpx
zo5cg<0XhQ{d5FE>Z)%3Tp(-DcA@ETmn16wSvN1kIZ`<ADw70(zbCOqV)YIhPWDYlE
zzcyM<C;`}D;aoW!-<YT06euJ?ghy@k?#0pM1f0AlA50urzs~)%b@2XiD&0ijdsU?b
hJatf}-l@l|H~k513#<QC?Zyoz(RYDC_6I!3{tGW)v!(z5

literal 0
HcmV?d00001

diff --git a/prsctrl/devices/monochromator/__pycache__/base.cpython-311.pyc b/prsctrl/devices/monochromator/__pycache__/base.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..9d148c2926a441d99589de8185c20ede7776c5d6
GIT binary patch
literal 1229
zcmb_aJ#Q015S_gb=Lo(aNR%c8mZ;oB)CeJkAW_92Sv02;tMl#JXK^29_nauMQn=tB
z<R1h@`7@N!RgtLZ9GNN=Gk3PZ*iwYV+V^(%&Fs#5yZhC3HvwCu_o5>P@SP^}X3YlE
z=QubA0fNPlFpnjMXD~3}EeK-_!n`m5uJEgxX9}wgP5TE;n?_+Cygn?pf{xBr5ax-@
zqfCUe+_IamoOW?~4iY>jz%!&N*cdL5yIN#>7P46LFV;rZTw!a-S}W{^uu)yDaF4Py
z3nP^!L7u4)%`X~_P5h=c1Tx-+OV+wXC@d}GuBL>>ojQEsf6!8C|3D=Dv`+?cEB}qu
zpYm+rx3g}35-91vKSj^!yzBMzXxQ-wQHIH~8_O^c(op&X73M1Tg*@(uQv1oD^88Mq
z<^JHbu$9y@A8jv*-!DnJuIUEC8QeJaFV+-?5Y7*mCTn~t2YK}Xp=qdx*cI+ca4ch)
z_VS3QiKg|9hN@HOF_z{_;nCA&Au9=_M{N;2Lb&ggf2&dSEUR;#)$ZL_dnJLk_%F2`
z&XpV}&PTh;cISL)aN)AmbP8OO28ran*yKFP#4x6Do%7GbAg&^cE=;)uPY8Ahb_wV@
z%JV9%D|&?`(3{jFgtNu(+TNZR%yuV$aBD(sXZ*1wZvHtisp0DNo0YqlP{|@it)^9&
zK_^tCs`63_T^4`mysX^6QhS(3FHpZjn3#;QYk2l;-G5@a3>~e)Epb2B1WH-I09$Jn
Aq5uE@

literal 0
HcmV?d00001

diff --git a/prsctrl/devices/monochromator/base.py b/prsctrl/devices/monochromator/base.py
new file mode 100644
index 0000000..eab850e
--- /dev/null
+++ b/prsctrl/devices/monochromator/base.py
@@ -0,0 +1,16 @@
+from abc import ABC, abstractmethod
+
+class Monochromator:
+    @abstractmethod
+    def reset(self):
+        pass
+    @abstractmethod
+    def set_wavelength_nm(self, wavelength_nm):
+        pass
+    @abstractmethod
+    def get_wavelength_nm(self):
+        pass
+
+    @abstractmethod
+    def __repr__(self):
+        pass
diff --git a/prsctrl/devices/monochromator/impl/__init__.py b/prsctrl/devices/monochromator/impl/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/prsctrl/devices/monochromator/impl/__pycache__/__init__.cpython-311.pyc b/prsctrl/devices/monochromator/impl/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d818e3c9b09b3e272d65d3e66fd08e83cbc28aca
GIT binary patch
literal 232
zcmZ3^%ge<81a48%86f&Gh=2h`DC095kTIPhg&~+hlhJP_LlF~@{~09ttJ>KrCbT%U
zs5r(kB{wrKv$&)vu_V7J#wE2lyClCLCOAK>q&%@GH7204BqKi$Mx|$#WRxbw6lCNB
z6{n`<q$Zan<|U`b6ci<w6y?OEq?TnSrxwTL=I7-nXB6e<g3Zj#Ey#(9j|bXP5+AQu
nQ2C3)CO1E&G$+-rh!yA-kZX(ify4)9Mn=XD3^1aI87Kw-VpBs+

literal 0
HcmV?d00001

diff --git a/prsctrl/devices/monochromator/impl/__pycache__/bentham_tmc300.cpython-311.pyc b/prsctrl/devices/monochromator/impl/__pycache__/bentham_tmc300.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..2a056674d89d5f12af66c234ad14d7aae78ca099
GIT binary patch
literal 3353
zcmdT`&2JM&6rbI-orz-;3^Z{AX@&!e48=)6Y71&BK`K?ClA=N{meFeC9e==nnAr^>
zZmJpyRc;lj$8g|~Lq&_=&_AJnf-U)At%QWsQ*N%(UbwXH?b_=&F7(h-$M(<j@!ssb
zdB6AG{*+9{3ABQ9yey9q@*58NE!yks-G<IK(TOe@B!~a9A(?VcmV!AYr^tjWw<CQ;
z9(^Ja@(g}K%f)m>j~HVn%~6TS<Wr(Y9}+#r=@SLy;MbEI*QFaIGq#Jvm5k&?s+wEg
zm0<*f<Tcx}3uR%Onrn+fpb}vJNqg_Xc$;vNlXQ}kbt$Ll@<Wn~=n7y|j{wH-*|{-2
z21xZWz;T_zQ^&p7&1=i&7Z+=VID@uqTduGThq-0WE_2H*YbFaMn7RKXSzr8Sx#BSR
zqO@bLi2`SK(H~WXy~>$UDV1He$~Ds$FZ7R$2H*wYZ|_@xZQ|}*yB+p*Y4}n%iHaBF
zx7TRMBO2jV>k8<H4)aHScY{;mIwC8zxU=E7+{_k=rCKWJUowodOO~0{T(SEXv`kFk
zmfo1Q>Y%SYil~A{uLpu&tg4AST=$ae+C6S?s{|63`4rsiaHHs;h3wUX<%{_*9WI>w
zCEcu86~`6m=KLqzx#QZ^{0+P4u4{tluWz_z+v@+7DsFjgHD4{;Ak2#fFSwdj;Q6X3
zxWdTm{9dKNo&1o)@)fgc<W~cis;*f8r)R4h9#vI%u&b)I$-vLq{=_64(YXjvCoj?`
z9w&D4t@OEe`dlNjmGmc?r#@(<FSOGaaHcbrhQEo<>|7(#rZY|dy9e52$m@9fzSkF_
zvrRS$hFQ>{ANn2op`Uf>vGTRFi9sUQT%Slt)i1caCM<`+J!>X+;S!mEi@v8>E-Tss
zSO~-nt|H4qtrfn$U&FP5oy-9j>8zkxIM8$*24yaIsFYD^hkG~2z{@JSdoTmu4rY$@
zWd<(KC}IMv6A1t>zHeR@hyAI+=^ZqfF_FUgl<=*Cef!4M(mnT#th@yZ&OAV!bmQdA
z!t=A8(^-Ib7oUILjmlFWbqPQt-i?vN;Fq_>QIH*S3OdAhN(>zEx=`HjlHm}OhJzP(
z@*8M`!S+UtFbJQ3-m{)IAqV!2^%q8@4)s?E*`b5}pm#8hKn|B76^!>K{8ZrA1f0<$
zK(%NsANv0~gmRGNdOl!R%&ILQ=v)R2(ru=>%;1{iG8^KMX+@wTvw&)bW>(p{<}k<A
zgv<4C%i3%&t77m~G^0`j(rK2C<b<@bi;*Dkd@Gp=FIwGzT<jfLU8@+n8YCsvv~_Oy
z?DFD<t-(A{rrKj#e^-ZNIT3d}#js0Wq+&s2BynrJGT}$KpNRt2MFodVYKf3(Fq#8F
z#{j64KPeeM)TV6b*pIU<y3nQzO}g-cCfhXq=-6YJns3wjCY=waT68AJ12Ei*f0x)w
zG!if9#1Hg)+Dt9B=u(?5HR)1kYI-zp1QZQ306aa+8&m%aif&3kIXM5b&;}s$ztdFS
zlxje8U8#Y|2Sa948lo(Y4pKI#%9tIO%bHc<0cnF;JV-tv2?d_6HrHd~K!AbYf!G(>
zsm1J4(UUC`SSV&dSR6<2Q`!maVO|rn0A32p8q^_mu!}(I2!?<u%I94s$a_Bhh7%q<
za-S}g$}r)Ltek<}oUZ`>3nklhZYTNk-H?YNHP8KWtChO^>&;f`N{e1?)2mH-wKFph
zB%SPWwK36{7)_!WM}88;#6DcvAe~6?W*1z;!Jtc(UTgWt%KK<JI=xOhlSj9{Y0`Jz
za1czG@CNG_&J_VKy5#9-%tQSbyefw3e=vci-$5;W*mUE*|D=^n9A6nMD7mWY#Z^p0
zYX<fcs(N=#GkPmys;b)s*!u`<Af^#cBAi0NVkJ%^WDu|(`3cBBqYr4Kb044{e!8*}
zrCowRBT?2RAtY#Yrb|LN7RS{P((z~-hdoG3(YY=OAtvF%C<KQ>>oakm`JQY$z1KcS
zrKO5h^2WhGpFy7sft2+5?nPELc%j3J7FaWE;Vb%KaA6;d^B{tpaUKA46-km_l0@DA
zbjZ=>@b@J-RQErf*mS+rj!i$Jt=P$S>||YeNmz6E+l?$qVALoyZvBq4fBeIeZ|~nK
Ce(e+h

literal 0
HcmV?d00001

diff --git a/prsctrl/devices/monochromator/impl/__pycache__/dummy.cpython-311.pyc b/prsctrl/devices/monochromator/impl/__pycache__/dummy.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..3686fd1ca14192be559e2a06270fe5a534f00279
GIT binary patch
literal 1892
zcmb_c&u<$=6rR~1_N1*F+yF@vqB<oA8AxyBfKUaZQhR7Eq>3J_l?G>b{G;p-GqY|Q
z6C@uZks>5ckRE$VRrQ~7DoeFiLPFw{o2&GIdV%+5?a0P1;=tJc{AT9co$r0~W*+Bq
zX9%=k)k^(qgOES4GivrQIJpDC0r7}OeNrX{5#%l%k%Vyw@zc|O+4Kz0^sT@y+Z4Fh
ziD&H*&ldKf2|W0vt(@`bZBon}W4Ck+Ym*{Pa<`%|a_ce*Dsd#;l$s(ku$^oI`~Z3c
zDN~P>jeSz39^GTO@*XK$o(X8<s<4I)nB6D$X_?__$%SjJAlR8)<y1So7*|1!I_F>L
z0g1<E4`Jdd{L=PlY-Th@$Rvk?XS;-tw1bDB!YCd81+8c%wrVwnOc>{lun}{f<hCpK
zgfGHcT<2j>G!jb*znaW(?)nv_I9K?pLg&@}FFtX;QbH={b1#60RV>jl=bBL8#8K0^
z9aZD)iWJV5J8?Y<M}M_OTyJeT&3Xi6QT2rzS3*}fP3gwccRX>g;R@vh<GbKAf+kF%
zZ&#W-66>YCGHv6PQ4(1osP_T>?2zAB?m_ma>~psCj4d6p<sMt^vgQ8jrF|<6p?3mQ
z;*Oh%8=yDg1_ZDLNEo)+rh9a<2*Gw^%67BVzNlqyOl*Ha3MFF6V1XxQV){`nu^M4D
zl4o&*%5(6iP+dWu2TW|uZ!gVoK+oV~>RkZL{_M}}N7l`Mbi_7#Y@^FICR3O5z;jQl
z13Ldh>btWlu6=n{>X3LLjtbvx``;JBK;}U}(a;&|?9*Z!=A8#JpD54v`V0@ISeW8J
z{rLEZZT8q^mu>b}KNu^8)Q|B}z*v{U8xS0jU2+%x(*`GrmWos>m2bk>_%7vZ|4Ho>
zYXRSbTi7A}`Gwy6T9>W;i>eGT;bz2}%qX=NW_bLBOlgDTE=5yv{+eTyPQHywuqsi>
zdUt+Z%P7v_Z4p)i0k_2&&V$Hn`52$${M%N=PiOQYm2bhrauMMo!aD#-Zg`Wp!uL4`
z_i`|*jr&ZOx5SJzV4(2m!7(0v28Ll524n`X$ua1Dh`b>%YF{3ZQ^-*JJ?y?7bgo)P
zF`H!JOx7A<Et!Mux(Tt6ausD>07$H@3fzMh_O<pEjIii*KCjrPsYO@iI*egCsVcz0
yq?Go_`HuedGmD*CFSGcN9c9*fnYE7jJ1KN0zXK~zLGUy@Tz!F~FK0|?9e)F%@VO8G

literal 0
HcmV?d00001

diff --git a/prsctrl/devices/monochromator/impl/bentham_tmc300.py b/prsctrl/devices/monochromator/impl/bentham_tmc300.py
new file mode 100644
index 0000000..ce3ecce
--- /dev/null
+++ b/prsctrl/devices/monochromator/impl/bentham_tmc300.py
@@ -0,0 +1,59 @@
+# proprietary package :/
+import pyBen
+from os import path
+
+import logging
+log = logging.getLogger(__name__)
+
+from ..base import Monochromator
+
+class TMC300(Monochromator):
+    """
+    Controls the Bentham TMC300 monochromator.
+    This is the source of the probe light beam
+    """
+    def __init__(self):
+        self.path_cfg = path.abspath('system.cfg')
+        self.path_atr = path.abspath('systemAll-1nm.atr')
+        self.parked = -1
+        self.wavelength_nm = -1
+
+    def return_parameters(self):
+        """
+        Returns parameters relevant for this device. 
+        New parameters to be saved can be added here
+        """
+        parameters = {'bentham cfg_path': self.path_cfg,
+                      'bentham atr_path': self.path_atr,
+                      'bentham wavelength': self.wavelength}
+        return parameters
+
+    def reset(self):
+        """
+        Parks the TMC300. Important to do at least once after new lamp was started
+        """
+        pyBen.build_system_model(self.path_cfg)
+        pyBen.load_setup(self.path_atr)
+        pyBen.initialise()
+        pyBen.park()
+        log.info('TMC300 initialized and parked')
+        self.parked = 1
+        self.wavelength_nm = -1
+
+    def set_wavelength_nm(self, wavelength_nm):
+        """
+        Changes the probe wavelength
+        """
+        pyBen.build_system_model(self.path_cfg)
+        pyBen.load_setup(self.path_atr)
+        pyBen.initialise()
+        pyBen.select_wavelength(wavelength_nm, 0)
+        log.info('TMC300 wavelength set to: %0.1f' % wavelength_nm + 'nm')
+        self.wavelength = wavelength_nm
+        self.parked = 0
+
+    def get_wavelength_nm(self):
+        return self.wavelength
+
+    def __repr__(self):
+        return 'TMC300'
\ No newline at end of file
diff --git a/prsctrl/devices/monochromator/impl/dummy.py b/prsctrl/devices/monochromator/impl/dummy.py
new file mode 100644
index 0000000..ee5caf4
--- /dev/null
+++ b/prsctrl/devices/monochromator/impl/dummy.py
@@ -0,0 +1,23 @@
+import logging
+log = logging.getLogger(__name__)
+
+from ..base import Monochromator
+
+class DummyMonochromator(Monochromator):
+    def __init__(self):
+        super().__init__()
+        self.wavelength_nm = -1
+
+    def reset(self):
+        log.info("Dummy-Monochromator reset")
+        self.wavelength_nm = -1
+
+    def set_wavelength_nm(self, wavelength_nm):
+        log.info("Dummy-Monochromator set to {wl} nm")
+        self.wavelength_nm = wavelength_nm
+
+    def get_wavelength_nm(self):
+        return self.wavelength_nm
+
+    def __repr__(self):
+        return "Dummy-Monochromator"
diff --git a/prsctrl/devices/shutter/__init__.py b/prsctrl/devices/shutter/__init__.py
new file mode 100644
index 0000000..4909c2c
--- /dev/null
+++ b/prsctrl/devices/shutter/__init__.py
@@ -0,0 +1,34 @@
+
+from .base import Shutter
+
+TYPENAME_DUMMY = "Dummy"
+TYPENAME_DAQ = "DAQ"
+
+try:
+    from .impl.sr830 import SR830
+except ImportError:
+    pass
+
+from .impl.dummy import DummyShutter
+
+def list_devices() -> dict[str,list[str]]:
+    devices = {
+        TYPENAME_DUMMY: ["Dummy Shutter"],
+    }
+    try:
+        from .impl.daq import ShutterDAQ
+        devices[TYPENAME_DAQ] = ShutterDAQ.enumerate_devices()
+    except ImportError:
+        pass
+    return devices
+
+def connect_device(type_name: str, device_name: str) -> Shutter:
+    if type_name == TYPENAME_DUMMY:
+        return DummyShutter()
+    elif type_name == TYPENAME_DAQ:
+        try:
+            from .impl.daq import ShutterDAQ
+            return ShutterDAQ.connect_device(device_name)
+        except ImportError as e:
+            raise ValueError(f"ShutterDAQ not available: {e}")
+    raise ValueError(f"Unknown device type {type_name}")
\ No newline at end of file
diff --git a/prsctrl/devices/shutter/__pycache__/__init__.cpython-311.pyc b/prsctrl/devices/shutter/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..f5520f77325fcdab3da2be0f982334520f19759a
GIT binary patch
literal 1788
zcmZ`(L1-IS5dD95CGD<OvLiW8Vpnvdq)-);7ILT^6uBZcC5MQlstZ;HLe_rA!n-T=
z?<%g1?26EX3po^uu}NF-$xR5fJqB{}wWqZ)L@XE#C5K*$z!#BI=dUE&s@q|9{`}dQ
z{WG&~{x6}BjDUW%M;E@~5&DyDdgSja$LpYMA`NL+M+VMej5IFCX?%{Cm{rgP!<X}6
zWCpJx;=hh4kI^hLg(dVgKZ}+y`1tgIA?8Gg^b?85BuL~dy>rk!cUIQ|-wHWJ6N#*W
zC-~!ezb1n%qy@7mq5Op*FoE4bcA;k5gu1?|nqe%v{8ah@n0?vL#&3QEisG4jPJT-4
z8Z}ENhk_!&14X0b#~?P54YEfXeu&F>6+wYesE!S870RyTZRUTDcEIxD#9BwTc(OrB
zP|d+>$o3lDv7c{I9YJYAW+mh$t#-4f9QZ%SuH4<T3jJ>Q^V$2;ne@Hs!qm*Yd$X=s
zHmdp!t@srUg1dWxm^FjYqD=}Kc~mYD%T-Pz(huC=U87o|_B5pxn&8|(*UO8x*omt8
zwtDAQe#Roy%BMA>Y?dt>K3JjoDPk?!m1;g)nYWjUl;rO(+Y1%5w>&J{3$?j?b)f>z
zWL_sFyJ(h3zDi3r)$`qx@>b{1<qHM)v|T9Ns4lyT4u|wIrcp>E439MrqJiFs!&~n<
zmlG|X8}K(iZTSUXs42eh^m9}F;I*3ESCe~c>Of7c2R4*FG3JP|_F-_ig|IJlDw?9Q
zF0^>CwcG8ZV5E_;6gcWh{6qAcoaA5OB=1W0a+MU!qCwnXCv|UAVm<1S4-^kWe}l4#
z;NSP&z`E#p(y)C7HT_u0vIvI5E_EY50o-AY(|JQ!<p6iwHaq7W)$tAt!wWVL9%T{W
zjFr(Pz}cl$-X7@f5z_cN|0DXD>yLX3Bf843@k_WjvVAc^9sO5K!k6&?N*S_OMouxR
zniX3uJ}Q>=;+#%ysVhS>=Av0yGSyBORn}KEAySqq4KTq{q#-6e42Me<(**Ez@jwUR
zjVpgq)N7;zTY(NS=Zhy1m{_chDiDn@>!qGxcZ>BDL<2PggBzLsK->w$4+loSTYItw
z;Al#b4SipVJ5s#G3DRU!8FTu%8I8S;j_pUso_)C&oj8b2ILbu(a9{+`Bu$=*!^k^M
z?Dos6Ab|HGse?$$QBr`fHULeUg!PR)<Xrst*<BF8d-C{!JnjhN7E5+#B#qH7meX;5
zHyBCB_}!Qf^h_e`3Ufu6MFyfy%UHKu*&BO{!fi*{Ro!h;=Q3b7qSskh(8?v-<zawb
zfsL3qT3&aaqhkm|Uc26kNu#3GbdsWRurWkge}I6*F+M_9oPIvKaJdm~4h%JvmH?$S
zg{#gvZZ`uFXbzT6MN<$PQ|yxx>xm!X_Z)QnEVl#+N59v$Zf@DzcYa#lx_vO5Xd$ru
jTMSEhVyncg6TkD`@-pBp|0_D<?T?}#e53qRJj(wA&fv4u

literal 0
HcmV?d00001

diff --git a/prsctrl/devices/shutter/__pycache__/base.cpython-311.pyc b/prsctrl/devices/shutter/__pycache__/base.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..42976ce29e7694b54824bf29cda9e31dbbdb6178
GIT binary patch
literal 1159
zcmbtSyKWOf6uq+#+llN1ghc}d5(RP-Q6q#Df|Sl6Sv0E^tM$$pTkMOOF(|H5xZn#2
zUl0`KXDFksB2m#fGF2+>o!yO<hZLlY*Jtl*_MCfXes((Rfb0A2qwzBa@SB`^IhC<|
zj>Z9S;4FrOc`UI!i-85Zz^yrO`_KY7#(%jyn>z#Oxqry*S%tm*dZ*Y3hf2#Z(uvUH
zj7L?idD)e-jL|p%0UqPvS;FRQ4u=>!t_lD=2cyV&CF)|-7LAd`ow;)**TkHAZAXhY
zP-C-b4#rchg^aNIi$ykxS~d`<@c|sM{t-gqC=rho6+AhQcV77Km5|Ec=E)?TP=h*?
z{u`k_=`8mL*+_p4rSRYFVb5v(`Z&?!>Cn%|85WCCEFvAIk??aFX&L)me3?W-`KlD=
z4?`uk^1Z^1;!KHIrxLtnTsop<6JZ}tTkUVo5>2?R7umuhxkf;TUv?wgXckVEi*(km
zImn~0%MF4}s%S`|r!u_*M{}YAL$g`aQ~?sRV!8uED+r{>Wf08n)f9E4bBUwhTPv_Q
z4HFRr#d;7V8K1^vw}asGG>prPq%ljg^*+tO8D?25yA*s#U`9#PF+-GeYYfmGQgej;
zi{FX+U|})0vjBuM8yemD2NO8GE%Bpk_N?H)cCX6K@flhDo>SQ2Fp{LN?9E8N+{St9
oWjT#k@-f!Yl~->O7B*w-1fKr7=~*~!hP_>fGm8DaAz@_w11rAvW&i*H

literal 0
HcmV?d00001

diff --git a/prsctrl/devices/shutter/base.py b/prsctrl/devices/shutter/base.py
new file mode 100644
index 0000000..67e9af4
--- /dev/null
+++ b/prsctrl/devices/shutter/base.py
@@ -0,0 +1,15 @@
+from abc import ABC, abstractmethod
+
+class Shutter:
+    @abstractmethod
+    def close(self):
+        pass
+    @abstractmethod
+    def open(self):
+        pass
+    @abstractmethod
+    def is_open(self) -> bool:
+        pass
+    @abstractmethod
+    def __repr__(self):
+        pass
diff --git a/prsctrl/devices/shutter/impl/__init__.py b/prsctrl/devices/shutter/impl/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/prsctrl/devices/shutter/impl/__pycache__/__init__.cpython-311.pyc b/prsctrl/devices/shutter/impl/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..34dfdab1e0a31b2a3fba93013b410cda04385b5d
GIT binary patch
literal 226
zcmXv|K?=e!5KI(B1n~jBz>5zM5k&DQf_RaIP}{8uwoTY<6<^{L#CQ3DLT{c-!Omf3
zc6V6jH5v^?!1grJjeZ(xA^)cC2lEt(IEbm-y#;l`TsOyWxt_z(BY9XQxhafiir5lt
z&|ld)IM|f$5h3g!tZmWC#jq~V;Is{4Of!r*Dq;jjF;fN!-b{=hye^rMz~n9irNVz!
gYUUo_!6LUwnc<Rpp+(cvj{{X*DP<*EqHfsz0F<9V&Hw-a

literal 0
HcmV?d00001

diff --git a/prsctrl/devices/shutter/impl/__pycache__/daq.cpython-311.pyc b/prsctrl/devices/shutter/impl/__pycache__/daq.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..9c00dfe88573af1fc944c5a0f2332bc3086e2d73
GIT binary patch
literal 3028
zcmeHJ&2JM&6rcUFH^~O)t4afeIDrC2kdOculvavD1+Az>6{x^+WNkc?#9{4qX4eU^
zQZ=e_KowFs6oL4Va!M101HJXip?4cuB3cOvsj5_NMxheQsqgLD8#_t=gU;^$_RX7l
zGjHDf_Rap<+}uc@7(X1E{#z#GPpnjnQW3T$KzK+fp@KouLQD`)77Z~biiC+XQq_RT
zs{$b#@OUMrP>IS$ARUYa1tOBmgeuE~23T+vY&Lwmm`cSl5(&OTvxwk`(XXQKL{AQm
zP3LTz@uWAThgHk1IMg2!Mq&abF_8+(BqmW2P^J=~LS?`JRcL?)pNg>{Q>nU4R>5k+
zA1~Gb+J-&aM%oBIH93tH2QH0#n?#?g1!eSOs}BI8BP^0cwT&!d&5r{mFp?N`<V$RB
za9wm%s?R1edYU=G<g}j2Fe4&5vc-%^uE7u%4jm3}&yHS<->?|B;v+Pj%A_ot>$b_`
zmzZ_iHnZ_DbJCvIIg4Lgu&2#T^);2Ur*jkW?6e7;*`&deww_6{c$Qm9n;UV;=2A&!
z#Vs$e@l-ksN`1CJyWpsa1WaTn68ZL>W%pN=4d`44z!KT~^vGTLUh`%rzO=h=ZGoO7
z{WU`+0FN6X0@{bfu4$X`<wY{%N41_k7s&U*qOelkYaHG$80{J0t5>L4&nE%mzfxsy
zwUhg%0+m)_z72m)m&?HC-P%mkQ8Gv@d0xCD-6HeA`CG6If!Mf1m9i47O0{pg>np$+
zVE+}^|2Z>fuZtWfe~12Y3}*g7CDdUv%QB3vs~p$tDABKgbG!-VHl5PMoN3tl6idJ$
z*_`cC#c8*gy{o};B*UC?<Wy$TgvpxGK3Li83bptFRLVGCK2)>OsKEYPzX2?fH_f4Y
zH}BJ5(#7UurRHO0A~u{`3vO!dueIZ^wBsvtYxeWS-)|JP(ULY=&_>;s6R)%rYk?O+
zQ5!00Lj`T9tbmzo>%w~+<paWwZa?Yc$B+A|{|S%=?Pv8Twb0sIRQpP5U!i($wSw1=
z&y93RFT3QC?%>O?0Qf&83HeV-@-_$=Z%05<?ocslm=>e_6KpvIP)8iaZOymTFvr!n
z;~YVg9)P;QBir3va1sPBTh4&wl_zkT!1wIu1gJ~T6!>Q3XufG@l9SuQz_t+Kcw$8a
zm)I8CggrV#?&2)V_v9{5*##XfbPIA<X!z0fr{jgtFx+d`pT|83Q61(j(8rN<^DM$(
zM9jBb9~lc@)zjH<#T8F;Ew`gdf{kA=ExAj*2||6^v;DL~YSP~RDX#vIs!xp&8X+2y
z9ofJ`0ke>!T3$N09Qig|u-1vY5HB*VER#z!I6PRQlKk_Bcf#7gr?nRbti<ZCQ2T?g
zOC2X(cbtCJak|*iU+U;Dh6YNZfr2{VPEohbe#(FBu6>c%@UE7f4W1Ktk6n|XF`Xj`
z_V4|KJlmC0e-vsDll`q032wPp_C!yL=38!LZfDH-Ot=!baK5!a{7ufX!xJoQX5g6&
zM<h46{1go1G=8TWIrb&zCWn6%8PD%p`W;A`aFQqON{I7aH4(0F`V2<1t^h2Nw@sl3
z`BLYpLKEI^+71`G<1b_Yxc|tPF2_8v*fw5j8!u?%Z$e$qPL&RxS)-+c=Zc~8rO^3;
zdfwfKDEzCyCxC7x5>8_xkv3`0Kv_#9W^=mXweS#3%)1eAn>jk;txvOT-A*Ob41Ojk
zKZE)~gwqK4Rk&pG0)muN;jwU^m;9?Nib@Y;?JB6Ua<oi*(0s|&X@c^3nfTC1y8AW{
z_m&l@B~T^+OIOM&3AB|(K{<>4&c2tRx*Ycu0k=s~E<j)9g5OkCxLVI`bT-o9v}6|y
zeZojh^jAIt@0bn3VL6q`OgRlx%)SaT<9rA#IMT<FCv^A&L#lcUuMftyI_yRH3w{y0
zU^24q0F)&`5H?9qq5ghL4lKFXW}tIvsubvaq!t6cr9khJ^p+ef)Zb;fSAezch5McF
MQTt(^CU?F60;Bzc1^@s6

literal 0
HcmV?d00001

diff --git a/prsctrl/devices/shutter/impl/__pycache__/dummy.cpython-311.pyc b/prsctrl/devices/shutter/impl/__pycache__/dummy.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..2d37c226fd5dd63ec918d03a335356942a6bada1
GIT binary patch
literal 1515
zcmcIj&1(}u6rb7bCet>twxzVTVAF%GIas_2MMSZn2PtCF!@97<-N}b;vg^!7Z7=3f
zu!^7;sYg$h(tjqAfMr1tJoOfd2kFW8_M;@G9-W>2<$Yz}`@MPdIhPwHu(J2&D-S6l
zKTt`Q77M)xAnX#G*wi69Q3xlGAvRiE*#r6DMAuWcVy7Inrs*1m*jvO_w~4KBZ7&6J
z@J35d+jN5z(nqMSA1QzZ8e}#q4d3U&ih?3UAFkeIfLBlnCpxu>uI!K!wdpp)oZCcK
z?G&Jf`SkP-c|r9IWYB`_TBBCmOul?lDSQmSj1~261AL&n#P9R&f$ad^XnpGQBsM|@
zV<_|pGSc;e5@@pFaS<@ntk$c(X@W_W+$jYkrfE4vDNR#i`h4?P+*~#8OD?2w!>&QJ
z^hMEkg|Wuv6W{fW4Y%Y!FA8ql-SjJNJ^3kD{YvAJ;Z<A+<|T()ez9(G!xNS-9K+_%
zsuq`qj5=ymYaSS}6D!`P7=hGV)BTNENh-~NOD+KXZjx^-_d4@7^OenhVY6*E*I{$5
zWcMJ1Sp99mR)+0d1p%6g0r5J$eKs8&p16U^`qpGv+NJo=@~+40`$~{<+;X5+>m_%e
z3LIRC>GL8B7^oPuH8H>mO-NPF10bETckB&oO<ZWRr4CzaC0pdc|G&6Q4RWy@7Y=(I
z5{gMIt&f5h`eO1i_m$8#hLL}fSZcH74qI*|dzb`%Iy{gx2ylb(#zAv)0|o65*8x*2
zxF<|=Xhb42c1z-%G|A!k`JI<x<^scMuNQ0FG=ovothsi>K{;!hPa8!i@`RHorr^I~
z8etY7$i;WU;*JAXg^G|aR)0M_TY>e5fP&-zFr3NLRj4-KC8vN&wPkd~0P00lV*qsl
z)qg|CE6iKS1Q{5<a<yI#M#|j312Pxl9M*LfAW$C_;Z#-B!(wMp!ajurj@i|y9oIx2
zY{*QO0J<qk=^;7O44=dFOtaic&wOO<^kOHy*i3yVbFIPMRT+hXhvEH|pJ@GciYu(+
E51*Y+YybcN

literal 0
HcmV?d00001

diff --git a/prsctrl/devices/shutter/impl/daq.py b/prsctrl/devices/shutter/impl/daq.py
new file mode 100644
index 0000000..54894c4
--- /dev/null
+++ b/prsctrl/devices/shutter/impl/daq.py
@@ -0,0 +1,41 @@
+from pylablib.devices import NI
+
+import logging
+log = logging.getLogger(__name__)
+
+from ..base import Shutter
+
+class ShutterDAQ(Shutter):
+    def __init__(self, channel):
+        self.daq_name = 'Dev1'
+        self.channel = channel
+
+    def open(self):
+        with NI.NIDAQ(self.daq_name) as shutter:
+            shutter.add_voltage_output('vout', self.channel, (0,5))
+            shutter.set_voltage_outputs('vout', 5)
+        log.info('Shutter opened')
+
+    def close(self):
+        with NI.NIDAQ(self.daq_name) as shutter:
+            shutter.add_voltage_output('vout', self.channel, (0,5))
+            shutter.set_voltage_outputs('vout', 0)
+        log.info('Shutter closed')
+
+    def __repr__(self):
+        return f'ShutterDAQ({self.daq_name}/{self.channel})'
+
+    # name: channel
+    shutters = {
+        "TAS Lamp Shutter": "ao0",
+        "TAS Pump Shutter": "ao1",
+    }
+    @staticmethod
+    def enumerate_devices():
+        return list(ShutterDAQ.shutters.keys())
+
+    @staticmethod
+    def connect_device(name):
+        if name not in ShutterDAQ.shutters:
+            raise ValueError(f"Unknown shutter {name}. Must be one of {ShutterDAQ.shutters}")
+        return ShutterDAQ(ShutterDAQ.shutters[name])
\ No newline at end of file
diff --git a/prsctrl/devices/shutter/impl/dummy.py b/prsctrl/devices/shutter/impl/dummy.py
new file mode 100644
index 0000000..ebd0872
--- /dev/null
+++ b/prsctrl/devices/shutter/impl/dummy.py
@@ -0,0 +1,14 @@
+import logging
+log = logging.getLogger(__name__)
+
+from ..base import Shutter
+
+class DummyShutter(Shutter):
+    def __init__(self):
+        super().__init__()
+    def open(self):
+        log.info("Dummy-Shutter open")
+    def close(self):
+        log.info("Dummy-Shutter close")
+    def __repr__(self):
+        return "Dummy-Shutter"
diff --git a/prsctrl/measurement.py b/prsctrl/measurement.py
new file mode 100644
index 0000000..d929ae0
--- /dev/null
+++ b/prsctrl/measurement.py
@@ -0,0 +1,186 @@
+# -*- coding: utf-8 -*-
+"""
+Created on Fri Jan 24 15:18:31 2025
+
+@author: Matthias Quintern
+"""
+from .measurement_device.base import VoltageMeasurementDevice
+from .led_control_device.base import LedControlDevice
+from .led_script import LedScript
+from .utility.prsdata import DataCollector
+
+import time
+import datetime
+from queue import Queue
+
+import logging
+log = logging.getLogger(__name__)
+
+def measure(
+    vm_dev: VoltageMeasurementDevice, 
+    led_dev: LedControlDevice, 
+    led_script: LedScript,
+    data: DataCollector,
+    delta_t: float=0.1, 
+    flush_after:int|None=None,
+    use_buffer=False,
+    max_measurements: int=None,
+    stop_on_script_end: bool=False,
+    verbose: bool=False,
+    command_queue: None|Queue=None,
+    data_queue: None|Queue=None,
+    add_measurement_info_to_metadata=True
+):
+    """
+    Perform a measurement
+
+    Parameters
+    ----------
+    vm_dev : VoltageMeasurementDevice
+        DESCRIPTION.
+    led_dev : LedControlDevice
+        DESCRIPTION.
+    led_script : LedScript
+        DESCRIPTION.
+    data : DataCollector
+        DESCRIPTION.
+    delta_t : float, optional
+        Target interval between measurements and led updates. The default is 0.1.
+    flush_after : int|None, optional
+        If int, flush values to disk after <flush_after>. The default is None.
+    use_buffer : TYPE, optional
+        If True, use the buffer measurement mode. The default is False.
+    max_measurements : int, optional
+        Number of measurements to perform before returning.
+        Note: If use_buffer=True, a few more than max_measurements might be performed
+        The default is None.
+    stop_on_script_end : bool, optional
+        Stop when the script end is reached.
+    verbose : bool, optional
+        If True, print some messages. The default is False.
+    command_queue : None|Connection, optional
+        A queue to receive to commands from. 
+        Commands may be:
+            "stop" -> stops the measurement
+            ("led_script", <LedScript object>) a new led script to use
+        The default is None.
+    data_queue : None|Queue, optional
+        A queue to put data in. The default is None.
+    add_measurement_info_to_metadata : bool, optional
+        If True, add measurement info to the metadata:
+        time, measurement_interval, measurement_use_buffer, measurement_voltage_device, measurement_led_device
+        The default is True.
+    Returns
+    -------
+    None.
+
+    """
+    get_time = lambda: datetime.datetime.now().strftime("%Y-%m-%d_%H:%M:%S")
+    if add_measurement_info_to_metadata:
+        data.metadata["measurement_interval"] = str(delta_t) + " s"
+        data.metadata["measurement_use_buffer"] = str(use_buffer)
+        data.metadata["measurement_voltage_measurement_device"] = str(vm_dev)
+        data.metadata["measurement_led_control_device"] = str(led_dev)
+        led_name = led_dev.get_led_name()
+        if led_name: data.metadata["measurement_led_lamp"] = led_name
+        data.metadata["measurement_time_start"] = get_time()
+    # write metadata to disk
+    data.write_metadata()
+    vm_dev.reset(True)
+    if use_buffer:
+        vm_dev.buffer_measure(delta_t, verbose=True)
+    # allow 0 instead of None
+    if max_measurements == 0: max_measurements = None
+    if flush_after == 0: flush_after = None
+    try:
+        i = 0
+        led_val = led_script.start()
+        try:
+            led_dev.set_level(led_val)
+        except Exception as e:
+            log.error(f"Error setting led to {led_val:03}%: {e}")
+            raise e
+        t_iter_start = time.time()
+        while True:
+            # using while True and if, to be able to log the stop reason
+            if max_measurements is not None and i >= max_measurements:
+                log.info(f"Reached maximum number of measurements ({i}{max_measurements}), stopping measurement")
+                break
+            # 1) read value(s)
+            if use_buffer:
+                try:
+                    values = vm_dev.buffer_read_new_values()
+                except ValueError as e:
+                    # print(f"Error in buffer measurement {i}:", e)
+                    values = []
+            else:
+                values = [vm_dev.read_value()]
+            # print(values)
+            # 2) process value(s)
+            for (tval, vval) in values:
+                if i == 0:
+                    t0 = tval
+                tval -= t0
+                current_data = (i, tval, vval, led_val)
+                data.add_data(*current_data)
+                # 3) write data
+                if verbose: print(f"n = {i:6d}, t = {tval: .2f} s, U = {vval: .5f} V, LED = {led_val:03}%" + " "*10, end='\r')
+                if flush_after is not None and (i+1) % flush_after == 0:
+                    data.flush(verbose=verbose)
+                # if a queue was given, put the data
+                if data_queue is not None:
+                    data_queue.put(current_data)
+                i += 1
+
+            # if a pipe was given, check for messages
+            if command_queue is not None and command_queue.qsize() > 0:
+                recv = command_queue.get(block=False)
+                if recv == "stop":
+                    log.info(f"Received 'stop', stopping measurement")
+                    break
+                elif type(recv) == tuple and recv[0] == "led_script":
+                    log.info(f"Received 'led_script', replacing script")
+                    led_script = recv[1]
+                elif type(recv) == tuple and recv[0] == "metadata":
+                    log.info(f"Received 'metadata', updating metadata")
+                    data.metadata |= recv[1]
+                    data.write_metadata()
+                else:
+                    log.error(f"Received invalid message: '{recv}'")
+
+            # 4) sleep
+            # subtract the execution time from the sleep time for a more
+            # accurate frequency
+            dt_sleep = delta_t - (time.time() - t_iter_start)
+            if dt_sleep > 0:
+                # print(f"Sleeping for {dt_sleep}")
+                time.sleep(dt_sleep)
+            t_iter_start = time.time()
+            # 5) update LED
+            if stop_on_script_end and led_script.is_done(t_iter_start):
+                log.info("Reached led script end, stopping measurement")
+                break
+            new_led_val = led_script.get_state(t_iter_start)
+            if new_led_val != led_val:
+                try:
+                    led_dev.set_level(new_led_val)
+                    led_val = new_led_val
+                except Exception as e:
+                    log.error(f"Error setting led to {new_led_val:03}%: {e}")
+                    raise e
+
+    except KeyboardInterrupt:
+        log.info("Keyboard interrupt, stopping measurement")
+    except Exception as e:
+        log.critical(f"Unexpected error, stopping measurement. Error: {e}")
+        if command_queue is not None:
+            command_queue.put(("exception", e))
+    if add_measurement_info_to_metadata:
+        data.metadata["measurement_time_stop"] = get_time()
+    # Write again after having updated the stop time
+    data.write_metadata()
+    data.flush()
+    led_dev.off()
+
+    
+    
diff --git a/pr_interactive.py b/prsctrl/prsctrl_interactive.py
similarity index 67%
rename from pr_interactive.py
rename to prsctrl/prsctrl_interactive.py
index 64e31e8..a1c6f03 100644
--- a/pr_interactive.py
+++ b/prsctrl/prsctrl_interactive.py
@@ -1,27 +1,16 @@
 """
 run this before using this library:
-ipython -i cpdctrl_interactive.py
-
-always records iv-t curves
-    i-data -> smua.nvbuffer1
-    v-data -> smua.nvbuffer2
+ipython -i prctrl_interactive.py
 """
 version = "0.1"
 
 import numpy as np
 import matplotlib.pyplot as plt
-import pandas as pd
 
 from datetime import datetime as dtime
-from sys import exit
-from time import sleep
 from os import path, makedirs
-import pickle as pkl
-import json
-import atexit
 import threading as mt
 import multiprocessing as mp
-# from multiprocessing.managers import BaseManager
 
 import argparse
 
@@ -29,27 +18,28 @@ if __name__ == "__main__":
     import sys
     if __package__ is None:
         # make relative imports work as described here: https://peps.python.org/pep-0366/#proposed-change
-        __package__ = "cpdctrl"
+        __package__ = "prsctrl"
         from os import path
         filepath = path.realpath(path.abspath(__file__))
         sys.path.insert(0, path.dirname(path.dirname(filepath)))
 
 
-from . import led_control_device
-from . import voltage_measurement_device
-from .voltage_measurement_device.base import VoltageMeasurementDevice
-from .voltage_measurement_device.impl import keithley2700 as _volt
-from .led_control_device.base import LedControlDevice
-from .led_control_device.impl import thorlabs_ledd1b as _led
-from .led_script import LedScript
+# import device modules
+from .devices import shutter as mod_shutter
+from .devices import lock_in as mod_lock_in
+from .devices import lamp as mod_lamp
+from .devices import monochromator as mod_monochromator
+# import base classes
+from .devices.lock_in import Lock_In_Amp
+from .devices.shutter import Shutter
+from .devices.lamp import Lamp
+from .devices.monochromator import Monochromator
 
-from .measurement import measure as _measure
-from .utility.data import DataCollector
-from .utility.data import plot_cpd_data as data_plot
+# from .measurement import measure as _measure
+from .utility.data_collector import PrsDataCollector
 from .utility.config_file import ConfigFile
-from .utility import file_io
-from .utility.device_select import select_device_interactive
-from .update_funcs import _Monitor, _update_print
+from .utility.device_select import select_device_interactive, connect_device_from_config_or_interactive
+from .update_funcs import Monitor
 
 import logging
 log = logging.getLogger(__name__)
@@ -60,15 +50,13 @@ _runtime_vars = {
 }
 # defaults, these may be overridden by a config file
 settings = {
-    "datadir":      path.expanduser("~/data"),
+    "datadir":      path.expanduser("~/Desktop/PR/data"),
     "name":         "interactive-test",
-    "led":          "unknown",
-    "interval":     0.5,
     "flush_after":  3000,
     "use_buffer":   False,
 }
 
-cfilename: str = "cpdctrl.yaml"
+cfilename: str = "photoreflectance.yaml"
 config_path: str = ""
 config_file: ConfigFile = ConfigFile("")
 
@@ -76,13 +64,20 @@ test = False
 
 # DEVICES
 # global variable for the instrument/client returned by pyvisa/bleak
-dev: VoltageMeasurementDevice|None = None
-led: LedControlDevice|None = None
-data_collector = DataCollector(data_path=settings["datadir"], data_name="interactive", dirname="interactive_test", add_number_if_dir_exists=True)
+lockin: Lock_In_Amp|None = None
+shutter: Shutter|None = None
+lamp: Lamp|None = None
+mcm: Monochromator|None = None
+
+data_collector = PrsDataCollector(data_path=settings["datadir"], data_name="interactive", dirname="interactive_test", add_number_if_dir_exists=True)
 t0 = 0
 data = None
 md = None
 
+from .test_measurement import  _measure_both_sim
+def measure_both_sim(**kwargs):
+    return _measure_both_sim(mcm, lockin, shutter, **kwargs)
+
 def monitor(script: str|int=0, interval: float|None=None, metadata:dict={}, flush_after: int|None=None, use_buffer: bool|None=None, max_measurements=None, stop_on_script_end: bool=False, max_points_shown=None):
     """
     Monitor the voltage with matplotlib.
@@ -131,9 +126,9 @@ def monitor(script: str|int=0, interval: float|None=None, metadata:dict={}, flus
     metadata["led_script"] = str(script)
     print(f"Starting measurement with:\n\tinterval = {interval}s\nUse <C-c> to stop. Save the data using 'data.save_csv()' afterwards.")
     plt.ion()
-    plt_monitor = _Monitor(use_print=False, max_points_shown=max_points_shown)
+    plt_monitor = Monitor(max_points_shown=max_points_shown)
     led_script = LedScript(script=script, auto_update=True, verbose=True)
-    data_collector = DataCollector(metadata=metadata, data_path=settings["datadir"], data_name=settings["name"])
+    data_collector = PrsDataCollector(metadata=metadata, data_path=settings["datadir"], data_name=settings["name"])
     # data_collector.clear()
     data_queue = mp.Queue()
     command_queue = mp.Queue()
@@ -190,7 +185,7 @@ def data_load(dirname:str) -> tuple[np.ndarray, dict]:
         dirpath = dirname
     else:
         dirpath = path.join(settings["datadir"], dirname)
-    data, md = DataCollector.load_data_from_dir(dirpath, verbose=True)
+    data, md = PrsDataCollector.load_data_from_dir(dirpath, verbose=True)
     
 # SETTINGS
 def set(setting, value):
@@ -208,7 +203,8 @@ def name(s:str):
 
 def save_settings():
     global settings
-    config_file.set_values(settings)
+    for k, v in settings.items():
+        config_file.set(k, v)
     config_file.save()
 
 def load_settings():
@@ -242,7 +238,7 @@ Run 'help("topic")' to see more information on a topic""")
 Functions:
     name("<name>")         - short for set("name", "<name>")
     set("setting", value)  - set a setting to a value
-    save_settings()        - store the settings as "cpdctrl.json" in the working directory
+    save_settings()        - store the settings in the config file
     load_settings()        - load settings from a file
 
 Upon startup, settings are loaded from the config file.
@@ -250,7 +246,7 @@ The global variable 'config_path' determines the path used by save/load_settings
 The search path is:
     <working-dir>/{cfilename}
     $XDG_CONFIG_HOME/{cfilename}
-    ~/.config/cpdctrl/{cfilename}
+    ~/.config/photoreflectance/{cfilename}
     
 The current file path is: 
     {config_path}
@@ -265,20 +261,27 @@ The current file path is:
         print(topic.__doc__.strip(" ").strip("\n"))
 
 
+def connect_devices():
+    global lockin, shutter, lamp, mcm
+    lockin  = mod_lock_in.connect_device(*select_device_interactive(mod_lock_in.list_devices(), "Select Lock-In-Amplifier: "))
+    shutter = mod_shutter.connect_device(*select_device_interactive(mod_shutter.list_devices(), "Select Shutter: "))
+    lamp    = mod_lamp.connect_device(*select_device_interactive(mod_lamp.list_devices(), "Select Lamp: "))
+    mcm     = mod_monochromator.connect_device(*select_device_interactive(mod_monochromator.list_devices(), "Select Monochromator: "))
+
 def init():
-    global dev, led, settings, config_path, config_file
-    print(r"""                  .___      __         .__   
-  ____ ______   __| _/_____/  |________|  |  
-_/ ___\\____ \ / __ |/ ___\   __\_  __ \  |  
-\  \___|  |_> > /_/ \  \___|  |  |  | \/  |__
- \___  >   __/\____ |\___  >__|  |__|  |____/
-     \/|__|        \/    \/                  """ + f"""{version}
-Interactive Shell for CPD measurements with Keithley 2700B
+    global lockin, shutter, lamp, mcm, settings, config_path, config_file
+    print(r""" __         .__   
+_____________  ______ _____/  |________|  |  
+\____ \_  __ \/  ___// ___\   __\_  __ \  |  
+|  |_> >  | \/\___ \\  \___|  |  |  | \/  |__
+|   __/|__|  /____  >\___  >__|  |__|  |____/
+|__|              \/     \/                  """ + f"""{version}
+Interactive Shell for Photoreflectance measurements
 ---
 Enter 'help()' for a list of commands""")
     parser = argparse.ArgumentParser(
-        prog="cpdctrl",
-        description="measure voltage using a Keithley SMU",
+        prog="prsctrl",
+        description="measure photoreflectance",
     )
     backend_group = parser.add_mutually_exclusive_group(required=False)
     parser.add_argument("-c", "--config", action="store", help="alternate path to config file")
@@ -289,10 +292,9 @@ Enter 'help()' for a list of commands""")
     if path.isfile(cfilename):
         config_path = cfilename
     elif 'XDG_CONFIG_HOME' in environ.keys():
-        # and path.isfile(environ["XDG_CONFIG_HOME"] + "/cpdctrl.json"):
-        config_path = path.join(environ["XDG_CONFIG_HOME"], "cpdctrl", cfilename)
+        config_path = path.join(environ["XDG_CONFIG_HOME"], "prsctrl", cfilename)
     else:
-        config_path = path.join(path.expanduser("~/.config/cpdctrl"), cfilename)
+        config_path = path.join(path.expanduser("~/.config/prsctrl"), cfilename)
     if args["config"]:
         config_path = args["config"]
 
@@ -300,7 +302,7 @@ Enter 'help()' for a list of commands""")
     load_settings()
 
     # setup logging
-    log_path = path.expanduser(config_file.get_or("path_log", "~/.cache/cpdctrl-interactive.log"))
+    log_path = path.expanduser(config_file.get_or("path_log", "~/.cache/prsctrl-interactive.log"))
     makedirs(path.dirname(log_path), exist_ok=True)
     logging.basicConfig(
         level=logging.WARN,
@@ -315,42 +317,10 @@ Enter 'help()' for a list of commands""")
         makedirs(settings["datadir"])
 
     # init the devices
-    last_vm_type = config_file.get_or("last_dev_vm_type", None)
-    last_vm_name = config_file.get_or("last_dev_vm_name", None)
-    if last_vm_name and last_vm_type:
-        try:
-            dev = voltage_measurement_device.connect_device(last_vm_type, last_vm_name)
-        except:
-            log.error(f"Failed to connect to last used device {last_vm_type}::{last_vm_name}")
-    while dev is None:
-        devs = voltage_measurement_device.list_devices()
-        print("-" * 50)
-        vm_dev_type, vm_dev_name = select_device_interactive(devs, "Select voltage measurement device: ")
-        try:
-            dev = voltage_measurement_device.connect_device(vm_dev_type, vm_dev_name)
-        except:
-            log.error(f"Failed to connect to device {vm_dev_type}::{vm_dev_name}")
-        config_file.set("last_dev_vm_type", vm_dev_type)
-        config_file.set("last_dev_vm_name", vm_dev_name)
-
-    # init the devices
-    last_led_type = config_file.get_or("last_dev_led_type", None)
-    last_led_name = config_file.get_or("last_dev_led_name", None)
-    if last_led_name and last_led_type:
-        try:
-            led = led_control_device.connect_device(last_led_type, last_led_name)
-        except:
-            log.error(f"Failed to connect to last used device {last_led_type}::{last_led_name}")
-    while led is None:
-        devs = led_control_device.list_devices()
-        print("-" * 50)
-        led_dev_type, led_dev_name = select_device_interactive(devs, "Select LED control device: ")
-        try:
-            led = led_control_device.connect_device(led_dev_type, led_dev_name)
-        except:
-            log.error(f"Failed to connect to device {led_dev_type}::{led_dev_name}")
-        config_file.set("last_dev_led_type", led_dev_type)
-        config_file.set("last_dev_led_name", led_dev_name)
+    shutter = connect_device_from_config_or_interactive(config_file, "shutter", "Shutter", mod_shutter, log=log)
+    lockin = connect_device_from_config_or_interactive(config_file, "lock-in", "Lock-In Amplifier", mod_lock_in, log=log)
+    lamp = connect_device_from_config_or_interactive(config_file, "lamp", "Lamp", mod_lamp, log=log)
+    mcm = connect_device_from_config_or_interactive(config_file, "monochromator", "Monochromator", mod_monochromator, log=log)
 
     # atexit.register(_backend.exit, dev)
 
diff --git a/system.cfg b/prsctrl/system.cfg
similarity index 100%
rename from system.cfg
rename to prsctrl/system.cfg
diff --git a/systemAll-1nm.atr b/prsctrl/systemAll-1nm.atr
similarity index 100%
rename from systemAll-1nm.atr
rename to prsctrl/systemAll-1nm.atr
diff --git a/systemAll-new.atr b/prsctrl/systemAll-new.atr
similarity index 100%
rename from systemAll-new.atr
rename to prsctrl/systemAll-new.atr
diff --git a/prsctrl/test-measure-xenon.py b/prsctrl/test-measure-xenon.py
new file mode 100644
index 0000000..3de43a9
--- /dev/null
+++ b/prsctrl/test-measure-xenon.py
@@ -0,0 +1,211 @@
+import pyvisa
+
+if __name__ == "__main__":
+    import sys
+    if __package__ is None:
+        # make relative imports work as described here: https://peps.python.org/pep-0366/#proposed-change
+        __package__ = "photoreflectance"
+        from os import path
+        filepath = path.realpath(path.abspath(__file__))
+        sys.path.insert(0, 'C:\\Users\Administrator\Desktop\Software\Python\Python\github')
+
+from time import sleep, time as now
+
+import numpy as np
+import matplotlib.pyplot as plt
+from Bentham import Bentham
+from prsctrl.devices.lamp.impl.xenon import Xenon
+from prsctrl.devices.shutter import ShutterProbe
+
+from .update_funcs import Monitor
+from prsctrl.devices.lock_in.impl.sr830 import SR830
+import logging
+
+logging.basicConfig(
+    level=logging.INFO,
+    format="%(asctime)s [%(levelname)s] [%(name)s] %(message)s",
+    handlers=[
+        # logging.FileHandler(log_path),
+        logging.StreamHandler()
+    ]
+)
+log = logging.getLogger(__name__)
+
+def set_measurement_params(lockin: SR830, p: dict={}, **kwargs):
+    params = p | kwargs
+    key_to_setter = {
+        "time_constant_s": lockin.set_time_constant_s,
+        "filter_slope": lockin.set_filter_slope,
+        "sync_filter": lockin.set_sync_filter,
+        "reserve": lockin.set_reserve,
+        "sensitivity_volt": lockin.set_sensitivity_volt,
+    }
+    for k, v in params.items():
+        if k not in key_to_setter.keys():
+            raise KeyError(f"Invalid parameter {k}")
+        key_to_setter[k](v)
+
+
+def set_offset_laser_only(lockin: SR830, shutter: ShutterProbe, wait_time_s):
+    """
+    Set the R offset from the signal when only the laser is on.
+    This signal should be stray laser light and laser induced PL
+    :return: Offset as percentage of the full scale R
+    """
+    log.info("Setting offset when the lamp is off.")
+    shutter.close_()
+    sleep(wait_time_s + 10)
+    lockin.run("AOFF 3")  # auto offset R
+    R_offset_fs = float(lockin.query("OEXP? 3").split(",")[0])  # returns R offset and expand
+    return R_offset_fs
+
+
+def _measure_both_sim(monochromator: Bentham, lockin: SR830, shutter: ShutterProbe, wl=550, aux_DC="Aux In 4", monitor=None):
+    data = {}
+    lockin_params = {
+        "time_constant_s": 10,
+        # "time_constant_s": 100e-3,
+        "sensitivity_volt": 50e-6,
+        "filter_slope": 12,
+        "sync_filter": 1,
+        "reserve": "Normal",
+    }
+    measurement_params = {
+        "measurement_time_s": 30,
+        "sample_rate_Hz": 512,
+    }
+
+    set_measurement_params(lockin, lockin_params)
+
+    measurement_time_s = measurement_params["measurement_time_s"]
+    sample_rate_AC = measurement_params["sample_rate_Hz"]
+    n_bins_AC = measurement_time_s * sample_rate_AC   # x sec messen mit <sample_rate> werte pro sekunde
+    timeout_s = 60
+    timeout_interval = 0.5
+    # trigger on the falling edge, since the light comes through when the ref signal is low
+    # could of course also trigger on rising and apply 180° shift
+    lockin.run("RSLP 2")
+    # since we dont expect changes in our signal, we can use larger time constants and aggressive filter slope
+    # for better signal to noise
+    def run_lockin_cmd(cmd, n_try=2):
+        com_success = n_try
+        e = None
+        while com_success > 0:
+            try:
+                return cmd()
+            except pyvisa.VisaIOError as e:
+                lockin.try_recover_from_communication_error(e)
+            com_success -= 1
+        raise e
+
+    # 5s for setting buffer,
+    # 5s for get values and plot
+    input("Make sure the laser is turned off and press enter > ")
+    mon = monitor if monitor is not None else Monitor(r"$t$ [s]", [
+        dict(ax=0, ylabel=r"$R [V]$", color="green"),
+    ])
+    data["lock-in-params"] = lockin_params
+    data["measurement-params"] = measurement_params
+
+    N_runs = 60
+
+    shutter.open_()
+    monochromator.drive(wl)
+    sleep(10)
+
+    t0 = now()
+    j = 0
+    data['R'] = []
+    data['t'] = []
+    for i in range(N_runs):
+        mon.set_ax_title(f"{i+1}/{N_runs}")
+        run_lockin_cmd(lambda: lockin.buffer_setup(CH1="R", CH2=aux_DC, length=n_bins_AC, sample_rate=sample_rate_AC))
+        ti = now() - t0
+        run_lockin_cmd(lambda: lockin.buffer_start_fill())
+        t = timeout_s
+        while t > 0:
+            t -= timeout_interval
+            sleep(timeout_interval)
+            if run_lockin_cmd(lambda: lockin.buffer_is_done()):
+                break
+        if t < 0: raise RuntimeError("Timed out waiting for buffer measurement to finish")
+        R = run_lockin_cmd(lambda: lockin.buffer_get_data(CH1=False, CH2=True))[0]
+        data['R'].append(R)
+        tdata = np.arange(n_bins_AC) * 1/sample_rate_AC * measurement_time_s + ti
+        data['t'].append(tdata)
+        mon.update_array(tdata, R)
+    mon.set_fig_title("Background")
+    mon.set_ax_title("")
+    return data, mon
+
+lockin = None
+lamp = None
+mcm = None
+shutter = None
+
+def measure_both_sim(**kwargs):
+    return _measure_both_sim(mcm, lockin, shutter, **kwargs)
+
+
+def _load_process():
+    import os; import pickle
+    with open(os.path.expanduser("~/Desktop/PR/2025-05-07_Xenon_1.pkl"), "rb") as file:
+        data = pickle.load(file)
+    process_data(data['R'], data['t'])
+
+
+def process_data(data_R: list[np.ndarray], data_t: list[np.ndarray]) -> np.ndarray:
+    assert len(data_R) == len(data_t)
+    n_points_2 = 512 * 5
+
+    n_points_averaged = data_R[0].shape[0]-2*n_points_2
+    l = len(data_R) * n_points_averaged
+    # Rs = np.empty(l, dtype=float)
+    # ts = np.empty(l, dtype=float)
+    Rs = []
+    ts = []
+
+    fig, ax = plt.subplots()
+    ax.set_xlabel("$t$ [s]")
+    ax.set_ylabel(r"$R [V]$")
+    for i in range(len(data_R)):
+        Rs_i = moving_average(data_R[i], n_points_2)
+        new_t_data = np.arange(data_R[i].shape[0], dtype=int) /512 + (i * 30)
+        ts_i = new_t_data[n_points_2:-n_points_2]
+        # ts_i = data_t[i][n_points_2:-n_points_2]
+        # Rs[i*n_points_averaged:(i+1)*n_points_averaged] = Rs_i
+        # ts[i*n_points_averaged:(i+1)*n_points_averaged] = ts_i
+        Rs.append(Rs_i)
+        ts.append(ts_i)
+        ax.plot(ts_i, Rs_i, color="blue")
+    plt.show()
+    return fig
+
+def moving_average(a: np.ndarray, n_points_2=2):
+    """
+
+    :param a:
+    :param n_points_2: Number of points to take to the left and right of the averaged point, leading to 2*n_points+1 per value
+    :return:
+    """
+    l = a.shape[0]
+    lret = l-2*n_points_2
+    ret = np.empty(lret)
+    for i in range(lret):
+        around_i = n_points_2 + i
+        begin = around_i - n_points_2
+        end = around_i + n_points_2 + 1
+        ret[i] = np.sum(a[begin:end]) / (2*n_points_2 + 1)
+        # print(i, begin, end, ret[i])
+    return ret
+
+
+if __name__ == "__main__":
+    mcm = Bentham()
+    shutter = ShutterProbe()
+    # mcm.park()
+    lamp = Xenon()
+    #lockin = SR830.connect_device(SR830.enumerate_devices()[0])
+    # lockin = Model7260.connect_device(Model7260.enumerate_devices()[0])
+    # mcm = DummyBentham()
+    # shutter = DummyShutter()
diff --git a/test.py b/prsctrl/test.py
similarity index 94%
rename from test.py
rename to prsctrl/test.py
index 23b4aa4..f97384e 100644
--- a/test.py
+++ b/prsctrl/test.py
@@ -1,5 +1,3 @@
-import pyvisa
-
 if __name__ == "__main__":
     import sys
     if __package__ is None:
@@ -10,18 +8,20 @@ if __name__ == "__main__":
         sys.path.insert(0, 'C:\\Users\Administrator\Desktop\Software\Python\Python\github')
 
 from time import sleep
-
+import pyvisa
 import numpy as np
 import scipy as scp
-from Bentham import Bentham, DummyBentham
-from devices.Xenon import Xenon
-from devices.Shutter import ShutterProbe, DummyShutter
+
+from Bentham import Bentham
+from prsctrl.devices.lamp.impl.xenon import Xenon
+from prsctrl.devices.shutter import Shutter
+from prsctrl.devices.lamp.impl.xenon import Xenon
 
 from .update_funcs import Monitor
-from .measurement_device.impl.sr830 import SR830
-from .measurement_device.impl.model7260 import Model7260
-import logging
+from prsctrl.devices.lock_in.impl.sr830 import SR830
+from prsctrl.devices.lock_in.impl.model7260 import Model7260
 
+import logging
 logging.basicConfig(
     level=logging.INFO,
     format="%(asctime)s [%(levelname)s] [%(name)s] %(message)s",
@@ -47,21 +47,21 @@ def set_measurement_params(lockin: SR830, p: dict={}, **kwargs):
         key_to_setter[k](v)
 
 
-def set_offset_laser_only(lockin: SR830, shutter: ShutterProbe, wait_time_s):
+def set_offset_laser_only(lockin: SR830, shutter: Shutter, wait_time_s):
     """
     Set the R offset from the signal when only the laser is on.
     This signal should be stray laser light and laser induced PL
     :return: Offset as percentage of the full scale R
     """
     log.info("Setting offset when the lamp is off.")
-    shutter.close_()
+    shutter.close()
     sleep(wait_time_s + 10)
     lockin.run("AOFF 3")  # auto offset R
     R_offset_fs = float(lockin.query("OEXP? 3").split(",")[0])  # returns R offset and expand
     return R_offset_fs
 
 
-def _measure_both_sim(monochromator: Bentham, lockin: SR830, shutter: ShutterProbe, wl_range=(400, 750, 25), aux_DC="Aux In 4", offset_with_laser_only=True, monitor=None):
+def _measure_both_sim(monochromator: Bentham, lockin: SR830, shutter: Shutter, wl_range=(400, 750, 25), aux_DC="Aux In 4", offset_with_laser_only=True, monitor=None):
     data = {}
     lockin_params = {
         "time_constant_s": 10,
@@ -125,7 +125,7 @@ def _measure_both_sim(monochromator: Bentham, lockin: SR830, shutter: ShutterPro
         print(f"R_offset_volt_before {R_offset_volt}")
     data["reference_freq_Hz_before"] = lockin.get_frequency()
 
-    shutter.open_()
+    shutter.open()
     for i_wl, wl in enumerate(range(*wl_range)):
         mon.set_ax_title(f"$\\lambda = {wl}$ nm")
         run_lockin_cmd(lambda: lockin.buffer_setup(CH1="R", CH2=aux_DC, length=n_bins_AC, sample_rate=sample_rate_AC))
@@ -143,6 +143,7 @@ def _measure_both_sim(monochromator: Bentham, lockin: SR830, shutter: ShutterPro
             if run_lockin_cmd(lambda: lockin.buffer_is_done()):
                 break
         if t < 0: raise RuntimeError("Timed out waiting for buffer measurement to finish")
+        # ToDo Phase messen
         arr = run_lockin_cmd(lambda: lockin.buffer_get_data(CH1=True, CH2=True))
         data[wl] = {}
         data[wl]["raw"] = arr
@@ -151,7 +152,7 @@ def _measure_both_sim(monochromator: Bentham, lockin: SR830, shutter: ShutterPro
         errs = np.std(arr, axis=1)
         dR = means[0]
         R = means[1]
-        sdR = errs[1]
+        sdR = errs[0]
         sR = errs[1]
         data[wl] |= {"dR": dR, "sdR": sdR, "R": R, "sR": sR}
         dR_R = dR / R
@@ -172,7 +173,7 @@ def _measure_both_sim(monochromator: Bentham, lockin: SR830, shutter: ShutterPro
     mon.set_ax_title("")
     return data, mon
 
-def _measure_both(monochromator: Bentham, lockin: SR830, shutter: ShutterProbe, wl_range=(400, 750, 25), AC=True, DC=True, monitor=None):
+def _measure_both(monochromator: Bentham, lockin: SR830, shutter: Shutter, wl_range=(400, 750, 25), AC=True, DC=True, monitor=None):
     mon = monitor if monitor is not None else Monitor(r"$\lambda$ [nm]", [
         # dict(ax=0, ylabel="Wavelength [nm]", color="red"),
         # dict(ax=1, ylabel="Ref", color="blue", lim=(0, 5)),
@@ -185,7 +186,7 @@ def _measure_both(monochromator: Bentham, lockin: SR830, shutter: ShutterProbe,
         dict(ax=5, ylabel=r"$\theta$", color="orange", lim=(-180, 180)),
         dict(ax=6, ylabel=r"$\sigma_\theta$", color="orange")
     ])
-    shutter.open_()
+    shutter.open()
     data_raw = []
     data_wl = {}
     # TODO these are only printed, not set!
@@ -290,7 +291,7 @@ def _measure_both(monochromator: Bentham, lockin: SR830, shutter: ShutterProbe,
     return data_wl, data_raw, mon
 
 
-def _measure(monochromator: Bentham, lamp: Xenon, lockin: SR830, shutter: ShutterProbe, wl_range=(400, 750, 25)):
+def _measure(monochromator: Bentham, lamp: Xenon, lockin: SR830, shutter: Shutter, wl_range=(400, 750, 25)):
     data = []
     mon = Monitor(r"$\lambda$ [nm]", [
         # dict(ax=0, ylabel="Wavelength [nm]", color="red"),
@@ -303,7 +304,7 @@ def _measure(monochromator: Bentham, lamp: Xenon, lockin: SR830, shutter: Shutte
     N_bins = 100
     dt = 0.01
     i = 0
-    shutter.open_()
+    shutter.open()
     if isinstance(lockin, SR830):
         lockin.run("SENS 17")  # 1 mV/nA
         lockin.run("OFLT 5")
@@ -345,7 +346,7 @@ def _measure(monochromator: Bentham, lamp: Xenon, lockin: SR830, shutter: Shutte
             data.append((wl, arr))
             i += 1
 
-    shutter.close_()
+    shutter.close()
     return data, mon
 
 lockin = None
@@ -364,7 +365,7 @@ def measure_both_sim(**kwargs):
 
 if __name__ == "__main__":
     mcm = Bentham()
-    shutter = ShutterProbe()
+    shutter = module_shutter.connect_device(module_shutter.TYPENAME_DAQ, "TAS Lamp Shutter")
     # mcm.park()
     lamp = Xenon()
     lockin = SR830.connect_device(SR830.enumerate_devices()[0])
diff --git a/prsctrl/test_measurement.py b/prsctrl/test_measurement.py
new file mode 100644
index 0000000..6798e7d
--- /dev/null
+++ b/prsctrl/test_measurement.py
@@ -0,0 +1,184 @@
+import numpy as np
+import scipy as scp
+from time import sleep
+import pyvisa
+
+import logging
+log = logging.getLogger(__name__)
+
+
+from prsctrl.devices.lamp import Lamp
+from prsctrl.devices.shutter import Shutter
+from prsctrl.devices.monochromator import Monochromator
+from .update_funcs import Monitor
+from prsctrl.devices.lock_in import Lock_In_Amp
+from prsctrl.devices.lock_in.impl.sr830 import SR830
+
+def set_measurement_params(lockin: SR830, p: dict={}, **kwargs):
+    params = p | kwargs
+    key_to_setter = {
+        "time_constant_s": lockin.set_time_constant_s,
+        "filter_slope": lockin.set_filter_slope,
+        "sync_filter": lockin.set_sync_filter,
+        "reserve": lockin.set_reserve,
+        "sensitivity_volt": lockin.set_sensitivity_volt,
+        "frequency_Hz": lockin.set_frequency_Hz,
+        "reference": lockin.set_reference,
+        "reference_trigger": lockin.set_reference_trigger,
+    }
+    for k, v in params.items():
+        if k not in key_to_setter.keys():
+            raise KeyError(f"Invalid parameter {k}")
+        key_to_setter[k](v)
+
+
+def set_offsets_laser_only(lockin: SR830, shutter: Shutter, wait_time_s, R=True, phase=True):
+    """
+    Set the R offset from the signal when only the laser is on.
+    This signal should be stray laser light and laser induced PL
+    :param phase: If True, use the Auto-Phase function to offset the phase
+    :param R: If True, use the Auto-Offset function to offset R
+    :return: Offset as percentage of the full scale R, Phase offset in degrees
+    """
+    log.info("Setting offset when the lamp is off.")
+    shutter.close()
+    sleep(wait_time_s + 10)
+    lockin.run("AOFF 3")  # auto offset R
+    # R must come before phase, because after auto-phase the signal needs to stabilize again
+    if R:
+        R_offset_fs = float(lockin.query("OEXP? 3").split(",")[0])  # returns R offset and expand
+    if phase:
+        lockin.run("APHS")
+    phase_offset_deg = float(lockin.query("PHAS? 3"))  # returns R offset and expand
+    return R_offset_fs, phase_offset_deg
+
+
+def _measure_both_sim(monochromator: Monochromator, lockin: SR830, shutter: Shutter, wl_range=(400, 750, 25), aux_DC="Aux In 4", offset_with_laser_only=True, monitor=None, laser_power_mW=None):
+    data = {}
+    lockin_params = {
+        "time_constant_s": 10,
+        # "time_constant_s": 300e-3,
+        "sensitivity_volt": 500e-6,
+        "filter_slope": 12,
+        "sync_filter": 1,
+        "reserve": "Normal",
+        "reference": "Internal",
+        "reference_trigger": "Falling Edge",
+        "frequency_Hz": 173,
+    }
+    measurement_params = {
+        "measurement_time_s": 30,
+        "sample_rate_Hz": 512,
+    }
+    if laser_power_mW:
+        measurement_params["laser_power_mW"] = laser_power_mW
+
+    set_measurement_params(lockin, lockin_params)
+
+    measurement_time_s = measurement_params["measurement_time_s"]
+    sample_rate_AC = measurement_params["sample_rate_Hz"]
+    n_bins_AC = measurement_time_s * sample_rate_AC   # x sec messen mit <sample_rate> werte pro sekunde
+    timeout_s = 60
+    timeout_interval = 0.5
+    # trigger on the falling edge, since the light comes through when the ref signal is low
+    # could of course also trigger on rising and apply 180° shift
+    lockin.run("RSLP 2")
+    # since we dont expect changes in our signal, we can use larger time constants and aggressive filter slope
+    # for better signal to noise
+    wait_time_s = lockin.get_wait_time_s()
+
+    def run_lockin_cmd(cmd, n_try=2):
+        com_success = n_try
+        e = None
+        while com_success > 0:
+            try:
+                return cmd()
+            except pyvisa.VisaIOError as e:
+                lockin.try_recover_from_communication_error(e)
+            com_success -= 1
+        raise e
+
+    # 5s for setting buffer,
+    # 5s for get values and plot
+    print(f"Time estimate {(measurement_time_s + wait_time_s + 10 + 5 + 5)/60 * ((wl_range[1]-wl_range[0])/wl_range[2])} minutes")
+    input("Make sure the laser is turned on and press enter > ")
+    mon = monitor if monitor is not None else Monitor(r"$\lambda$ [nm]", [
+        dict(ax=0, ylabel=r"$\Delta R$", color="green"),
+        dict(ax=1, ylabel=r"$\sigma_{\Delta R}$", color="green"),
+        dict(ax=2, ylabel=r"$R$", color="blue"),
+        dict(ax=3, ylabel=r"$\sigma_R$", color="blue"),
+        dict(ax=4, ylabel=r"$\Delta R/R$", color="red"),
+        dict(ax=5, ylabel=r"$\sigma_{\Delta R/R}$", color="red"),
+        dict(ax=6, ylabel=r"$\theta$", color="pink"),
+    ])
+    mon.set_fig_title(f"Turn on laser and plug detector into A and {aux_DC} ")
+
+    data["lock-in-params"] = lockin_params
+    data["measurement-params"] = measurement_params
+    full_scale_voltage = lockin_params["sensitivity_volt"]
+    def set_offsets(name):
+        shutter.close()
+        mon.set_fig_title(f"Measuring baseline with lamp off")
+        R_offset_fs, phase_offset_deg = set_offsets_laser_only(lockin, shutter, wait_time_s)
+        R_offset_volt = R_offset_fs * full_scale_voltage
+        data[f"R_offset_volt_{name}"] = R_offset_volt
+        data[f"phase_offset_deg_{name}"] = phase_offset_deg
+        print(f"R_offset_volt_{name} {R_offset_volt}")
+        print(f"phase_offset_deg_{name}: {phase_offset_deg}")
+
+    if offset_with_laser_only: set_offsets("before")
+    data["reference_freq_Hz_before"] = lockin.get_frequency_Hz()
+
+    data["info"] = []
+
+    shutter.open()
+    for i_wl, wl in enumerate(range(*wl_range)):
+        mon.set_ax_title(f"$\\lambda = {wl}$ nm")
+        run_lockin_cmd(lambda: lockin.buffer_setup(CH1="R", CH2=aux_DC, length=n_bins_AC, sample_rate=sample_rate_AC))
+        mon.set_fig_title(f"Setting wavelength to {wl} nm")
+        monochromator.set_wavelength_nm(wl)
+        mon.set_fig_title(f"Waiting for signal to stabilize")
+        # wait the wait time
+        sleep(wait_time_s + 10)
+        overload = run_lockin_cmd(lambda: lockin.check_overloads())
+        if overload:
+            msg = f"Overload of {overload} at {wl} nm"
+            log.warning(msg)
+            data["info"].append(msg)
+        theta = []
+        mon.set_fig_title(f"Measuring...")
+        theta.append(run_lockin_cmd(lambda: float(lockin.query("OUTP? 4"))))
+        run_lockin_cmd(lambda: lockin.buffer_start_fill())
+        t = timeout_s
+        while t > 0:
+            t -= timeout_interval
+            sleep(timeout_interval)
+            if run_lockin_cmd(lambda: lockin.buffer_is_done()):
+                break
+        if t < 0: raise RuntimeError("Timed out waiting for buffer measurement to finish")
+        theta.append(run_lockin_cmd(lambda: float(lockin.query("OUTP? 4"))))
+        arr = run_lockin_cmd(lambda: lockin.buffer_get_data(CH1=True, CH2=True))
+        data[wl] = {}
+        data[wl]["raw"] = arr
+        data[wl]["theta"] = theta
+        # calculate means
+        means = np.mean(arr, axis=1)
+        errs = np.std(arr, axis=1)
+        dR = means[0]
+        R = means[1]
+        sdR = errs[0]
+        sR = errs[1]
+        data[wl] |= {"dR": dR, "sdR": sdR, "R": R, "sR": sR}
+        dR_R = dR / R
+        sdR_R = np.sqrt((sdR / R) + (dR * sR/R**2))
+        data[wl] |= {"dR_R": dR_R, "sdR_R": sdR_R}
+        mon.update(wl, dR, sdR, R, sR, dR_R, sdR_R, theta[0])
+    # if it fails, we still want the data returned
+    try:
+        if offset_with_laser_only: set_offsets("before")
+        data["reference_freq_Hz_after"] = lockin.get_frequency_Hz()
+    except Exception as e:
+        print(e)
+    mon.set_fig_title("Photoreflectance")
+    mon.set_ax_title("")
+    return data, mon
diff --git a/update_funcs.py b/prsctrl/update_funcs.py
similarity index 97%
rename from update_funcs.py
rename to prsctrl/update_funcs.py
index 74ea752..bce283d 100644
--- a/update_funcs.py
+++ b/prsctrl/update_funcs.py
@@ -16,7 +16,9 @@ class Monitor:
         self.lines = []
         n_ax = max(self.options, key=lambda v: v["ax"])["ax"] + 1
         plt.ion()
-        self.fig1, self.ax = plt.subplots(n_ax, 1, figsize=(7, 8), sharex=True)
+        self.fig1, self.ax = plt.subplots(n_ax, 1, figsize=(7, 8), sharex=True, squeeze=False)
+        self.ax = self.ax[:,0]
+        self.ax[-1].set_xlabel(xlabel)
        
         
         for i in range(len(self.ydatas)):
diff --git a/prsctrl/utility/__init__.py b/prsctrl/utility/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/prsctrl/utility/__pycache__/__init__.cpython-311.pyc b/prsctrl/utility/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..23ea318eb50a209a1546e761cc11b6cf6e19d338
GIT binary patch
literal 213
zcmZ3^%ge<81iewx86f&Gh=2h`DC095kTIPhg&~+hlhJP_LlF~@{~09tE5q3;CbT%U
zs5r(kB{wrKv$&)vu_V7J#wE2lyClCLCOAK>q&%@GH7204BqKi$Mx|$#WRxbw6lCNB
z6{n`<q$Zan<|U`b6ci<w6y?N}mSpB+mQ=>X#{-QliI3MSsQkrYlbfGXnv-f*#0s<+
X<g{XbAn}2jk&*EO1B@tQ28say9c??n

literal 0
HcmV?d00001

diff --git a/prsctrl/utility/__pycache__/config_file.cpython-311.pyc b/prsctrl/utility/__pycache__/config_file.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..6145af64ecf724c016ff98fbdd60e0b59b56b79c
GIT binary patch
literal 4076
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
bjo?HxII$rei01{^$cyBA<o$3=2UG2T+dFy0

literal 0
HcmV?d00001

diff --git a/prsctrl/utility/__pycache__/data_collector.cpython-311.pyc b/prsctrl/utility/__pycache__/data_collector.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..eb6f3f3ad9d2566bebc748c13992f906e4b2b2e0
GIT binary patch
literal 9583
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
Q4c3+(W9!#@bTMN64+Hc#BLDyZ

literal 0
HcmV?d00001

diff --git a/prsctrl/utility/__pycache__/device_select.cpython-311.pyc b/prsctrl/utility/__pycache__/device_select.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..c1cbc9b557d5bfdd14f4ed5cc1ef2fcc5da7e439
GIT binary patch
literal 4965
zcmbstZD<_Fb$0hY_CD8=Wm%RivbJPN=SFgD;*y+I2U%8P*G}xBv`tc}*VFCXM|`(?
zp53#f>#7wYl(R8JfkG706s4qziwUT-1^?)eG;M$N&z?B2SP&HYqolvCxCP^1eKUJ2
z?VTJa(9z!P%$qmw&3p5{R-eRTVFc}O+CcujC_?|B6Ssw0gZsaP!MjM26b>WIVIFe_
zTpX0;cg6~j1z6|2u&hrJ-txcZQ+$fQ=r09c3vfsYD8XXzwV)#M2nSymU1B)&F^A9{
z_&H4pWd$XS14;yQN)&!Ez-H&A>se8W1LcSkoJEN}4|`{E5oZiJt;z*eH%O&~RU;|e
zUB+S=rxbjxkimLNDP#;gK(J9EYKCv|p)Yy}0e<&wVE-;M(Gst4Zy}Rk1K{rVF@WxD
zgU_P&`I2BzTCHXZ?P8rp^FwpMd&$Ro|5Cv4ySNCMK83HsR1w|>rJ4Tsk>WQ4@1qa=
z?Nm5)YuE^S_H}Sk0#|%=m0S-Y!@WwF8xhYQuAOH449)?{UJ9B)pv5-nd(GhEcwS+0
zke~sk<hD0CQ!s-&Mly?rkav9;k;5GFYCw4`56}ePeohX(if;YvI(kER6<y~H$>j_>
z6x%W1<PxED2`)G+LvsyAc8mke#=s<<F$&jkaZ%0^tt1<HEN8S*DXl7Uv7q8G+ju!m
z(j^SYI-8DfH#Xg6ZwyKqPRZ2#3YwZGi?Wt=`O*zK*sVg@6$mgS1nXr@RSIg(MN)xd
z8#_kzWjG(*&URB2N|qj4XU>3?*7gY(TL*c-Ll&@HPU||X8(K?9RR!;9`H2kD<u%16
zR>Vpwqp1ebiY|gi<ZD{dNat{>gwuM3VCrt}YO%0D(xlKjaAw<~;by3X?1kU`5$N7U
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
Pzu-Y{ExNnel<DGs;h8Qi

literal 0
HcmV?d00001

diff --git a/prsctrl/utility/__pycache__/file_io.cpython-311.pyc b/prsctrl/utility/__pycache__/file_io.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..8607281095f3251e2f7038a326f9cd4ca65f481b
GIT binary patch
literal 2041
zcmZt{O>YxNbY^$Gv11zth%HbNtoV?;K<$vyDnv9Tl#dn>Xp35jV3cmW>v+rB>&}dw
z#Il7!sp=w24N?)IqN;mILAh|~q1W;YVq~e-N}PJi%@S%AacSRdu!%#T?Kks2=gs>V
z{~8STBY@iDf%HEjLVt0h13<g*VicD9NJl!hPzF!pj4&x+P79VeDe695GNhECdlo#C
z9=%`hTfmdD?p;8WeY$W3ss1(YMirbs%cM*<i6iASmcF#c4{&fHDRB8K=!2E>Us!<d
zBZgn`VJV?ypjNt^vY=zu36je(^K8-<dbNviQC(PuvsSw26+yow6u}6>6pQEk6#!ze
zJjp5rMWYI3#LUhdRWw~!EJM?QP>KezsbZ#pk&S{vw4kcWNkunjOh#P~4jv->3{`YQ
zP;kVIHs^?-u8Kqkz9VlaJD5@)KOFjU=EKp%=hPrHF|KFKEF_9(%qEF52ED=TT;htI
zVzU}C5}(Yow4LoNaArC`oyetaP&QJQkz`snX(Vza$%vK6Gt)BJd?IC9#*}Hta`TQ4
z?lR@xfrQ{}34Zh)Ko#`27x@C!@$clCTp4fqx7|CinEHv<k3A?nEZnv0UpIEB%^hmP
zfB4a-4S#G^ioF0c^b*ICn~H$=1>FMPfkJI5Anq+mSuBb5ZaKNL4lKiFr9&W$K(AZ0
zE*mym^>kd8O5z!Gos>N#PknP-U9+uiL~(7G50yN+02VwQZ-6fL#{G@3yQ@>*)N)-W
zw5l%kwpv+c!A)|x*JD{O$tCHAt3Yt=%aUA{YRLnLZF_BV5D^ihtEgtrqB-#@n#Co=
zw!fB_B;CVXxwN&(fd}m^7k_h`bH-o_OB+hom}3g>i>#J0l;|uplAUJ?aE&Zwrkzz|
zuD&s+Wpb7=>JofDrZu`@^S*1|<-=e@_t|7#NyFrD&qG7UVo6#!`idBiO<P(lcf;y1
zj&o_({_U~O=xx}(>q^%C1-L}`Jsq^hn?>~zUROt=HepU5F$yp>hSN`(Mi}MyaHN!(
z)ww8VX-UHo%`9{JztF6_ah4F9xQ(y&Io{4y9A7th65zf)JOt_lEqm6WY$}`2OdIfQ
zajqk8P?Wz^JRbmrm&w@<sh#3!o#J{tt>ggkxkKszf(aWy!NJ9k8-cyez~0K)mgM{P
z!tD#UE-qZGT;#;W?TK5L7cN&Ww+17XiPk{4jl7->RFztxo!{TQb8~5~5sEfL(N*v8
zqi9=@ec@Jk_fmZ6_|GSPJW;>$VC>=8QoI>H{AYOhS$O!#$nT#u!l#<yQ`K|N!@HIu
zcdz|$t$MB%3NHnpg$}KT4%O#cd-hi+suSzaL%Z7u`{29|Y6S+XAGJjw*VotEG71dd
zGwZ=e+ApCekw#>s85wE#M^>c~%ID#a@VI<>pYU{#!12ER(?>l|k6^&b%_Gjo#eE)P
zu<3mszUu1f7={rogWd|)b%DRomx_UFiA4PH2c!E>j+L&HL6E@zia?;oG(W9k$J<Fg
z<<2^Vp<32tX3=<Em?%gO!jDD(RnT*Pu=d_!yuQDlZusL(e|%MnlK~K^nDB^I!R^3}
zz1I<J>h>Vv&jmTe(OVqx2i2`P;r<^Z*M-|0FTE!-ww||)F>(Y%JUB`LL2@x}p*^er
n_iZ6x#r?D;501AHpv9f;vK0+P@QF6+MMD@5K`GxrZczUL8<gQa

literal 0
HcmV?d00001

diff --git a/prsctrl/utility/__pycache__/prsdata.cpython-311.pyc b/prsctrl/utility/__pycache__/prsdata.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..ed5aefc7d424aca9ddd1af8ededc08aff8ad0137
GIT binary patch
literal 15571
zcmeHOYit`=cAg=J<d7moNz~i2GO`p~iY3Li9DAenBeH16&f1D>*?A~-R9Z8#X;UOU
zGm0gKN|e;w(ymc6t`_EY9W1xlq-tXnF0d$!Vi(9R(l+g{8DX|2rVtRI2vGm3f@Fcz
zKiZyihaApO(l#mD9|bxj&&=HSJ@?*ozjMyzp9TUx3a<1Yv|aq`trYdo_)@y6iVt5Z
z@NkFXDV~l|<21QD#+~HOj5Fl!ns$$SXd?|f&XO?ixYt1m-b<tgEK8{Rkfx}Q;AdRp
ze%`@5V}a@F@#^W|co6b4<2Af%yjG~?-6=>kUgw~mr+Cjbif2D`KwkJ2^M?33-Y?WA
z0|I@ip%j{Q3(iZ8r8hnx)brKw3kpqqjnFjZ<7=<E#+!M1jOqzJ!ek?lu*4pRUVA~1
zC*s1aJTVoG3Gv9Zpw~)~cvOz21T!dAos3RijtPBnJ|c>dIo&lnbn5g(s(D(7NHd}^
zEyU%CX+e(g5joPIyd0Y>H3jb_K79EUaNrIl5MGWucp7-w$TI@NJ5nBs;$4EP_~aJc
z#?zD=c;FiM@a#1TxZA}0uF>OOzL~FryASSuxK{~&hzVSyKZMFYGHV_Wknn0KKM21X
z!6j5*3YMY;_mrch^g=;Bz@du#H82{O`?u$0__}LMMb0{?xrGlw-g+VQU*vc54Qpzy
z=N&Lot-5Dal)}K$l;q>!8jeLIiJOkZBNw9a3mh_=i^O@(<h+q866ekfTolJJ5`$sn
zxhXL*Z6xQTqA)4P=6bn=$VE6Db9^#_6XG0~jK~-JNjW1&bOzsa1}oCpQZ17%lWi1*
z&rbM#SqJnEm3E}52{T&8nBtXo+Sh>0lwv6AGMU{Xn|4BOGf&(TrL6C1$3ktIUI@zG
za!#JMm-;T9cDw_r-m#~0tVu;@>36#2(#(VcFS$#l=3y?bz0wsmiF@Rla;m(gP36!u
zoo4Pi?d$g}^wr9vc~_d6r7xMiPP<a|6gBB6^MR+vs0~_bX}`5rdvC>`r0IM~rj?Vy
z6VFtn+->WV-<G)eQptz^UVk=hk?Xg%DDc16B6)MUY~F2e#k;ipgeBIKrhf!-`TdF+
zjdRaBvN&!%-jP(-;i!C35Xs6SYYms}^o%6qD&>W#Xk6g?Q@g%Fs$TB=jLgLokTU_R
zw1?I`ZwTV~gd{v>`X{9~QVh!8)Ycc{u{jO{h;+a(vd|?iA_|-|lT0Q=S>RLdQCQvF
zwp7<PE-G<x!DwbtD8z|;Fy%sjPmPGPO=sk}qyQozIw^}dsdV2<k=TrISQHbY?np=?
zt_0l`l_0Cg;&WXr5#c9LhD@Lwnt%x19hFe@=&TUurK?c!npDvGHDS;ZJv5S#k4-0I
zWX}<Jqu$yhP#8oUNzBBJpdPo*NJ4CiG>5dDv{u9!q&ud0370#{RE~Rmad`0T8A%YO
zvqSteh)qcrBXUAK8y2L?aw2(lEHNct1=gJ%os%yn;-%XKX!gwcv&oAINGwdnK(0pO
zlfv1gC;@L`XJ_PSEGp08J9fT5Ij6G|6DXD^CQ>y;$=+WI!L3|M!3McN73!Na%uVk~
zRWQq5KXCKF`=^(yI+Uu8LR(iReDg%+#Aj{o_)w?{X7=U6x#KH!ZOZ0hwJxmHg%y7o
z!j-B`c}C%OkeHKd-6^f^l;S@HF>2MOm0<17tGDKF%;!$4!7W;F%PJKJoTFE`Z4bG@
zWp41n?oXQ(Zcyb;YTU{90$FC!o7+{Wsm}%$1Nl0&rV}5s@L8!1EjHb0zulf^)Y>Pt
z+9y{j9~4vwHQm{Ndw;%B4Rvdw?p4ZD`zpQCwf$k&f#t3P4`j6~taXLoJCO}99?OZ)
z+w6(O6ZunW{Wg5a!l%&Ca_8LbbNM}L!&6$rQ>zs7ZA<vPwNL4PS#5nqYkftjf93PW
zZA$lR_v?WeU$yb9)_7K_Ir~|28}Ra220mZH5KxmQN`n{Nqfjz`ISb?tC0pVyna^qJ
zl8MgX*_7n>XuIT}r>#2|q%`+YyR=Eu6Xsr&M#SbA!IeIlh|NsLr5=y&Nb<Tj3{&ce
z2yo4q+#S$B-3c?-Sd<KI);$h!69zl@DG6K1aUu#i-7hD|a-72Ksru4Pw1)12bkYtW
z3)D&=c=K$o>u%4|>3e6Dz@Qo!)B=MU$4Xs8mS3D!>$<eMu8iZRrx2{octsSHkLlh?
zlO^zOf`n0c0X70HU3rs@r4YPt#L_ekOa%siWHOns=g(;9x{&N)41wc8NDK0#yzGmd
z5Vu3wHdeTy(<nHrElhy-y_l{Y$O83wu<_R0H{Q<4cjuP6?)5zw%e<`yhqU03!VZzn
zPU0jfT{v)L!uX+I0Ee7nopsXiG;SU5SHKaPk}cfITb@hB!dAUeP77E`)4anz<({GD
znKYBPw$LmxP36rAXa>SV+5wOST3=RI>~BQb0fon26NZjaozzZBVy-%7ov%_?X_|VK
zqTxd}LS`ftd|3oY3cwXO%*hE(r>}}nL5(1*T}d$-mvv_>aY1LI@u`H)B$7g0cU^@n
zg4l<tT*ho>apOQ-N=DNV=nRHQ*d37PrD<LzMcxo_bSENmDpVR^OW;08FZ}}$5V=)#
z3cL3Qhn3bnOGkmgSFPWx)$dj6_pY#2x7Zu3QrnmR4iNaNY`@0#D{TKtpf=l`8&(6H
z7T{JX+S`{87yLE1Ubyi>R=)G*?KksM_D!{EyVkT__4jK2Ud7+L>V#w@Eg@fEuCI`k
z!!~^S`s=SZj3W_J9dzfHj;Ds6b^h{MW@x|XR}>9&(p)bPZLY>Ygctj2EDN>uXCbUh
zbG=$c9Z#duYM&AF0OmKCc}@Vv4*NQWS%NB$GqrULMvVi&L}p1eE=76c75C7xo+4I5
zg(EO0u)_xCU@j%1aoq#(0<~BX*Dy!~lz`=#B0dAJ60V2xJYh>yqP!`WLJnc-13*9y
zgc=t2-r0A1U!M7?cWL*%eGj&(+n-ZILt1Dk!xmWoL$-ODZO%342bMf4yF+7lD5b9<
zC#++D$ce~_9Psn^9bjajfnRhUg4bRjLeNKMaF{w*i=ca+0oB3DJJJk*QD@o(lzHEk
z0)R8`yjce^blw~*Gc!D798)y!y2e@+u=1uArtG!Z*Z%tBdA&lO@eIxeqa`x-w0Oac
zF*i2eT~@yBbwL06=iQ(Rx_?Ancl-$Uf;1QbtjfA2oZTSYYYzv`utm;1op!F@i%Mk(
zW}|OJr&5kiF69{H9@9P>G{DgtfZvy0Kz=}f59A!kd+MBTo=9qJ`TLHSs5>-G-K-)K
zkRJInnBcmje+Svj$s{Ek5*EdA3uJSC?A>=k0CP-IJdoN_l3B(5tbboDF&T+T2l~x4
zCm^fT59I5Aq5cJCsnU29zDqCXwkb{B`2isKC4p8-CZvcP%_E#6BDUZW5<nL&5V+Hl
z_$-Daeiu7{=q`X3(WLGYBk>CYyj_eWg&t3Nhb2o)cY?Il>B~9|G%DfN#BsmF!A1He
z_Ci1^SkbGa5GXwc^7R7sS#?duS*UNjGje-Gt?$z6yHKii5^_D98OmHK_=DMlIXZg~
z=t-p6gQ|Z^W;iokV5>6Xt*bY#T08m+&(DMKt~MUkfCi6h!J`j@Bg?^&PbD=trUl28
zm&VoLxXO-aoGZ1BS$Q#)?^v8Kp;_8{oW{zJ)0rWxIiiHVmkS}`^E>k=^8<II@Uny<
zOZ@$v_fOs*xQ8JRFysOM@y?G=emwAV3^Bf{|9hmV!Ma;>H|BEn*WbSRw!*d>!-1m7
zV53_U<QXw;!%!x&n1vC$Lq(~1hZR|*L4w%jFYNu!v=dg7OfbN@vH<V`gqL@E@f@Iq
z_3=jqCIH#v;+dl1hQ2wFW_SqszQv@L$N9A8vP&0O=M0qNLV3Zvzjba;+5;-L8~5>>
zzzi$AE`w{3B=kLxoj3C=@5YZkl&0cU>m!&nn|4g${=@>P27@L}X}peuW-A$nHDY3m
za1!7fFsUKJK}=#;(nwNJ^Cb>dUD(_}-JVK_(-E0y<bZqxF$rT1mbwVo_lkDZL9-gn
z-^pDT<_5VpP}w#kj(_7qard+r7>)D7Y%eEArv*ulOeeY5q;tL8@MxHO?In0Pei$B}
zJZDxl8bNIV8Y-DVedc8bm9Uu^04*n027r5|J>AY1!0pz=gmVxEwSiV`#+)JxVolX%
zJa*4~L3Zs5bMcw!<Qy;<?9~R}iO}M@<GtMO9_}ibWCSjbmJe(gBt8!|n#7bbnn{2X
zvQ!?u(wNxl2!jnInutfhYD&hnl&G9dr^Ux~=VN;C(SN`thGC+jF6ZTiSaceJZI4^T
zO+@#>5Qws22>~!0=f&qS*bz_a9yFiGvvQA@fEOYm3?+}A(wP{{0Nn+;VIr<OVTR}~
zGDC=9me3S~%pjK`f}0>H)mjq46_y#8wPO%31wbe)P^(W-^^F;}0^<g}JMu%HHMgu%
z-asoMSq2sUgSQXn2h`9uEwpWwVryFqn>&8|>L0(Fmwx#A-Pf~+3r%f#$L%+>Zx))l
zLTh{OO1>d?^={w8*1qM|KDG5}t@Y{baG{OMH{`GUq$%H=Z@xS7ux-b3+YYsDm)5om
zO6cmz9?gw`+2F)y^(_d;26K_60VVXb8hTm_J)H@!Zi2>vEu%=jz^AXw*K$O~69Ltw
zOqRGd3QQiaWZqKP%>-8e(V^-?ea>I?F^6_~ezlthY7@}7SE9)KvK=S^bPf>GPMeTk
zS3$E{$t{+I3ft_wi>LAPO+}V$RSaD+wyt>DOAx1R5Us-g$~z4a4~qmXXT^(Wep?;@
zqONspqb@7tn|FZN_mm+Z@X6X<hm7#PcwI8vZg061w6%$~Z)NY&@qM;3UEick5rFi(
zBmRV~WUm}5wFT7U3J$GR=fPTR1-*{4AJE=HleeR3OByRzY~@gw%u?;;6gS~MTbq5>
zGGRojzFAq2(*J%%51~KSv2n`HWp4b|5eeAaN$lfJvW-?pod3U#mISl8i}snj%eUV~
z|Br5vBf3L8Pt=c8=O}S88!k!Ml_Q)y17?0>YX#5r1wc-z?q2R<;;H~%4=yU3PLy4P
zTsI<sUK2a@5aot!xT)SFQ4yRiiSw7hLJw}yV!7z@08dK9zzO|D&vxpJ(G0$nzT~JW
zdPfMTC?!U3PPZ+j7c3N$a*yGtff@i$pudDmb=Z<|7Xjx*<FHjnd5*x6K`zCW`-X_b
zKr5x{yGMFK1?@?-pD3b3;<6#_FV#V64j6dCZTRZ}9{_mJeNlj=fH1&2p}PoI!O|wg
z#adX%;>$pEPqF(V`p3m%NIH<9ixbRq&dHc$pbzu`8J?6^;YoJ_S1qm-17o0k*brlY
z4`&YIrGGUr##Y#5GXNkON<bs520FAr2Wnj%`I9Sk&5PS}k@xx+`!mC6IWr<iELzSw
z&~j!8BM}v(Xf&%#^?6l8cJlpa)T$1x3gUd;LynbDV^(_aJB#1RUAetKyMLvTQ#$7U
zM*4K%m$RSD!lUt38&g_iN~uW|Ao-QWJ(+N!sWrEA@r}&UmC)uK|G}Z3zF<HSXh`4`
zO^O*+8&7JDCzYC$&<hCsJkXSLzJKcOxEkoz0^lQYLj6!+CY%X>Ue~rtQSC#HU(d`b
zsd;tgEp6s4BgCLzP*muU<10cTByh;_d9W_KdvOr;$$ZChuu}<kE;09f_jle4{37&V
z?B}nk&mPmBJ+|C^OzA!bP9dY5kLy1H2!}Np^w-l#<%+CbNvqTI+Vs3N%6MK|@k+2I
z*Zo0Q4fbfk9%TG;H1RndQ0oqAbq5vy!9p-pLQ&{Y{z1bY=U*{{o?p;|9%8H`rd$LU
z>!YbKLyVL#TS}MJ1Zm%40982FS6}UFC#Z^+9qkg-U|f}_3Fe)E;Fz={Ol9eF|1|Hi
zIxflzX5KVvmCC_8n5|s)-4T>s*ZOA*tX_9}kFvD*Hso6Obio?s{dAfZL$Y}$2vllf
zL<8ejh4K#lM?Ii;T{8Xr=?cI1JSf<C3+^lB08=kKeq_GRvo?O3*bP)~Fwoh11jflf
z-LOX$$V2?V>URe-V1>dCCJwKRa;kV;LV-rEw6~&GR(`S+2V=utG7+6U9q+k}7@m@9
zt!a3+j8u8AkwWaYaoUIGO1{dP3y@(2hNmen;4A#tX9f-P>*lU+!^8DU*~okWrAN{(
zxx37PB4#}BKgM6?Tes-XWi);kFFru{S6w+%0ehm+uz2Myv$hllvpl$dUc%KCn1c+#
zoHda>R?In^m_AReCy`jJXu&}rQprLia7T`x89O>Ldg}0zW3Lzos4VUW*u24_QN#|0
zjlpN4w{K=D0Y3$bK5mc$)2f*lL7~-PV)uHO$%@B5AoKY|A_j-KlEe}bGZSDr$ELW`
z;*8MC5$77T7A!qd<br^<Ck`>xoB_7vi(rUCumT=8IEuoZ2J`{vQX(@k5_|+q&S1zg
zi#`>JN<yV6#*AI(c!n8=jS3$g8$NYx^z^Y8N33Oj1N#niwun+}1sdp%ShEJX6Xo-W
zwnSsXWC9M#6;pM8Guu~>Sp@ix(JJ}~cM9TpO0h2jv(T5B@}SKQEGH>{2^Qjk8xc>z
z5nxL|sCXG(Q^B#z(PR>HA;5=|H*MRD`Bs90hOw#$2uD&KXX2ORiK}rVIh@fHz#W!=
zR~SE|gva!@RI^#?j3xOXx2>m{c*nqk1V>u%)D0uS!5;(gxrFJYJZGGac@~>`28iyr
zPI?i~lZrc#Y{5uY6yO{WTKHM;niD*$R{>imBhW7R5#%XGF#UNX0uqFhdhLnBr-#Br
zr-vqv96Nq^Waz|U5e2Ha6A2zQ=<$hBe8#;-cVXA0vTH#n9$(@vAtv&zn8*pN68FH9
zgoqR;mT?&f6i(1>j6i`Ce}WnR9ENm(`b|Ftr&xTsy>PBYtLe<R3T)t(?}qQX|E53V
z$D=Z{Iky^oLJK}o#Hoem&8t*{cZmLiP(Xc6EsIz0q;IG5&o8~AHto@x_GFG0f=v&D
zTb6@cKG>%QcWA*KUr?dI5S)$K^f1)59O}xyq=tI6Q12>LQ#(Nyn%b56;SXHO)<gH3
zff!$v8`ijCg&SUJ*>rbP{uQ;QUu)^l9xAl9{doHyZ~tN6-M;Mb%BIbC4=nAzA6nY3
zZrY=5+LH}u!-a;;4;!{FH*C$nr8ex*8uqMGRZz`J%jVq0B}Q%O(^|ma>}vS#{rZ*m
zuDh3)y43ckwf3iT&XrB=IqB})4-Y`0Czm(%E1UZ7cmAyB!O+ioKkiuGHLUC!UTN!4
zwg~r+0>SV2Ic<E>cvjn{w6-awZ3>Pmt$Lw&QU@VlU~OL^DZl>4M{!&3zO^LZA6vSt
zJ~600F_>dkt4e9g3CsD)1y(!}lyA#P68zh$pK5IXb;qvdhFwa-t_lXw4bK1rI(vTl
z-6dJ=+^u!)&ar^c8=e6qTO^=mG&}=ZhBd4lTYfUMj5VqL?Kf@;nAm?#IW>-yeAU+1
zwbs{_`qw|N3Eg3Dvr5ZB;AYD~<Ez#@r`0^C)I0|d7VwO_<tKrmmLm<WzZqx*`nL_t
zkrwaYw$VuUH$30&`nz`K`7PeRdy)p)!;FlK9O<D&-1R|z;SFAo^fcfpG+a#+6S{9=
zVmiUk#PHcaF>z%k5-Y}dCMNjA<iv#71^GlCNevP_6eDg!(uZU(lJ5f1{h(jU(Mhm@
zUrg}C(?<l2IE5*2-v(KM$Crx<P)F1m+`L3wtm1P>@a&MWfYIbfypLF^lqI_20<2d2
ztU8=778E8RY^w{_B9Pp0p84TX@_65MpZ`lAdHl5NQ~B>fD=DS2JPkTsby!A`_#Cc7
z^eVN6`WP3i6Fc!cT{|(WmG~)l-KxXmdIAo+70DM)2)lOH2(2gaov!v(3P^sK+?FQE
z?ZJ~DJ3jG!8djbg)do+JpfWK_!Mrcfl)HA-vDMYS6k4U=cE91i__Nf<yOq7qYdfL)
z5L70Zwf5R;B>n0rWQ7*)zyv_@1LSs}A-4xJAD{YUTse70IebPt_!0>#6SE1W%p}Sf
zEF34@Baz)z68FQ~X(G6FS_Vr)RE8s-PH-vdPH-pL&W)qagh=~K4ygTPU7E6Ea_ix!
zB5rNB9$r}A(O6juIWpmzcgNw3E@*NVjjF84*|i#y!!yr<r5fz+-*@of0xatR>uY`X
z66U?UbKVEXvPzCpHthvxC(M0_anJkW0f_Sy`{aQ*wixGyT<rR~V%lft4h`DOJm?+s
zemHE_m}bO!$ce+U=Bj8LrXM7Et2WRt*Va^($K7_#mG+uEs<QG3bb`RW>JJ&v72#)G
z&|XFq(*6zV46f;&|G%uW##U!7U$;)3{tZsRhxqzRT@2c0YQ&{h<NX4~H~dM(zW|^&
zPVgBpBJG8Pb7BMVeqDVTjyr)2`v`u<1^GOAQ%^31;@v(<m=4^|jS*}lfuo}_F#5rN
zI1(Zc?qZ@I7|^^z>!`3QlY~UoK%-?mS;DF&#NAlwzzk+G0{g5^)#9;Kt~<)3H`(wa
zzhv_v8#r1vG@W&Hm6tC@C&4R@j%YaE0;jza+>B&sDQF0t<s!3DsqDNyQ9L@Ih{Io3
zrnoId>9eJm+XAPz<r!I!@cCk5MwGUceX$i<jhW3zL1fj2Ej*2qjKFSeP!fh<jh3{f
zSQR?ZH`K~rhTRcN*U&*MgE*ewNW^5+$+{t94~OpDHASNmXS5QX^53R#Opp7ruztZ-
z&CcpTD9#-+=u^=PQ03`YM-Q8G;6y~m=EtJvK?}J6fB!1l%8fRT7*=-|nF_iGh6G3C
z5gyV=RY71e;GFIvBNVNHWsveh1bID|@)VCC5akIV0-Sdc--XQZUp3<A7IjxFa$bm~
zJjEjl;$eu@-3f9uN&H=SdGzn#ZGSX{ncRlrh8W`!LLl+?@M#nY52Pn(SiHM1ihvGG
zsXLP~S!bo0^Vm;GXC@PHc;6?%vEo@$H|%X!qw!fIXwC>?FfC+)M04QXFUA2Rx-98l
z3^lexzZ|`AQJ#oJ<`Oe<Pry)f7O?tvkYG<qA9NQvqpi~ux)ZppJ0i2XYZjNW?k+aM
z9hse&gtOpyj|sellBc8xkvqXsdH@@S2}yzC2axI?;U|4cP}OgCQLH}`ekXM;^@Fix
zPqX4_UJ1264D~IC`j&V#G@ykBuCp0e=1S(uXJD&$tyI_Ej9ri4jKA~z!f>Xp;IGYg
zkk3%I^X3b;UcB+5>ffySH!mD61nL)#6g+I^*t>5nyajqyw(fcrC|I@a8F$8A@cJ?r
zZnS0EFrxl?03+HUm~sF9iFZ$Ax2jBw#<VC*OCb=1VhHg7uA^OT8HwBqwV^xBx0~N<
zU2KJX80Q2O2chuBRzGB0mf4nEkIHswY?s1zLD;RT8&%oExo7gV<g+s$x;wb^(t~F*
zRVq8Av3RDNl*71of146sd2j|x7}nTfg@uD?)whB-f;k5q3}!iv<rJ1POH*2R8DEth
z(AWWm9Vj+DfSq!>0;_H~SW)o!jUKYTTmBpV>=~8aq_LY6c2j}zJY?#ZnR=CJ)R;zv
zX)IJ#FT6m|7@T%}8>bI}VW)dqbaxW|9T<@e_1#58w*kuW(5zky=Z}i(82+0=X0O}0
zi?^|u2quElCl~O~hPoFHAs&ZkK@?{(7Ik+$Sp1JmKdS5#(S(TGyy(IxpJ7Ts!67Cw
zR7OIU7+Gwc_=-zZd<zNA$_gdmF}u%DP7a8F0kODuN_9X%L8Ivc6;evy0#&D!z6Hv=
zKt2WP3B~>`P=N*VDNxl5<Wq1rEnLvtO*vL|cWCa81?OkfA!WVqXMxQNzCy5Z!C$E7
zl+OKX{eFe2U3CvTX#mvg(=SN)SJv3$?(fpURSHPXsWd;E6Yr+swj|z5k-!I_5I~%A
W`eoz(JG^mEz|<&ZT<?jD{(l18cp;qt

literal 0
HcmV?d00001

diff --git a/utility/__pycache__/visa.cpython-311.pyc b/prsctrl/utility/__pycache__/visa.cpython-311.pyc
similarity index 91%
rename from utility/__pycache__/visa.cpython-311.pyc
rename to prsctrl/utility/__pycache__/visa.cpython-311.pyc
index aad90329d0069650f39b4176859928d52103d5dc..836d20e8deb781ad265df1bea21673c965bf8c80 100644
GIT binary patch
delta 25
hcmX@idy03%85YKr$!A&o*b0i0ONw$fOR=tG1OS2g30MFC

delta 18
acmX@bdzg2_85YLa$!A&oHY>5NU<3e0*#^4+

diff --git a/utility/config_file.py b/prsctrl/utility/config_file.py
similarity index 100%
rename from utility/config_file.py
rename to prsctrl/utility/config_file.py
diff --git a/utility/data_collector.py b/prsctrl/utility/data_collector.py
similarity index 54%
rename from utility/data_collector.py
rename to prsctrl/utility/data_collector.py
index 8a6954b..8e115ce 100644
--- a/utility/data_collector.py
+++ b/prsctrl/utility/data_collector.py
@@ -4,11 +4,19 @@ import os
 import datetime
 import pickle
 import logging
+from abc import abstractmethod
+
 log = logging.getLogger(__name__)
 
-from cpdctrl.utility.file_io import get_next_filename, sanitize_filename
-from cpdctrl.utility.data import CpdData, FLUSH_TYPE, FLUSH_PREFIX, METADATA_FILENAME
+from ..utility.file_io import get_next_filename, sanitize_filename
+from ..utility.prsdata import PrsData, FLUSH_TYPE, FLUSH_PREFIX, METADATA_FILENAME
 
+"""
+Wollen:
+- Daten während der Messung hinzufügen und in Snippets auf die Disk schreiben
+- Daten nach der Messung laden, aus Rohdaten (directory), aus Berechneten Daten (csv)
+
+"""
 
 class DataCollector:
     """
@@ -16,13 +24,15 @@ class DataCollector:
     """
     def __init__(self,
                  data_path: str,
-                 data_name: str="CPData",
+                 data_name: str="PRS",
                  metadata: dict[str, str]={},
                  dirname: str|None=None,
                  add_number_if_dir_exists=True,
+                 data_container=list,
                  ):
-        self.data = []
-        self.cpd_data = None  # if loaded, this contains the final numpy array
+        self.data_type = data_container
+        self.data = data_container()
+        self.full_data = None  # if loaded, this contains the final numpy array
         self.name = data_name
         self.metadata = metadata
         self.path = os.path.abspath(os.path.expanduser(data_path))
@@ -50,12 +60,60 @@ class DataCollector:
     # OPERATION
     def clear(self):
         self.data = []
-        self.cpd_data = None
+        self.full_data = None
 
-    def add_data(self, i, t, v, l):
-        self.data.append((i, t, v, l))
-        self.cpd_data = None  # no longer up to date
 
+    def assert_directory_exists(self):
+        if not os.path.isdir(self.dirpath):
+            os.makedirs(self.dirpath)
+
+    def get_data(self) -> PrsData:
+        """
+        Load the full data and return it together with the metadata
+        Returns
+        -------
+        tuple[np.ndarray, dict]
+           The full data and the metadata
+        """
+        if self.full_data is None:
+            self.full_data = PrsData(path=self.dirpath, metadata=self.metadata)
+        return self.full_data
+
+    def save_csv_in_dir(self, sep=",", verbose=False):
+        """Save full data as csv inside the directory with temporary data"""
+        self.get_data()
+        filepath = os.path.join(self.dirpath, self.dirname + ".csv")
+        self.full_data.save_csv_at(filepath, sep, verbose)
+
+    def write_metadata(self):
+        f"""
+        Write the metadata to the disk as '{METADATA_FILENAME}'
+
+        Returns
+        -------
+        None.
+        """
+        filepath = os.path.join(self.dirpath, METADATA_FILENAME)
+        log.debug(f"Writing metadata to {filepath}")
+        with open(filepath, "wb") as file:
+            pickle.dump(self.metadata, file)
+
+class PrsDataCollector(DataCollector):
+    def __init__(self,
+                 data_path: str,
+                 data_name: str="PRS",
+                 metadata: dict[str, str]={},
+                 dirname: str|None=None,
+                 add_number_if_dir_exists=True,
+        ):
+        super().__init__(data_path, data_name, metadata, dirname, add_number_if_dir_exists, dict)
+
+    @abstractmethod
+    def add_data(self, wavelength, raw):
+        self.data[wavelength] = raw
+        self.full_data = None  # no longer up to date
+
+    @abstractmethod
     def flush(self, verbose: bool = False):
         """
         Write the current data to a file and clear the internal data
@@ -79,63 +137,27 @@ class DataCollector:
         if len(self.data) == 0:
             return
         self.assert_directory_exists()
-        if FLUSH_TYPE == "csv":
-            filename = self._get_flush_filename() + ".csv"
-            filepath = os.path.join(self.dirpath, filename)
-            log.info(f"Flushing data to {filepath}")
-            if verbose: print(f"Flushing data to {filepath}")
-
-            df = pd.DataFrame(self.data, columns=CpdData.columns)
-            df.meta = str(self.metadata)
-            df.to_csv(filepath, sep=",", index=False, metadata=True)
-        elif FLUSH_TYPE == "pickle-ndarray":
-            filename = self._get_flush_filename() + ".ndarray.pkl"
-            filepath = os.path.join(self.dirpath, filename)
-            log.info(f"Flushing data to {filepath}")
-            if verbose: print(f"Flushing data to {filepath}")
-            with open(filepath, "wb") as file:
-                pickle.dump(np.array(self.data), file)
-        else:
-            raise ValueError(f"Invalid FLUSH_TYPE: '{FLUSH_TYPE}'")
+        for key, key_data in self.data.items():
+            if FLUSH_TYPE == "csv":
+                filename = self._get_flush_filename(key) + ".csv"
+                filepath = os.path.join(self.dirpath, filename)
+                log.info(f"Flushing data to {filepath}")
+                if verbose: print(f"Flushing data to {filepath}")
+                df = pd.DataFrame(key_data, columns=PrsData.columns)
+                df.meta = str(self.metadata)
+                df.to_csv(filepath, sep=",", index=False, metadata=True)
+            elif FLUSH_TYPE == "pickle-ndarray":
+                filename = self._get_flush_filename(key) + ".ndarray.pkl"
+                filepath = os.path.join(self.dirpath, filename)
+                log.info(f"Flushing data to {filepath}")
+                if verbose: print(f"Flushing data to {filepath}")
+                with open(filepath, "wb") as file:
+                    pickle.dump(np.array(key_data), file)
+            else:
+                raise ValueError(f"Invalid FLUSH_TYPE: '{FLUSH_TYPE}'")
         self.clear()
 
     # File IO
-    def _get_flush_filename(self):
-        """Get the filename of the next partial file, incrementing the number every time"""
-        return sanitize_filename(get_next_filename(FLUSH_PREFIX + self.name, self.dirpath, digits=5))
-
-    def assert_directory_exists(self):
-        if not os.path.isdir(self.dirpath):
-            os.makedirs(self.dirpath)
-
-    def get_data(self) -> CpdData:
-        """
-        Load the full data and return it together with the metadata
-        Returns
-        -------
-        tuple[np.ndarray, dict]
-           The full data and the metadata
-        """
-        if self.cpd_data is None:
-            self.cpd_data = CpdData(path=self.dirpath, metadata=self.metadata)
-        return self.cpd_data
-
-    def save_csv_in_dir(self, sep=",", verbose=False):
-        """Save full data as csv inside the directory with temporary data"""
-        self.get_data()
-        filepath = os.path.join(self.dirpath, self.dirname + ".csv")
-        self.cpd_data.save_csv_at(filepath, sep, verbose)
-
-    def write_metadata(self):
-        f"""
-        Write the metadata to the disk as '{METADATA_FILENAME}'
-
-        Returns
-        -------
-        None.
-        """
-        filepath = os.path.join(self.dirpath, METADATA_FILENAME)
-        log.debug(f"Writing metadata to {filepath}")
-        with open(filepath, "wb") as file:
-            pickle.dump(self.metadata, file)
+    def _get_flush_filename(self, key):
+        return sanitize_filename(self.name + "_" + str(key))
 
diff --git a/prsctrl/utility/device_select.py b/prsctrl/utility/device_select.py
new file mode 100644
index 0000000..7e4f8d9
--- /dev/null
+++ b/prsctrl/utility/device_select.py
@@ -0,0 +1,72 @@
+def select_device_interactive(type_devices_dict: dict[str, list[str]], prompt="Select an instrument: ") -> tuple[str, str]:
+    """
+    Select a device interactively from the command line
+
+    Parameters
+    ----------
+    type_devices_dict
+        A dictionary of device types and their corresponding device names
+    -------
+    The type and name of the selected device.
+    These can be passed to the connect_device method of the led_control_device or voltage_measurement_device libraries
+    """
+    res = type_devices_dict
+    flat_res = [ (t, v) for t, l in res.items() for v in l ]
+    for i, (t,v) in enumerate(flat_res):
+        print(f"{i+1:02}: {t} - {v}")
+    while len(flat_res) > 0:
+        try:
+            instr = int(input(prompt)) - 1
+            if instr < 0 or instr >= len(flat_res):
+                raise ValueError
+            return flat_res[instr]
+        except ValueError:
+            print(f"Enter a number between 1 and {len(flat_res)}")
+            continue
+    raise Exception("No devices found")
+
+
+from .config_file import ConfigFile
+
+
+
+
+import logging
+def connect_device_from_config_or_interactive(config_file: ConfigFile, device_typename: str, device_typename_prompt: str, module, config_key_template="last_dev_<device>_<type/name>", log: logging.Logger=logging.getLogger(__name__), n_interactive_tries=2):
+    """
+    Connect a device from the type and name stored in a config file, and if that fails prompt the user on the command line
+    :param config_file: ConfigFile object
+    :param device_typename: device type name to use in the config file key
+    :param device_typename_prompt: device type name to use in interactive prompt
+    :param module: python module supporting .connect_device(type, name) and .enumerate_devices()
+    :param config_key_template: template for the config key string
+    :param log: Logger
+    :param n_interactive_tries: how often to try the interactive selection
+    :return: device
+    """
+    # get the last connected from the config file
+    key_type = config_key_template.replace("<device>", device_typename).replace("<type/name>", "type")
+    key_name = config_key_template.replace("<device>", device_typename).replace("<type/name>", "name")
+    last_shutter_type = config_file.get_or(key_type, None)
+    last_shutter_name = config_file.get_or(key_name, None)
+    dev = None
+    # try to connect
+    if last_shutter_name and last_shutter_type:
+        try:
+            dev = module.connect_device(last_shutter_type, last_shutter_name)
+        except:
+            log.error(f"Failed to connect to last used device {last_shutter_type}::{last_shutter_name}")
+    while dev is None and n_interactive_tries > 0:
+        devs = module.list_devices()
+        print("-" * 50)
+        dev_type, dev_name = select_device_interactive(devs, f"Select {device_typename_prompt}: ")
+        try:
+            dev = module.connect_device(dev_type, dev_name)
+            config_file.set(key_type, dev_type)
+            config_file.set(key_name, dev_name)
+        except:
+            log.error(f"Failed to connect to device {dev_type}::{dev_name}")
+        n_interactive_tries -= 1
+    if dev is None:
+        raise Exception("Failed to connect a device")
+    return dev
diff --git a/utility/file_io.py b/prsctrl/utility/file_io.py
similarity index 100%
rename from utility/file_io.py
rename to prsctrl/utility/file_io.py
diff --git a/utility/data.py b/prsctrl/utility/prsdata.py
similarity index 90%
rename from utility/data.py
rename to prsctrl/utility/prsdata.py
index 755bd5c..1e52493 100644
--- a/utility/data.py
+++ b/prsctrl/utility/prsdata.py
@@ -6,19 +6,19 @@ import pickle
 import logging
 log = logging.getLogger(__name__)
 
-from cpdctrl.utility.file_io import get_next_filename, sanitize_filename
+from ..utility.file_io import get_next_filename, sanitize_filename
 
 FLUSH_TYPE = "pickle-ndarray"
 FLUSH_PREFIX = "PART_"
 METADATA_FILENAME = FLUSH_PREFIX + "measurement_metadata.pkl"
 
-class CpdData:
+
+class PrsData:
     """
     Class managing data and metadata.
     Can be initialized from data directly, or a file or directory path.
     """
-    columns = ["idx", "t [s]", "V [V]", "LED [%]"]
-    def __init__(self, path:str|None=None, data:np.ndarray|None=None, metadata:dict|None=None, verbose=False):
+    def __init__(self, path:str|None=None, data:tuple|None=None, metadata:dict|None=None, verbose=False):
         self.data = data
         if type(metadata) == dict:
             self.metadata = metadata
@@ -30,14 +30,14 @@ class CpdData:
             raise ValueError("Either path or data must be defined, but not both.")
         if path is not None:  # load from file
             if os.path.isdir(path):
-                self.data, md = CpdData.load_data_from_dir(path, verbose=verbose)
+                self.data, md = PrsData.load_data_from_dir(path, verbose=verbose)
                 self.metadata |= md
             elif os.path.isfile(path):
                 if path.endswith(".csv"):
-                    self.data, md = CpdData.load_data_from_csv(path)
+                    self.data, md = PrsData.load_data_from_csv(path)
                     self.metadata |= md
                 elif path.endswith(".pkl"):
-                    self.data, md = CpdData.load_data_from_pkl(path)
+                    self.data, md = PrsData.load_data_from_pkl(path)
                     self.metadata |= md
                 else:
                     raise NotImplementedError(f"Only .csv and .pkl files are supported")
@@ -48,13 +48,13 @@ class CpdData:
 
     # Convert data
     def to_dataframe(self):
-        df = pd.DataFrame(self.data, columns=CpdData.columns)
+        df = pd.DataFrame(self.data, columns=self.columns)
         df.meta = str(self.metadata)
         return df
 
     def to_csv(self, sep=","):
         # self.to_dataframe().to_csv(os.path.join(self.path, self.name + ".csv"), index=False, metadata=True)
-        return CpdData.get_csv(self.data, self.metadata, sep=sep)
+        return PrsData.get_csv(self.data, self.metadata, sep=sep)
 
 
     def save_csv_at(self, filepath, sep=",", verbose=False):
@@ -74,7 +74,7 @@ class CpdData:
         csv = ""
         for k, v in metadata.items():
             csv += f"# {k}: {v}\n"
-        csv += "".join(f"{colname}{sep}" for colname in CpdData.columns).strip(sep) + "\n"
+        csv += "".join(f"{colname}{sep}" for colname in PrsData.columns).strip(sep) + "\n"
         for i in range(data.shape[0]):
             csv += f"{i}{sep}{data[i,1]}{sep}{data[i,2]}{sep}{data[i,3]}\n"
         return csv.strip("\n")
@@ -118,8 +118,8 @@ class CpdData:
             data = np.loadtxt(f, delimiter=sep)
         return data, metadata
 
-    @staticmethod
-    def load_data_from_pkl(filepath:str) -> tuple[np.ndarray, dict]:
+    @classmethod
+    def load_data_from_pkl(cls, filepath:str) -> tuple[np.ndarray, dict]:
         """
         Loads data from a single csv file.
         Lines with this format are interpreted as metadata:
@@ -130,8 +130,6 @@ class CpdData:
         ----------
         filepath
            Path to the csv file.
-        sep
-            csv separator
         Returns
         -------
         data
@@ -155,8 +153,8 @@ class CpdData:
         else:
             raise ValueError(f"Pickled object must be either numpy.ndarray or (numpy.ndarray, dict), but is of type {type(obj)}")
         # must be loaded by now
-        if not len(data.shape) == 2 and data.shape[1] == 4:
-            raise ValueError(f"numpy.ndarray has invalid shape: {data.shape}, however the shape must be (N, 4)")
+        if not len(data.shape) == 2 and data.shape[1] == len(cls.columns):
+            raise ValueError(f"numpy.ndarray has invalid shape: {data.shape}, however the shape must be (N, {len(cls.columns)})")
         if not isinstance(metadata, dict):
             raise ValueError(f"Metadata is not a of type dict")
         return data, metadata
@@ -239,7 +237,7 @@ def plot_cpd_data(data: str or pd.DataFrame or np.ndarray, t: str="seconds", tit
         Matplotlib figure object.
     """
     if type(data) == str:
-        _data, _ = CpdData.load_data_from_dir(data)
+        _data, _ = PrsData.load_data_from_dir(data)
     else:
         _data = data
     fig, ax = plt.subplots()
diff --git a/utility/visa.py b/prsctrl/utility/visa.py
similarity index 100%
rename from utility/visa.py
rename to prsctrl/utility/visa.py
diff --git a/utility/__pycache__/visa.cpython-310.pyc b/utility/__pycache__/visa.cpython-310.pyc
deleted file mode 100644
index e30c975279b97cf5f786f84fef4c89ab5ee9f674..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1141
zcmY*Y-EPw`6t>eO?YbYB7!uqdi<`C6-~lGY*pGxJjcHmp5LKqijomg{nq;<9)G58=
zk~cs|?FAQm1YX6rT=5FK;@H`$)scUW&+&J@?>J6ZSL+DckK3n%KNW=j8sl+;J@f&(
zY{0+}!!c@?Gj3y!rw*^oaNA`*bD8%Yw>^eis9F67(dguEqw(?dXunxBE?WD|-L0LY
zlh*l}MxjA{Xf;@vegIu2Feo&|g)_sGN*_(!qB3;~Ji~|RvN7>)UV>dIJn;I3KXn;+
zCe;EJ)e#b}3wP=nA4cHwX9%M&=z0aijFGBNYs@LUpXe80WAqg~g$rCO^fyMRPN1D}
zm5YSXI3{#NqnLJMPDYWWL~xnrBIJ^&0aav3RXBhpC)YU_V?q;VEyhPt$Vozn+yb6b
z0ZYY&wC0<6vt}9HnMWH6dnBVmk+f&=jH}FOa^0gxlE^&EQpp*~vox`hn_EYRC%c;^
zAB%38*;R>KGF7P!Ul0Xy658itn}D|$#lY7F%|%-jbEMOy;T2EV9QGV&S*&}9LC7WF
zCQ*+hsj@JP_h=r2ri9n+!LrN?C9(U*k+jMe$(b6+^5BhURo=WhNb{K41Zl<-@_F%!
znoHWx#s)<{IlI5OPo+e?7DJNGT$x@q0CQV=wo2Nk8EiA{g)x*_SK_p<J;u9vzgg4E
zkM2#FKexSNay`^WJ7TCSkU?Xiy(p1NXxE6iMdBGm-(4Q;1Q!ziiC~WnqXhT}s!|ag
za(SiFENG=Y^^FQ1oQ~BXO&+Fxqy~96$Ob6{^IptDMU#*Rxr*XQjRV8sZ8p~HJjsU~
zAbF=GDt+^^UcgXackvo_a2>uH^cC#m4eVm^9Gp!@I4}wGHk-b1VbWC)-j9;LUg~po
s3~MfQtz-Y#PDd=8aC6k^dNgd9v$c1_l;tsh53dW!@|D+|I$m@B148RY#Q*>R

diff --git a/utility/device_select.py b/utility/device_select.py
deleted file mode 100644
index 41646b3..0000000
--- a/utility/device_select.py
+++ /dev/null
@@ -1,26 +0,0 @@
-def select_device_interactive(type_devices_dict: dict[str, list[str]], prompt="Select an instrument: ") -> tuple[str, str]:
-    """
-    Select a device interactively from the command line
-
-    Parameters
-    ----------
-    type_devices_dict
-        A dictionary of device types and their corresponding device names
-    -------
-    The type and name of the selected device.
-    These can be passed to the connect_device method of the led_control_device or voltage_measurement_device libraries
-    """
-    res = type_devices_dict
-    flat_res = [ (t, v) for t, l in res.items() for v in l ]
-    for i, (t,v) in enumerate(flat_res):
-        print(f"{i+1:02}: {t} - {v}")
-    while len(flat_res) > 0:
-        try:
-            instr = int(input(prompt)) - 1
-            if instr < 0 or instr >= len(flat_res):
-                raise ValueError
-            return flat_res[instr]
-        except ValueError:
-            print(f"Enter a number between 1 and {len(flat_res)}")
-            continue
-    raise Exception("No devices found")
\ No newline at end of file