Changeset 1418


Ignore:
Timestamp:
Jul 7, 2014 3:19:34 PM (7 years ago)
Author:
vondreele
Message:

fix HKLF imports for mmcif data
fix some nDig entries for ValidatedTextCtrl? = need be tuple (or list)
fix missing darg image in old image gpx files
fix Hmax problem for triclinics

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIImath.py

    r1415 r1418  
    14541454        Hmax[0] = ((Hmax[0]+2)/4)*4
    14551455        Hmax[1] = ((Hmax[1]+2)/4)*4
    1456         Hmax[2] = ((Hmax[2]+1)/4)*4
     1456        Hmax[2] = ((Hmax[2]+2)/4)*4
    14571457
    14581458def OmitMap(data,reflDict,pgbar=None):
  • trunk/GSASIIplot.py

    r1417 r1418  
    29062906        pass
    29072907    size,imagefile = G2frame.PatternTree.GetItemPyData(G2frame.Image)
    2908     dark = Data['dark image']
     2908    dark = Data.get('dark image',[0,''])
    29092909    if dark[0]:
    29102910        darkfile = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,
  • trunk/GSASIIpwdGUI.py

    r1409 r1418  
    12691269                instSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,u' Lam (\xc5): (%10.6f)'%(insDef['Lam'])),
    12701270                    0,WACV)
    1271                 waveVal = G2gd.ValidatedTxtCtrl(G2frame.dataDisplay,insVal,'Lam',nDig=6,typeHint=float,OnLeave=AfterChange)
     1271                waveVal = G2gd.ValidatedTxtCtrl(G2frame.dataDisplay,insVal,'Lam',nDig=(10,6),typeHint=float,OnLeave=AfterChange)
    12721272                instSizer.Add(waveVal,0,WACV)
    12731273                labelLst.append(u'Lam (\xc5)')
     
    12811281                instSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,u' Lam (\xc5): (%10.6f)'%(insDef['Lam'])),
    12821282                    0,WACV)
    1283                 waveVal = G2gd.ValidatedTxtCtrl(G2frame.dataDisplay,insVal,'Lam',nDig=6,typeHint=float,OnLeave=AfterChange)
     1283                waveVal = G2gd.ValidatedTxtCtrl(G2frame.dataDisplay,insVal,'Lam',nDig=(10,6),typeHint=float,OnLeave=AfterChange)
    12841284                instSizer.Add(waveVal,0,WACV)
    12851285                labelLst.append(u'Lam (\xc5)')
     
    38083808        Status.SetStatusText('PDF computed')
    38093809        for plot in auxPlot:
    3810             G2plt.PlotXY(G2frame,plot[:2],type=plot[2])
     3810            G2plt.PlotXY(G2frame,plot[:2],Title=plot[2])
    38113811       
    38123812        G2plt.PlotISFG(G2frame,newPlot=True,type='I(Q)')
  • trunk/imports/G2sfact_CIF.py

    r1391 r1418  
    5353       
    5454        F2datanames = ('_refln_f_squared_meas','_refln.f_squared_meas',
     55            '_refln_intensity_meas','_refln.intensity_meas',
    5556                      )
    5657
     
    7374        F2signames = ('_refln_f_squared_meas_sigma','_refln.f_squared_meas_sigma',
    7475                      '_refln_f_squared_sigma',
    75                       )
     76                      '_refln_intensity_meas_sigma','_refln.intensity_meas_sigma',
     77                      '_refln.intensity_sigma',)
    7678
    7779        phasenames = ('_refln_phase_calc','_refln.phase_calc',
     
    135137                for blknm in blklist:
    136138                    choice.append('')
    137                     # accumumlate some info about this phase
     139                    # accumulate some info about this phase
    138140                    choice[-1] += blknm + ': '
    139141                    for i in phasenamefields: # get a name for the phase
     
    325327                wave = float(blk['_diffrn_radiation.wavelength'])
    326328            else:
    327                 wave = None
     329                wave = 1.5418
    328330            self.UpdateParameters(Type=type,Wave=wave) # histogram type
    329331            return True
Note: See TracChangeset for help on using the changeset viewer.