Changeset 60d6c23 in sasview

Timestamp:

Apr 13, 2009 4:28:17 PM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

5fe5871c

Parents:

b86c920

Message:

add 1 to compute chsig panel

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• fitpage.py (modified) (1 diff)
• fitting.py (modified) (7 diffs)

sansview/perspectives/fitting/basepage.py

@@ -380 +380 @@
         return
     
+    
     def read_file(self, path):
         """

sansview/perspectives/fitting/fitpage.py

@@ -536 +536 @@
                     self.qmax_x = float(self.qmax.GetValue())
                     # return residuals within self.qmin_x and self.qmax_x
-                    x,y,dy = [numpy.asarray(v) for v in (self.data.x,self.data.y,self.data.dy)]
+                    x,y = [numpy.asarray(v) for v in (self.data.x,self.data.y)]
+                    
+                    if self.data.dy==None:
+                        dy= numpy.zeros(len(y))
+                    else:
+                        dy= numpy.asarray(self.data.dy)
+                    dy[dy==0]=1
                     if self.qmin_x==None and self.qmax_x==None: 
                         fx =numpy.asarray([self.model.run(v) for v in x])

sansview/perspectives/fitting/fitting.py

@@ -232 +232 @@
         detector=None
         source=None
+        info = None
+        id=None
         dxl=None
         dxw=None
@@ -242 +244 @@
         if hasattr(item, "source"):
             source =item.source
+        if hasattr(item ,"info"):
+            info= item.info
+        if hasattr(item,"id"):
+            id = item.id
         from sans.guiframe import dataFitting 
-        data= dataFitting.Data1D(x=item.x, y=item.y, dy=dy, dxl=dxl, dxw=dxw)
-        data.name=item.name
-        data.detector=detector
-        data.source= source
+        if item.__class__.__name__=="Data1D":
+            data= dataFitting.Data1D(x=item.x, y=item.y, dy=dy, dxl=dxl, dxw=dxw)
+        else:
+            data= dataFitting.Theory1D(x=item.x, y=item.y, dxl=dxl, dxw=dxw)
+        data.name = item.name
+        data.detector = detector
+        data.source = source
+        ## allow to highlight data when plotted
+        data.interactive = item.interactive
+        ## when 2 data have the same id override the 1 st plotted
+        data.id = id
+        ## info is a reference to output of dataloader that can be used
+        ## to save  data 1D as cansas xml file
+        data.info= info
+        ## If the data file does not tell us what the axes are, just assume...
+        data.xaxis(item._xaxis,item._xunit)
+        data.yaxis(item._yaxis,item._yunit)
+        ##group_id specify on which panel to plot this data
+        data.group_id = item.group_id
         return data
 
@@ -518 +539 @@
                         new_model.parameterset[ param_name].set( param_value )
             
-            
             #Do the single fit
             self.fitter.set_model(new_model, self.fit_id, pars)
-            dy=[]
-            x=[]
-            y=[]
-            ## checking the validity of error
-            if metadata.__class__ in  ["Data1D","Theory1D"]:
-                for i in range(len(metadata.dy)):
-                    if metadata.dy[i] !=0:
-                        dy.append(metadata.dy[i])
-                        x.append(metadata.x[i])
-                        y.append(metadata.y[i])
-                if len(dy)>0:        
-                    metadata.dy=numpy.zeros(len(dy))
-                    metadata.dy=dy
-                    metadata.y=numpy.zeros(len(y))
-                    metadata.y=y
-                    metadata.x=numpy.zeros(len(x))
-                    metadata.x=x
-           
+            
             self.fitter.set_data(data=metadata,Uid=self.fit_id,
                                  smearer=smearer,qmin= qmin,qmax=qmax )
@@ -544 +547 @@
             self.fitter.select_problem_for_fit(Uid= self.fit_id,
                                                value= value.get_scheduled())
-           
+            value.clear_model_param()
         except:
             msg= title +" error: %s" % sys.exc_value
@@ -878 +881 @@
             if hasattr(data, "group_id"):
                 my_info.group_id= data.group_id
-            
+        
         return my_info
                 
@@ -886 +889 @@
         """ 
         try:
+            
             new_plot = Theory1D(x=x, y=y)
             my_info = self._get_plotting_info( data)
@@ -894 +898 @@
             new_plot.xaxis( my_info._xaxis,  my_info._xunit)
             new_plot.yaxis( my_info._yaxis, my_info._yunit)
-            
+            if data!=None:
+                if new_plot.id == data.id:
+                    new_plot.id += "Model"
+         
             # Pass the reset flag to let the plotting event handler
             # know that we are replacing the whole plot