Changeset 740c381 in sasview


Ignore:
Timestamp:
Dec 6, 2018 8:50:14 AM (8 days ago)
Author:
wojciech
Branches:
ESS_GUI, ESS_GUI_Invariant
Children:
aea6bb7
Parents:
bf7f025
Message:

Fix to solve hanging Invariant Perspective SASVIEW-1232

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py

    r11a336f r740c381  
    329329            surface = None 
    330330 
     331        if self._low_extrapolate: 
     332            try: 
     333                qstar_low, qstar_low_err = inv.get_qstar_low() 
     334            except Exception as ex: 
     335                calculation_failed = True 
     336                msg += str(ex) 
     337        if self._high_extrapolate: 
     338            try: 
     339                qstar_high, qstar_high_err = inv.get_qstar_high() 
     340            except Exception as ex: 
     341                calculation_failed = True 
     342                msg += str(ex) 
     343 
    331344        if (calculation_failed): 
    332345            logging.warning('Calculation failed: {}'.format(msg)) 
    333346            return self.model 
    334347        else: 
    335  
    336348            if self._low_extrapolate: 
    337                 # for presentation in InvariantDetails 
    338                 qstar_low, qstar_low_err = inv.get_qstar_low() 
    339349                extrapolated_data = inv.get_extra_data_low(self._low_points) 
    340350                power_low = inv.get_extrapolation_power(range='low') 
     
    370380                if qmax_plot > Q_MAXIMUM: 
    371381                    qmax_plot = Q_MAXIMUM 
    372                 qstar_high, qstar_high_err = inv.get_qstar_high() 
    373382                power_high = inv.get_extrapolation_power(range='high') 
    374383                high_out_data = inv.get_extra_data_high(q_end=qmax_plot, npts=500) 
Note: See TracChangeset for help on using the changeset viewer.