Changeset 82d88d5 in sasview for src/sas/sasgui/perspectives/corfunc

Timestamp:

Mar 6, 2019 4:18:09 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1249

Children:

f923967

Parents:

cb64d86 (diff), f205d3a (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 py37-sasgui

Location:

src/sas/sasgui/perspectives/corfunc

Files:

• corfunc_panel.py (modified) (1 diff)
• media/corfunc_help.rst (modified) (1 diff)
• __init__.py (modified) (1 diff)
• corfunc.py (modified) (2 diffs)
• corfunc_state.py (modified) (9 diffs)

src/sas/sasgui/perspectives/corfunc/corfunc_panel.py

@@ -277 +277 @@
         self._transformed_data = transforms
         (transform1, transform3, idf) = transforms
-        plot_x = transform1.x[transform1.x <= 200]
-        plot_y = transform1.y[transform1.x <= 200]
+        plot_x = transform1.x[transform1.x <= 1000]
+        plot_y = transform1.y[transform1.x <= 1000]
         self._manager.show_data(Data1D(plot_x, plot_y), TRANSFORM_LABEL1)
-        # No need to shorten gamma3 as it's only calculated up to x=200
+        # No need to shorten gamma3 as it's only calculated up to x=1000
         self._manager.show_data(transform3, TRANSFORM_LABEL3)
 
-        plot_x = idf.x[idf.x <= 200]
-        plot_y = idf.y[idf.x <= 200]
+        plot_x = idf.x[idf.x <= 1000]
+        plot_y = idf.y[idf.x <= 1000]
         self._manager.show_data(Data1D(plot_x, plot_y), IDF_LABEL)
 

src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst

@@ -30 +30 @@
 of the profile provides measures of the layer thickness, and the area under 
 the profile is related to the amount of material that is adsorbed.
+
+.. note::
+    These transforms assume that the data has been measured on a pinhole-
+    collimated instrument or, if not, that the data has been Lorentz-
+    corrected beforehand.
 
 Both analyses are performed in 3 stages:

src/sas/sasgui/perspectives/corfunc/__init__.py

@@ -1 +1 @@
 PLUGIN_ID = "Corfunc Plug-In 0.1"
-from corfunc import *
+from .corfunc import *

src/sas/sasgui/perspectives/corfunc/corfunc.py

@@ -18 +18 @@
 from sas.sascalc.dataloader.loader import Loader
 import sas.sascalc.dataloader
-from plot_labels import *
+from .plot_labels import *
 
 logger = logging.getLogger(__name__)
@@ -148 +148 @@
                     self.data_id = data.id
                     self.corfunc_panel.set_data(data)
-                except:
-                    msg = "Corfunc set_data: " + str(sys.exc_value)
+                except Exception as exc:
+                    msg = "Corfunc set_data: " + str(exc)
                     wx.PostEvent(self.parent, StatusEvent(status=msg,
                         info='error'))

src/sas/sasgui/perspectives/corfunc/corfunc_state.py

@@ -74 +74 @@
         if self.outputs != {} and self.outputs is not None:
             state += "\nOutputs:\n"
-            for key, value in self.outputs.iteritems():
+            for key, value in self.outputs.items():
                 name = output_list[key][1]
                 state += "{}: {}\n".format(name, str(value))
@@ -158 +158 @@
         state = new_doc.createElement("state")
         top_element.appendChild(state)
-        for name, value in self.saved_state.iteritems():
+        for name, value in self.saved_state.items():
             element = new_doc.createElement(name)
             element.appendChild(new_doc.createTextNode(str(value)))
@@ -181 +181 @@
             output = new_doc.createElement("output")
             top_element.appendChild(output)
-            for key, value in self.outputs.iteritems():
+            for key, value in self.outputs.items():
                 element = new_doc.createElement(key)
                 element.appendChild(new_doc.createTextNode(str(value)))
@@ -214 +214 @@
                 try:
                     self.timestamp = (entry.get('epoch'))
-                except:
+                except Exception as exc:
                     msg = ("CorfuncState.fromXML: Could not read timestamp",
-                        "\n{}").format(sys.exc_value)
+                        "\n{}").format(exc)
                     logger.error(msg)
 
@@ -222 +222 @@
             entry = get_content('ns:state', node)
             if entry is not None:
-                for item in DEFAULT_STATE.iterkeys():
+                for item in DEFAULT_STATE.keys():
                     input_field = get_content("ns:{}".format(item), entry)
                     if input_field is not None:
@@ -283 +283 @@
             root, ext = os.path.splitext(basename)
             if not ext.lower() in self.ext:
-                raise IOError, "{} is not a supported file type".format(ext)
+                raise IOError("{} is not a supported file type".format(ext))
             tree = etree.parse(path, parser=etree.ETCompatXMLParser())
             root = tree.getroot()
@@ -299 +299 @@
             # File not found
             msg = "{} is not a valid file path or doesn't exist".format(path)
-            raise IOError, msg
+            raise IOError(msg)
 
         if len(output) == 0:
@@ -323 +323 @@
             msg = ("The CanSAS writer expects a Data1D instance. {} was "
                 "provided").format(datainfo.__class__.__name__)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
         if datainfo.title is None or datainfo.title == '':
             datainfo.title = datainfo.name
@@ -358 +358 @@
                 state = CorfuncState()
                 state.fromXML(nodes[0])
-        except:
+        except Exception as exc:
             msg = "XML document does not contain CorfuncState information\n{}"
-            msg.format(sys.exc_value)
+            msg.format(exc)
             logger.info(msg)
         return state