Changeset 4348 for trunk

Timestamp:

Mar 8, 2020 11:03:16 AM (3 years ago)

Author:

vondreele

Message:

Detail work on various RMC plots - getting titles & axes labels correct

File:

• trunk/GSASIIphsGUI.py (modified) (4 diffs)

trunk/GSASIIphsGUI.py

@@ -5402 +5402 @@
                 '_SQ2.csv':[r'$\mathsf{Q,\AA^{-1}}$','S(Q)','RMCP S(Q)-2 for '],
                 '_FQ1.csv':[r'$\mathsf{Q,\AA^{-1}}$','F(Q)','RMCP F(Q) for '],
-                '_FT_XFQ1.csv':[r'$\mathsf{R,\AA}$','G(R)','RMCP x-ray G(R) for '],
-#                '_XFQ1.csv':[r'$\mathsf{Q,\AA^{-1}}$','F(Q)','RMCP x-ray F(Q) for '],
+                '_FT_XFQ1.csv':[r'$\mathsf{R,\AA}$','g(R)','RMCP x-ray g(R) for '],
                 '_bragg.csv':[r'$\mathsf{TOF,\mu s}$','Normalized Intensity','RMCP bragg for ']}
             Ysave = []
@@ -5422 +5421 @@
                             break
                         X.append(float(items[0]))
-                        Yobs.append(float(items[1]))
-                        Ycalc.append(float(items[2]))
+                        Yobs.append(float(items[2]))
+                        Ycalc.append(float(items[1]))
                     Yobs = np.array([X,Yobs])
                     Ycalc = np.array([X,Ycalc])
-                    if 'G(R)' in Labels[label][1]:
-                            
-                        Ysave.append(Yobs)
+                    if '(R)' in Labels[label][1]:
+                        Ysave.append(Ycalc)
                         Ymin = Ysave[0][1][0]
                     if 'bragg' in label: 
@@ -5471 +5469 @@
                             XY = [[X.T,(DX*Y.T)*X.T] for iy,Y in enumerate(Partials) if 'Va' not in Names[iy+1]]                            
                     Names = [name for name in Names if 'Va' not in name]
+                    ylabel = Labels[label][1]
                     if 'G(R)' in Labels[label][1]:
                         if ifNeut:
                             title = 'Neutron '+Labels[label][2]+pName
                         else:
-                            title = 'X-ray '+Labels[label][2]+pName
+                            title = 'X-ray '+Labels[label][2].replace('G','g')+pName
+                            ylabel = 'g(R)'
                         sumAtm = 0
                         BLtables = G2elem.GetBLtable(generalData)
@@ -5508 +5508 @@
                         Xmax = np.searchsorted(Ysave[0][0],XY[0][0][-1])
                         G2plt.PlotXY(G2frame,XY2=XY,XY=[Ysave[0][:,0:Xmax],],labelX=Labels[label][0],
-                            labelY=Labels[label][1],newPlot=True,Title=title,
-                            lines=False,names=[r'   $G(R)_{obs}$',]+Names[1:])
+                            labelY=ylabel,newPlot=True,Title=title,
+                            lines=False,names=[r'   $G(R)_{calc}$',]+Names[1:])
                     else:                        
                         G2plt.PlotXY(G2frame,XY,labelX=Labels[label][0],
-                            labelY=Labels[label][1],newPlot=True,Title=Labels[label][2]+pName,
+                            labelY=ylabel,newPlot=True,Title=Labels[label][2]+pName,
                             lines=True,names=Names[1:])
 #chi**2 plot