Changeset 1138 for trunk/GSASIIIO.py

Timestamp:

Nov 7, 2013 12:12:55 PM (12 years ago)

Author:

toby

Message:

major constraints revision

File:

• trunk/GSASIIIO.py (modified) (6 diffs)

trunk/GSASIIIO.py ¶

@@ -715 +715 @@
 #    
 def ProjFileOpen(G2frame):
-    'Read a GSAS-II project file'
+    'Read a GSAS-II project file and load into the G2 data tree'
     file = open(G2frame.GSASprojectfile,'rb')
     print 'load from file: ',G2frame.GSASprojectfile
@@ -731 +731 @@
             Id = G2frame.PatternTree.AppendItem(parent=G2frame.root,text=datum[0])
             if 'PWDR' in datum[0]:                
-                G2frame.PatternTree.SetItemPyData(Id,datum[1][:3])     #temp. trim off junk
+                if 'ranId' not in datum[1][0]: # patch: add random Id if not present
+                    datum[1][0]['ranId'] = ran.randint(0,sys.maxint)
+                G2frame.PatternTree.SetItemPyData(Id,datum[1][:3])  #temp. trim off junk (patch?)
+            elif datum[0].startswith('HKLF'): 
+                if 'ranId' not in datum[1][0]: # patch: add random Id if not present
+                    datum[1][0]['ranId'] = ran.randint(0,sys.maxint)
+                G2frame.PatternTree.SetItemPyData(Id,datum[1])
             else:
                 G2frame.PatternTree.SetItemPyData(Id,datum[1])
@@ -751 +757 @@
                     G2frame.imageDefault = Data                
         file.close()
-        print 'project load successful'
+        print('project load successful')
         G2frame.NewPlot = True
     except:
@@ -783 +789 @@
         finally:
             wx.EndBusyCursor()
-        print 'project save successful'
+        print('project save successful')
 
 def SaveIntegration(G2frame,PickId,data):
@@ -847 +853 @@
             G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Index Peak List'),[])
             G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Unit Cells List'),[])
-            G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Reflection Lists'),{})             
-        G2frame.PatternTree.SetItemPyData(Id,[[''],[np.array(X),np.array(Y),np.array(W),np.zeros(N),np.zeros(N),np.zeros(N)]])
+            G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Reflection Lists'),{})
+            valuesdict = {
+                'wtFactor':1.0,
+                'Dummy':False,
+                'ranId':ran.randint(0,sys.maxint),
+                }
+        G2frame.PatternTree.SetItemPyData(
+            Id,[valuesdict,
+                [np.array(X),np.array(Y),np.array(W),np.zeros(N),np.zeros(N),np.zeros(N)]])
     G2frame.PatternTree.SelectItem(Id)
     G2frame.PatternTree.Expand(Id)
@@ -1978 +1991 @@
             # old GPX file from before pre-constraint varyList is saved
             print ' *** Old refinement: Please use Calculate/Refine to redo  ***'
-            raise Exception(' *** CIF creation aborted ***')
+            raise Exception(' *** Export aborted ***')
         else:
             varyList = list(varyList)