Changeset 4228


Ignore:
Timestamp:
Jan 3, 2020 5:10:32 AM (22 months ago)
Author:
vondreele
Message:

Weight plots now work for dPlot & qPlot in single and multiplots

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIplot.py

    r4224 r4228  
    18451845            return
    18461846        newPlot = False
    1847         if event.key == 'w' and not Page.plotStyle['qPlot'] and not Page.plotStyle['dPlot']:  #can't do weight plots when x-axis is different
     1847        if event.key == 'w':    # and not Page.plotStyle['qPlot'] and not Page.plotStyle['dPlot']:  #can't do weight plots when x-axis is different
    18481848            G2frame.Weight = not G2frame.Weight
    18491849            if not G2frame.Weight and 'PWDR' in plottype:
     
    32343234                    else:
    32353235                        DZ = (xye[1]-xye[3])*np.sqrt(wtFactor*xye[2])
    3236                     DifLine = Plot1.plot(X[Ibeg:Ifin],DZ[Ibeg:Ifin],colors[3],picker=1.,label='_diff')                    #(Io-Ic)/sig(Io)
     3236                    DifLine = Plot1.plot(X,DZ,colors[3],picker=1.,label='_diff')                    #(Io-Ic)/sig(Io)
    32373237                    Plot1.axhline(0.,color='k')
    32383238
  • trunk/fsource/powsubs/epsvoigt.for

    r1484 r4228  
    125125      DFDS = DEDF*DFRDG*(TL-TG)
    126126      DFDS = DFDS+(ETA*DTLDFW+(1.0-ETA)*DTGDFW)*DFWDG
    127       DFDS = 0.5*DFDS*STOFW/SQSGT                        !OK?
     127      DFDS = 0.5*DFDS*STOFW/SQSGT                        !OK
    128128
    129129      DFWDL = 0.2*DSDL*FWHM/SUMHM
     
    131131
    132132      DFDG = DEDF*DFRDL*(TL-TG)
    133       DFDG = DFDG+(ETA*DTLDFW+(1.0-ETA)*DTGDFW)*DFWDL            !WRONG
     133      DFDG = DFDG+(ETA*DTLDFW+(1.0-ETA)*DTGDFW)*DFWDL            !OK
    134134
    135135      DFDA = ETA*DTLDA+(1.0-ETA)*DTGDA                  !OK
Note: See TracChangeset for help on using the changeset viewer.