Changeset 55e13ab in sasview


Ignore:
Timestamp:
Nov 18, 2008 7:58:50 AM (15 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:
5fcfca4
Parents:
9696b075
Message:

smearing added

Location:
sansview/perspectives/fitting
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • sansview/perspectives/fitting/fitpage1D.py

    r1f62278 r55e13ab  
    133133        ix = 0 
    134134        iy = 1 
    135         self.smear= wx.CheckBox(self, -1, "Smear", (10, 10)) 
     135        self.smear= wx.CheckBox(self, -1, "Fit with Smear", (10, 10)) 
     136        wx.EVT_CHECKBOX(self, self.smear.GetId(), self.onSmear) 
    136137        self.sizer1.Add(self.smear,(iy,ix),(1,1),\ 
    137138                   wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15) 
     
    594595        self.vbox.Layout() 
    595596        self.GrandParent.GetSizer().Layout() 
    596      
     597    def onSmear(self, event): 
     598        if self.smear.GetValue()==True: 
     599            from DataLoader.qsmearing import smear_selection 
     600            smear =smear_selection( self.data ) 
     601            self.data.smearer= smear 
     602            #print "on smearing", self.data.smearer._compute_matrix() 
     603        else: 
     604            self.data.smearer=None 
     605         
  • sansview/perspectives/fitting/fitpanel.py

    r7691125 r55e13ab  
    7575        """      
    7676        try: 
    77             name = data.group_id # item in Data1D 
     77            name = data.name # item in Data1D 
    7878        except: 
    7979            name = 'Fit' 
     
    177177            raise 
    178178        print "fitpanel", self.draw_model_name  
     179         
    179180    def set_model_list(self,dict): 
    180181         """  
  • sansview/perspectives/fitting/fitting.py

    r1f62278 r55e13ab  
    332332                    #Do the single fit 
    333333                    self.fitter.set_model(Model(model), self.id, pars)  
     334                    print "Single fit : on smearing",metadata.smearer 
    334335                    self.fitter.set_data(metadata,self.id,qmin,qmax) 
    335336                    self.fitter.select_problem_for_fit(Uid=self.id,value=value.get_scheduled()) 
  • sansview/perspectives/fitting/models.py

    r44bbf6a r55e13ab  
    9292        self.model_list[str(wx.NewId())] = EllipsoidModel  
    9393         
    94         from sans.guitools.LineModel import LineModel 
     94        from sans.models.LineModel import LineModel 
    9595        self.model_list[str(wx.NewId())]  = LineModel 
    9696         
Note: See TracChangeset for help on using the changeset viewer.