Changeset d2ee6f6 in sasview

Timestamp:

May 26, 2009 8:46:49 PM (15 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

1c8015f

Parents:

ee6f84c

Message:

prview: added setup script to install pr perspective as module. Modified perspective for use in SansView? (see standalone mode).

Location:

prview/perspectives/pr

Files:

• inversion_panel.py (modified) (5 diffs)
• pr.py (modified) (7 diffs)

prview/perspectives/pr/inversion_panel.py

@@ -207 +207 @@
             if self.standalone==False:
                 self.plot_data.SetValue(str(value))
-                self.plot_radio.SetValue(True)
                 self._on_pars_changed(None)
         elif name=='datafile':
             self.data_file.SetValue(str(value))
-            self.file_radio.SetValue(True)
             self._on_pars_changed(None)
         else:
@@ -433 +431 @@
 
         iy = 0
-        if self.standalone==False:
-            self.file_radio = wx.RadioButton(self, -1, "File data:")
+        self.file_radio = wx.StaticText(self, -1, "Data:")
+        pars_sizer.Add(self.file_radio, (iy,0), (1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        
+        if self.standalone==True:
+            self.data_file = wx.TextCtrl(self, -1, size=(220,20))
+            self.data_file.SetEditable(False)
+            self.data_file.SetValue("")
+            pars_sizer.Add(self.data_file, (iy,1), (1,1), wx.ADJUST_MINSIZE, 15)
         else:
-            self.file_radio = wx.StaticText(self, -1, "Data file:")
-        self.data_file = wx.TextCtrl(self, -1, size=(220,20))
-        self.data_file.SetEditable(False)
-        self.data_file.SetValue("")
-        id = wx.NewId()
-        pars_sizer.Add(self.file_radio, (iy,0), (1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        pars_sizer.Add(self.data_file, (iy,1), (1,1), wx.ADJUST_MINSIZE, 15)
-        
-        if self.standalone==False:
-            iy += 1
-            self.plot_radio = wx.RadioButton(self, -1, "Plot data:")
-            self.plot_data = wx.TextCtrl(self, -1, size=(100,20))
+            self.plot_data = wx.TextCtrl(self, -1, size=(220,20))
             self.plot_data.SetEditable(False)
-            pars_sizer.Add(self.plot_radio, (iy,0), (1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
             pars_sizer.Add(self.plot_data, (iy,1), (1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         
@@ -788 +780 @@
             self.alpha_estimate_ctl.Enable(False)
             
-            if self.standalone==False and self.plot_radio.GetValue():
+            if self.standalone==False:
                 dataset = self.plot_data.GetValue()
                 self.manager.estimate_plot_inversion(alpha=alpha, nfunc=nfunc, 
@@ -923 +915 @@
         
         if flag:
-            if self.standalone==False and self.plot_radio.GetValue():
+            if self.standalone==False:
                 dataset = self.plot_data.GetValue()
                 if len(dataset.strip())==0:
@@ -962 +954 @@
             if path and os.path.isfile(path):
                 self.data_file.SetValue(str(path))
-                if self.standalone==False:
-                    self.file_radio.SetValue(True)
                 self.manager.show_data(path, reset=True)
                 self._on_pars_changed(None)

prview/perspectives/pr/pr.py

@@ -29 +29 @@
     DEFAULT_DMAX  = 140.0
     
-    def __init__(self):
+    def __init__(self, standalone=True):
         ## Plug-in name
         self.sub_menu = "Pr inversion"
@@ -77 +77 @@
         self._pr_npts = 51
         ## Flag to let the plug-in know that it is running standalone
-        self.standalone = True
+        self.standalone = standalone
         self._normalize_output = False
         self._scale_output_unity = False
@@ -257 +257 @@
         new_plot.xaxis("\\rm{Q}", 'A^{-1}')
         new_plot.yaxis("\\rm{Intensity} ","cm^{-1}")
-        #new_plot.group_id = "test group"
-        wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title="I(q)"))
+        
+        title = "I(q)"
+        # If we have a group ID, use it
+        if pr.info.has_key("plot_group_id"):
+            new_plot.group_id = pr.info["plot_group_id"]
+            title = pr.info["plot_group_id"]
+            
+        wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title=title))
         
         # If we have used slit smearing, plot the smeared I(q) too
@@ -342 +348 @@
         new_plot.xaxis("\\rm{r}", 'A')
         new_plot.yaxis("\\rm{P(r)} ","cm^{-3}")
-            
+        # Make sure that the plot is linear
+        new_plot.xtransform="x"
+        new_plot.ytransform="y"                 
         wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title="P(r) fit"))
         
@@ -538 +546 @@
 
             elif item.name==graph.selected_plottable:
+                    #TODO: we might want to check that the units are consistent with I(q)
+                    #      before allowing this menu item
                 return [["Compute P(r)", "Compute P(r) from distribution", self._on_context_inversion]]      
                 
@@ -876 +886 @@
         pr.slit_width = self.slit_width
         
+        # Keep track of the plot window title to ensure that
+        # we can overlay the plots
+        if hasattr(self.current_plottable, "group_id"):
+            pr.info["plot_group_id"] = self.current_plottable.group_id
+        
         # Fill in errors if none were provided
-        if self.current_plottable.dy == None:
-            print "no error", self.current_plottable.name
-            y = numpy.zeros(len(pr.y))
+        err = self.current_plottable.dy
+        all_zeros = True
+        if err == None:
+            err = numpy.zeros(len(y)) 
+        else:    
+            for i in range(len(err)):
+                if err[i]>0:
+                    all_zeros = False
+        
+        if all_zeros:        
+            scale = None
+            min_err = 0.0
             for i in range(len(pr.y)):
-                y[i] = math.sqrt(pr.y[i])
-            pr.err = y
-        else:
-            pr.err = self.current_plottable.dy
-        
-        #self.pr = pr
+                # Scale the error so that we can fit over several decades of Q
+                if scale==None:
+                    scale = 0.05*math.sqrt(pr.y[i])
+                    min_err = 0.01*pr.y[i]
+                err[i] = scale*math.sqrt( math.fabs(pr.y[i]) ) + min_err
+            message = "The loaded file had no error bars, statistical errors are assumed."
+            wx.PostEvent(self.parent, StatusEvent(status=message))
+
+        pr.err = err
+        
         return pr
 
@@ -1160 +1188 @@
             [Somehow openGL needs this call]
         """
-        self.parent.set_perspective(self.perspective)
+        if self.standalone==True:
+            self.parent.set_perspective(self.perspective)
   
 if __name__ == "__main__":