/[escript]/trunk/downunder/py_src/datasources.py
ViewVC logotype

Diff of /trunk/downunder/py_src/datasources.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 4060 by caltinay, Fri Nov 9 03:50:19 2012 UTC revision 4061 by caltinay, Fri Nov 9 04:05:28 2012 UTC
# Line 179  class ErMapperData(DataSource): Line 179  class ErMapperData(DataSource):
179              self.__datafile=headerfile[:-4]              self.__datafile=headerfile[:-4]
180          else:          else:
181              self.__datafile=datafile              self.__datafile=datafile
182          self.__altOfData=altitude          self.__altitude=altitude
183          self.__datatype=datatype          self.__datatype=datatype
184          self.__readHeader()          self.__readHeader()
185    
# Line 285  class ErMapperData(DataSource): Line 285  class ErMapperData(DataSource):
285          """          """
286          return (list(self.__origin), list(self.__nPts), list(self.__delta))          return (list(self.__origin), list(self.__nPts), list(self.__delta))
287    
288        def getDataType(self):
289            return self.__datatype
290    
291      def getSurveyData(self, domain, origin, NE, spacing):      def getSurveyData(self, domain, origin, NE, spacing):
292          nValues=self.__nPts          nValues=self.__nPts
293          # determine base location of this dataset within the domain          # determine base location of this dataset within the domain
# Line 298  class ErMapperData(DataSource): Line 301  class ErMapperData(DataSource):
301                  first, nValues, (), self.__maskval)                  first, nValues, (), self.__maskval)
302          sigma = whereNonZero(data-self.__maskval)          sigma = whereNonZero(data-self.__maskval)
303          data = data*self.__scalefactor          data = data*self.__scalefactor
304          sigma = sigma*self.__scalefactor          sigma = sigma * 2. * self.__scalefactor
305          return data, sigma          return data, sigma
306    
307    

Legend:
Removed from v.4060  
changed lines
  Added in v.4061

  ViewVC Help
Powered by ViewVC 1.1.26