Changeset 4568

Timestamp:

Sep 12, 2020 9:49:04 AM (3 years ago)

Author:

vondreele

Message:

cleanup of RollMap? command

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (2 diffs)
• GSASIIphsGUI.py (modified) (3 diffs)

trunk/GSASIIdataGUI.py

@@ -5397 +5397 @@
         
 #        G2G.Define_wxId('wxID_MCRON', 'wxID_MCRLIST', 'wxID_MCRSAVE', 'wxID_MCRPLAY',)
-
+##### GSAS-II Menu items
         # Main menu
         G2frame = self.GetTopLevelParent()
@@ -6220 +6220 @@
         self.MapPeaksEdit.Append(G2G.wxID_FINDEQVPEAKS,'Equivalent peaks','Find equivalent peaks')
         self.MapPeaksEdit.Append(G2G.wxID_INVERTPEAKS,'Invert peak positions','Inverts map & peak positions')
-        self.MapPeaksEdit.Append(G2G.wxID_ROLLMAP,'Roll map','Roll map by specified steps')
+        self.MapPeaksEdit.Append(G2G.wxID_ROLLMAP,'Roll charge flip map','Roll charge flip map by specified steps')
         self.MapPeaksEdit.Append(G2G.wxID_PEAKSUNIQUE,'Unique peaks','Select unique set')
         self.MapPeaksEdit.Append(G2G.wxID_PEAKSSAVE,'Save peaks','Save peaks to csv file')

trunk/GSASIIphsGUI.py

@@ -5827 +5827 @@
     def OnStopRMC(event):
         if G2frame.RMCchoice == 'fullrmc':
-            RMCPdict = data['RMC']['fullrmc']
             generalData = data['General']
             pName = G2frame.GSASprojectfile.split('.')[0] + '-' + generalData['Name']
@@ -11948 +11947 @@
     def OnRollMap(event):
         if 'Map Peaks' in data:
-            if mapData['Flip'] != True:
-                print('Only valid for charge flip maps')
-                return
+            half = np.array([.5,.5,.5])
             mapPeaks = data['Map Peaks']
             generalData = data['General']
+            mapData = generalData['Map']
+            if mapData['Flip'] != True:
+                wx.MessageBox('Only valid for charge flip maps',caption='Roll map error',style=wx.ICON_EXCLAMATION)
+                return
             Amat,Bmat = G2lat.cell2AB(generalData['Cell'][1:7])            
-            mapData = generalData['Map']
             dims = mapData['rho'].shape
             dims = [[-D,D] for D in dims]
@@ -11972 +11972 @@
                     peak[1:4] %= 1.
                     peak[4] = np.sqrt(np.sum(np.inner(Amat,peak[1:4])**2))
+                    if len(peak)>4:
+                        peak[5] = np.sqrt(np.sum(np.inner(Amat,(peak[1:4]-half)%1.)**2))
                 FillMapPeaksGrid()
                 G2plt.PlotStructure(G2frame,data)