Changeset 193 for trunk/GSASII.py


Ignore:
Timestamp:
Dec 22, 2010 2:29:41 PM (12 years ago)
Author:
vondreele
Message:

various fixes, but still bugs.
GSASII.py - add more sample parameters
GSASIIgrid.py - add save/load image controls; turn image plot back on
GSASIIimgGUI.py - load/save image controls
GSASIIIO.py - find 'Temp' in comments & load value as Temperature
GSASIIlattice.py - change 'laue' to 'SGLaue'
GSASIIphsGUI.py - change mustrain GUI
GSASIIplot.py - fix point picking in powder plots, add mustrain surface plotting
GSASIIspc.py - add conversion of isotropic to generalized mustrain converter (doesn't work yet)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r186 r193  
    307307                self.dirname = dlg.GetDirectory()
    308308                for filename in filenames:
    309                     Data,Iparm,Comments = G2IO.SelectPowderData(self, filename)              #Data: list of tuples (filename,Pos,Bank)
     309                    Data,Iparm,Comments,Temperature = G2IO.SelectPowderData(self, filename)              #Data: list of tuples (filename,Pos,Bank)
    310310                    if not Data:                                                    #if Data rejected by user - go to next one
    311311                        continue
     
    313313                    DataType = DataType.strip()[0:3]                                #just 1st 3 chars
    314314                    wx.BeginBusyCursor()
    315                     Sample = {'Scale':[1.0,True],'Type':'Debye-Scherrer','Absorption':[0.0,False],'DisplaceX':[0.0,False],
    316                         'DisplaceY':[0.0,False],'Diffuse':[]}
     315                    Sample = {'Scale':[1.0,True],'Type':'Debye-Scherrer','Absorption':[0.0,False],
     316                        'DisplaceX':[0.0,False],'DisplaceY':[0.0,False],'Diffuse':[],
     317                        'Temperature':Temperature,'Pressure':1.0,'Humidity':0.0,'Voltage':0.0,
     318                        'Force':0.0}
    317319                    try:
    318320                        for Item in Data:
Note: See TracChangeset for help on using the changeset viewer.