Changeset 2782

Timestamp:

Apr 14, 2017 10:45:44 AM (6 years ago)

Author:

vondreele

Message:

add autoscaling to autointegration
impose check on rescale limits - need to be in right order

Location:

trunk

Files:

• GSASIIimgGUI.py (modified) (6 diffs)
• GSASIIpwdGUI.py (modified) (1 diff)
• config_example.py (modified) (1 diff)

trunk/GSASIIimgGUI.py

@@ -2298 +2298 @@
       processing loop. (Default is 30.0 seconds.)
     '''
-
     def __init__(self,G2frame,PollTime=30.0):
         def OnStart(event):
@@ -2464 +2463 @@
             fInp4.invalid = not os.path.exists(fInp4.GetValue())
             fInp4._IndicateValidity()
+            
+        def OnAutoScale(event):
+            self.AutoScale = autoscale.GetValue()
+            
+        def OnAutoScaleName(event):
+            self.AutoScaleName = scalename.GetValue()
+            self.Scale[0] = self.AutoScales[self.AutoScaleName]
+            scaleval.SetValue(self.Scale[0])
                 
         ##################################################
@@ -2489 +2496 @@
         self.params['optPDF'] = True
         self.pdfControls = {}
+        self.AutoScale = False
+        self.Scale = [1.0,]
 
         G2frame.PatternTree.GetSelection()
-        size,imagefile,imagetag = G2frame.PatternTree.GetImageLoc(self.imageBase)        
+        size,imagefile,imagetag = G2frame.PatternTree.GetImageLoc(self.imageBase) 
         self.imagedir,fileroot = os.path.split(imagefile)
+        Comments = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(
+            G2frame,self.imageBase, 'Comments'))
+        DefaultAutoScaleNames = GSASIIpath.GetConfigValue('Autoscale_ParmNames')
+        self.AutoScaleName = GSASIIpath.GetConfigValue('DefaultAutoScale')
+        self.AutoScales = {}
+        for comment in Comments:
+            if '=' in comment:
+                name,val = comment.split('=',1) 
+                if name in DefaultAutoScaleNames:
+                    try:
+                        self.AutoScales[name] = float(val)
+                        if name == self.AutoScaleName:
+                            self.Scale[0] = float(val)
+                    except ValueError:
+                        continue
         self.params['filter'] = '*'+os.path.splitext(fileroot)[1]
         self.params['outdir'] = os.path.abspath(self.imagedir)
@@ -2557 +2581 @@
         sizer.Add(G2G.G2CheckBox(mnpnl,'',self.params,'SeparateDir'))
         lblsizr.Add(sizer)
+        if self.AutoScales:
+            sizer = wx.BoxSizer(wx.HORIZONTAL)
+            autoscale = wx.CheckBox(mnpnl,label='Do autoscaling with:')
+            autoscale.Bind(wx.EVT_CHECKBOX,OnAutoScale)
+            sizer.Add(autoscale,0,WACV)
+            scalename = wx.ComboBox(mnpnl,value=self.AutoScaleName,choices=self.AutoScales.keys(),
+                style=wx.CB_READONLY|wx.CB_DROPDOWN)
+            scalename.Bind(wx.EVT_COMBOBOX,OnAutoScaleName)
+            sizer.Add(scalename,0,WACV)
+            sizer.Add(wx.StaticText(mnpnl,label=' to '),0,WACV)
+            scaleval = G2G.ValidatedTxtCtrl(mnpnl,self.Scale,0,nDig=(10,2),min=1.)
+            sizer.Add(scaleval,0,WACV)
+            lblsizr.Add(sizer,0)
+        #ToDO: Autonormalize, parm name?, scaling value?
         sizer = wx.BoxSizer(wx.HORIZONTAL)
         sizer.Add(wx.StaticText(mnpnl, wx.ID_ANY,'Autocompute PDF:'),0,wx.ALIGN_CENTER_VERTICAL)
@@ -2716 +2754 @@
         # do integration
         size,imagefile,imagetag = G2frame.PatternTree.GetImageLoc(imgId)
+        if self.AutoScale:
+            Comments = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(
+                G2frame,imgId, 'Comments'))
+            for comment in Comments:
+                if '=' in comment:
+                    name,val = comment.split('=',1) 
+                    if name == self.AutoScaleName:
+                        val = float(val)
+                        if val > 0.:
+                            Scale = self.Scale[0]/val
+                        break
         masks = G2frame.PatternTree.GetItemPyData(
             G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Masks'))
@@ -2737 +2786 @@
             # write out the images in the selected formats
             Sdata = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id, 'Sample Parameters'))
+            if self.AutoScale:
+                print 'Rescale by %.4f'%(Scale)
+                y,w = G2frame.PatternTree.GetItemPyData(Id)[1][1:3]
+                y *= Scale
+                w /= Scale**2
             # determine the name for the current file
             fileroot = namepre

trunk/GSASIIpwdGUI.py

@@ -2221 +2221 @@
                 iBeg = np.searchsorted(x0,Xmin)
                 iFin = np.searchsorted(x0,Xmax)
-                sum0 = np.sum(y0[iBeg:iFin])
-                result = dlg.GetSelections()
-                for i in result: 
-                    item = histList[i]
-                    Id = G2gd.GetPatternTreeItemId(G2frame,G2frame.root,item)
-                    xi,yi,wi = G2frame.PatternTree.GetItemPyData(Id)[1][:3]
-                    sumi = np.sum(yi[iBeg:iFin])
-                    if sumi:
-                        Scale = sum0/sumi
-                        yi *= Scale
-                        wi /= Scale**2
+                if iBeg > iFin:
+                    wx.MessageBox('Wrong order for Xmin, Xmax','Error',style=wx.ICON_EXCLAMATION)
+                else:
+                    sum0 = np.sum(y0[iBeg:iFin])
+                    result = dlg.GetSelections()
+                    for i in result: 
+                        item = histList[i]
+                        Id = G2gd.GetPatternTreeItemId(G2frame,G2frame.root,item)
+                        xi,yi,wi = G2frame.PatternTree.GetItemPyData(Id)[1][:3]
+                        sumi = np.sum(yi[iBeg:iFin])
+                        if sumi:
+                            Scale = sum0/sumi
+                            yi *= Scale
+                            wi /= Scale**2
         finally:
             dlg.Destroy()
         G2plt.PlotPatterns(G2frame,plotType=histName[:4],newPlot=True)
-            
         
     def OnSampleCopy(event):

trunk/config_example.py

@@ -125 +125 @@
 Default is 30 seconds
 '''
+
+Autoscale_ParmNames = ['userComment2',r'extraInputs\1\extraInputs','Ion_Chamber_I0',]
+DefaultAutoScale = "userComment2"
+'''Gives the possible selection of incident monitor names as found in an image metadata file.
+DefaultAutoScale must be one of the AutoScale_ParmNames
+Used in AutoIntegration
+'''