Changeset 3106


Ignore:
Timestamp:
Oct 2, 2017 1:32:34 PM (4 years ago)
Author:
vondreele
Message:

new fortran routine for processing spot masks
fix to SConstruct - remove -m64

Location:
trunk
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimage.py

    r3105 r3106  
    837837            tam = ma.mask_or(tam,ma.make_mask(pm.polymask(nI*nJ,tax,
    838838                tay,len(polygon),polygon,tamp)[:nI*nJ]))
    839     for X,Y,rsq in masks['Points'].T:
    840         tam = ma.mask_or(tam,ma.getmask(ma.masked_less((tax-X)**2+(tay-Y)**2,rsq)))
     839    try:
     840        import spotmask as sm
     841        spots = masks['Points'].T
     842        if len(spots):
     843            tam = ma.mask_or(tam,ma.getmask(sm.spotmask(nI*nJ,tax,
     844                    tay,len(spots),spots,tamp)[:nI*nJ]))
     845    except:
     846        for X,Y,rsq in masks['Points'].T:
     847            tam = ma.mask_or(tam,ma.getmask(ma.masked_less((tax-X)**2+(tay-Y)**2,rsq)))
    841848    if tam.shape: tam = np.reshape(tam,(nI,nJ))
    842849    times[0] += time.time()-t0
  • trunk/fsource/SConstruct

    r3006 r3106  
    224224        if F2PYflags == "": F2PYflags = '--fcompiler=gnu95 --f77exec=gfortran --f77flags="-fno-range-check -m32"'
    225225    elif sys.platform == "win32":
    226          if F2PYflags == "": F2PYflags = '--compiler=mingw32 --fcompiler=gnu95 --f77flags="-fno-range-check -m64"'
     226         if F2PYflags == "": F2PYflags = '--compiler=mingw32 --fcompiler=gnu95 --f77flags="-fno-range-check"'
    227227elif FCompiler == 'g77':
    228228    if FORTpath == "": FORTpath = G77path
Note: See TracChangeset for help on using the changeset viewer.