Changeset b9a5f0e in sasview for src/sas/perspectives/calculator/gen_scatter_panel.py

Timestamp:

Feb 13, 2015 2:52:52 AM (9 years ago)

Author:

krzywon

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:

fd5ac0d

Parents:

35ec279

Message:

90% complete with the conversion.

File:

• src/sas/perspectives/calculator/gen_scatter_panel.py (modified) (14 diffs)

src/sas/perspectives/calculator/gen_scatter_panel.py

@@ -29 +29 @@
 from sas.guiframe.utils import format_number
 from sas.guiframe.events import StatusEvent  
-from sas.calculator import sans_gen 
+from sas.calculator import sas_gen 
 from sas.perspectives.calculator.calculator_widgets import OutputTextCtrl
 from sas.perspectives.calculator.calculator_widgets import InputTextCtrl
@@ -116 +116 @@
     """
     ## Internal nickname for the window, used by the AUI manager
-    window_name = "Generic SANS Calculator"
+    window_name = "Generic SAS Calculator"
     ## Name to appear on the window title bar
-    window_caption = "Generic SANS "
+    window_caption = "Generic SAS "
     ## Flag to tell the AUI manager to put this panel in the center pane
     CENTER_PANE = True
@@ -133 +133 @@
         self.reader = None
         self.ext = None
-        self.id = 'GenSANS'
+        self.id = 'GenSAS'
         self.file_name = ''
         self.time_text = None
         self.orient_combo = None
-        self.omfreader = sans_gen.OMFReader()
-        self.sldreader = sans_gen.SLDReader()
-        self.pdbreader = sans_gen.PDBReader()
-        self.model = sans_gen.GenSAS()
+        self.omfreader = sas_gen.OMFReader()
+        self.sldreader = sas_gen.SLDReader()
+        self.pdbreader = sas_gen.PDBReader()
+        self.model = sas_gen.GenSAS()
         self.param_dic = self.model.params
         self.parameters = []
@@ -451 +451 @@
         """
         sld_n_default = 6.97e-06
-        omfdata = sans_gen.OMFData()
-        omf2sld = sans_gen.OMF2SLD()
+        omfdata = sas_gen.OMFData()
+        omf2sld = sas_gen.OMF2SLD()
         omf2sld.set_data(omfdata, self.default_shape)
         self.sld_data = omf2sld.output
@@ -538 +538 @@
             if self.parent.parent is None:
                 return 
-            msg = "Generic SANS Calculator: %s" % (sys.exc_value)
+            msg = "Generic SAS Calculator: %s" % (sys.exc_value)
             wx.PostEvent(self.parent.parent,
                           StatusEvent(status=msg, type='stop'))
@@ -572 +572 @@
             self.is_avg = False
             if self.ext in self.omfreader.ext:
-                gen = sans_gen.OMF2SLD()
+                gen = sas_gen.OMF2SLD()
                 gen.set_data(data)
                 #omf_data = data
@@ -591 +591 @@
                 raise
             msg = "Loading Error: This file format is not supported "
-            msg += "for GenSANS." 
+            msg += "for GenSAS." 
             wx.PostEvent(self.parent.parent,
                           StatusEvent(status=msg, type='stop', info='Error'))
@@ -684 +684 @@
         graph_title = self._sld_plot_helper(ax, output, has_arrow)
         # Use y, z axes (in mpl 3d) as z, y axes 
-        # that consistent with our SANS detector coords.
+        # that consistent with our SAS detector coords.
         ax.set_xlabel('x ($\A%s$)'% output.pos_unit)
         ax.set_ylabel('z ($\A%s$)'% output.pos_unit)
@@ -1210 +1210 @@
         # Object that receive status event
         self.parent = parent
-        self.sld_data = sans_gen.MagSLD([0], [0], [0]) 
+        self.sld_data = sas_gen.MagSLD([0], [0], [0]) 
         self.sld_ctl = None
         self.default_shape = 'rectangular'
@@ -1277 +1277 @@
         """
         """
-        omfdata = sans_gen.OMFData()
+        omfdata = sas_gen.OMFData()
         sets = {}
         try:
@@ -1298 +1298 @@
                 exec "omfdata.%s = sets['%s']"% (key, key)            
 
-            omf2sld = sans_gen.OMF2SLD()
+            omf2sld = sas_gen.OMF2SLD()
             omf2sld.set_data(omfdata, self.default_shape)
             self.sld_data = omf2sld.output
@@ -1628 +1628 @@
         self.parent.set_main_panel_sld_data(self.sld_data)
         
-        reader = sans_gen.SLDReader() 
+        reader = sas_gen.SLDReader() 
         extension = '*.sld'
         path = None
@@ -1810 +1810 @@
         self.panel = SasGenPanel(parent=self)
         self.data = None
-        self.omfdata = sans_gen.OMFData()
+        self.omfdata = sas_gen.OMFData()
         self.sld_data = None
         self._default_save_location = os.getcwd() 
@@ -2117 +2117 @@
 
         media = calmedia.get_data_path(media='media')
-        path = os.path.join(media,"gen_sans_help.html") 
+        path = os.path.join(media,"gen_sas_help.html") 
         name = "Generic Scattering Calculator"
         frame = HelpWindow(self, -1, 
-                           title=' Help: GenSANS',  
+                           title=' Help: GenSAS',  
                            pageToOpen=path, size=(865, 450))   
         try: