Changeset 2468 for trunk/imports/G2phase.py

Timestamp:

Sep 15, 2016 2:03:04 PM (6 years ago)

Author:

vondreele

Message:

add dzero calc from compression 2D images
plot magnetic structures; rework a number of draw atom routines to accomodate magnetic structures
fix EXP phase importer for nonmagnetic atoms in magnetic structure

File:

• trunk/imports/G2phase.py (modified) (1 diff)

trunk/imports/G2phase.py

@@ -296 +296 @@
                         XYZ = Atom[3:6]
                         Atom[7],Atom[8] = G2spc.SytSym(XYZ,SGData)
+                        if Ptype == 'magnetic':
+                            Atom = Atom[:7]+[0.,0.,0.]+Atom[7:]
                         Atom.append(ran.randint(0,sys.maxint))
                         Atoms.append(Atom)
                     elif key[11:] == 'M' and key[6:8] == 'AT':
                         S = EXPphase[key]
-                        Mag = [float(S[:10]),float(S[10:20]),float(S[20:30])]
-                        Atoms[-1] = Atoms[-1][:7]+Mag+Atoms[-1][7:]
+                        Atoms[-1][7:10] = [float(S[:10]),float(S[10:20]),float(S[20:30])]
         elif Ptype == 'macromolecular':
             for key in keyList: