Changeset ee18d33 in sasview for src/sas/qtgui/Perspectives/Fitting/FittingLogic.py

Timestamp:

Aug 9, 2017 7:52:07 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

38eb433

Parents:

985ad94

Message:

Initial setup for batch fitting. SASVIEW-615

File:

• src/sas/qtgui/Perspectives/Fitting/FittingLogic.py (modified) (3 diffs)

src/sas/qtgui/Perspectives/Fitting/FittingLogic.py

@@ -178 +178 @@
     def computeDataRange(self):
         """
+        Wrapper for calculating the data range based on local dataset
+        """
+        return self.computeRangeFromData(self.data)
+
+    def computeRangeFromData(self, data):
+        """
         Compute the minimum and the maximum range of the data
         return the npts contains in data
         """
         qmin, qmax, npts = None, None, None
-        if isinstance(self.data, Data1D):
+        if isinstance(data, Data1D):
             try:
-                qmin = min(self.data.x)
-                qmax = max(self.data.x)
-                npts = len(self.data.x)
+                qmin = min(data.x)
+                qmax = max(data.x)
+                npts = len(data.x)
             except (ValueError, TypeError):
                 msg = "Unable to find min/max/length of \n data named %s" % \
@@ -195 +201 @@
             qmin = 0
             try:
-                x = max(np.fabs(self.data.xmin), np.fabs(self.data.xmax))
-                y = max(np.fabs(self.data.ymin), np.fabs(self.data.ymax))
+                x = max(np.fabs(data.xmin), np.fabs(data.xmax))
+                y = max(np.fabs(data.ymin), np.fabs(data.ymax))
             except (ValueError, TypeError):
                 msg = "Unable to find min/max of \n data named %s" % \
@@ -202 +208 @@
                 raise ValueError, msg
             qmax = np.sqrt(x * x + y * y)
-            npts = len(self.data.data)
+            npts = len(data.data)
         return qmin, qmax, npts