Changeset 3310

Timestamp:

Mar 5, 2018 4:28:16 PM (4 years ago)

Author:

vondreele

Message:

still more magsym fixes

Location:

trunk

Files:

• GSASIIspc.py (modified) (1 diff)
• imports/G2phase_GPX.py (modified) (1 diff)

trunk/GSASIIspc.py

@@ -1139 +1139 @@
                 FlpSpn = [1,]+FlpSpn
                 SpnFlp = np.concatenate((SpnFlp,SpnFlp[:Nsym]*FlpSpn[Nfl+incv-1]))                    
-    if ' 1bar ' in SGData['GenSym'][0] and FlpSpn[0] < 0:
-        detM[1] = 1.
+#    if ' 1bar ' in SGData['GenSym'][0] and FlpSpn[0] < 0:
+#        detM[1] = 1.
     MagMom = SpnFlp*np.array(Ncv*detM)
     SGData['MagMom'] = MagMom

trunk/imports/G2phase_GPX.py

@@ -78 +78 @@
         self.Phase['Pawley ref'] = []       # & any Pawley refl.
         self.Phase['RBModels'] = {}
-        del self.Phase['MCSA']
+        if 'MCSA' in self.Phase:
+            del self.Phase['MCSA']
         if 'Map Peaks' in self.Phase:
             del self.Phase['Map Peaks']
-        del self.Phase['General']['Map']
+        if 'Map' in self.Phase['General']:
+            del self.Phase['General']['Map']
         self.Phase['ranId'] = ran.randint(0,sys.maxsize)
         return True