Changeset 450

Timestamp:

Jan 9, 2012 1:01:20 PM (12 years ago)

Author:

vondreele

Message:

 

Location:

trunk

Files:

• GSASIIIO.py (modified) (1 diff)
• GSASIIimgGUI.py (modified) (1 diff)
• GSASIIplot.py (modified) (1 diff)
• GSASIItestplot.py (modified) (1 diff)
• fsource/histogram2d.for (modified) (2 diffs)

trunk/GSASIIIO.py

@@ -768 +768 @@
                 print 'Read MAR CCD tiff file: ',filename
             image = np.array(ar.array('H',File.read(2*Npix)),dtype=np.int32)
+    elif sizexy == [4096,4096]:
+        if IFD[273][2][0] == 8:
+            if IFD[258][2][0] == 16:
+                tifType = 'scanCCD'
+                pixy = (9,9)
+                File.seek(8)
+                if not imageOnly:
+                    print 'Read APS scanCCD tiff file: ',filename
+                image = np.array(ar.array('H',File.read(2*Npix)),dtype=np.int32)
 #    elif sizexy == [960,960]:
 #        tiftype = 'PE-BE'

trunk/GSASIIimgGUI.py

@@ -633 +633 @@
     comboSizer.Add(wx.StaticText(parent=self.dataDisplay,label=' Calib lines to skip   '),0,
         wx.ALIGN_CENTER_VERTICAL)
-    calibSkip  = wx.ComboBox(parent=self.dataDisplay,value=str(data['calibskip']),choices=['0','1','2','3','4','5','6','7','8','9','10'],
+    calibSkip  = wx.ComboBox(parent=self.dataDisplay,value=str(data['calibskip']),choices=[str(i) for i in range(25)],
         style=wx.CB_READONLY|wx.CB_DROPDOWN)
     calibSkip.Bind(wx.EVT_COMBOBOX, OnCalibSkip)

trunk/GSASIIplot.py

@@ -1905 +1905 @@
                 Imin,Imax = [np.amin(A),np.amax(A)]
             ImgM = Plot.imshow(AM,aspect='equal',cmap='Reds',
-                interpolation='nearest',vmin=0,vmax=2,extent=[0,Xmax,Xmax,0])
+                interpolation='nearest',vmin=0,vmax=2,extent=[0,Xmax,Ymax,0])
             Img = Plot.imshow(A,aspect='equal',cmap=acolor,
                 interpolation='nearest',vmin=Imin,vmax=Imax,extent=[0,Xmax,Ymax,0])

trunk/GSASIItestplot.py

@@ -29 +29 @@
         self.SetSizer(sizer)
 
+    def Show(self):
+        self.frame.Show()
+
     def StartEventLoop(self):
-        self.frame.Show()
+        self.Show()
         self.app.MainLoop()
 

trunk/fsource/histogram2d.for

@@ -21 +21 @@
 
       IMPLICIT NONE
-      INTEGER*4   N
+      INTEGER*8   N
       REAL*4      X(0:N-1),Y(0:N-1),Z(0:N-1)
       INTEGER*8   NXBINS,NYBINS
@@ -33 +33 @@
         I = INT((X(K)-XLIM(0))/DX)
         J = INT((Y(K)-YLIM(0))/DY)
+C        if ( j.ge.500 )
+C     1    print *,k,x(k),y(k),i,j,xlim(0),dx,ylim(0),dy,nxbins,nybins
         IF ( (I .GE. 0 .AND. I .LT. NXBINS) .AND.
      1     (J .GE. 0 .AND. J .LT. NYBINS) ) THEN
+C          if ( j.ge.500 )
+C     1      print *,i,j,nst(i,j),hst(i,j),z(k)
           NST(I,J) = NST(I,J)+1.0
           HST(I,J) = HST(I,J)+Z(K)