Changeset 1399 for trunk/GSASIIplot.py

Timestamp:

Jun 30, 2014 10:40:05 AM (9 years ago)

Author:

vondreele

Message:

allow D (&T) for hydrogen atom types
allow ge* for image extensions (as found at APS 1ID!)
switch e11 & e22 definitions to match coordinate system (x horizontal, y vertical)
add subtraction of dark image for image display & strain fitting
skip images with no strain entries in fitallstrsta

File:

• trunk/GSASIIplot.py (modified) (2 diffs)

trunk/GSASIIplot.py

@@ -2879 +2879 @@
         pass
     size,imagefile = G2frame.PatternTree.GetItemPyData(G2frame.Image)
+    dark = Data['dark image']
+    if dark[0]:
+        darkfile = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame, 
+            G2frame.root,dark[0]))[1]
     if imagefile != G2frame.oldImagefile:
         imagefile = G2IO.CheckImageFile(G2frame,imagefile)
@@ -2886 +2890 @@
         G2frame.PatternTree.SetItemPyData(G2frame.Image,[size,imagefile])
         G2frame.ImageZ = G2IO.GetImageData(G2frame,imagefile,imageOnly=True)
+        if dark[0]:
+            darkImg = G2IO.GetImageData(G2frame,darkfile,imageOnly=True)
+            G2frame.ImageZ += dark[1]*darkImg
         G2frame.oldImagefile = imagefile