counting instrument

mesoscopy/instrument/lockin.py

@@ -76,7 +76,8 @@ def init_lockin(
 
 
 def enable_DC(station: Station):
-    for lockin in _list_lockins(station):
+    lockins = _list_lockins(station)
+    for lockin in lockins:
         station.__getattr__(lockin).oscs[1].freq(0)
         station.__getattr__(lockin).demods[2].adcselect(0)
         station.__getattr__(lockin).demods[2].oscselect(1)

mesoscopy/measurement/parameters.py

@@ -1,6 +1,7 @@
 from time import time
 from qcodes import Parameter
 from typing import Tuple
+from qcodes import Instrument
 from qcodes.utils.validators import Ints
 from qcodes.instrument.parameter import _BaseParameter
 from qcodes.instrument.specialized_parameters import ElapsedTimeParameter as \
@@ -38,6 +39,24 @@ def reset_count(self) -> None:
         self._count = 0
 
 
+class Counter(Instrument):
+    '''an instrument to use as counter'''
+    def __init__(self, name: str = 'counter',
+                **kwargs):
+        super().__init__(name, **kwargs)
+
+        self.add_parameter(
+            'counter',
+            parameter_class=Parameter,
+            initial_value=0,
+            label=f"counter",
+            unit="#",
+            vals=Numbers(min_value=0),
+            get_cmd=None,
+            set_cmd=None,
+            )
+
+
 class TimestampParameter(Parameter):
     '''parameter to keep track of time, gives a timestamp'''
 

mesoscopy/measurement/sweep.py

@@ -252,6 +252,7 @@ def sweep2d(
     measure_retrace: Optional[bool] = False,
     num_retrace: Optional[str] = 201,
     additional_setpoints: Sequence[doNd.ParamMeasT] = tuple(),
+    force: Optional[bool] = False,
 ):
 
     sweep2d_time(param_setx, xarray, inner_delay,