Changeset 77e9ac6 in sasview

Timestamp:

Jul 11, 2016 4:36:55 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:

f2bbabf

Parents:

3b8efec

git-author:

Lewis O'Driscoll <lewis.o'driscoll@…> (07/07/16 07:31:01)

git-committer:

Lewis O'Driscoll <lewis.o'driscoll@…> (07/11/16 04:36:55)

Message:

Tidy up

Location:

src/sas

Files:

• sascalc/corfunc/corfunc_calculator.py (modified) (1 diff)
• sasgui/perspectives/corfunc/corfunc_panel.py (modified) (2 diffs)
• sasgui/perspectives/corfunc/corfunc_state.py (modified) (1 diff)

src/sas/sascalc/corfunc/corfunc_calculator.py

@@ -143 +143 @@
         # better fitting curve
         data = interp1d(q, iq)
-        s1 = self._Interpolator(data, lambda x: self._porod(x, fitp[0], fitp[1]),
-            self.upperq[0], q[-1])
+        s1 = self._Interpolator(data,
+            lambda x: self._porod(x, fitp[0], fitp[1]), self.upperq[0], q[-1])
 
         mask = np.logical_and(q < self.lowerq, 0 < q)

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

@@ -202 +202 @@
             wx.PostEvent(self._manager.parent, PlotQrangeEvent(
                 ctrl=[self._qmin_input, self._qmax1_input, self._qmax2_input],
-                active=event.GetEventObject(), id=IQ_DATA_LABEL, group_id=group_id,
-                leftdown=False))
+                active=event.GetEventObject(), id=IQ_DATA_LABEL,
+                group_id=group_id, leftdown=False))
 
     def _validate_inputs(self):
@@ -305 +305 @@
         self._background_input.SetToolTipString(("A background value to "
             "subtract from all intensity values"))
-        q_sizer.Add(self._background_input, (1,1), (1,1), wx.RIGHT | wx.EXPAND, 5)
+        q_sizer.Add(self._background_input, (1,1), (1,1),
+            wx.RIGHT | wx.EXPAND, 5)
 
         qrange_label = wx.StaticText(self, -1, "Q Range:", size=(50,20))

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

@@ -109 +109 @@
             we will append the data [optional]
 
-        :return: None if no doc is provided, modified XML document if doc != None
+        :return: None if no doc is provided, modified XML document if doc!=None
         """
         from xml.dom.minidom import getDOMImplementation