Changes in src/sas/sasgui/perspectives/simulation/simulation.py [9a5097c:463e7ffc] in sasview

File:

• src/sas/sasgui/perspectives/simulation/simulation.py (modified) (6 diffs)

src/sas/sasgui/perspectives/simulation/simulation.py

@@ -10 +10 @@
 import wx
 import os
-import numpy as np
+import numpy
 import time
 import logging
@@ -24 +24 @@
 from sas.sascalc.data_util.calcthread import CalcThread
 from sas.guicomm.events import NewPlotEvent, StatusEvent    
+
+logger = logging.getLogger(__name__)
 
 class Calc1D(CalcThread):
@@ -46 +48 @@
     def compute(self):
         x = self.x
-        output = np.zeros(len(x))
-        error = np.zeros(len(x))
+        output = numpy.zeros(len(x))
+        error = numpy.zeros(len(x))
         
         self.starttime = time.time()
@@ -93 +95 @@
         self._default_save_location = os.getcwd()
         # Log startup
-        logging.info("Simulation plug-in started")
+        logger.info("Simulation plug-in started")
         
     def get_panels(self, parent):
@@ -123 +125 @@
         # Q-values for plotting simulated I(Q)
         step = (self.q_max-self.q_min)/(self.q_npts-1)
-        self.x = np.arange(self.q_min, self.q_max+step*0.01, step)
+        self.x = numpy.arange(self.q_min, self.q_max+step*0.01, step)        
         
         # Set the list of panels that are part of the simulation perspective
@@ -187 +189 @@
         # Q-values for plotting simulated I(Q)
         step = (self.q_max-self.q_min)/(self.q_npts-1)
-        self.x = np.arange(self.q_min, self.q_max+step*0.01, step)
+        self.x = numpy.arange(self.q_min, self.q_max+step*0.01, step)    
          
         # Compute the simulated I(Q)