Changeset 1920

Timestamp:

Jul 6, 2015 10:38:00 AM (8 years ago)

Author:

vondreele

Message:

modify the pack-f.for code to read rectangular MAR images (NX != NY pixels) Recompiled the Windows 32 & 64 bit fortran sources.

Location:

trunk

Files:

• GSASIIIO.py (modified) (2 diffs)
• binwin2.7/fellipse.pyd (modified) (previous)
• binwin2.7/histogram2d.pyd (modified) (previous)
• binwin2.7/histosigma2d.pyd (modified) (previous)
• binwin2.7/pack_f.pyd (modified) (previous)
• binwin2.7/polymask.pyd (modified) (previous)
• binwin2.7/pypowder.pyd (modified) (previous)
• binwin2.7/pyspg.pyd (modified) (previous)
• binwin2.7/pytexture.pyd (modified) (previous)
• binwin64-2.7/fellipse.pyd (modified) (previous)
• binwin64-2.7/histogram2d.pyd (modified) (previous)
• binwin64-2.7/histosigma2d.pyd (modified) (previous)
• binwin64-2.7/pack_f.pyd (modified) (previous)
• binwin64-2.7/polymask.pyd (modified) (previous)
• binwin64-2.7/pypowder.pyd (modified) (previous)
• binwin64-2.7/pyspg.pyd (modified) (previous)
• binwin64-2.7/pytexture.pyd (modified) (previous)
• fsource/pack_f.for (modified) (3 diffs)

trunk/GSASIIIO.py

@@ -530 +530 @@
         if 'FORMAT' in line[0:6]:
             items = line.split()
-            size = int(items[1])
-            Npix = size*size
+            sizex = int(items[1])
+            Npix = int(items[3])
+            sizey = int(Npix/sizex)
     pos = 4096
-    data['size'] = [size,size]
+    data['size'] = [sizex,sizey]
     File.seek(pos)
     line = File.read(8)
@@ -543 +544 @@
     raw = File.read()
     File.close()
-    image = np.zeros(shape=(size,size),dtype=np.int32)
-    image = np.flipud(pf.pack_f(len(raw),raw,size,image).T)  #transpose to get it right way around & flip
+    image = np.zeros(shape=(sizex,sizey),dtype=np.int32)
+    
+    image = np.flipud(pf.pack_f(len(raw),raw,sizex,sizey,image).T)  #transpose to get it right way around & flip
     if imageOnly:
         return image

trunk/fsource/pack_f.for

@@ -1 @@
-      SUBROUTINE PACK_F(N,CMPR,M,IMG)
+      SUBROUTINE PACK_F(N,CMPR,MX,MY,IMG)
 
 Cf2py intent(in) N
 Cf2py intent(in) CMPR
 Cf2py depend(N) CMPR
-Cf2py intent(in) M
+Cf2py intent(in) MX
+Cf2py intent(in) MY
 Cf2py intent(in,out) IMG
-Cf2py depend(M) IMG
+Cf2py depend(MX,MY) IMG
 
       IMPLICIT NONE
-      INTEGER*4 BITDECODE(0:7),SETBITS(0:16),IN,N,M,BITNUM
+      INTEGER*4 BITDECODE(0:7),SETBITS(0:16),IN,N,MX,MY,BITNUM
       INTEGER*4 PIXEL,SPILLBITS,USEDBITS,VALIDS,WINDOW,TOTAL
-      INTEGER*4 IMG(0:M-1,0:M-1),NEXTINT
+      INTEGER*4 IMG(0:MX-1,0:MY-1),NEXTINT
       INTEGER*4 SPILL,ROW,COL,PIXNUM,MM1
       INTEGER*2 TMP
@@ -29 +30 @@
       ROW = 0
       COL = 0
-      TOTAL = M**2
-      MM1 = M-1
+      TOTAL = MX*MY
+      MM1 = MX-1
       IN = 0
       DO WHILE (PIXEL .LT. TOTAL)
@@ -79 +80 @@
               END IF
 
-              ROW = PIXEL/M
-              COL = MOD(PIXEL,M)
-              IF ( PIXEL .GT. M ) THEN
+              ROW = PIXEL/MX
+              COL = MOD(PIXEL,MX)
+              IF ( PIXEL .GT. MX ) THEN
                 IF ( COL .EQ. 0 ) THEN
                   TMP = NEXTINT +