Changeset 4011

Timestamp:

May 31, 2019 8:25:10 PM (5 years ago)

Author:

toby

Message:

test if texture is set non-zero w/o appropriate histograms

File:

• trunk/GSASIIphsGUI.py (modified) (1 diff)

trunk/GSASIIphsGUI.py

@@ -6750 +6750 @@
         def OnShOrder(event):
             Obj = event.GetEventObject()
-            textureData['Order'] = int(Obj.GetValue())
+            # the Kaduk test: is Texture appropriate? Look for a 2nd histogram
+            # of any type with differing setting angles from the 1st.
+            instArray = {}
+            if int(Obj.GetValue()) > 0:
+                for h in data['Histograms']:
+                    PatternId = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,h)
+                    Inst = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId,'Instrument Parameters'))[0]
+                    Sample = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId,'Sample Parameters'))
+                    if Inst['Type'][1] in instArray:
+                        if instArray[Inst['Type'][1]] != [Sample['Chi'],Sample['Phi'],Sample['Omega']]:
+                            textureData['Order'] = int(Obj.GetValue())
+                            break
+                    else:
+                        instArray[Inst['Type'][1]] = [Sample['Chi'],Sample['Phi'],Sample['Omega']]
+                else:
+                    textureData['Order'] = 0
+                    wx.MessageBox('Incorrect use of Texture. Use preferred orientation (on data tab) unless you have multiple histograms taken with different orientations',
+                            caption='Texture Error',style=wx.ICON_EXCLAMATION)
+            else:
+                textureData['Order'] = 0
             textureData['SH Coeff'][1] = SetSHCoef()
             wx.CallLater(100,UpdateTexture)