Changeset 1778

Timestamp:

Apr 6, 2015 1:33:00 PM (8 years ago)

Author:

vondreele

Message:

allow Refine texture menu item to appear; use DestroyChildren? to clear the Texture tab before filling
fix azimuth calculations after image integration
put Azimuth in Sample parms.
add 3 prints to debug option in G2mapvars
add Omega, Chi, Phi & Azimuth to sequential results table if they vary

Location:

trunk

Files:

• GSASIIIO.py (modified) (2 diffs)
• GSASIIddataGUI.py (modified) (3 diffs)
• GSASIIgrid.py (modified) (2 diffs)
• GSASIImapvars.py (modified) (1 diff)
• GSASIIphsGUI.py (modified) (4 diffs)
• GSASIIpwdGUI.py (modified) (2 diffs)

trunk/GSASIIIO.py

@@ -1041 +1041 @@
     else:
         for i,azm in enumerate(azms[:-1]):
-            Azms.append(G2img.meanAzm(azm,azms[i+1]))
+            if azm > 360. and azms[i+1] > 360.:
+                Azms.append(G2img.meanAzm(azm%360.,azms[i+1]%360.))
+            else:    
+                Azms.append(G2img.meanAzm(azm,azms[i+1]))
     for i,azm in enumerate(azms[:-1]):
         Aname = name+" Azm= %.2f"%(Azms[i])
@@ -1058 +1061 @@
         Sample['Chi'] = data['GonioAngles'][1]
         Sample['Phi'] = data['GonioAngles'][2]
+        Sample['Azimuth'] = Azms[i]     #put here too
         if 'PWDR' in Aname:
             parms = ['PXC',data['wavelength'],0.0,0.99,1.0,-0.10,0.4,0.30,1.0,0.0001,Azms[i]]    #set polarization for synchrotron radiation!

trunk/GSASIIddataGUI.py

@@ -665 +665 @@
                 if dlg.ShowModal() == wx.ID_OK:
                     POData[6] = [hkls[i] for i in dlg.GetSelections()]
+                    if not POData[6]:
+                        POData[6] = ['']
                 else:
                     return
@@ -796 +798 @@
         wx.CallLater(100,UpdateDData,G2frame,DData,data,hist)
         
+    DData.DestroyChildren()
     if DData.GetSizer():
         DData.GetSizer().Clear(True)
@@ -898 +901 @@
             mainSizer.Add(HstrainSizer())
                 
-            #texture  'Pref. Ori.':['MD',1.0,False,[0,0,1],0,[]] last two for 'SH' are SHorder & coeff
             poSizer = wx.BoxSizer(wx.VERTICAL)
             POData = UseList[hist]['Pref.Ori.']

trunk/GSASIIgrid.py

@@ -1823 +1823 @@
         self.TextureEdit = wx.Menu(title='')
         self.TextureMenu.Append(menu=self.TextureEdit, title='Texture')
-#        self.TextureEdit.Append(id=wxID_REFINETEXTURE, kind=wx.ITEM_NORMAL,text='Refine texture', 
-#            help='Refine the texture coefficients from sequential Pawley results')
-# N.B. Binding is now commented out
+        self.TextureEdit.Append(id=wxID_REFINETEXTURE, kind=wx.ITEM_NORMAL,text='Refine texture', 
+            help='Refine the texture coefficients from sequential results')
         self.TextureEdit.Append(id=wxID_CLEARTEXTURE, kind=wx.ITEM_NORMAL,text='Clear texture', 
             help='Clear the texture coefficients' )
@@ -2501 +2500 @@
         else:
             sampleParmDict = {'Temperature':[],'Pressure':[],'Time':[],
-                              'FreePrm1':[],'FreePrm2':[],'FreePrm3':[],}
+                'FreePrm1':[],'FreePrm2':[],'FreePrm3':[],'Omega':[],
+                'Chi':[],'Phi':[],'Azimuth':[],}
         Controls = G2frame.PatternTree.GetItemPyData(
             GetPatternTreeItemId(G2frame,G2frame.root, 'Controls'))

trunk/GSASIImapvars.py

@@ -380 +380 @@
 
     # check for errors:
+    if debug:
+        print 'indepVarList',indepVarList
+        print 'depVarList',depVarList
+        print 'multdepVarList',multdepVarList
     inboth = set(indepVarList).intersection(set(depVarList))
     if len(inboth) > 0:

trunk/GSASIIphsGUI.py

@@ -240 +240 @@
         """        
         # UpdateGeneral execution starts here
+        General.DestroyChildren()
         phaseTypes = ['nuclear','modulated','magnetic','macromolecular']
         SetupGeneral()
@@ -3611 +3612 @@
 
         # UpdateTexture executable starts here
+        Texture.DestroyChildren()
         G2frame.dataFrame.SetStatusText('')
         generalData = data['General']        
@@ -5868 +5870 @@
                             
     def OnTextureRefine(event):
-        print 'refine texture maybe from C[i,j] in seq. result? not yet'
-        event.Skip()        
+        print 'refine texture from C[i,j] in seq. result'
             
     def OnTextureClear(event):
         print 'clear texture? - does nothing'
-        event.Skip()
 
     def FillSelectPageMenu(TabSelectionIdDict, menuBar):
@@ -6048 +6048 @@
         # Texture
         FillSelectPageMenu(TabSelectionIdDict, G2frame.dataFrame.TextureMenu)
-        #G2frame.dataFrame.Bind(wx.EVT_MENU, OnTextureRefine, id=G2gd.wxID_REFINETEXTURE)
+        G2frame.dataFrame.Bind(wx.EVT_MENU, OnTextureRefine, id=G2gd.wxID_REFINETEXTURE)
         G2frame.dataFrame.Bind(wx.EVT_MENU, OnTextureClear, id=G2gd.wxID_CLEARTEXTURE)
         # Pawley reflections

trunk/GSASIIpwdGUI.py

@@ -81 +81 @@
         'FreePrm1':0.,'FreePrm2':0.,'FreePrm3':0.,
         'Gonio. radius':200.0,
-        'Omega':0.0,'Chi':0.0,'Phi':0.0,
+        'Omega':0.0,'Chi':0.0,'Phi':0.0,'Azimuth':0.0,
 #SASD items
         'Materials':[{'Name':'vacuum','VolFrac':1.0,},{'Name':'vacuum','VolFrac':0.0,}],
@@ -117 +117 @@
     parms.append(['Chi','Goniometer chi:',[10,3]])
     parms.append(['Phi','Goniometer phi:',[10,3]])
+    parms.append(['Azimuth','Detector azimuth',[10,3]])
     parms.append(['Time','Clock time (s)',[12,3]])
     parms.append(['Temperature','Sample temperature (K): ',[10,3]])