Changeset 446 for sans/utils/bt5/bt5plot2/usans.py

Timestamp:

Nov 13, 2008 2:13:31 PM (14 years ago)

Author:

ajj

Message:

 

File:

• sans/utils/bt5/bt5plot2/usans.py (modified) (2 diffs)

sans/utils/bt5/bt5plot2/usans.py

@@ -22 +22 @@
     metadata = {}
     motlist = []
-    
+
+    print "File: ",fileName    
     inputfile = open(fileName, "r")
 
     inputdata = inputfile.readlines()
 
-    mdtmp = inputdata[0].replace("'","")
-    mdtmp = mdtmp.split()
+    if len(inputdata) < 2:
+        inputfile.close()
+        return 0,0
+
+    if inputdata[1].find('Filename') > 0:
+
+        mdtmp = inputdata[0].replace("'","")
+        mdtmp = mdtmp.split()
     
-    #Sundry metadata about run settings
-    (metadata['filename'], metadata['datetime'],
-    metadata['mon'],metadata['prefactor'],
-    metadata['base'],metadata['numpnts'],
-    metadata['type']) = (mdtmp[0],' '.join(mdtmp[1:5]),float(mdtmp[6]),int(mdtmp[7]),mdtmp[8],int(mdtmp[9]),mdtmp[10])
+        #Sundry metadata about run settings
+        (metadata['filename'], metadata['datetime'],
+        metadata['mon'],metadata['prefactor'],
+        metadata['base'],metadata['numpnts'],
+        metadata['type']) = (mdtmp[0],' '.join(mdtmp[1:5]),float(mdtmp[6]),int(mdtmp[7]),mdtmp[8],int(mdtmp[9]),mdtmp[10])
     
-    #Comment string
-    metadata['title'] = inputdata[2].strip()
+        #Comment string
+        metadata['title'] = inputdata[2].strip()
     
-    #Start, step and end values for motors 1-6
-    motlist.append(inputdata[5].split()[1:])
-    motlist.append(inputdata[6].split()[1:])
-    motlist.append(inputdata[7].split()[1:])
-    motlist.append(inputdata[8].split()[1:])
-    motlist.append(inputdata[9].split()[1:])
-    motlist.append(inputdata[10].split()[1:]) 
-    metadata['motorvals'] = motlist
+        #Start, step and end values for motors 1-6
+        motlist.append(inputdata[5].split()[1:])
+        motlist.append(inputdata[6].split()[1:])
+        motlist.append(inputdata[7].split()[1:])
+        motlist.append(inputdata[8].split()[1:])
+        motlist.append(inputdata[9].split()[1:])
+        motlist.append(inputdata[10].split()[1:]) 
+        metadata['motorvals'] = motlist
     
-    for index in range(13, len(inputdata), 2):
-        detdata[float(inputdata[index].split()[0])] = inputdata[index + 1].split(',')    
+        for index in range(13, len(inputdata), 2):
+            detdata[float(inputdata[index].split()[0])] = inputdata[index + 1].split(',')    
 
-    for key in detdata.keys():
-        for val in range(0, len(detdata[key])):
-            detdata[key][val] = int(detdata[key][val])
+        for key in detdata.keys():
+            for val in range(0, len(detdata[key])):
+                detdata[key][val] = int(detdata[key][val])
 
-    inputfile.close()
-    return detdata,metadata
+        inputfile.close()
+        return detdata,metadata
+
+    else:
+        inputfile.close()
+        return 0,0
 
 def printBT5DetData(detdata):
@@ -69 +80 @@
 
     for motorval in motorvals:
-        str = motorval + ":"
+        str = repr(motorval) + ":"
         str += "\tMon: " + repr(detdata[motorval][0])
         str += "\tDet 1-5: " + repr(detdata[motorval][2])