Changeset 2295

Timestamp:

May 26, 2016 11:31:57 AM (7 years ago)

Author:

vondreele

Message:

add merohedral twins tutorial
fix problem in GetImageZ

Location:

trunk

Files:

• GSASIIctrls.py (modified) (1 diff)
• GSASIIimgGUI.py (modified) (2 diffs)

trunk/GSASIIctrls.py

@@ -3876 +3876 @@
     ['MCsimanneal', 'MCsimanneal', 'MCSA in GSAS.htm',
         'Monte-Carlo simulated annealing structure'],
+        
+    ['MerohedralTwins', 'MerohedralTwins','Merohedral twin refinement in GSAS.htm',
+        'Merohedral twin refinements'],
 
     ['2DCalibration', '2DCalibration', 'Calibration of an area detector in GSAS.htm',

trunk/GSASIIimgGUI.py

@@ -67 +67 @@
     if darkImg:
         Did = G2gd.GetPatternTreeItemId(G2frame, G2frame.root, darkImg)
-        Ddata = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Did,'Image Controls'))
-        dformatName = Ddata.get('formatName','')
         if Did:
+            Ddata = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Did,'Image Controls'))
+            dformatName = Ddata.get('formatName','')
             Npix,imagefile,imagetag = G2frame.PatternTree.GetImageLoc(Did)
             imagefile = G2IO.CheckImageFile(G2frame,imagefile)
@@ -87 +87 @@
             if darkImg:
                 Did = G2gd.GetPatternTreeItemId(G2frame, G2frame.root,darkImg)
-                Ddata = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Did,'Image Controls'))
-                dformatName = Ddata.get('formatName','')
-                Npix,imagefile,imagetag = G2frame.PatternTree.GetImageLoc(Did)
-                imagefile = G2IO.CheckImageFile(G2frame,imagefile)
-                darkImage = G2IO.GetImageData(G2frame,imagefile,True,ImageTag=imagetag,FormatName=dformatName)
-                backImage += np.array(darkImage*darkScale,dtype='int32')                
+                if Did:
+                    Ddata = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Did,'Image Controls'))
+                    dformatName = Ddata.get('formatName','')
+                    Npix,imagefile,imagetag = G2frame.PatternTree.GetImageLoc(Did)
+                    imagefile = G2IO.CheckImageFile(G2frame,imagefile)
+                    darkImage = G2IO.GetImageData(G2frame,imagefile,True,ImageTag=imagetag,FormatName=dformatName)
+                    backImage += np.array(darkImage*darkScale,dtype='int32')                
             sumImg += np.array(backImage*backScale,dtype='int32')
     if darkImg: del darkImg         #force cleanup