Changeset 1599 for trunk/imports/G2phase.py

Timestamp:

Dec 8, 2014 3:58:55 PM (10 years ago)

Author:

vondreele

Message:

rationalize SS, RB & normal atom data; atId is after U23 followed by RB & SS stuff
revise Jana2K imports to have just 3+1 SS only & build atoms as above

File:

• trunk/imports/G2phase.py (modified) (2 diffs)

trunk/imports/G2phase.py ¶

@@ -427 +427 @@
                     dlg.Destroy()
                 SGlines = G2spc.SGPrint(SGData)
-                for l in SGlines: print l
             elif 'qi' in S[:2]:
                 if nqi:
@@ -518 +517 @@
             Atom = [Name,aType,'',XYZ[0],XYZ[1],XYZ[2],1.0,SytSym,Mult,IA,Uiso]
             Atom += Uij
+            Atom.append(ran.randint(0,sys.maxint))
+            Atom.append([])
+            Atom.append([])
             Atom.append({'SS1':{'waveType':waveType,'crenelType':crenelType,'Sfrac':Sfrac,'Spos':Spos,'Sadp':Sadp,'Smag':Smag}})    #SS2 is for (3+2), etc.
-            Atom.append(ran.randint(0,sys.maxint))
             Atoms.append(Atom)
         file2.close()