Changeset 4012


Ignore:
Timestamp:
Jun 1, 2019 10:36:04 AM (3 years ago)
Author:
vondreele
Message:

reinstate texture model as possible with single histograms - skip the "Kaduk" test

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIphsGUI.py

    r4011 r4012  
    67546754            instArray = {}
    67556755            if int(Obj.GetValue()) > 0:
    6756                 for h in data['Histograms']:
    6757                     PatternId = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,h)
    6758                     Inst = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId,'Instrument Parameters'))[0]
    6759                     Sample = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId,'Sample Parameters'))
    6760                     if Inst['Type'][1] in instArray:
    6761                         if instArray[Inst['Type'][1]] != [Sample['Chi'],Sample['Phi'],Sample['Omega']]:
    6762                             textureData['Order'] = int(Obj.GetValue())
    6763                             break
     6756                if textureData['Model'] != 'cylindrical':
     6757                    for h in data['Histograms']:
     6758                        PatternId = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,h)
     6759                        Inst = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId,'Instrument Parameters'))[0]
     6760                        Sample = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId,'Sample Parameters'))
     6761                        if Inst['Type'][1] in instArray:
     6762                            if instArray[Inst['Type'][1]] != [Sample['Chi'],Sample['Phi'],Sample['Omega']]:
     6763                                textureData['Order'] = int(Obj.GetValue())
     6764                                break
     6765                        else:
     6766                            instArray[Inst['Type'][1]] = [Sample['Chi'],Sample['Phi'],Sample['Omega']]
    67646767                    else:
    6765                         instArray[Inst['Type'][1]] = [Sample['Chi'],Sample['Phi'],Sample['Omega']]
     6768                        textureData['Order'] = 0
     6769                        wx.MessageBox('Incorrect use of Texture. Use preferred orientation (on data tab) unless you have multiple histograms taken with different orientations',
     6770                                caption='Texture Error',style=wx.ICON_EXCLAMATION)
    67666771                else:
    67676772                    textureData['Order'] = 0
    6768                     wx.MessageBox('Incorrect use of Texture. Use preferred orientation (on data tab) unless you have multiple histograms taken with different orientations',
    6769                             caption='Texture Error',style=wx.ICON_EXCLAMATION)
    6770             else:
    6771                 textureData['Order'] = 0
    67726773            textureData['SH Coeff'][1] = SetSHCoef()
    67736774            wx.CallLater(100,UpdateTexture)
Note: See TracChangeset for help on using the changeset viewer.