Changeset 2515

Timestamp:

Nov 4, 2016 11:56:16 AM (7 years ago)

Author:

vondreele

Message:

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

Location:

trunk

Files:

• GSASIIIO.py (modified) (2 diffs)
• defaultIparms.py (modified) (8 diffs)

trunk/GSASIIIO.py

@@ -1582 +1582 @@
         'Reinitialize the Reader to initial settings'
         ImportBaseclass.ReInitialize(self)
-        self.powderentry = ['',None,1] #  (filename,Pos,Bank)
+        self.powderentry = ['',None,None] #  (filename,Pos,Bank)
         self.powderdata = [] # Powder dataset
         '''A powder data set is a list with items [x,y,w,yc,yb,yd]:
@@ -1624 +1624 @@
         'Reinitialize the Reader to initial settings'
         ImportBaseclass.ReInitialize(self)
-        self.smallangleentry = ['',None,1] #  (filename,Pos,Bank)
+        self.smallangleentry = ['',None,None] #  (filename,Pos,Bank)
         self.smallangledata = [] # SASD dataset
         '''A small angle data set is a list with items [x,y,w,yc,yd]:

trunk/defaultIparms.py

@@ -38 +38 @@
 defaultIparms.append([
     '#GSAS-II instrument parameter file for lab CuKa data\n',
-    'Type:PXC\n',
+    'Type:PXC;Bank:1\n',
     'Lam1:1.5405;Lam2:1.5443;Zero:0.0;Polariz.:0.7;Azimuth:0.0;I(L2)/I(L1):0.5\n',
     'U:2.0;V:-2.0;W:5.0;X:0.0;Y:0.0;SH/L:0.002\n',
@@ -46 +46 @@
 defaultIparms.append([
     '#GSAS-II instrument parameter file APS 11BM @ 30keV\n', 
-    'Type:PXC\n',
+    'Type:PXC;Bank:1\n',
     'Lam:0.413263;Polariz.:0.99;Azimuth:0.0;Zero:0.0\n',
     'U:1.163;V:-0.126;W:0.063;X:0.0;Y:0.0;SH/L:0.002\n',
@@ -54 +54 @@
 defaultIparms.append([
     '#GSAS-II instrument parameter file 0.7A synchrotron data\n',
-    'Type:PXC\n',
+    'Type:PXC;Bank:1\n',
     'Lam:0.69968;Zero:0.0;Polariz.:0.99;Azimuth:0.0\n',
     'U:5.9840407759;V:-1.28771353531;W:0.118521878603\n',
@@ -63 +63 @@
 defaultIparms.append([
     '#GSAS-II instrument parameter file\n',
-    'Type:PNC\n',
+    'Type:PNC;Bank:1\n',
     'Lam:1.909;Zero:0.0;Polariz.:0.0;Azimuth:0.0\n',
     'U:257.182710995;V:-640.525145369;W:569.378664828\n',
@@ -72 +72 @@
 defaultIparms.append([
     '#GSAS-II instrument parameter file for 9m HIPD back scattering bank\n',
-    'Type:PNT\n',
+    'Type:PNT;Bank:1\n',
     'fltPath:10.32567;2-theta:151.0;Azimuth:0.0\n',
     'Zero:-0.773346536757;difC:5084.82763065;difA:-2.6304177486;difB:0.0\n',
@@ -84 +84 @@
 defaultIparms.append([
     '#GSAS-II instrument parameter file for 10m TOF 90deg bank\n',
-    'Type:PNT\n',
+    'Type:PNT;Bank:1\n',
     'fltPath:10;2-theta:90.0;Azimuth:0.0\n',
     'Zero:0.0;difC:3500.;difA:0.0;difB:0.0\n',
@@ -96 +96 @@
 defaultIparms.append([
     '#GSAS-II instrument parameter file for POWGEN\n',
-    'Type:PNT;fltPath:63.169;2-theta:90.0;Azimuth:0.0\n',
+    'Type:PNT;Bank:1;fltPath:63.169;2-theta:90.0;Azimuth:0.0\n',
     'Zero:-4.96558487231;difC:22594.7440533;difA:-0.927945556608;difB:1.42511277627\n',
     'alpha:1.0\n',
@@ -107 +107 @@
 defaultIparms.append([
     '#GSAS-II instrument parameter file for Generic TOF\n',
-    'Type:PNT;fltPath:25.0;2-theta:150.;Azimuth:0.0\n',
+    'Type:PNT;Bank:1;fltPath:25.0;2-theta:150.;Azimuth:0.0\n',
     'Zero:0.;difC:9000.;difA:0.;difB:0.\n',
     'alpha:1.0\n',