Changeset 5343

Timestamp:

Oct 6, 2022 10:16:28 AM (8 months ago)

Author:

vondreele

Message:

fix issue with TOF data in getPawleydRange & remove an obviously not needed "get"

Location:

trunk

Files:

• GSASIIphsGUI.py (modified) (2 diffs)
• GSASIIstrMath.py (modified) (1 diff)

trunk/GSASIIphsGUI.py

@@ -1197 +1197 @@
         nhist += 1
         Inst = Histograms[item]['Instrument Parameters'][0]
-        dmax,dmin = [G2lat.Pos2dsp(Inst,t) for t in Histograms[item]['Limits'][1]]
+        if 'T' in Inst['Type'][1]:
+            dmin,dmax = [G2lat.Pos2dsp(Inst,t) for t in Histograms[item]['Limits'][1]]
+        else:    
+            dmax,dmin = [G2lat.Pos2dsp(Inst,t) for t in Histograms[item]['Limits'][1]]
         if dmaxAll is None: 
             dmaxAll = dmax
@@ -13626 +13629 @@
                     style=wx.DEFAULT_DIALOG_STYLE)
         mainSizer = wx.BoxSizer(wx.VERTICAL)
-        mainSizer.Add(wx.StaticText(genDlg,wx.ID_ANY,
-            'Set Pawley Extraction Parameters for phase '+generalData.get('Name','?')))
+        mainSizer.Add(wx.StaticText(genDlg,label='Set Pawley Extraction Parameters for phase '+generalData['Name']))
         mainSizer.Add([5,10])
         pawlRef = G2G.G2CheckBoxFrontLbl(genDlg,' Do Pawley refinement?: ',generalData,'doPawley',DisablePawleyOpts)

trunk/GSASIIstrMath.py

@@ -1559 +1559 @@
 #        MmodAR,MmodBR,MmodAI,MmodBI = G2mth.MagMod(glTau,mXYZ,modQ,MSSdata,SGData,SSGData)  #Ntau,Nops,Natm,Mxyz cos,sin parts sum matches drawing
         mXYZ,MmodAR,MmodBR,MmodAI,MmodBI = G2mth.MagMod2(glTau,Xdata+dXdata,modQ,MSSdata,SGData,SSGData)  #Ntau,Nops,Natm,Mxyz cos,sin parts sum matches drawing
-        
+        #expand Mmod over mag symm ops. --> GSSdata
         if not SGData['SGGray']:    #for fixed Mx,My,Mz
             GSdata = np.inner(Gdata.T,np.swapaxes(SGMT,1,2))  #apply sym. ops.--> Natm,Nops,Nxyz