Changeset 878

Timestamp:

Mar 26, 2013 1:26:05 PM (11 years ago)

Author:

vondreele

Message:

another bad finally

File:

• trunk/GSASII.py (modified) (3 diffs)

trunk/GSASII.py

@@ -558 +558 @@
         if not os.path.exists(instfile): # no such file
             return {}
+        fp = 0
         try:
             fp = open(instfile,'Ur')
@@ -565 +566 @@
         except IOError:
             print('Error reading file:'+str(instfile))
-        finally:        
+        if fp:        
             fp.close()
 
-        try:
-            ibanks = int(Iparm.get('INS   BANK  ').strip())
-        except:
-            ibanks = 1
+        ibanks = int(Iparm.get('INS   BANK  ','1').strip())
         hType = Iparm['INS   HTYPE '].strip()
         if ibanks == 1: # there is only one bank here, return it
@@ -639 +637 @@
                 v = Iparm['INS  1PRCF11'].split()
                 data.extend([float(v[0]),float(v[1]),float(v[2])])                  #get GU, GV & GW - always here
-                azm = Iparm.get('INS  1DETAZM')
-                if azm is None: #not in this Iparm file
-                    azm = 0.0
-                else:
-                    azm = float(azm)
+                azm = float(Iparm.get('INS  1DETAZM','0.0'))
                 v = Iparm['INS  1PRCF12'].split()
                 if v1[0] == 3: