Changeset 4894


Ignore:
Timestamp:
Apr 26, 2021 5:02:09 PM (6 months ago)
Author:
toby
Message:

bug on aborted refinement; more on FPA

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIfpaGUI.py

    r4893 r4894  
    118118    Cu K alpha spectrum
    119119    '''
    120     parmDict['wave'] = {i:v for i,v in enumerate((1.534753,1.540596,1.541058,1.54441,1.544721))}
    121     parmDict['int'] = {i:v for i,v in enumerate((0.0159, 0.5791, 0.0762, 0.2417, 0.0871))}
    122     parmDict['lwidth'] = {i:v for i,v in enumerate((3.6854, 0.437, 0.6, 0.52, 0.62))}
     120    # values from Marcus Mendenhall from atan_windowed_FP_profile.py
     121    parmDict['wave'] = {i:v for i,v in enumerate((1.53471, 1.5405925, 1.5410769, 1.5443873, 1.5446782))}
     122    parmDict['int'] = {i:v for i,v in enumerate([0.0043303 , 0.58384351, 0.07077796, 0.2284605 , 0.11258773])}
     123    parmDict['lwidth'] = {i:v for i,v in enumerate((2.93 , 0.436, 0.558, 0.487, 0.63))}
    123124
    124125def SetMonoWave():
     
    283284                     Title='FPA peak', newPlot=True, lines=True)
    284285    def _onSaveFPA(event):
     286        XferFPAsettings(parmDict)
    285287        filename = G2G.askSaveFile(G2frame,'','.NISTfpa',
    286288                                       'dict of NIST FPA values',FPdlg)
     
    302304        for i in parmDict['wave'].keys():
    303305            if i not in parmDict[prm]: parmDict[prm][i] = defVal
    304             ctrl = G2G.ValidatedTxtCtrl(FPdlg,parmDict[prm],i,size=(90,-1))
     306            if prm == 'wave':
     307                ctrl = G2G.ValidatedTxtCtrl(FPdlg,parmDict[prm],i,size=(90,-1),nDig=(10,6))
     308            else:
     309                ctrl = G2G.ValidatedTxtCtrl(FPdlg,parmDict[prm],i,size=(90,-1),nDig=(10,3))
    305310            waveSizer.Add(ctrl,1,WACV,1)
    306311    MainSizer.Add(waveSizer)
  • trunk/GSASIIstrMain.py

    r4876 r4894  
    158158    Rvals = {}
    159159    chisq0 = None
     160    Lastshft = None
    160161    while True:
    161162        G2mv.Map2Dict(parmDict,varyList)
Note: See TracChangeset for help on using the changeset viewer.