Changeset 2515


Ignore:
Timestamp:
Nov 4, 2016 11:56:16 AM (5 years ago)
Author:
vondreele
Message:

put Bank 1 into default Iparms & put None back in initializations.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIIO.py

    r2514 r2515  
    15821582        'Reinitialize the Reader to initial settings'
    15831583        ImportBaseclass.ReInitialize(self)
    1584         self.powderentry = ['',None,1] #  (filename,Pos,Bank)
     1584        self.powderentry = ['',None,None] #  (filename,Pos,Bank)
    15851585        self.powderdata = [] # Powder dataset
    15861586        '''A powder data set is a list with items [x,y,w,yc,yb,yd]:
     
    16241624        'Reinitialize the Reader to initial settings'
    16251625        ImportBaseclass.ReInitialize(self)
    1626         self.smallangleentry = ['',None,1] #  (filename,Pos,Bank)
     1626        self.smallangleentry = ['',None,None] #  (filename,Pos,Bank)
    16271627        self.smallangledata = [] # SASD dataset
    16281628        '''A small angle data set is a list with items [x,y,w,yc,yd]:
  • trunk/defaultIparms.py

    r2151 r2515  
    3838defaultIparms.append([
    3939    '#GSAS-II instrument parameter file for lab CuKa data\n',
    40     'Type:PXC\n',
     40    'Type:PXC;Bank:1\n',
    4141    'Lam1:1.5405;Lam2:1.5443;Zero:0.0;Polariz.:0.7;Azimuth:0.0;I(L2)/I(L1):0.5\n',
    4242    'U:2.0;V:-2.0;W:5.0;X:0.0;Y:0.0;SH/L:0.002\n',
     
    4646defaultIparms.append([
    4747    '#GSAS-II instrument parameter file APS 11BM @ 30keV\n',
    48     'Type:PXC\n',
     48    'Type:PXC;Bank:1\n',
    4949    'Lam:0.413263;Polariz.:0.99;Azimuth:0.0;Zero:0.0\n',
    5050    'U:1.163;V:-0.126;W:0.063;X:0.0;Y:0.0;SH/L:0.002\n',
     
    5454defaultIparms.append([
    5555    '#GSAS-II instrument parameter file 0.7A synchrotron data\n',
    56     'Type:PXC\n',
     56    'Type:PXC;Bank:1\n',
    5757    'Lam:0.69968;Zero:0.0;Polariz.:0.99;Azimuth:0.0\n',
    5858    'U:5.9840407759;V:-1.28771353531;W:0.118521878603\n',
     
    6363defaultIparms.append([
    6464    '#GSAS-II instrument parameter file\n',
    65     'Type:PNC\n',
     65    'Type:PNC;Bank:1\n',
    6666    'Lam:1.909;Zero:0.0;Polariz.:0.0;Azimuth:0.0\n',
    6767    'U:257.182710995;V:-640.525145369;W:569.378664828\n',
     
    7272defaultIparms.append([
    7373    '#GSAS-II instrument parameter file for 9m HIPD back scattering bank\n',
    74     'Type:PNT\n',
     74    'Type:PNT;Bank:1\n',
    7575    'fltPath:10.32567;2-theta:151.0;Azimuth:0.0\n',
    7676    'Zero:-0.773346536757;difC:5084.82763065;difA:-2.6304177486;difB:0.0\n',
     
    8484defaultIparms.append([
    8585    '#GSAS-II instrument parameter file for 10m TOF 90deg bank\n',
    86     'Type:PNT\n',
     86    'Type:PNT;Bank:1\n',
    8787    'fltPath:10;2-theta:90.0;Azimuth:0.0\n',
    8888    'Zero:0.0;difC:3500.;difA:0.0;difB:0.0\n',
     
    9696defaultIparms.append([
    9797    '#GSAS-II instrument parameter file for POWGEN\n',
    98     'Type:PNT;fltPath:63.169;2-theta:90.0;Azimuth:0.0\n',
     98    'Type:PNT;Bank:1;fltPath:63.169;2-theta:90.0;Azimuth:0.0\n',
    9999    'Zero:-4.96558487231;difC:22594.7440533;difA:-0.927945556608;difB:1.42511277627\n',
    100100    'alpha:1.0\n',
     
    107107defaultIparms.append([
    108108    '#GSAS-II instrument parameter file for Generic TOF\n',
    109     'Type:PNT;fltPath:25.0;2-theta:150.;Azimuth:0.0\n',
     109    'Type:PNT;Bank:1;fltPath:25.0;2-theta:150.;Azimuth:0.0\n',
    110110    'Zero:0.;difC:9000.;difA:0.;difB:0.\n',
    111111    'alpha:1.0\n',
Note: See TracChangeset for help on using the changeset viewer.