Changeset 7c1d04a in sasview for src/sas/sasgui


Ignore:
Timestamp:
Jul 4, 2016 10:19:15 PM (8 years ago)
Author:
butler
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:
66f21cd
Parents:
80c5d46
Message:

see issue #590. fix error in q.rg and uncertainties in Rg and I0.
Uncertainty calculation for slope and intercept are still wrong I
believe.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/plottools/fitDialog.py

    rd7bb526 r7c1d04a  
    516516            if self.Rgerr_tctr.IsShown(): 
    517517                if rg != None and rg != 0: 
    518                     value = format_number(3 * float(cstA) / (2 * rg)) 
     518                    value = format_number(3 * float(errA) / (2 * rg)) 
    519519                else: 
    520520                    value = '' 
    521521                self.Rgerr_tctr.SetValue(value) 
    522522                if self.I0err_tctr.IsShown(): 
    523                     val = numpy.abs(numpy.exp(cstB) - numpy.exp(cstB + errB)) 
     523                    val = numpy.abs(numpy.exp(cstB) * errB) 
    524524                    self.I0err_tctr.SetValue(format_number(val)) 
    525525            if self.Diameter_tctr.IsShown(): 
     
    534534                self.Diametererr_tctr.SetValue(value) 
    535535            if self.RgQmin_tctr.IsShown(): 
    536                 value = format_number(rg * self.mini) 
     536                value = format_number(rg * self.floatInvTransform(self.mini)) 
    537537                self.RgQmin_tctr.SetValue(value) 
    538538            if self.RgQmax_tctr.IsShown(): 
    539                 value = format_number(rg * self.maxi) 
     539                value = format_number(rg * self.floatInvTransform(self.maxi)) 
    540540                self.RgQmax_tctr.SetValue(value) 
    541541 
Note: See TracChangeset for help on using the changeset viewer.