Changeset 4048

Timestamp:

Jul 2, 2019 10:30:19 AM (4 years ago)

Author:

vondreele

Message:

Use extra reflections generated by Dysnomia in forming new Fourier map

Location:

trunk

Files:

• GSASIIphsGUI.py (modified) (2 diffs)
• GSASIIpwd.py (modified) (4 diffs)

trunk/GSASIIphsGUI.py

@@ -4165 +4165 @@
         reflData = reflSets[generalData['Name']]['RefList']
         refDmin = reflData[-1][4]
+        mulMin = np.argmin(reflData[:,3])
+        if reflData[mulMin,3] < 0:
+            refDmin = reflData[mulMin-1,4]
         MEMData = G2frame.MEMData
         if MEMData.GetSizer():
@@ -4296 +4299 @@
         wx.CallAfter(UpdateDysnomia)
         
-        if G2pwd.MEMupdateReflData(prfName,reflData):
+        goon,reflData = G2pwd.MEMupdateReflData(prfName,data,reflData)
+        if goon:
+            reflSets[generalData['Name']]['RefList'] = reflData
+            G2frame.GPXtree.SetItemPyData(G2gd.GetGPXtreeItemId(G2frame,pId,'Reflection Lists'),reflSets)
             OnFourierMaps(event)           #auto run Fourier
         else:

trunk/GSASIIpwd.py

@@ -3016 +3016 @@
     prevpos = 0.
     for ref in reflData:
+        if ref[3] < 0:
+            continue
         if 'T' in Type:
             h,k,l,mult,dsp,pos,sig,gam,Fobs,Fcalc,phase,x,x,x,x,prfo = ref[:16]
@@ -3100 +3102 @@
     return True
 
-def MEMupdateReflData(prfName,reflData):
+def MEMupdateReflData(prfName,data,reflData):
     ''' Update reflection data with new Fosq, phase result from Dysnomia
 
@@ -3107 +3109 @@
     '''
     
+    generalData = data['General']
+    cell = generalData['Cell'][1:7]
+    A = G2lat.cell2A(cell)
     reflDict = {}
+    newRefs = []
     for iref,ref in enumerate(reflData):
-        reflDict[hash('%5d%5d%5d'%(ref[0],ref[1],ref[2]))] = iref
+        if ref[3] > 0:
+            newRefs.append(ref)
+            reflDict[hash('%5d%5d%5d'%(ref[0],ref[1],ref[2]))] = iref
     fbaName = os.path.splitext(prfName)[0]+'.fba'
     try:
@@ -3130 +3138 @@
             refId = reflDict[hash('%5d%5d%5d'%(h,k,l))]
         except KeyError:    #added reflections at end skipped
+            d = float(1/np.sqrt(G2lat.calc_rDsq([h,k,l],A)))
+            newRefs.append([h,k,l,-1,d,0.,0.01,1.0,Fosq,Fosq,phase,1.0,1.0,1.0,1.0])
             continue
-        reflData[refId][8] = Fosq
-        reflData[refId][10] = phase
-    return True
+        newRefs[refId][8] = Fosq
+        newRefs[refId][10] = phase
+    newRefs = np.array(newRefs)
+    return True,newRefs
     
 #testing data