Index: src/sas/sasgui/perspectives/fitting/basepage.py
===================================================================
--- src/sas/sasgui/perspectives/fitting/basepage.py	(revision 9a5097cd1c76689d1f997b85ba43d12a95d8f243)
+++ src/sas/sasgui/perspectives/fitting/basepage.py	(revision 463e7ffce130ae386f93cd18b87a1120743e88b5)
@@ -5,5 +5,5 @@
 import os
 import wx
-import numpy as np
+import numpy
 import time
 import copy
@@ -34,4 +34,5 @@
 from sas.sasgui.guiframe.documentation_window import DocumentationWindow
 
+logger = logging.getLogger(__name__)
 
 (PageInfoEvent, EVT_PAGE_INFO) = wx.lib.newevent.NewEvent()
@@ -100,5 +101,5 @@
         self.graph_id = None
         # Q range for data set
-        self.qmin_data_set = np.inf
+        self.qmin_data_set = numpy.inf
         self.qmax_data_set = None
         self.npts_data_set = 0
@@ -278,5 +279,5 @@
 
         """
-        x = np.linspace(start=self.qmin_x, stop=self.qmax_x,
+        x = numpy.linspace(start=self.qmin_x, stop=self.qmax_x,
                            num=self.npts_x, endpoint=True)
         self.data = Data1D(x=x)
@@ -295,14 +296,14 @@
         """
         if self.qmin_x >= 1.e-10:
-            qmin = np.log10(self.qmin_x)
+            qmin = numpy.log10(self.qmin_x)
         else:
             qmin = -10.
 
         if self.qmax_x <= 1.e10:
-            qmax = np.log10(self.qmax_x)
+            qmax = numpy.log10(self.qmax_x)
         else:
             qmax = 10.
 
-        x = np.logspace(start=qmin, stop=qmax,
+        x = numpy.logspace(start=qmin, stop=qmax,
                            num=self.npts_x, endpoint=True, base=10.0)
         self.data = Data1D(x=x)
@@ -341,16 +342,16 @@
         qstep = self.npts_x
 
-        x = np.linspace(start=xmin, stop=xmax, num=qstep, endpoint=True)
-        y = np.linspace(start=ymin, stop=ymax, num=qstep, endpoint=True)
+        x = numpy.linspace(start=xmin, stop=xmax, num=qstep, endpoint=True)
+        y = numpy.linspace(start=ymin, stop=ymax, num=qstep, endpoint=True)
         # use data info instead
-        new_x = np.tile(x, (len(y), 1))
-        new_y = np.tile(y, (len(x), 1))
+        new_x = numpy.tile(x, (len(y), 1))
+        new_y = numpy.tile(y, (len(x), 1))
         new_y = new_y.swapaxes(0, 1)
         # all data reuire now in 1d array
         qx_data = new_x.flatten()
         qy_data = new_y.flatten()
-        q_data = np.sqrt(qx_data * qx_data + qy_data * qy_data)
+        q_data = numpy.sqrt(qx_data * qx_data + qy_data * qy_data)
         # set all True (standing for unmasked) as default
-        mask = np.ones(len(qx_data), dtype=bool)
+        mask = numpy.ones(len(qx_data), dtype=bool)
         # store x and y bin centers in q space
         x_bins = x
@@ -358,6 +359,6 @@
 
         self.data.source = Source()
-        self.data.data = np.ones(len(mask))
-        self.data.err_data = np.ones(len(mask))
+        self.data.data = numpy.ones(len(mask))
+        self.data.err_data = numpy.ones(len(mask))
         self.data.qx_data = qx_data
         self.data.qy_data = qy_data
@@ -782,6 +783,6 @@
                 except Exception:
                     # Skip non-data lines
-                    logging.error(traceback.format_exc())
-            return np.array(angles), np.array(weights)
+                    logger.error(traceback.format_exc())
+            return numpy.array(angles), numpy.array(weights)
         except:
             raise
@@ -1304,5 +1305,5 @@
                     [state.values, state.weights]
             except Exception:
-                logging.error(traceback.format_exc())
+                logger.error(traceback.format_exc())
             selection = self._find_polyfunc_selection(disp_model)
             for list in self.fittable_param:
@@ -1321,5 +1322,5 @@
                             list[6].Disable()
                         except Exception:
-                            logging.error(traceback.format_exc())
+                            logger.error(traceback.format_exc())
             # For array, disable all fixed params
             if selection == 1:
@@ -1330,5 +1331,5 @@
                             item[2].Disable()
                         except Exception:
-                            logging.error(traceback.format_exc())
+                            logger.error(traceback.format_exc())
 
     def _selectDlg(self):
@@ -1464,5 +1465,5 @@
                 self.Refresh()
 
-        # logging.info("is_modified flag set to %g",is_modified)
+        # logger.info("is_modified flag set to %g",is_modified)
         return is_modified
 
@@ -1569,5 +1570,5 @@
             self.save_current_state()
         except Exception:
-            logging.error(traceback.format_exc())
+            logger.error(traceback.format_exc())
 
         return flag, is_modified
@@ -2120,5 +2121,5 @@
         for data in self.data_list:
             # q value from qx and qy
-            radius = np.sqrt(data.qx_data * data.qx_data +
+            radius = numpy.sqrt(data.qx_data * data.qx_data +
                                 data.qy_data * data.qy_data)
             # get unmasked index
@@ -2126,5 +2127,5 @@
                          (radius <= float(self.qmax.GetValue()))
             index_data = (index_data) & (data.mask)
-            index_data = (index_data) & (np.isfinite(data.data))
+            index_data = (index_data) & (numpy.isfinite(data.data))
 
             if len(index_data[index_data]) < 10:
@@ -2161,5 +2162,5 @@
             index_data = (float(self.qmin.GetValue()) <= radius) & \
                          (radius <= float(self.qmax.GetValue()))
-            index_data = (index_data) & (np.isfinite(data.y))
+            index_data = (index_data) & (numpy.isfinite(data.y))
 
             if len(index_data[index_data]) < 5:
@@ -2233,6 +2234,6 @@
 
                 # Check that min is less than max
-                low = -np.inf if min_str == "" else float(min_str)
-                high = np.inf if max_str == "" else float(max_str)
+                low = -numpy.inf if min_str == "" else float(min_str)
+                high = numpy.inf if max_str == "" else float(max_str)
                 if high < low:
                     min_ctrl.SetBackgroundColour("pink")
@@ -2384,5 +2385,5 @@
                     self.model.set_dispersion(p, disp_model)
                 except Exception:
-                    logging.error(traceback.format_exc())
+                    logger.error(traceback.format_exc())
 
         # save state into
@@ -2499,5 +2500,5 @@
             self.Refresh()
         except Exception:
-            logging.error(traceback.format_exc())
+            logger.error(traceback.format_exc())
             # Error msg
             msg = "Error occurred:"
@@ -2600,5 +2601,5 @@
                 del self.state.model._persistency_dict[name.split('.')[0]]
         except Exception:
-            logging.error(traceback.format_exc())
+            logger.error(traceback.format_exc())
 
     def _lay_out(self):
@@ -2654,5 +2655,5 @@
             self.qmin_x = data_min
             self.qmax_x = math.sqrt(x * x + y * y)
-            # self.data.mask = np.ones(len(self.data.data),dtype=bool)
+            # self.data.mask = numpy.ones(len(self.data.data),dtype=bool)
             # check smearing
             if not self.disable_smearer.GetValue():
@@ -2742,5 +2743,5 @@
             except Exception:
                 # Not for control panels
-                logging.error(traceback.format_exc())
+                logger.error(traceback.format_exc())
         # Make sure the resduals plot goes to the last
         if res_item is not None:
@@ -3075,5 +3076,5 @@
                     disfunc = str(item[7].GetValue())
             except Exception:
-                logging.error(traceback.format_exc())
+                logger.error(traceback.format_exc())
 
             # 2D
@@ -3118,5 +3119,5 @@
                         disfunc += ' ' + str(weight)
             except Exception:
-                logging.error(traceback.format_exc())
+                logger.error(traceback.format_exc())
             content += name + ',' + str(check) + ',' + value + disfunc + ',' + \
                        bound_lo + ',' + bound_hi + ':'
@@ -3366,6 +3367,6 @@
 
             if value[1] == 'array':
-                pd_vals = np.array(value[2])
-                pd_weights = np.array(value[3])
+                pd_vals = numpy.array(value[2])
+                pd_weights = numpy.array(value[3])
                 if len(pd_vals) == 0 or len(pd_vals) != len(pd_weights):
                     msg = ("bad array distribution parameters for %s"
@@ -3389,5 +3390,5 @@
 
         except Exception:
-            logging.error(traceback.format_exc())
+            logger.error(traceback.format_exc())
             print "Error in BasePage._paste_poly_help: %s" % \
                   sys.exc_info()[1]
