Changeset 1192

Timestamp:

Jan 11, 2014 10:01:33 AM (9 years ago)

Author:

vondreele

Message:

modify docs for stress strain stuff
add True vs Conventional strain fitting
make stress/strain window have scroll bars

Location:

trunk

Files:

• GSASIIimgGUI.py (modified) (3 diffs)
• GSASIIobj.py (modified) (1 diff)

trunk/GSASIIimgGUI.py

@@ -16 +16 @@
 '''
 import wx
+import wx.lib.scrolledpanel as wxscroll
 import matplotlib as mpl
 import math
@@ -1590 +1591 @@
         G2frame.dataFrame.GetStatusBar().SetStatusText("To add strain data: On 2D Powder Image, key a:add ring")
         
-    G2frame.dataDisplay = wx.Panel(G2frame.dataFrame)
+    G2frame.dataDisplay = wxscroll.ScrolledPanel(G2frame.dataFrame)
     mainSizer = wx.BoxSizer(wx.VERTICAL)
     mainSizer.Add((5,10),0)
@@ -1599 +1600 @@
     mainSizer.Layout()    
     G2frame.dataDisplay.SetSizer(mainSizer)
-    G2frame.dataDisplay.SetSize(mainSizer.Fit(G2frame.dataFrame))
-    G2frame.dataFrame.setSizePosLeft(mainSizer.Fit(G2frame.dataFrame))    
+    G2frame.dataDisplay.SetAutoLayout(1)
+    G2frame.dataDisplay.SetupScrolling()
+    Size = mainSizer.Fit(G2frame.dataFrame)
+    Size[0] += 25
+    G2frame.dataDisplay.SetSize(Size)
+    G2frame.dataFrame.setSizePosLeft(Size)    

trunk/GSASIIobj.py

@@ -794 +794 @@
 Stress/Strain               Sample phi          (float) Sample rotation about vertical axis.
 \                           Sample z            (float) Sample translation from the calibration sample position (for Sample phi = 0)
-\                           strain              (list: 3x3 array of float) The strain tensor coefficients [[' e11','e12','e13'],[' e21','e22','e23'],[' e31','e32','e33']].
                                                 These will be restricted by space group symmetry; result of strain fit refinement.
 \                           Type                (str) 'True' or 'Conventional': The strain model used for the calculation.
-\                           d-zero              (list:dict) Each item is for a diffraction ring on the image; all items are from the same phase and are used to determine the strain tensor.
+\                           d-zero              (list:dict) Each item is for a diffraction ring on the image; all items are from the same phase 
+                                                and are used to determine the strain tensor.
                                                 The dictionary items are:
                                                 'Dset': (float) True d-spacing for the diffraction ring; entered by the user.
-                                                'Dcalc': (float) d-spacing...
+                                                'Dcalc': (float) Average calculated d-spacing determined from strain coeff.
+                                                'Emat': (list: float) The strain tensor elements e11, e12 & e22 (e21=e12, rest are 0)
+                                                'Esig': (list: float) Esds for Emat from fitting.
                                                 'pixLimit': (int) Search range to find highest point on ring for each data point
                                                 'cutoff': (float) I/Ib cutoff for searching.
-                                                'ImxyObs': (list:lists) [[X],[Y]] observed points to be used for strain calculations.
-                                                'ImxyCalc':(list:lists) [[X],[Y]] calculated points based on refined strain.                                           
+                                                'ImxyObs': (list: lists) [[X],[Y]] observed points to be used for strain calculations.
+                                                'ImtaObs': (list: lists) [[d],[azm]] transformed via detector calibration from ImxyObs.
+                                                'ImtaCalc': (list: lists [[d],[azm]] calculated d-spacing & azimuth from fit.
                                                 
 ======================  ======================  ====================================================