Ignore:
Timestamp:
Oct 15, 2013 12:25:24 PM (9 years ago)
Author:
vondreele
Message:

modify reflection array to be a dictionary with 4 items: RefList?, Uniq, Phi & FF. Each is list. Use patches to convert old format to new in various places.
Fix bug in simulate PWDR code.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/imports/G2sfact.py

    r1077 r1106  
    5151                sigFo = float(sigFo)
    5252                # h,k,l,m,dsp,Fo2,sig,Fc2,Fot2,Fct2,phase,...
    53                 self.RefList.append([h,k,l,0,0,Fo**2,2.*Fo*sigFo,0,Fo**2,0,0,[],[],0,{}])
     53                self.RefDict['RefList'].append([h,k,l,0,0,Fo**2,2.*Fo*sigFo,0,Fo**2,0,0,0])
     54                self.RefDict['Uniq'].append([])
     55                self.RefDict['Phi'].append([])
     56                self.RefDict['FF'].append({})
    5457            self.UpdateControls(Type='Fosq',FcalcPresent=False) # set Fobs type & if Fcalc values are loaded
    5558            self.UpdateParameters(Type='SXC',Wave=None) # histogram type
     
    97100                sigFo = float(sigFo)
    98101                # h,k,l,m,dsp,Fo2,sig,Fc2,Fot2,Fct2,phase,...
    99                 self.RefList.append([h,k,l,0,0,Fo,sigFo,0,Fo,0,0,[],[],0,{}])
     102                self.RefDict['RefList'].append([h,k,l,0,0,Fo,sigFo,0,Fo,0,0,0])
     103                self.RefDict['Uniq'].append([])
     104                self.RefDict['Phi'].append([])
     105                self.RefDict['FF'].append({})
    100106            self.UpdateControls(Type='Fosq',FcalcPresent=False) # set Fobs type & if Fcalc values are loaded
    101107            self.UpdateParameters(Type='SXC',Wave=None) # histogram type
Note: See TracChangeset for help on using the changeset viewer.