Changeset 1698


Ignore:
Timestamp:
Mar 12, 2015 5:09:00 PM (7 years ago)
Author:
toby
Message:

Allow powder data importers to set Controls values (such as FreePrm? labels); fix FreePrm? initialization

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r1696 r1698  
    13631363                self.PatternTree.AppendItem(Id,text='Reflection Lists'),
    13641364                {})
     1365            # if any Control values have been set, move them into tree
     1366            Controls = self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,self.root, 'Controls'))
     1367            Controls.update(rd.Controls)
    13651368            newHistList.append(HistName)
    13661369        else:
  • trunk/GSASIIIO.py

    r1694 r1698  
    17591759        self.comments = []
    17601760        self.idstring = ''
    1761         self.Sample = G2pdG.SetDefaultSample()
     1761        self.Sample = G2pdG.SetDefaultSample() # default sample parameters
     1762        self.Controls = {}  # items to be placed in top-level Controls
    17621763        self.GSAS = None     # used in TOF
    17631764        self.repeat_instparm = True # Should a parm file be
  • trunk/GSASIIobj.py

    r1625 r1698  
    852852    'minF/sig':0,
    853853    'Author':'no name',
    854     'FreeVar1':'Sample humidity (%)',
    855     'FreeVar2':'Sample voltage (V)',
    856     'FreeVar3':'Applied load (MN)',
     854    'FreePrm1':'Sample humidity (%)',
     855    'FreePrm2':'Sample voltage (V)',
     856    'FreePrm3':'Applied load (MN)',
    857857    }
    858858'''Values to be used as defaults for the initial contents of the ``Controls``
Note: See TracChangeset for help on using the changeset viewer.