Changeset d1520fc in sasview

Timestamp:

Feb 13, 2018 10:15:53 AM (6 years ago)

Author:

GitHub <noreply@…>

Parents:

61bfd36 (diff), 9592c6f (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.

git-author:

Jeff Krzywon <krzywon@…> (02/13/18 10:15:53)

git-committer:

GitHub <noreply@…> (02/13/18 10:15:53)

Message:

Merge 9592c6fe2e6d97a1a1f2c24d361c096926db6c57 into 61bfd3677b70fdddc3b49008cbc8a8713a2baaa2

Files:

• src/sas/sascalc/dataloader/loader.py (modified) (2 diffs)
• docs/sphinx-docs/source/user/marketplace.rst (modified) (2 diffs)
• src/sas/sasgui/guiframe/media/data_formats_help.rst (modified) (3 diffs)
• src/sas/sasgui/perspectives/calculator/calculator.py (modified) (2 diffs)
• src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (modified) (1 diff)
• src/sas/sasgui/perspectives/fitting/basepage.py (modified) (4 diffs)

src/sas/sascalc/dataloader/loader.py

@@ -54 +54 @@
         self.wildcards = ['All (*.*)|*.*']
 
+        # Deprecated extensions
+        self.deprecated_extensions = ['.asc', '.nxs']
+
         # Creation time, for testing
         self._created = time.time()
@@ -73 +76 @@
         # Gets set to a string if the file has an associated reader that fails
         msg_from_reader = None
+        extlist = [ext for ext in self.deprecated_extensions if
+                   path.lower().endswith(ext)]
+        if extlist:
+            msg = ("\rThe file you are attempting to load, {}, is no longer "
+                   "loadable by SasView. The file extension suggests the data "
+                   "set is in pixel space. SasView will no longer reduce raw da"
+                   "ta sets. Please provide fully reduced data in Q space. No a"
+                   "ttempt to load the data has been made."
+                   .format(path))
+            raise RuntimeError(msg)
         try:
             return super(Registry, self).load(path, format=format)

docs/sphinx-docs/source/user/marketplace.rst

@@ -6 +6 @@
 plug-in fitting models for *SasView* for all to use.
 
-.. note:: These plug-in models require SasView version 4.0 or later.
+.. note:: 
+    These plug-in models require SasView version 4.0 or later. However, 
+    not *all* models may work with *every* version of SasView because 
+    of changes to our API.
 
 Contributed models should be written in Python (only version 2.7.x is
@@ -12 +15 @@
 combination of Python and C. You only need to upload the .py/.c source
 code files to the Marketplace!
+
+Please put a comment in your code to indicate which version of SasView you 
+wrote the model for.
 
 For guidance on how to write a plugin model see :ref:`Writing_a_Plugin` . It

src/sas/sasgui/guiframe/media/data_formats_help.rst

@@ -28 +28 @@
 
 *  .TXT
-*  .ASC
 *  .DAT
 *  .XML (in canSAS format v1.0 and 1.1)
+*  .H5  (as NeXus NXcanSAS only)
+*  .NXS (as NeXus NXcanSAS only)
+
+.. note::
+    From SasView version 4.2 onwards files written in the NIST .ASC format are no longer read. This is because that 
+    format normally represents *raw* and not reduced data.
 
 If using CSV output from, for example, a spreadsheet, ensure that it is not using commas as delimiters for thousands.
@@ -40 +45 @@
 
 For a description of the ISIS 1D format see:
-http://www.isis.stfc.ac.uk/instruments/loq/software/colette-ascii-file-format-descriptions9808.pdf
+https://www.isis.stfc.ac.uk/Pages/colette-ascii-file-format-descriptions.pdf
 
 For a description of the NXcanSAS format see:
@@ -58 +63 @@
 --------------
 
-SasView will read ASCII ('text') files in the NIST 2D format (with the extensions .ASC or .DAT) or files in the NeXus NXcanSAS (HDF5) format (with the extension .H5). File extensions are not case-sensitive. Both of these formats are written by the `Mantid Framework <http://www.mantidproject.org/>`_.
+SasView will read ASCII ('text') files in the NIST 2D format (with the extension .DAT) or files in the NeXus NXcanSAS (HDF5) format (with the extension .H5 or .NXS). File extensions are not case-sensitive. Both of these formats are written by the `Mantid Framework <http://www.mantidproject.org/>`_.
 
 Most of the header lines in the NIST 2D format can actually be removed except the last line, and only the first three columns (*Qx, Qy,* and *I(Qx,Qy)*) are actually required.
+
+.. note::
+    From SasView version 4.2 onwards files written in the NIST .ASC format are no longer read. This is because that 
+    format normally represents *raw* and not reduced data.
+
+.. note::
+    SasView does not read the standard NeXus format, only the NXcanSAS subset. 
 
 The SasView :ref:`File_Converter_Tool` available in SasView 4.1 onwards can be used to convert data sets in the 2D BSL/OTOKO format into the NeXus NXcanSAS (HDF5) format.

src/sas/sasgui/perspectives/calculator/calculator.py

@@ -86 +86 @@
                 ("Generic Scattering Calculator",
                         gensas_help, self.on_gen_model),
+                ("Orientation Viewer", "Show 3-D view of oriented shape", self.on_show_orientation),
                 ("Python Shell/Editor", pyconsole_help, self.on_python_console),
                 ("Image Viewer", imageviewer_help, self.on_image_viewer), ]
@@ -190 +191 @@
             self.gen_frame.Show(False)
         self.gen_frame.Show(True)
+
+    def on_show_orientation(self, event):
+        """
+        Make sasmodels orientation & jitter viewer available
+        """
+        from sasmodels.jitter import run
+        run()
 
     def on_image_viewer(self, event):

src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst

@@ -19 +19 @@
     or with a comma or semi-colon delimiter
 *   2D `ISIS ASCII formatted
-    <http://www.isis.stfc.ac.uk/instruments/loq/software/
-    colette-ascii-file-format-descriptions9808.pdf>`_ data
+    <https://www.isis.stfc.ac.uk/Pages/colette-ascii-file-format-descriptions.pdf>`_ data
 *   `1D BSL/OTOKO format
     <http://www.diamond.ac.uk/Beamlines/Soft-Condensed-Matter/small-angle/

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

@@ -1367 +1367 @@
             except Exception:
                 logger.error(traceback.format_exc())
-            selection = self._find_polyfunc_selection(disp_model)
+            index, selection = self._find_polyfunc_selection(disp_model)
             for list in self.fittable_param:
                 if list[1] == key and list[7] is not None:
-                    list[7].SetSelection(selection)
+                    list[7].SetSelection(index)
                     # For the array disp_model, set the values and weights
-                    if selection == 1:
+                    if selection == 'array':
                         disp_model.set_weights(self.values[key],
                                                self.weights[key])
@@ -1385 +1385 @@
                             logger.error(traceback.format_exc())
             # For array, disable all fixed params
-            if selection == 1:
+            if selection == 'array':
                 for item in self.fixed_param:
                     if item[1].split(".")[0] == key.split(".")[0]:
@@ -2668 +2668 @@
     def _find_polyfunc_selection(self, disp_func=None):
         """
-        FInd Comboox selection from disp_func
+        Find Combobox selection from disp_func
 
         :param disp_function: dispersion distr. function
@@ -2675 +2675 @@
         if disp_func is not None:
             try:
-                return POLYDISPERSITY_MODELS.values().index(disp_func.__class__)
+                return (list(POLYDISPERSITY_MODELS).index(disp_func.type),
+                       disp_func.type)
             except ValueError:
                 pass  # Fall through to default class
-        return POLYDISPERSITY_MODELS.keys().index('gaussian')
+        return (list(POLYDISPERSITY_MODELS).index('gaussian'), 'gaussian')
 
     def on_reset_clicked(self, event):