Changeset 1192


Ignore:
Timestamp:
Jan 11, 2014 10:01:33 AM (8 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimgGUI.py

    r1190 r1192  
    1616'''
    1717import wx
     18import wx.lib.scrolledpanel as wxscroll
    1819import matplotlib as mpl
    1920import math
     
    15901591        G2frame.dataFrame.GetStatusBar().SetStatusText("To add strain data: On 2D Powder Image, key a:add ring")
    15911592       
    1592     G2frame.dataDisplay = wx.Panel(G2frame.dataFrame)
     1593    G2frame.dataDisplay = wxscroll.ScrolledPanel(G2frame.dataFrame)
    15931594    mainSizer = wx.BoxSizer(wx.VERTICAL)
    15941595    mainSizer.Add((5,10),0)
     
    15991600    mainSizer.Layout()   
    16001601    G2frame.dataDisplay.SetSizer(mainSizer)
    1601     G2frame.dataDisplay.SetSize(mainSizer.Fit(G2frame.dataFrame))
    1602     G2frame.dataFrame.setSizePosLeft(mainSizer.Fit(G2frame.dataFrame))   
     1602    G2frame.dataDisplay.SetAutoLayout(1)
     1603    G2frame.dataDisplay.SetupScrolling()
     1604    Size = mainSizer.Fit(G2frame.dataFrame)
     1605    Size[0] += 25
     1606    G2frame.dataDisplay.SetSize(Size)
     1607    G2frame.dataFrame.setSizePosLeft(Size)   
  • trunk/GSASIIobj.py

    r1182 r1192  
    794794Stress/Strain               Sample phi          (float) Sample rotation about vertical axis.
    795795\                           Sample z            (float) Sample translation from the calibration sample position (for Sample phi = 0)
    796 \                           strain              (list: 3x3 array of float) The strain tensor coefficients [[' e11','e12','e13'],[' e21','e22','e23'],[' e31','e32','e33']].
    797796                                                These will be restricted by space group symmetry; result of strain fit refinement.
    798797\                           Type                (str) 'True' or 'Conventional': The strain model used for the calculation.
    799 \                           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.
     798\                           d-zero              (list:dict) Each item is for a diffraction ring on the image; all items are from the same phase
     799                                                and are used to determine the strain tensor.
    800800                                                The dictionary items are:
    801801                                                'Dset': (float) True d-spacing for the diffraction ring; entered by the user.
    802                                                 'Dcalc': (float) d-spacing...
     802                                                'Dcalc': (float) Average calculated d-spacing determined from strain coeff.
     803                                                'Emat': (list: float) The strain tensor elements e11, e12 & e22 (e21=e12, rest are 0)
     804                                                'Esig': (list: float) Esds for Emat from fitting.
    803805                                                'pixLimit': (int) Search range to find highest point on ring for each data point
    804806                                                'cutoff': (float) I/Ib cutoff for searching.
    805                                                 'ImxyObs': (list:lists) [[X],[Y]] observed points to be used for strain calculations.
    806                                                 'ImxyCalc':(list:lists) [[X],[Y]] calculated points based on refined strain.                                           
     807                                                'ImxyObs': (list: lists) [[X],[Y]] observed points to be used for strain calculations.
     808                                                'ImtaObs': (list: lists) [[d],[azm]] transformed via detector calibration from ImxyObs.
     809                                                'ImtaCalc': (list: lists [[d],[azm]] calculated d-spacing & azimuth from fit.
    807810                                               
    808811======================  ======================  ====================================================
Note: See TracChangeset for help on using the changeset viewer.