Ignore:
Timestamp:
Mar 3, 2015 3:01:18 PM (7 years ago)
Author:
toby
Message:

allow non-identical sequential refinement when copynext is not used (still bugs on table display); implement tutorial downloads

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIstrMain.py

    r1643 r1688  
    5454        begin = time.time()
    5555        values =  np.array(G2stMth.Dict2Values(parmDict, varyList))
     56        # test code to compute GOF and save for external repeat
     57        #args = ([Histograms,Phases,restraintDict,rigidbodyDict],parmDict,varyList,calcControls,pawleyLookup,dlg)
     58        #print '*** before fit chi**2',np.sum(G2stMth.errRefine(values,*args)**2)           
     59        #fl = open('beforeFit.cpickle','wb')
     60        #import cPickle
     61        #cPickle.dump(values,fl,1)
     62        #cPickle.dump(args[:-1],fl,1)
     63        #fl.close()
    5664        Ftol = Controls['min dM/M']
    5765        Factor = Controls['shift factor']
     
    329337                item = ':'.join(items)
    330338                newVaryList.append(item)
    331         if newVaryList != firstVaryList:
    332             # variable lists are expected to match between sequential refinements
     339        if newVaryList != firstVaryList and Controls['Copy2Next']:
     340            # variable lists are expected to match between sequential refinements when Copy2Next is on
    333341            print '**** ERROR - variable list for this histogram does not match previous'
     342            print '     Copy of variables is not possible'
    334343            print '\ncurrent histogram',histogram,'has',len(newVaryList),'variables'
    335344            combined = list(set(firstVaryList+newVaryList))
Note: See TracChangeset for help on using the changeset viewer.