From f1fc90cb1617201faac22dfc6f605425ddd811df Mon Sep 17 00:00:00 2001 From: Lindsey Date: Fri, 17 Apr 2015 15:57:10 -0700 Subject: [PATCH] changes references for Transmitter to Source --- SimPEG/Problem.py | 2 +- SimPEG/Survey.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/SimPEG/Problem.py b/SimPEG/Problem.py index 29fcde34..4b940318 100644 --- a/SimPEG/Problem.py +++ b/SimPEG/Problem.py @@ -79,7 +79,7 @@ class Fields(object): srcTestList = [srcTestList] for srcTest in srcTestList: if srcTest not in self.survey.srcList: - raise KeyError('Invalid Transmitter, not in survey list.') + raise KeyError('Invalid Source, not in survey list.') ind = np.in1d(self.survey.srcList, srcTestList) return ind diff --git a/SimPEG/Survey.py b/SimPEG/Survey.py index e2b30faa..318f30e7 100644 --- a/SimPEG/Survey.py +++ b/SimPEG/Survey.py @@ -170,13 +170,13 @@ class Data(object): if len(key) is not 2: raise KeyError('Key must be [Src, Rx]') if key[0] not in self.survey.srcList: - raise KeyError('Src Key must be a transmitter in the survey.') + raise KeyError('Src Key must be a source in the survey.') if key[1] not in key[0].rxList: - raise KeyError('Rx Key must be a receiver for the transmitter.') + raise KeyError('Rx Key must be a receiver for the source.') return key elif isinstance(key, self.survey.srcPair): if key not in self.survey.srcList: - raise KeyError('Key must be a transmitter in the survey.') + raise KeyError('Key must be a source in the survey.') return key, None else: raise KeyError('Key must be [Src] or [Src,Rx]') @@ -185,7 +185,7 @@ class Data(object): src, rx = self._ensureCorrectKey(key) assert rx is not None, 'set data using [Src, Rx]' assert isinstance(value, np.ndarray), 'value must by ndarray' - assert value.size == rx.nD, "value must have the same number of data as the transmitter." + assert value.size == rx.nD, "value must have the same number of data as the source." self._dataDict[src][rx] = Utils.mkvc(value) def __getitem__(self, key): @@ -236,7 +236,7 @@ class BaseSurvey(object): @srcList.setter def srcList(self, value): assert type(value) is list, 'srcList must be a list' - assert np.all([isinstance(src, self.srcPair) for src in value]), 'All transmitters must be instances of %s' % self.srcPair.__name__ + assert np.all([isinstance(src, self.srcPair) for src in value]), 'All sources must be instances of %s' % self.srcPair.__name__ assert len(set(value)) == len(value), 'The srcList must be unique' self._srcList = value