Changeset 4133
- Timestamp:
- Sep 3, 2019 10:29:15 PM (3 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIscriptable.py
r4128 r4133 108 108 :meth:`G2Project.set_Controls` Set overall GSAS-II control settings such as number of cycles and to set up a sequential 109 109 fit. (Also see :meth:`G2Project.get_Controls` to read values.) 110 :meth:`G2Project.imageMultiDistCalib` Performs a global calibration fit with images at multiple distance settings. 110 111 ================================================== =============================================================================================================== 111 112 … … 791 792 gpx.refine() 792 793 794 .. _ImageProc: 795 793 796 ---------------------- 794 797 Image Processing … … 848 851 c = img.getControls() 849 852 print(c['distance'],c['wavelength']) 853 854 .. _MultiDist_Example: 850 855 851 856 This example performs a number of cycles of constrained fitting. … … 2899 2904 This may produce a better result if run more than once. 2900 2905 2906 See :ref:`MultiDist_Example` for example code. 2907 2901 2908 :param str imageList: the images to include in the fit, if not specified 2902 2909 all images in the project will be included. … … 5024 5031 >>> imlst[0].setControl('outAzimuths',3) 5025 5032 >>> pwdrList = imlst[0].Integrate() 5033 5034 More detailed image processing examples are shown at :ref:`ImageProc`. 5026 5035 5027 5036 ''' -
trunk/GSASIIstrMain.py
r4111 r4133 370 370 SeqResult = G2stIO.GetSeqResult(GPXfile) 371 371 # SeqResult = {'SeqPseudoVars':{},'SeqParFitEqList':[]} 372 makeBack = True373 372 Histo = {} 374 373 NewparmDict = {} … … 378 377 G2fil.G2Print('\nRefining with '+str(histogram)) 379 378 G2mv.InitVars() 380 #print('before load',{i:phaseDict[i] for i in phaseDict if 'Ax:2' in i})381 379 (Natoms,atomIndx,phaseVary,phaseDict,pawleyLookup, 382 380 FFtables,BLtables,MFtables,maxSSwave) = G2stIO.GetPhaseData( 383 381 Phases,restraintDict,rbIds, 384 382 Print=False,pFile=printFile,seqRef=True) 385 #print('before fit ',{i:phaseDict[i] for i in phaseDict if 'Ax:2' in i})386 383 ifPrint = False 387 384 if dlg: … … 424 421 parmDict.update(hapDict) 425 422 parmDict.update(histDict) 426 if Controls['Copy2Next']: 423 if Controls['Copy2Next']: # update with parms from last histogram 427 424 #parmDict.update(NewparmDict) # don't use in case extra entries would cause a problem 428 425 for parm in NewparmDict: 429 426 if parm in parmDict: 430 427 parmDict[parm] = NewparmDict[parm] 428 elif histogram in SeqResult: # update phase from last seq ref 429 NewparmDict = SeqResult[histogram].get('parmDict',{}) 430 for parm in NewparmDict: 431 if '::' in parm and parm in parmDict: 432 parmDict[parm] = NewparmDict[parm] 433 431 434 G2stIO.GetFprime(calcControls,Histo) 432 435 # do constraint processing … … 526 529 G2stIO.SetHistogramData(parmDict,sigDict,Histo,None,ifPrint,printFile) 527 530 G2stIO.SaveUpdatedHistogramsAndPhases(GPXfile,Histo,Phases,rigidbodyDict,histRefData) 528 makeBack = False529 531 NewparmDict = {} 530 532 # make dict of varied parameters in current histogram, renamed to … … 535 537 for parm in set(list(varyList)+list(varyListStart)): 536 538 items = parm.split(':') 537 if len(items) < 3: continue 539 if len(items) < 3: 540 continue 538 541 if str(hId) in items[1]: 539 542 items[1] = str(nexthId) 540 543 newparm = ':'.join(items) 541 544 NewparmDict[newparm] = parmDict[parm] 545 else: 546 if items[2].startswith('dA'): parm = parm.replace(':dA',':A') 547 NewparmDict[parm] = parmDict[parm] 548 542 549 # except G2obj.G2Exception(Msg): 543 550 # printFile.close() 544 551 # G2fil.G2Print (' ***** Refinement aborted *****') 545 552 # return False,Msg.msg 546 #print('after fit',{i:parmDict[i] for i in parmDict if 'Ax:2' in i})547 553 if GSASIIpath.GetConfigValue('Show_timing'): 548 554 t2 = time.time()
Note: See TracChangeset
for help on using the changeset viewer.