From a9289ece6923f4863d48c86299aac32e647caedc Mon Sep 17 00:00:00 2001 From: "Eugeniy E. Mikhailov" Date: Wed, 9 Mar 2022 14:41:30 -0500 Subject: scope uses getConfig from base instrument, since it has channel config capability --- qolab/hardware/scope/__init__.py | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'qolab') diff --git a/qolab/hardware/scope/__init__.py b/qolab/hardware/scope/__init__.py index 3c0889f..debe668 100644 --- a/qolab/hardware/scope/__init__.py +++ b/qolab/hardware/scope/__init__.py @@ -59,22 +59,6 @@ class Scope(BasicInstrument): allTraces=self.getAllTraces(**kwargs) allTraces.plot() - def getConfig(self): - config = BasicInstrument.getConfig(self).copy() - chconfig = {} - for chNum in range(1, self.numberOfChannels+1): - chNconfig = {} - for p in self.channelProperties: - getter = f'getChan{p}' - if not hasattr(self, getter): - print(f'warning no getter for {p}, i.e. {getter} is missing') - continue - res = getattr(self, getter)(chNum) - chNconfig[p] = res - chconfig[chNum] = chNconfig - config['ChannelsConfig']=chconfig - return config - def save(self, fname=None, item_format='e', availableNpnts=None, maxRequiredPoints=None, decimate=True, extention='dat'): allTraces = self.getAllTraces(availableNpnts=availableNpnts, maxRequiredPoints=maxRequiredPoints, decimate=decimate) allTraces.config['item_format']=item_format -- cgit v1.2.3