Changeset 2044

Timestamp:

Nov 11, 2015 10:30:39 AM (8 years ago)

Author:

vondreele

Message:

put DEBUG back in for tif files, revise ImageJ section to be more general.

File:

• trunk/imports/G2img_1TIF.py (modified) (3 diffs)

trunk/imports/G2img_1TIF.py

@@ -22 +22 @@
 import GSASIIpath
 import numpy as np
+DEBUG = False
 GSASIIpath.SetVersionNumber("$Revision: $")
 class TIF_ReaderClass(G2IO.ImportImage):
@@ -111 +112 @@
         Tag,Type = st.unpack(byteOrd+'Hh',File.read(4))
         nVal = st.unpack(byteOrd+'i',File.read(4))[0]
-        #if DEBUG: print 'Try:',Tag,Type,nVal
+        if DEBUG: print 'Try:',Tag,Type,nVal
         if Type == 1:
             Value = st.unpack(byteOrd+nVal*'b',File.read(nVal))
@@ -129 +130 @@
             Value = st.unpack(byteOrd+nVal*'f',File.read(nVal*4))
         IFD[Tag] = [Type,nVal,Value]
-        #if DEBUG: print Tag,IFD[Tag]
+        if DEBUG: print Tag,IFD[Tag]
     sizexy = [IFD[256][2][0],IFD[257][2][0]]
     [nx,ny] = sizexy