Changes in / [8cec26b:d9c1551] in sasview

Location:

src/sas

Files:

• sascalc/dataloader/manipulations.py (modified) (3 diffs)
• sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) (9 diffs)
• sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) (4 diffs)
• sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (deleted)
• sasgui/guiframe/local_perspectives/plotting/parameters_panel_boxsum.py (added)
• sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (added)
• sasgui/guiframe/local_perspectives/plotting/slicerpanel.py (deleted)
• sasgui/perspectives/fitting/basepage.py (modified) (1 diff)

src/sas/sascalc/dataloader/manipulations.py

@@ -199 +199 @@
     z_max = max(data2D.q_data)
     z_min = min(data2D.q_data)
-    x_max = data2D.dqx_data[data2D.q_data[z_max]]
-    x_min = data2D.dqx_data[data2D.q_data[z_min]]
-    y_max = data2D.dqy_data[data2D.q_data[z_max]]
-    y_min = data2D.dqy_data[data2D.q_data[z_min]]
+    dqx_at_z_max = data2D.dqx_data[np.argmax(data2D.q_data)]
+    dqx_at_z_min = data2D.dqx_data[np.argmin(data2D.q_data)]
+    dqy_at_z_max = data2D.dqy_data[np.argmax(data2D.q_data)]
+    dqy_at_z_min = data2D.dqy_data[np.argmin(data2D.q_data)]
     # Find qdx at q = 0
-    dq_overlap_x = (x_min * z_max - x_max * z_min) / (z_max - z_min)
+    dq_overlap_x = (dqx_at_z_min * z_max - dqx_at_z_max * z_min) / (z_max - z_min)
     # when extrapolation goes wrong
     if dq_overlap_x > min(data2D.dqx_data):
@@ -210 +210 @@
     dq_overlap_x *= dq_overlap_x
     # Find qdx at q = 0
-    dq_overlap_y = (y_min * z_max - y_max * z_min) / (z_max - z_min)
+    dq_overlap_y = (dqy_at_z_min * z_max - dqy_at_z_max * z_min) / (z_max - z_min)
     # when extrapolation goes wrong
     if dq_overlap_y > min(data2D.dqy_data):
@@ -220 +220 @@
     # Final protection of dq
     if dq_overlap < 0:
-        dq_overlap = y_min
+        dq_overlap = dqy_at_z_min
     dqx_data = data2D.dqx_data[np.isfinite(data2D.data)]
     dqy_data = data2D.dqy_data[np.isfinite(

src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py

@@ -361 +361 @@
                 if self.slicer.__class__.__name__ != "BoxSum":
                     wx_id = ids.next()
-                    slicerpop.Append(wx_id, '&Edit Slicer Parameters')
+                    name = '&Edit Slicer Parameters and Batch Slicing'
+                    slicerpop.Append(wx_id, name)
                     wx.EVT_MENU(self, wx_id, self._onEditSlicer)
             slicerpop.AppendSeparator()
@@ -532 +533 @@
 
         """
-        ## Clear current slicer
+        # Clear current slicer
         if self.slicer is not None:
             self.slicer.clear()
-        ## Create a new slicer
+        # Create a new slicer
         self.slicer_z += 1
         self.slicer = slicer(self, self.subplot, zorder=self.slicer_z)
         self.subplot.set_ylim(self.data2D.ymin, self.data2D.ymax)
         self.subplot.set_xlim(self.data2D.xmin, self.data2D.xmax)
-        ## Draw slicer
+        # Draw slicer
         self.update()
         self.slicer.update()
@@ -572 +573 @@
         npt = math.floor(npt)
         from sas.sascalc.dataloader.manipulations import CircularAverage
-        ## compute the maximum radius of data2D
+        # compute the maximum radius of data2D
         self.qmax = max(math.fabs(self.data2D.xmax),
                         math.fabs(self.data2D.xmin))
@@ -578 +579 @@
                         math.fabs(self.data2D.ymin))
         self.radius = math.sqrt(math.pow(self.qmax, 2) + math.pow(self.ymax, 2))
-        ##Compute beam width
+        # Compute beam width
         bin_width = (self.qmax + self.qmax) / npt
-        ## Create data1D circular average of data2D
+        # Create data1D circular average of data2D
         Circle = CircularAverage(r_min=0, r_max=self.radius,
                                  bin_width=bin_width)
@@ -599 +600 @@
         new_plot.name = "Circ avg " + self.data2D.name
         new_plot.source = self.data2D.source
-        #new_plot.info = self.data2D.info
+        # new_plot.info = self.data2D.info
         new_plot.interactive = True
         new_plot.detector = self.data2D.detector
 
-        ## If the data file does not tell us what the axes are, just assume...
+        # If the data file does not tell us what the axes are, just assume...
         new_plot.xaxis("\\rm{Q}", "A^{-1}")
         if hasattr(self.data2D, "scale") and \
@@ -615 +616 @@
         new_plot.id = "Circ avg " + self.data2D.name
         new_plot.is_data = True
-        self.parent.update_theory(data_id=self.data2D.id, \
-                                       theory=new_plot)
+        self.parent.update_theory(data_id=self.data2D.id, theory=new_plot)
         wx.PostEvent(self.parent,
                      NewPlotEvent(plot=new_plot, title=new_plot.name))
@@ -630 +630 @@
         """
         if self.slicer is not None:
-            from SlicerParameters import SlicerParameterPanel
+            from parameters_panel_slicer import SlicerParameterPanel
             dialog = SlicerParameterPanel(self, -1, "Slicer Parameters")
             dialog.set_slicer(self.slicer.__class__.__name__,
@@ -668 +668 @@
         params = self.slicer.get_params()
         ## Create a new panel to display results of summation of Data2D
-        from slicerpanel import SlicerPanel
+        from parameters_panel_boxsum import SlicerPanel
         win = MDIFrame(self.parent, None, 'None', (100, 200))
         new_panel = SlicerPanel(parent=win, id=-1,
@@ -758 +758 @@
         if default_name.count('.') > 0:
             default_name = default_name.split('.')[0]
-        #default_name += "_out"
         if self.parent is not None:
             self.parent.show_data2d(data, default_name)
 
     def modifyGraphAppearance(self, e):
-        self.graphApp = graphAppearance(self, 'Modify graph appearance', legend=False)
+        self.graphApp = graphAppearance(self, 'Modify graph appearance',
+                                        legend=False)
         self.graphApp.setDefaults(self.grid_on, self.legend_on,
                                   self.xaxis_label, self.yaxis_label,

src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py

@@ -37 +37 @@
         ## Absolute value of the Angle between the middle line and any side line
         self.phi = math.pi / 12
+        # Binning base for log/lin binning
+        self.bin_base = 0
         ## Middle line
         self.main_line = LineInteractor(self, self.base.subplot, color='blue',
@@ -151 +153 @@
         phimin = -self.left_line.phi + self.main_line.theta
         phimax = self.left_line.phi + self.main_line.theta
+        bin_base = self.bin_base
         if nbins is None:
             nbins = 20
         sect = SectorQ(r_min=0.0, r_max=radius,
                        phi_min=phimin + math.pi,
-                       phi_max=phimax + math.pi, nbins=nbins)
+                       phi_max=phimax + math.pi, nbins=nbins, base=bin_base)
 
         sector = sect(self.base.data2D)
@@ -239 +242 @@
         params["Delta_Phi [deg]"] = math.fabs(self.left_line.phi * 180 / math.pi)
         params["nbins"] = self.nbins
+        params["binning base"] = self.bin_base
         return params
 
@@ -252 +256 @@
         phi = math.fabs(params["Delta_Phi [deg]"] * math.pi / 180)
         self.nbins = int(params["nbins"])
+        self.bin_base = params["binning base"]
         self.main_line.theta = main
         ## Reset the slicer parameters

src/sas/sasgui/perspectives/fitting/basepage.py

@@ -254 +254 @@
         if not hasattr(self, "model_view"):
             return
-        toggle_mode_on = self.model_view.IsEnabled()
+        toggle_mode_on = self.model_view.IsEnabled() or self.data is None
         if toggle_mode_on:
             if self.enable2D and not check_data_validity(self.data):