Changeset 3577 for trunk/GSASIIphsGUI.py

Timestamp:

Aug 30, 2018 4:49:24 PM (5 years ago)

Author:

vondreele

Message:

delete MAXMAGN - not using it any more
fix (maybe) mag constraints; works for orthogonal axes
fix bug in ReadPowerInstprm?
spelling of Levenberg!
fixes to mag structure from Bilbao stuff
set dmin to be min 1A for UnitCell? show reflections
fix Latt2text to show '-' & Trans2text
fix ext test in GetHistogramPhaseData? for mag structures

File:

• trunk/GSASIIphsGUI.py (modified) (5 diffs)

trunk/GSASIIphsGUI.py

@@ -308 +308 @@
         self.Mtrans = False
         self.kvec = [0.,0.,0.]
-        self.Bilbao = ''
         self.Draw()
 
@@ -527 +526 @@
         self.Phase['General']['SGData'] = self.SGData
         if self.ifMag:
-            self.Phase['General']['Name'] += ' mag: '+self.Bilbao
+            self.Phase['General']['Name'] += ' mag: '
         else:
             self.Phase['General']['Name'] += ' %s'%(self.Common)
@@ -2369 +2368 @@
                 if dlg.ShowModal() == wx.ID_OK:
                     newPhase,Trans,Uvec,Vvec,ifMag,ifConstr,Common = dlg.GetSelection()
+                    newPhase['ranId'] = ran.randint(0,sys.maxsize),
                     if ifMag:
                         BNSlatt = newPhase['General']['SGData']['BNSlattsym'][0]
@@ -2428 +2428 @@
         G2frame.GPXtree.SetItemPyData(sub,newPhase)
         newPhase['Drawing'] = []
-        
+        print(newPhase)
         if ifConstr:
             G2cnstG.TransConstraints(G2frame,data,newPhase,Trans,Vvec,atCodes)     #data is old phase
@@ -2454 +2454 @@
             sel = dlg.GetSelection()
             magchoice = magKeep[sel]
-            phaseName = '%s mag (%d)'%(data['General']['Name'],sel)
+            phaseName = '%s mag_%d'%(data['General']['Name'],sel)
             newPhase = copy.deepcopy(data)
+            newPhase['ranId'] = ran.randint(0,sys.maxsize),
             del newPhase['magPhases']
             generalData = newPhase['General']
             generalData['SGData'] = copy.deepcopy(magchoice['SGData'])            
-            generalData['Cell'][1:] = magchoice['Cell']
+            generalData['Cell'][1:] = magchoice['Cell'][:]
             SGData = generalData['SGData']
             vvec = np.array([0.,0.,0.])