Changeset 3a38a8b in sasview for src

Timestamp:

Aug 9, 2016 2:47:44 AM (8 years ago)

Author:

lewis

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

b7c21a7

Parents:

5451a78 (diff), 5213d22 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into file-converter

Location:

src/sas

Files:

• sascalc/fit/pluginmodel.py (modified) (1 diff)
• sasgui/perspectives/fitting/basepage.py (modified) (1 diff)
• sascalc/dataloader/readers/cansas_reader.py (modified) (1 diff)
• sascalc/file_converter/__init__.py (added)
• sascalc/file_converter/bsl_loader.py (added)
• sascalc/file_converter/c_ext/__init__.py (added)
• sascalc/file_converter/c_ext/bsl_loader.c (added)
• sascalc/file_converter/c_ext/bsl_loader.h (added)
• sasgui/perspectives/file_converter/__init__.py (added)
• sasgui/perspectives/file_converter/cansas_writer.py (added)
• sasgui/perspectives/file_converter/converter_panel.py (added)
• sasgui/perspectives/file_converter/converter_widgets.py (added)
• sasgui/perspectives/file_converter/file_converter.py (added)
• sasgui/perspectives/file_converter/frame_select_dialog.py (added)
• sasgui/perspectives/file_converter/media/file_converter_help.rst (added)
• sasgui/perspectives/file_converter/meta_panels.py (added)
• sasgui/perspectives/file_converter/otoko_loader.py (added)

src/sas/sascalc/fit/pluginmodel.py

@@ -3 +3 @@
 
 class Model1DPlugin(BaseComponent):
+    is_multiplicity_model = False
+
     ## Name of the model
 

src/sas/sasgui/perspectives/fitting/basepage.py

@@ -2146 +2146 @@
                 self.temp_multi_functional = True
         elif form_factor != None:
-            self.model = form_factor(self.multi_factor)
+            if self.multi_factor is not None:
+                self.model = form_factor(self.multi_factor)
+            else:
+                # old style plugin models do not accept a multiplicity argument
+                self.model = form_factor()
         else:
             self.model = None

src/sas/sascalc/dataloader/readers/cansas_reader.py

@@ -957 +957 @@
             written = written | self.write_node(pix, "z", item.pixel_size.z,
                                                 {"unit": item.pixel_size_unit})
-            written = written | self.write_node(det, "slit_length",
-                                                item.slit_length,
-                                                {"unit": item.slit_length_unit})
             if written == True:
                 self.append(pix, det)
+            self.write_node(det, "slit_length", item.slit_length,
+                {"unit": item.slit_length_unit})
+
 
     def _write_process_notes(self, datainfo, entry_node):