Changeset 26500ec in sasview for src/sas/calculator

Timestamp:

Mar 3, 2015 1:27:22 PM (10 years ago)

Author:

Doucet, Mathieu <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

e46cbc5

Parents:

121f72c

Message:

pylint fixes

File:

• src/sas/calculator/instrument.py (modified) (5 diffs)

src/sas/calculator/instrument.py

@@ -204 +204 @@
         spectrum = self.spectrum
         intensity = numpy.interp(self.wavelength,
-                                      spectrum[0],
-                                      spectrum[1],
-                                      0.0,
-                                      0.0)
+                                 spectrum[0],
+                                 spectrum[1],
+                                 0.0,
+                                 0.0)
         self.set_intensity(intensity)
         # min max range of the spectrum
@@ -245 +245 @@
         validate(wavelength)
         self.intensity = numpy.interp(self.wavelength,
-                                  self.spectrum[0],
-                                  self.spectrum[1],
-                                  0.0,
-                                  0.0)
+                                      self.spectrum[0],
+                                      self.spectrum[1],
+                                      0.0,
+                                      0.0)
 
     def set_mass(self, mass=_MASS):
@@ -346 +346 @@
         """
         out = numpy.interp(self.wavelength_list,
-                                      self.spectrum[0],
-                                      self.spectrum[1],
-                                      0.0,
-                                      0.0)
+                           self.spectrum[0],
+                           self.spectrum[1],
+                           0.0,
+                           0.0)
         return out
 
@@ -356 +356 @@
         Get wavelength and wavelength_spread list
         """
-        return self.wavelength_list, self.wavelengthspread_list
+        return self.wavelength_list, self.wavelength_spread_list
 
     def set_wave_list(self, wavelength=[]):
@@ -372 +372 @@
         :param wavelength_spread: list of wavelength spreads
         """
-        self.wavelengthspread_list = wavelength_spread
+        self.wavelength_spread_list = wavelength_spread