Changeset 4072
 Timestamp:
 Jul 26, 2019 8:37:07 AM (3 years ago)
 Location:
 trunk
 Files:

 4 edited
Legend:
 Unmodified
 Added
 Removed

trunk/GSASIIimgGUI.py
r4034 r4072 368 368 finally: 369 369 dlg.Destroy() 370 G2frame.GPXtree.SelectItem(G2frame.PickId)370 if G2frame.PickId: G2frame.GPXtree.SelectItem(G2frame.PickId) 371 371 372 372 def OnCopySelected(event): 
trunk/GSASIIplot.py
r4070 r4072 1844 1844 Page.plotStyle['WgtDiagnostic'] = not Page.plotStyle.get('WgtDiagnostic',False) 1845 1845 newPlot = True 1846 elif event.key == 'b' :1846 elif event.key == 'b' and plottype not in ['SASD','REFD']: 1847 1847 G2frame.SubBack = not G2frame.SubBack 1848 # if not G2frame.SubBack:1849 # G2frame.SinglePlot = True1850 1848 elif event.key == 'n': 1851 1849 if G2frame.Contour: 
trunk/GSASIIsasd.py
r3136 r4072 91 91 else: 92 92 cth = np.linspace(0,1.,NP) 93 Rct = R[:,np.newaxis]*np.sqrt(1.+(AR**21.)*cth**2) 93 try: 94 Rct = R[:,np.newaxis]*np.sqrt(1.+(AR**21.)*cth**2) 95 except: 96 Rct = R*np.sqrt(1.+(AR**21.)*cth**2) 94 97 return np.sqrt(np.sum(SphereFF(Q[:,np.newaxis],Rct,0)**2,axis=2)/NP) 95 98 … … 1403 1406 pos = distDict['Mean'] 1404 1407 args = [distDict['StdDev']] 1405 step = 0.02*distDict['StdDev']1406 1408 mode = distDict['Mean'] 1407 minX = np. fmax([mode4.*distDict['StdDev'],1.])1408 maxX = np. fmin([mode+4.*distDict['StdDev'],1.e5])1409 minX = np.max([mode4.*distDict['StdDev'],1.]) 1410 maxX = np.min([mode+4.*distDict['StdDev'],1.e5]) 1409 1411 elif 'LSW' in DistName: 1410 1412 distFxn = 'LSWDist' … … 1418 1420 pos = distDict['Mean'] 1419 1421 args = [distDict['StdDev']] 1420 minX = np. fmax([1.,pos4.*distDict['StdDev']])1421 maxX = np. fmin([pos+4.*distDict['StdDev'],1.e5])1422 minX = np.max([1.,pos4.*distDict['StdDev']]) 1423 maxX = np.min([pos+4.*distDict['StdDev'],1.e5]) 1422 1424 nP = 500 1423 1425 Diam = np.logspace(0.,5.,nP,True) 
trunk/exports/G2export_pwdr.py
r4071 r4072 72 72 self.Write(TreeName[5:]) 73 73 if prmname: self.Write('Instrument parameter file:'+os.path.split(prmname)[1]) 74 x = 100*np.array(histblk['Data'][0]) 74 x = np.array(histblk['Data'][0]) 75 if 'C' in histblk['Instrument Parameters'][0]['Type'][0]: 76 x *= 100. 77 else: 78 cw = np.diff(x) 79 x[:1] += cw 75 80 # convert weights to sigmas; use largest weight as minimum esd 76 81 s = np.sqrt(np.maximum(0.,np.array(histblk['Data'][2])))
Note: See TracChangeset
for help on using the changeset viewer.