Changeset 2546 for trunk/GSASIIstrIO.py


Ignore:
Timestamp:
Nov 22, 2016 1:08:48 PM (5 years ago)
Author:
vondreele
Message:

cleanup of all GSASII main routines - remove unused variables, dead code, etc.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIstrIO.py

    r2520 r2546  
    1212
    1313'''
    14 import sys
    1514import os
    1615import os.path as ospath
     
    1817import math
    1918import copy
    20 import random
    2119import cPickle
    2220import numpy as np
    2321import numpy.ma as ma
    24 import numpy.linalg as nl
    25 import scipy.optimize as so
    2622import GSASIIpath
    2723GSASIIpath.SetVersionNumber("$Revision$")
    2824import GSASIIElem as G2el
    29 import GSASIIgrid as G2gd
    3025import GSASIIlattice as G2lat
    3126import GSASIIspc as G2spc
     
    312307    '''       
    313308    fl = open(GPXfile,'rb')
    314     General = {}
    315     Atoms = []
    316309    while True:
    317310        try:
     
    787780            for i,mag in enumerate(RBmags):
    788781                name = '::RBV;'+str(i)+':'+str(irb)
    789                 mag = parmDict[name]
    790782                if name in sigDict:
    791783                    VectSig.append(sigDict[name])
     
    10781070    phaseVary = []
    10791071    phaseDict = {}
    1080     phaseConstr = {}
    10811072    pawleyLookup = {}
    10821073    FFtables = {}                   #scattering factors - xrays
     
    10841075    BLtables = {}                   # neutrons
    10851076    Natoms = {}
    1086     AtMults = {}
    1087     AtIA = {}
    10881077    maxSSwave = {}
    10891078    shModels = ['cylindrical','none','shear - 2/m','rolling - mmm']
     
    15161505                    print '    HKL  grid  neg esd  sum neg  num neg use unit?  unit esd  '
    15171506                    for hkl,grid,esd1,ifesd2,esd2 in itemRest[rest]:
    1518                         PH = np.array(hkl)
    15191507                        phi,beta = G2lat.CrsAng(np.array(hkl),cell,SGData)
    15201508                        ODFln = G2lat.Flnh(Start,SHCoef,phi,beta,SGData)
     
    16861674                    print >>pFile,' atom: %s, site sym: %s, type: %s wave type: %s:'    \
    16871675                        %(at[ct-1],at[cs],Stype,waveType)
    1688                     line = ''
    16891676                    for iw,wave in enumerate(Waves):
    16901677                        stiw = ':'+str(i)+':'+str(iw)
     
    21762163    hapVary = []
    21772164    controlDict = {}
    2178     poType = {}
    2179     poAxes = {}
    2180     spAxes = {}
    2181     spType = {}
    21822165   
    21832166    for phase in Phases:
     
    22032186                limits = Histogram['Limits'][1]
    22042187                inst = Histogram['Instrument Parameters'][0]
    2205                 Zero = inst['Zero'][0]
    22062188                if 'C' in inst['Type'][1]:
    22072189                    try:
     
    22262208                    if hapData['HStrain'][1][i]:
    22272209                        hapVary.append(pfx+name)
    2228                 DIJS = G2spc.HStrainVals(HSvals,SGData)
    22292210                controlDict[pfx+'poType'] = hapData['Pref.Ori.'][0]
    22302211                if hapData['Pref.Ori.'][0] == 'MD':
     
    30823063        Back = Background[0]
    30833064        DebyePeaks = Background[1]
    3084         lenBack = len(Back[3:])
    30853065        valstr = ' value : '
    30863066        sigstr = ' sig   : '
Note: See TracChangeset for help on using the changeset viewer.