Ignore:
Timestamp:
Jun 29, 2015 9:55:29 AM (7 years ago)
Author:
vondreele
Message:

fix sfact importers so twin id=1 by default
GUI details for twins fixed

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/imports/G2sfact.py

    r1912 r1913  
    7171                sigFo = float(sigFo)
    7272                # h,k,l,m,dsp,Fo2,sig,Fc2,Fot2,Fct2,phase,...
    73                 self.RefDict['RefList'].append([h,k,l,0,0,Fo**2,2.*Fo*sigFo,0,Fo**2,0,0,0])
     73                self.RefDict['RefList'].append([h,k,l,1,0,Fo**2,2.*Fo*sigFo,0,Fo**2,0,0,0])
    7474            self.errors = 'Error after reading reflections (unexpected!)'
    7575            self.RefDict['RefList'] = np.array(self.RefDict['RefList'])
     
    265265                # h,k,l,m,dsp,Fo2,sig,Fc2,Fot2,Fct2,phase,...
    266266                if self.Super == 0:
    267                     self.RefDict['RefList'].append([h,k,l,0,0,Fo,sigFo,0,Fo,0,0,0])
     267                    self.RefDict['RefList'].append([h,k,l,1,0,Fo,sigFo,0,Fo,0,0,0])
    268268                elif self.Super == 1:
    269                     self.RefDict['RefList'].append([h,k,l,m1,0,0,Fo,sigFo,0,Fo,0,0,0])
     269                    self.RefDict['RefList'].append([h,k,l,m1,1,0,Fo,sigFo,0,Fo,0,0,0])
    270270            self.errors = 'Error after reading reflections (unexpected!)'
    271271            self.RefDict['RefList'] = np.array(self.RefDict['RefList'])
     
    329329                tbar = float(tbar)
    330330                if len(self.Banks):
    331                     self.Banks[int(bN)-1]['RefDict']['RefList'].append([h,k,l,0,0,Fo,sigFo,0,Fo,0,0,0,wave,tbar])
     331                    self.Banks[int(bN)-1]['RefDict']['RefList'].append([h,k,l,1,0,Fo,sigFo,0,Fo,0,0,0,wave,tbar])
    332332                else:
    333333                # h,k,l,m,dsp,Fo2,sig,Fc2,Fot2,Fct2,phase,...
    334                     self.RefDict['RefList'].append([h,k,l,0,0,Fo,sigFo,0,Fo,0,0,0,wave,tbar])
     334                    self.RefDict['RefList'].append([h,k,l,1,0,Fo,sigFo,0,Fo,0,0,0,wave,tbar])
    335335            if len(self.Banks):
    336336                self.UpdateParameters(Type='SNT',Wave=None) # histogram type
     
    399399                tbar = float(tbar)
    400400                if len(self.Banks):
    401                     self.Banks[int(bN)-1]['RefDict']['RefList'].append([h,k,l,0,0,Fo,sigFo,0,Fo,0,0,0,wave,tbar])
     401                    self.Banks[int(bN)-1]['RefDict']['RefList'].append([h,k,l,1,0,Fo,sigFo,0,Fo,0,0,0,wave,tbar])
    402402                else:
    403403                # h,k,l,m,dsp,Fo2,sig,Fc2,Fot2,Fct2,phase,...
    404                     self.RefDict['RefList'].append([h,k,l,0,0,Fo,sigFo,0,Fo,0,0,0,wave,tbar])
     404                    self.RefDict['RefList'].append([h,k,l,1,0,Fo,sigFo,0,Fo,0,0,0,wave,tbar])
    405405            if len(self.Banks):
    406406                self.UpdateParameters(Type='SNT',Wave=None) # histogram type
     
    471471                tbar = float(tbar)
    472472                if len(self.Banks):
    473                     self.Banks[int(bN)-1]['RefDict']['RefList'].append([h,k,l,0,0,Fo,sigFo,0,Fo,0,0,0,wave,tbar])
     473                    self.Banks[int(bN)-1]['RefDict']['RefList'].append([h,k,l,1,0,Fo,sigFo,0,Fo,0,0,0,wave,tbar])
    474474                else:
    475475                # h,k,l,m,dsp,Fo2,sig,Fc2,Fot2,Fct2,phase,...
    476                     self.RefDict['RefList'].append([h,k,l,0,0,Fo,sigFo,0,Fo,0,0,0,wave,tbar])
     476                    self.RefDict['RefList'].append([h,k,l,1,0,Fo,sigFo,0,Fo,0,0,0,wave,tbar])
    477477            if len(self.Banks):
    478478                self.UpdateParameters(Type='SNT',Wave=None) # histogram type
Note: See TracChangeset for help on using the changeset viewer.