Changeset 4870 for trunk

Timestamp:

Mar 31, 2021 7:19:27 PM (2 years ago)

Author:

toby

Message:

problem with limits applied to plotting of wrong histogram; add normalized plotting

File:

• trunk/GSASIIplot.py (modified) (16 diffs)

trunk/GSASIIplot.py

@@ -2191 +2191 @@
         elif event.key in ['+','=']:
             G2frame.plusPlot = not G2frame.plusPlot
+        elif event.key == '/':
+            Page.plotStyle['Normalize'] = not Page.plotStyle['Normalize']
         elif event.key == 'i' and G2frame.Contour:                  #for smoothing contour plot
             choice = ['nearest','bilinear','bicubic','spline16','spline36','hanning',
@@ -2981 +2983 @@
             'refDelt':0.1*Ymax,})
 #end patch
+    if 'Normalize' not in Page.plotStyle:
+        Page.plotStyle['Normalize'] = False
     # reset plot when changing between different data types
     try:
@@ -3130 +3134 @@
                 Page.Choice = Page.Choice+ \
                     ['u/U: offset up/10x','d/D: offset down/10x','l: offset left','r: offset right',
-                     'o: reset offset','f: select data',]
-            
+                     'o: reset offset','f: select data',
+                     '/: normalize']
         elif plottype in ['SASD','REFD']:
             Page.Choice = [' key press',
@@ -3171 +3175 @@
                 G2frame.PatternId, 'Instrument Parameters'))
             Sample = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Sample Parameters'))
+            Limits = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Limits'))
             ParmList = [Parms,]
             SampleList = [Sample,]
+            LimitsList = [Limits,]
             Title = data[0].get('histTitle')
             if not Title: 
@@ -3187 +3193 @@
         ParmList = []
         SampleList = []
+        LimitsList = []
         Temps = []
         # loop through tree looking for matching histograms to plot
@@ -3210 +3217 @@
             SampleList.append(G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,
                 pid, 'Sample Parameters')))
+            LimitsList.append(G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,
+                pid, 'Limits')))
             Temps.append('%.1fK'%SampleList[-1]['Temperature'])
         if not G2frame.Contour:
@@ -3215 +3224 @@
             ParmList.reverse()
             SampleList.reverse()
+            LimitsList.reverse()
     if timeDebug:
         print('plot build time: %.3f for %dx%d patterns'%(time.time()-time0,len(PlotList[0][1][1]),len(PlotList)))
@@ -3261 +3271 @@
     else:
         Plot.set_xlabel(xLabel,fontsize=16)
-    if 'T' in ParmList[0]['Type'][0]:
+    if 'T' in ParmList[0]['Type'][0] or (Page.plotStyle['Normalize'] and not G2frame.SinglePlot):
         if Page.plotStyle['sqrtPlot']:
             Plot.set_ylabel(r'$\sqrt{Normalized\ intensity}$',fontsize=16)
@@ -3296 +3306 @@
         Parms = ParmList[N]
         Sample = SampleList[N]
+        limits = np.array(LimitsList[N])
         ifpicked = False
-        LimitId = 0
         NoffY = offsetY*(Nmax-N)
         if Pattern[1] is None: continue # skip over uncomputed simulations
@@ -3304 +3314 @@
         if PickId:
             ifpicked = Pattern[2] == G2frame.GPXtree.GetItemText(PatternId)
-            LimitId = G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId,'Limits')
-            limits = G2frame.GPXtree.GetItemPyData(LimitId)
             # recompute mask from excluded regions, in case they have changed
             excls = limits[2:]
@@ -3399 +3407 @@
             Y = ma.array(Y,mask=ma.getmask(X))
                 
-        if LimitId and ifpicked:
-            limits = np.array(G2frame.GPXtree.GetItemPyData(LimitId))
+        #if LimitId and ifpicked:
+        #    limits = np.array(G2frame.GPXtree.GetItemPyData(LimitId))
+        if ifpicked:
             lims = limits[1]
             if Page.plotStyle['qPlot'] and 'PWDR' in plottype and not ifLimits:
@@ -3560 +3569 @@
                         Plot.plot(X,ZB,colors[2],picker=False,label=incCptn('calc'))
                 else:  # not logPlot
+                    ymax = 1.
+                    if Page.plotStyle['Normalize'] and Y.max() != 0 and not G2frame.SinglePlot:
+                        ymax = Y.max()
                     if G2frame.SubBack:
                         if 'PWDR' in plottype:
-                            ObsLine = Plot.plot(Xum,Y,color=colors[0],marker=pP,
+                            ObsLine = Plot.plot(Xum,Y/ymax,color=colors[0],marker=pP,
                                 picker=False,clip_on=Clip_on,label=incCptn('obs-bkg'))  #Io-Ib
                             if np.any(Z):       #only if there is a calc pattern
-                                CalcLine = Plot.plot(X,Z-W,colors[1],picker=False,label=incCptn('calc-bkg'))               #Ic-Ib
+                                CalcLine = Plot.plot(X,(Z-W)/ymax,colors[1],picker=False,label=incCptn('calc-bkg'))               #Ic-Ib
                         else:
                             Plot.plot(X,YB,color=colors[0],marker=pP,
@@ -3572 +3584 @@
                     else:
                         if 'PWDR' in plottype:
-                            ObsLine = Plot.plot(Xum,Y,color=colors[0],marker=pP,
+                            ObsLine = Plot.plot(Xum,Y/ymax,color=colors[0],marker=pP,
                                 picker=True,pickradius=3.,clip_on=Clip_on,label=incCptn('obs'))    #Io
-                            CalcLine = Plot.plot(X,Z,colors[1],picker=False,label=incCptn('calc'))                 #Ic
+                            CalcLine = Plot.plot(X,Z/ymax,colors[1],picker=False,label=incCptn('calc'))                 #Ic
                         else:
                             Plot.plot(X,YB,color=colors[0],marler=pP,
@@ -3580 +3592 @@
                             Plot.plot(X,ZB,colors[2],picker=False,label=incCptn('calc'))
                     if 'PWDR' in plottype and (G2frame.SinglePlot and G2frame.plusPlot):
-                        BackLine = Plot.plot(X,W,colors[2],picker=False,label=incCptn('bkg'))                 #Ib
+                        BackLine = Plot.plot(X,W/ymax,colors[2],picker=False,label=incCptn('bkg'))                 #Ib
                         if not G2frame.Weight and np.any(Z):
-                            DifLine = Plot.plot(X,D,colors[3],
+                            DifLine = Plot.plot(X,D/ymax,colors[3],
                                 picker=True,pickradius=1.,label=incCptn('diff'))                 #Io-Ic
                     Plot.axhline(0.,color='k',label='_zero')
@@ -3617 +3629 @@
                         
             else:   #not picked
+                ymax = 1.
+                if Page.plotStyle['Normalize'] and Y.max() != 0:
+                    ymax = Y.max()
                 icolor = 256*N//len(PlotList)
                 if Page.plotStyle['logPlot']:
@@ -3635 +3650 @@
                 else:
                     if 'PWDR' in plottype:
-                        Plot.plot(X,Y,color=mcolors.cmap(icolor),picker=False)
+                        Plot.plot(X,Y/ymax,color=mcolors.cmap(icolor),picker=False)
                     elif plottype in ['SASD','REFD']:
                         try: