Changeset e0d9ed2 in sasview


Ignore:
Timestamp:
Nov 4, 2016 7:42:34 AM (7 years ago)
Author:
wojciech
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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
012e397
Parents:
d99f008
Message:

Skipping one smearing set up to avoid double Iq evaluation/compilation

Location:
src/sas/sasgui/perspectives/fitting
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/perspectives/fitting/fitpage.py

    rc8e1996 re0d9ed2  
    12051205                    self._keep.Enable(not self.batch_on) 
    12061206                    self._set_save_flag(True) 
    1207                     self._set_smear(self.data) 
     1207            #Setting smearing for cases with and without data. 
     1208            self._set_smear(self.data) 
    12081209 
    12091210            # more disables for 2D 
     
    12121213            try: 
    12131214                # update smearer sizer 
    1214                 self.onSmear(None) 
     1215                #This call for smearing set up caused double evaluation of 
     1216                #I(q) and double compilation as results 
     1217                #self.onSmear(None) 
    12151218                temp_smear = None 
    12161219                if not self.disable_smearer.GetValue(): 
  • src/sas/sasgui/perspectives/fitting/fitting.py

    rd99f008 re0d9ed2  
    864864                enable1D=enable1D, enable2D=enable2D, 
    865865                qmin=qmin, qmax=qmax, weight=weight) 
    866             # Replacing self._mac_sleep(0.2) with time.sleep(0.2) to prevent 
    867             # _handle error on Windows. It fixes the bug but doesn't resolve 
    868             # underlying issue of calling this code twice (threading related) 
    869             # Wojtek P., Nov 3 2016 
    870             time.sleep(0.2) 
    871866 
    872867    def _mac_sleep(self, sec=0.2): 
Note: See TracChangeset for help on using the changeset viewer.