Changeset 2974 for branch

Timestamp:

Aug 8, 2017 4:50:04 PM (6 years ago)

Author:

odonnell

Message:

remove prints in LoadDictFromProjFile?, SaveDictToProjFile?, add dump args

File:

• branch/2frame/GSASIIscriptable.py (modified) (7 diffs)

branch/2frame/GSASIIscriptable.py

@@ -86 +86 @@
         ]
     '''
-    if not ospath.exists(ProjFile):
-        print ('\n*** Error attempt to open project file that does not exist:\n   '+
-            str(ProjFile))
-        return
+    # Let IOError be thrown if file does not exist
+    # if not ospath.exists(ProjFile):
+    #     print ('\n*** Error attempt to open project file that does not exist:\n   '+
+    #         str(ProjFile))
+    #     return
     file = open(ProjFile,'rb')
-    print('loading from file: {}'.format(ProjFile))
+    # print('loading from file: {}'.format(ProjFile))
     Project = {}
     nameList = []
@@ -107 +108 @@
                 nameList[-1].append(datus[0])
         file.close()
-        print('project load successful')
+        # print('project load successful')
     except:
-        print("Error reading file "+str(ProjFile)+". This is not a GSAS-II .gpx file")
-        return None
+        raise IOError("Error reading file "+str(ProjFile)+". This is not a GSAS-II .gpx file")
+    finally:
+        file.close()
     return Project,nameList
 
@@ -122 +124 @@
     '''
     file = open(ProjFile,'wb')
-    print('save to file: {}'.format(ProjFile))
-    for name in nameList:
-        data = []
-        item = Project[name[0]]
-        data.append([name[0],item['data']])
-        for item2 in name[1:]:
-            data.append([item2,item[item2]])
-        cPickle.dump(data,file,1)
-    file.close()
-    print('project save successful')
+    # print('save to file: {}'.format(ProjFile))
+    try:
+        for name in nameList:
+            data = []
+            item = Project[name[0]]
+            data.append([name[0],item['data']])
+            for item2 in name[1:]:
+                data.append([item2,item[item2]])
+            cPickle.dump(data,file,1)
+    finally:
+        file.close()
+    # print('project save successful')
 
 def ImportPowder(reader,filename):
@@ -880 +884 @@
         phases = self.data['Phases']
         if phasename in phases:
-            return G2Phase(phases[phasename], self)
+            return G2Phase(phases[phasename], phasename, self)
 
     def phases(self):
@@ -1295 +1299 @@
     Author: Jackson O'Donnell jacksonhodonnell@gmail.com
     """
-    def __init__(self, data, proj):
+    def __init__(self, data, name, proj):
         self.data = data
+        self.name = name
         self.proj = proj
 
@@ -1441 +1446 @@
 def dump(*args):
     """The dump subcommand"""
-    import IPython.lib.pretty as pretty
-    proj, nameList = LoadDictFromProjFile(args[0])
-    print("names:", nameList)
-    for key, val in proj.items():
-        print(key, ":", sep='')
-        pretty.pprint(val)
+    raw = True
+    histograms = False
+    phases = False
+    filenames = []
+    for arg in args:
+        if arg in ['-h', '--histograms']:
+            histograms = True
+            raw = False
+        elif arg in ['-p', '--phases']:
+            phases = True
+            raw = False
+        elif arg in ['-r', '--raw']:
+            raw = True
+        else:
+            filenames.append(arg)
+    if raw:
+        import IPython.lib.pretty as pretty
+    for fname in filenames:
+        if raw:
+            proj, nameList = LoadDictFromProjFile(fname)
+            print("file:", fname)
+            print("names:", nameList)
+            for key, val in proj.items():
+                print(key, ":")
+                pretty.pprint(val)
+        else:
+            proj = G2Project(fname)
+            if histograms:
+                hists = proj.histograms()
+                for h in hists:
+                    print(fname, h.name)
+            if phases:
+                phases = proj.phases()
+                for p in phases:
+                    print(fname, p.name)
 
 
@@ -1461 +1495 @@
 
 def export(*args):
+    """The export subcommand"""
+    # Export CIF or Structure or ...
     pass