Changeset 1913 for trunk/imports/G2sfact.py

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:

• trunk/imports/G2sfact.py (modified) (5 diffs)

trunk/imports/G2sfact.py

@@ -71 +71 @@
                 sigFo = float(sigFo)
                 # h,k,l,m,dsp,Fo2,sig,Fc2,Fot2,Fct2,phase,...
-                self.RefDict['RefList'].append([h,k,l,0,0,Fo**2,2.*Fo*sigFo,0,Fo**2,0,0,0])
+                self.RefDict['RefList'].append([h,k,l,1,0,Fo**2,2.*Fo*sigFo,0,Fo**2,0,0,0])
             self.errors = 'Error after reading reflections (unexpected!)'
             self.RefDict['RefList'] = np.array(self.RefDict['RefList'])
@@ -265 +265 @@
                 # h,k,l,m,dsp,Fo2,sig,Fc2,Fot2,Fct2,phase,...
                 if self.Super == 0:
-                    self.RefDict['RefList'].append([h,k,l,0,0,Fo,sigFo,0,Fo,0,0,0])
+                    self.RefDict['RefList'].append([h,k,l,1,0,Fo,sigFo,0,Fo,0,0,0])
                 elif self.Super == 1:
-                    self.RefDict['RefList'].append([h,k,l,m1,0,0,Fo,sigFo,0,Fo,0,0,0])
+                    self.RefDict['RefList'].append([h,k,l,m1,1,0,Fo,sigFo,0,Fo,0,0,0])
             self.errors = 'Error after reading reflections (unexpected!)'
             self.RefDict['RefList'] = np.array(self.RefDict['RefList'])
@@ -329 +329 @@
                 tbar = float(tbar)
                 if len(self.Banks):
-                    self.Banks[int(bN)-1]['RefDict']['RefList'].append([h,k,l,0,0,Fo,sigFo,0,Fo,0,0,0,wave,tbar])
+                    self.Banks[int(bN)-1]['RefDict']['RefList'].append([h,k,l,1,0,Fo,sigFo,0,Fo,0,0,0,wave,tbar])
                 else:
                 # h,k,l,m,dsp,Fo2,sig,Fc2,Fot2,Fct2,phase,...
-                    self.RefDict['RefList'].append([h,k,l,0,0,Fo,sigFo,0,Fo,0,0,0,wave,tbar])
+                    self.RefDict['RefList'].append([h,k,l,1,0,Fo,sigFo,0,Fo,0,0,0,wave,tbar])
             if len(self.Banks):
                 self.UpdateParameters(Type='SNT',Wave=None) # histogram type
@@ -399 +399 @@
                 tbar = float(tbar)
                 if len(self.Banks):
-                    self.Banks[int(bN)-1]['RefDict']['RefList'].append([h,k,l,0,0,Fo,sigFo,0,Fo,0,0,0,wave,tbar])
+                    self.Banks[int(bN)-1]['RefDict']['RefList'].append([h,k,l,1,0,Fo,sigFo,0,Fo,0,0,0,wave,tbar])
                 else:
                 # h,k,l,m,dsp,Fo2,sig,Fc2,Fot2,Fct2,phase,...
-                    self.RefDict['RefList'].append([h,k,l,0,0,Fo,sigFo,0,Fo,0,0,0,wave,tbar])
+                    self.RefDict['RefList'].append([h,k,l,1,0,Fo,sigFo,0,Fo,0,0,0,wave,tbar])
             if len(self.Banks):
                 self.UpdateParameters(Type='SNT',Wave=None) # histogram type
@@ -471 +471 @@
                 tbar = float(tbar)
                 if len(self.Banks):
-                    self.Banks[int(bN)-1]['RefDict']['RefList'].append([h,k,l,0,0,Fo,sigFo,0,Fo,0,0,0,wave,tbar])
+                    self.Banks[int(bN)-1]['RefDict']['RefList'].append([h,k,l,1,0,Fo,sigFo,0,Fo,0,0,0,wave,tbar])
                 else:
                 # h,k,l,m,dsp,Fo2,sig,Fc2,Fot2,Fct2,phase,...
-                    self.RefDict['RefList'].append([h,k,l,0,0,Fo,sigFo,0,Fo,0,0,0,wave,tbar])
+                    self.RefDict['RefList'].append([h,k,l,1,0,Fo,sigFo,0,Fo,0,0,0,wave,tbar])
             if len(self.Banks):
                 self.UpdateParameters(Type='SNT',Wave=None) # histogram type