Changeset 76cd1ae in sasview for src/sans/dataloader/data_info.py

Timestamp:

Jan 14, 2014 3:53:36 PM (11 years ago)

Author:

Jeff Krzywon <jeffery.krzywon@…>

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:

16bd5ca

Parents:

083e993

Message:

Fix for the datainfo window not loading and bug fixes for the cansas data reader.

Fixes/changes:
(1) datainfo window is now loading for every data file I can test
(2) transmission spectrum information (but not data) is listed in datainfo window
(3) more than one transmission spectra can be loaded for each Data1D object
(4) fixed a bug in the cansas reader that allowed any file to be loaded as data if and only if another data file was already loaded
(5) fixed the cansas writer to include transmission spectrum data and output data in strict canSAS format
(6) increased the pylint score of cansas_constants.py to above 7
(7) increased the pylint score for all files I have modified

File:

• src/sans/dataloader/data_info.py (modified) (4 diffs)

src/sans/dataloader/data_info.py

@@ -425 +425 @@
     def __str__(self):
         _str  = "Transmission Spectrum:\n"
-        _str += "   Name:       {0}".format(self.name)
-        _str += "   Timestamp:  {1}".format(self.timestamp)
-        _str += "   Wavelength [{0}] | Transmission [{1}] | Trans Dev [{2}]\n".format(self.wavelength_unit, self.transmission_unit, self.transmission_deviation_unit)
-        for i in range(len(self.wavelength)):
-            _str += "   {0}, {1}".format(self.wavelength[i], self.transmission[i])
-            if len(self.transmission_deviation > i):
-                _str += ", {0}".format(self.transmission_deviation[i])
-            _str += "\n"
+        _str += "   Name:             \t{0}\n".format(self.name)
+        _str += "   Timestamp:        \t{0}\n".format(self.timestamp)
+        _str += "   Wavelength unit:  \t{0}\n".format(self.wavelength_unit)
+        _str += "   Transmission unit:\t{0}\n".format(self.transmission_unit)
+        _str += "   Trans. Dev. unit:  \t{0}\n".format(\
+                                            self.transmission_deviation_unit)
+        length_list = [len(self.wavelength), len(self.transmission), \
+                len(self.transmission_deviation)]
+        _str += "   Number of Pts:    \t{0}\n".format(max(length_list))
         return _str
     
@@ -498 +499 @@
         self.collimation = []
         ## Transmission Spectrum
-        self.trans_spectrum = TransmissionSpectrum()
+        self.trans_spectrum = []
         ## Additional meta-data
         self.meta_data  = {}
@@ -533 +534 @@
         for item in self.notes:
             _str += "%s\n" % str(item)
-
+        for item in self.trans_spectrum:
+            _str += "%s\n" % str(item)
         return _str
             
@@ -757 +759 @@
             clone = Data1D(x, y, dx=dx, dy=dy)
         
-        clone.title       = self.title
-        clone.run         = self.run
-        clone.filename    = self.filename
-        clone.instrument  = self.instrument
-        clone.notes       = deepcopy(self.notes)
-        clone.process     = deepcopy(self.process)
-        clone.detector    = deepcopy(self.detector)
-        clone.sample      = deepcopy(self.sample)
-        clone.source      = deepcopy(self.source)
-        clone.collimation = deepcopy(self.collimation)
-        clone.meta_data   = deepcopy(self.meta_data)
-        clone.errors      = deepcopy(self.errors)
+        clone.title          = self.title
+        clone.run            = self.run
+        clone.filename       = self.filename
+        clone.instrument     = self.instrument
+        clone.notes          = deepcopy(self.notes)
+        clone.process        = deepcopy(self.process)
+        clone.detector       = deepcopy(self.detector)
+        clone.sample         = deepcopy(self.sample)
+        clone.source         = deepcopy(self.source)
+        clone.collimation    = deepcopy(self.collimation)
+        clone.trans_spectrum = deepcopy(self.trans_spectrum)
+        clone.meta_data      = deepcopy(self.meta_data)
+        clone.errors         = deepcopy(self.errors)
         
         return clone