Changeset cd89c6f in sasview

Timestamp:

Jan 14, 2013 11:19:38 AM (11 years ago)

Author:

Jae Cho <jhjcho@…>

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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

fad6056

Parents:

5c2932a

Message:

cleaned up a little

Files:

• calculatorview/src/sans/perspectives/calculator/gen_scatter_panel.py (modified) (8 diffs)
• sanscalculator/src/sans/calculator/sans_gen.py (modified) (7 diffs)

calculatorview/src/sans/perspectives/calculator/gen_scatter_panel.py

@@ -28 +28 @@
 from sans.guiframe.events import StatusEvent  
 from sans.calculator import sans_gen 
-from calculator_widgets import OutputTextCtrl
-from calculator_widgets import InputTextCtrl
+from sans.perspectives.calculator.calculator_widgets import OutputTextCtrl
+from sans.perspectives.calculator.calculator_widgets import InputTextCtrl
 from wx.lib.scrolledpanel import ScrolledPanel
 from sans.perspectives.calculator.load_thread import GenReader
@@ -89 +89 @@
         """
         """
-        CalcThread.__init__(self,completefn,
+        CalcThread.__init__(self, completefn,
                  updatefn,
                  yieldtime,
@@ -1064 +1064 @@
                         return self.sld_data
             else:
-               sld_sets[list[0]]= None
+               sld_sets[list[0]] = None
         for key in sld_sets.keys():
             key_low = key.lower()
@@ -1611 +1611 @@
         Init
         """
-        kwds['size']= size
-        kwds['title']= title
+        kwds['size'] = size
+        kwds['title'] = title
         
         wx.Frame.__init__(self, parent, *args, **kwds)
@@ -1645 +1645 @@
         save_bmp = wx.ArtProvider.GetBitmap(wx.ART_FILE_SAVE_AS, wx.ART_TOOLBAR,
                                             tsize)
-        close_bmp= wx.ArtProvider.GetBitmap(wx.ART_QUIT, wx.ART_TOOLBAR, 
+        close_bmp = wx.ArtProvider.GetBitmap(wx.ART_QUIT, wx.ART_TOOLBAR, 
                                             tsize)
-        help_bmp= wx.ArtProvider.GetBitmap(wx.ART_HELP, wx.ART_TOOLBAR, 
+        help_bmp = wx.ArtProvider.GetBitmap(wx.ART_HELP, wx.ART_TOOLBAR, 
                                            (17, 20))
         
@@ -1680 +1680 @@
         save_bmp = wx.ArtProvider.GetBitmap(wx.ART_FILE_SAVE_AS, wx.ART_TOOLBAR,
                                             tsize)
-        quit_bmp= wx.ArtProvider.GetBitmap(wx.ART_QUIT, wx.ART_TOOLBAR, 
+        quit_bmp = wx.ArtProvider.GetBitmap(wx.ART_QUIT, wx.ART_TOOLBAR, 
                                            tsize)
-        help_bmp= wx.ArtProvider.GetBitmap(wx.ART_HELP, wx.ART_TOOLBAR, 
+        help_bmp = wx.ArtProvider.GetBitmap(wx.ART_HELP, wx.ART_TOOLBAR, 
                                            (13, 15))
         
@@ -1891 +1891 @@
         Gen scatter angle help panel
         """
-        from help_panel import  HelpWindow
+        from sans.perspectives.calculator.help_panel import  HelpWindow
         # Get models help model_function path
         import sans.perspectives.calculator as calmedia
@@ -1913 +1913 @@
 if __name__ == "__main__": 
     app = wx.PySimpleApp()
-    frame = SasGenWindow()    
-    frame.Show(True)
+    SGframe = SasGenWindow()    
+    SGframe.Show(True)
     app.MainLoop()     

sanscalculator/src/sans/calculator/sans_gen.py

@@ -64 +64 @@
         self.params['Up_frac_out']    = 1.0
         self.params['Up_theta']  = 0.0
-        self.description='GenSAS'
+        self.description = 'GenSAS'
         ## Parameter details [units, min, max]
         self.details = {}
@@ -74 +74 @@
         self.details['Up_theta'] = ['[deg]', None, None]
         # fixed parameters
-        self.fixed=[]
+        self.fixed = []
         
     def set_pixel_volumes(self, volume):     
@@ -146 +146 @@
         if x.__class__.__name__ == 'list':
             i_out = numpy.zeros_like(x[0])
-            y_in = numpy.zero_like(x[0])
+            y_in = numpy.zeros_like(x[0])
             # 1D I is found at y =0 in the 2D pattern
             return self._gen(x[0], y_in, i_out )
@@ -163 +163 @@
             i_out = numpy.zeros_like(x[0])
             import time
-            s=time.time()
+            s = time.time()
             out = self._gen(x[0], x[1], i_out)
-            print "i_out_time",time.time()-s
+            print "i_out_time", time.time() - s
             return out
         else:
@@ -346 +346 @@
         :return: x, y, z, sld_n, sld_mx, sld_my, sld_mz
         """
-        data_conv_m = None
+        #data_conv_m = None
         desc = ""
         mx = numpy.zeros(0)
@@ -454 +454 @@
                     output.zmax = float(zmax) * METER2ANG
                     output.valuemultiplier = valuemultiplier
-                    output.valuerangeminmag = mag2sld(float(valuerangeminmag),\
+                    output.valuerangeminmag = mag2sld(float(valuerangeminmag), \
                                                       valueunit)
-                    output.valuerangemaxmag = mag2sld(float(valuerangemaxmag),\
+                    output.valuerangemaxmag = mag2sld(float(valuerangemaxmag), \
                                                       valueunit)
             output.set_m(mx, my, mz)
@@ -1086 +1086 @@
     x = numpy.arange(1000)/10000. + 1e-5
     y = numpy.arange(1000)/10000. + 1e-5
-    z = numpy.arange(1000)/10000. + 1e-5
+    #z = numpy.arange(1000)/10000. + 1e-5
     i = numpy.zeros(1000)
     out = model.runXY([x,y,i])