Changeset 4539

Timestamp:

Aug 7, 2020 8:50:02 AM (3 years ago)

Author:

vondreele

Message:

remove commented old/bad code in G2IO
fix Instrument parameters plots for pink patterns

Location:

trunk

Files:

• GSASIIIO.py (modified) (2 diffs)
• GSASIIplot.py (modified) (3 diffs)

trunk/GSASIIIO.py

@@ -851 +851 @@
     Azms = np.zeros(data['outAzimuths'])
     dazm = 0.
-#    if data['fullIntegrate'] and data['outAzimuths'] == 1:
-#        Azms = [0.0,]                              #a poor man's average?
-#    else:
-##        for i,azm in enumerate(azms[:-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]))
     if data['outAzimuths'] > 1:
         dazm = np.min(np.abs(np.diff(azms)))/2.
@@ -887 +879 @@
         polariz = data['PolaVal'][0]
         for item in Comments:
-            # if 'polariz' in item:
-            #     try:
-            #         polariz = float(item.split('=')[1])
-            #     except:
-            #         polariz = 0.99
             for key in ('Temperature','Pressure','Time','FreePrm1','FreePrm2','FreePrm3','Omega',
                 'Chi','Phi'):

trunk/GSASIIplot.py

@@ -5635 +5635 @@
         Plot.legend(loc='best')
     else:       #'C' & 'B'
+        isig = 4
+        igam = 6
+        if 'B' in Parms['Type'][0]:
+            isig = 8
+            igam = 10
         Plot.figure.suptitle(TreeItemText)
         Plot.set_title('Instrument and sample peak widths')
@@ -5644 +5649 @@
         Z = np.ones_like(X)
         data = G2mth.setPeakparms(Parms,Parms2,X,Z)
-        s = np.sqrt(data[4])*np.pi/18000.   #var -> sig(radians)
-        g = data[6]*np.pi/18000.    #centideg -> radians
+        s = np.sqrt(data[isig])*np.pi/18000.   #var -> sig(radians)
+        g = data[igam]*np.pi/18000.    #centideg -> radians
         G = G2pwd.getgamFW(g,s)     #/2.  #delt-theta from TCH fxn
         Y = sq8ln2*s/nptand(X/2.)
@@ -5655 +5660 @@
         
         fit = G2mth.setPeakparms(Parms,Parms2,X,Z,useFit=True)
-        sf = np.sqrt(fit[4])*np.pi/18000.
-        gf = fit[6]*np.pi/18000.
+        sf = np.sqrt(fit[isig])*np.pi/18000.
+        gf = fit[igam]*np.pi/18000.
         Gf = G2pwd.getgamFW(gf,sf)      #/2.
         Yf = sq8ln2*sf/nptand(X/2.)