Changeset cb270ad2 in sasview for fittingview/src/sans/perspectives/fitting/basepage.py

Timestamp:

Apr 6, 2013 1:23:46 PM (11 years ago)

Author:

Miguel Gonzalez <onzalezm@…>

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:

3e001f9

Parents:

e2271c5

Message:

Added checkbutton in fittingview perspective to allow log spacing of points for theory models

File:

• fittingview/src/sans/perspectives/fitting/basepage.py (modified) (3 diffs)

fittingview/src/sans/perspectives/fitting/basepage.py

@@ -239 +239 @@
                 self._create_default_2d_data()
             else:
-                self._create_default_1d_data()
+                if self.pointsbox.GetValue():
+                    self._create_log_1d_data()
+                else:
+                    self._create_default_1d_data()
+                        
             if self.model != None:
                 if not self.data.is_data:
@@ -265 +269 @@
         self.data.id = str(self.uid) + " data"
         self.data.group_id = str(self.uid) + " Model1D"
-       
+         
+    def _create_log_1d_data(self):
+        """
+        Create log-spaced data for fitting perspective
+        Only when the page is on theory mode.
+        :warning: This data is never plotted.
+        
+        """
+        if self.qmin_x >= 1.e-10:
+            qmin = numpy.log10(self.qmin_x)
+        else:
+            qmin = -10.    
+            
+        if self.qmax_x <= 1.e10:
+            qmax = numpy.log10(self.qmax_x)
+        else:
+            qmax = 10. 
+               
+        x = numpy.logspace(start=qmin, stop=qmax,
+                           num=self.npts_x, endpoint=True, base=10.0)
+        self.data = Data1D(x=x)
+        self.data.xaxis('\\rm{Q}', "A^{-1}")
+        self.data.yaxis('\\rm{Intensity}', "cm^{-1}")
+        self.data.is_data = False
+        self.data.id = str(self.uid) + " data"
+        self.data.group_id = str(self.uid) + " Model1D"
+      
     def _create_default_2d_data(self):
         """
@@ -2936 +2966 @@
         self._draw_model()
         
+    def select_log(self, event):
+        """
+        Log checked to generate log spaced points for theory model
+        """
+
     def get_images(self):
         """