Changeset 2152 for trunk/GSASIIIO.py


Ignore:
Timestamp:
Feb 18, 2016 1:01:27 PM (6 years ago)
Author:
vondreele
Message:

all PWDR exporters will make file name from histogram name
allow read of multibank data
alert user to duplicate histograms (by name)
rename data will not change Bank or Azm part of histogram name
fix L&R plotting commands for TOF data

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIIO.py

    r2150 r2152  
    13221322    SGData = None
    13231323P1SGData = SGData
     1324######################################################################
    13241325class ImportBaseclass(object):
    13251326    '''Defines a base class for the reading of input files (diffraction
     
    13371338   
    13381339    UseReader = True  # in __init__ set value of self.UseReader to False to skip use of current importer
    1339     def __init__(self,
    1340                  formatName,
    1341                  longFormatName=None,
    1342                  extensionlist=[],
    1343                  strictExtension=False,
    1344                  ):
     1340    def __init__(self,formatName,longFormatName=None,
     1341                 extensionlist=[],strictExtension=False,):
    13451342        self.formatName = formatName # short string naming file type
    13461343        if longFormatName: # longer string naming file type
     
    13741371        self.readfilename = '?'
    13751372
    1376     def BlockSelector(self, ChoiceList, ParentFrame=None,
    1377                       title='Select a block',
    1378                       size=None, header='Block Selector',
    1379                       useCancel=True):
     1373    def BlockSelector(self, ChoiceList, ParentFrame=None,title='Select a block',
     1374        size=None, header='Block Selector',useCancel=True):
    13801375        ''' Provide a wx dialog to select a block if the file contains more
    13811376        than one set of data and one must be selected
     
    15081503                return False
    15091504
     1505######################################################################
    15101506class ImportPhase(ImportBaseclass):
    15111507    '''Defines a base class for the reading of files with coordinates
     
    15331529            size,header)
    15341530
     1531######################################################################
    15351532class ImportStructFactor(ImportBaseclass):
    15361533    '''Defines a base class for the reading of files with tables
     
    16011598    for an explanation on how to use this class.
    16021599    '''
    1603     def __init__(self,
    1604                  formatName,
    1605                  longFormatName=None,
    1606                  extensionlist=[],
    1607                  strictExtension=False,
    1608                  ):
    1609         ImportBaseclass.__init__(self,formatName,
    1610                                             longFormatName,
    1611                                             extensionlist,
    1612                                             strictExtension)
     1600    def __init__(self,formatName,longFormatName=None,
     1601        extensionlist=[],strictExtension=False,):
     1602        ImportBaseclass.__init__(self,formatName,longFormatName,
     1603            extensionlist,strictExtension)
    16131604        self.clockWd = None  # used in TOF
    16141605        self.ReInitialize()
     
    17641755    file without invoking any GUI objects.
    17651756    '''
    1766     def __init__(self,
    1767                  G2frame,
    1768                  formatName,
    1769                  extension,
    1770                  longFormatName=None,
    1771                  ):
     1757    def __init__(self,G2frame,formatName,extension,longFormatName=None,):
    17721758        self.G2frame = G2frame
    17731759        self.formatName = formatName # short string naming file type
Note: See TracChangeset for help on using the changeset viewer.