Changeset 2696

Timestamp:

Feb 9, 2017 9:03:55 AM (6 years ago)

Author:

vondreele

Message:

use F d 3 m for Si space group in ImageCalibrants? - should eliminate forbidden lines
add new menu item in Image Controls/Parms? to do reset of dist to set dist

Location:

trunk

Files:

• GSASIIgrid.py (modified) (2 diffs)
• GSASIIimgGUI.py (modified) (7 diffs)
• ImageCalibrants.py (modified) (1 diff)

trunk/GSASIIgrid.py

@@ -95 +95 @@
 [ wxID_IMCALIBRATE,wxID_IMRECALIBRATE,wxID_IMINTEGRATE, wxID_IMCLEARCALIB,wxID_IMRECALIBALL,  
     wxID_IMCOPYCONTROLS, wxID_INTEGRATEALL, wxID_IMSAVECONTROLS, wxID_IMLOADCONTROLS, wxID_IMAUTOINTEG,
-    wxID_IMCOPYSELECTED, wxID_SAVESELECTEDCONTROLS, wxID_IMXFERCONTROLS,
-] = [wx.NewId() for item in range(13)]
+    wxID_IMCOPYSELECTED, wxID_SAVESELECTEDCONTROLS, wxID_IMXFERCONTROLS,wxID_IMRESETDIST,
+] = [wx.NewId() for item in range(14)]
 
 [ wxID_MASKCOPY, wxID_MASKSAVE, wxID_MASKLOAD, wxID_NEWMASKSPOT,wxID_NEWMASKARC,wxID_NEWMASKRING,
@@ -2107 +2107 @@
         ImageParams.Append(help='Transfer integration range for other detector distances', 
             id=wxID_IMXFERCONTROLS, kind=wx.ITEM_NORMAL,text='Xfer angles')
+        ImageParams.Append(help='Reset all detector dist to set dist', 
+            id=wxID_IMRESETDIST, kind=wx.ITEM_NORMAL,text='Reset dist')
         
         self.PostfillDataMenu()

trunk/GSASIIimgGUI.py

@@ -343 +343 @@
         # sort both lists together, ordered by keyText
         selectedKeys = []
-        dlg = G2G.G2MultiChoiceDialog(
-            G2frame.dataFrame,
-            'Select which image controls\nto copy',
+        dlg = G2G.G2MultiChoiceDialog(G2frame.dataFrame,'Select which image controls\nto copy',
             'Select image controls', keyText)
         try:
@@ -356 +354 @@
         for parm in selectedKeys:
             copyDict[parm] = data[parm]
-        dlg = G2G.G2MultiChoiceDialog(
-            G2frame.dataFrame,
-            'Copy image controls from\n'+Source+' to...',
+        dlg = G2G.G2MultiChoiceDialog(G2frame.dataFrame,'Copy image controls from\n'+Source+' to...',
             'Copy image controls', Names)
         try:
@@ -411 +407 @@
             return
         dlg = G2G.G2MultiChoiceDialog(G2frame, 'Which images to select?',
-                                      'Select images', imglist, wx.CHOICEDLG_STYLE)
+            'Select images', imglist, wx.CHOICEDLG_STYLE)
         try:
             if dlg.ShowModal() == wx.ID_OK:
@@ -506 +502 @@
                      "label_3":"Xfer scaled 2-theta max", "value_3":True,
                      }
-        dlg = G2G.G2MultiChoiceDialog(G2frame,'Xfer angles',
-                                      'Transfer integration range from '+Source+' to:',Names,
-                                      extraOpts=extraopts)
+        dlg = G2G.G2MultiChoiceDialog(G2frame,'Xfer angles','Transfer integration range from '+Source+' to:',
+            Names,extraOpts=extraopts)
         try:
             if dlg.ShowModal() == wx.ID_OK:
@@ -547 +542 @@
             dlg.Destroy()
             G2frame.PatternTree.SelectItem(G2frame.PickId)        
+            
+    def OnResetDist(event):
+        dlg = wx.MessageDialog(G2frame,'Are you sure you want to do this?',caption='Reset dist to set dist',style=wx.YES_NO|wx.ICON_EXCLAMATION)
+        if dlg.ShowModal() != wx.ID_YES:
+            dlg.Destroy()
+            return
+        dlg.Destroy()
+        Names = G2gd.GetPatternTreeDataNames(G2frame,['IMG ',])
+        dlg = G2G.G2MultiChoiceDialog(G2frame,'Reset dist','Reset dist to set dist for:',Names)
+        try:
+            if dlg.ShowModal() == wx.ID_OK:
+                items = dlg.GetSelections()
+                for item in items:
+                    name = Names[item]
+                    Id = G2gd.GetPatternTreeItemId(G2frame,G2frame.root,name)
+                    Data = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id,'Image Controls'))
+                    Data['distance'] = Data['setdist']
+        finally:
+            dlg.Destroy()
+        wx.CallAfter(UpdateImageControls,G2frame,data,masks)
             
 # Sizers
@@ -1115 +1130 @@
                 dlg = G2G.G2HistoDataDialog(G2frame,' Edit sample goniometer data:',
                     'Edit data',['Omega','Chi','Phi'],['%.2f','%.2f','%.2f'],Names,Items)
-            try:
-                if dlg.ShowModal() == wx.ID_OK:
-                    result = dlg.GetData()      #?? what was this for?
-                    id, cookie = G2frame.PatternTree.GetFirstChild(G2frame.root)
-                    while id:
-                        name = G2frame.PatternTree.GetItemText(id)
-                        if 'IMG' in name:
-                            ctrls = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,id,'Image Controls'))
-                            vals = Items[Names.index(name)]
-                            ctrls['GonioAngles'] = vals
-                        id, cookie = G2frame.PatternTree.GetNextChild(G2frame.root, cookie)
-            finally:
-                dlg.Destroy()
-                G2frame.PatternTree.SelectItem(G2frame.PickId)
+                try:
+                    if dlg.ShowModal() == wx.ID_OK:
+                        id, cookie = G2frame.PatternTree.GetFirstChild(G2frame.root)
+                        while id:
+                            name = G2frame.PatternTree.GetItemText(id)
+                            if 'IMG' in name:
+                                ctrls = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,id,'Image Controls'))
+                                vals = Items[Names.index(name)]
+                                ctrls['GonioAngles'] = vals
+                            id, cookie = G2frame.PatternTree.GetNextChild(G2frame.root, cookie)
+                finally:
+                    dlg.Destroy()
+                    G2frame.PatternTree.SelectItem(G2frame.PickId)
         
         gonioSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -1194 +1208 @@
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnLoadControls, id=G2gd.wxID_IMLOADCONTROLS)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnTransferAngles, id=G2gd.wxID_IMXFERCONTROLS)
+    G2frame.dataFrame.Bind(wx.EVT_MENU, OnResetDist, id=G2gd.wxID_IMRESETDIST)
     def OnDestroy(event):
         G2frame.autoIntFrame = None

trunk/ImageCalibrants.py

@@ -40 +40 @@
 'LaB6  SRM660a skip 1':([2,],[''],[(4.1569162,4.1569162,4.1569162,90,90,90),],1,(1.0,10,10)),
 'LaB6  SRM660': ([2,],[''],[(4.15695,4.15695,4.15695,90,90,90),],0,(1.0,10,10)),
-'Si    SRM640c':([0,],[''],[(5.4311946,5.4311946,5.4311946,90,90,90),],0,(1.,10,10)),
+'Si    SRM640c':([0,],['F d 3 m'],[(5.4311946,5.4311946,5.4311946,90,90,90),],0,(1.,10,10)),
 'CeO2  SRM674b':([0,],[''],[(5.411651,5.411651,5.411651,90,90,90),],0,(1.0,2,1)),
 'Al2O3 SRM676a':([3,],['R -3 c'],[(4.759091,4.759091,12.991779,90,90,120),],0,(1.0,5,5)),