Skip to content

Commit 75be969

Browse files
Merged in cbillington/labscript_devices/novatech-units (pull request labscript-suite#24)
Default unit conversions for novatech static channels
2 parents dd7c810 + 3d1d01b commit 75be969

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

NovaTechDDS9M.py

+1-6
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,7 @@ def get_default_unit_conversion_classes(self, device):
5050
as the argument) to check if there are certain unit calibration
5151
classes that they should apply to their outputs, if the user has
5252
not otherwise specified a calibration class"""
53-
if device.connection in ['channel 0', 'channel 1']:
54-
# Default calibration classes for the non-static channels:
55-
return NovaTechDDS9mFreqConversion, NovaTechDDS9mAmpConversion, None
56-
else:
57-
return None, None, None
58-
53+
return NovaTechDDS9mFreqConversion, NovaTechDDS9mAmpConversion, None
5954

6055
def quantise_freq(self, data, device):
6156
if not isinstance(data, np.ndarray):

0 commit comments

Comments
 (0)