Changeset 2195 for trunk/GSASIIpwd.py

Timestamp:

Apr 3, 2016 2:30:21 PM (7 years ago)

Author:

vondreele

Message:

remove selected area image multiplier - not necessary
fix image scaling issues for selected area simulations
fix issues with absent pydiffaxlib & DIFFaX.exe on some platforms

File:

• trunk/GSASIIpwd.py (modified) (5 diffs)

trunk/GSASIIpwd.py

@@ -40 +40 @@
     import pydiffax as pyx
 except ImportError:
-    print 'the pydiffax library could not be loaded'
+    print 'pydiffax is not available for this platform - under develpment'
 
     
@@ -1916 +1916 @@
     df.close()    
     time0 = time.time()
-    subp.call(DIFFaX)
+    try:
+        subp.call(DIFFaX)
+    except OSError:
+        print 'DIFFax.exe is not available for this platform - under development'
     print 'DIFFaX time = %.2fs'%(time.time()-time0)
     if os.path.exists('GSASII-DIFFaX.spc'):
@@ -1979 +1982 @@
     planeId = ['h0l','0kl','hhl','h-hl'].index(Layers['Sadp']['Plane'])+1
     lmax = int(Layers['Sadp']['Lmax'])
-    mult = int(Layers['Sadp']['Mult'])
+    mult = 1
 # Sequences
     StkType = ['recursive','explicit'].index(Layers['Stacking'][0])
@@ -2046 +2049 @@
     hkLim,Incr,Nblk = pyx.pygetsadp(controls,Nspec,spec)
     Sapd = np.zeros((256,256))
-    maxInt = np.max(spec[1:])
-    Scale = mult*32767./maxInt
     iB = 0
     for i in range(hkLim):
@@ -2064 +2065 @@
             Sapd[:,p2] = spec[iB:iF]
         iB += Nblk
-    Sapd *= Scale
-    Sapd = np.where(Sapd<32767.,Sapd,32767.)
     Layers['Sadp']['Img'] = Sapd
     print 'GETSAD time = %.2fs'%(time.time()-time0)