diff options
| author |  rcoh <rcoh@mit.edu> | 2010-12-20 15:42:13 -0500 |
|---|---|---|
| committer | rcoh <rcoh@mit.edu> | 2010-12-20 15:42:13 -0500 |
| commit | a1d9b85320c9b07d62470d78ef0c5f9015baf813 (patch) | |
| tree | 8df16aec8de793ba0f2e4b330b764a6f6a49f59a /operationscore/PixelAssembler.py | |
| parent | 17577b1b19387b2cefb7ac777ed1323dd36be086 (diff) | |
| parent | 2736307c1d6d67868ca54a3df951f9e959efedd0 (diff) | |
Merge branch 'master' into pixelregions
Conflicts:
Util.py
pixelmappers/SimpleMapper.py
Diffstat (limited to 'operationscore/PixelAssembler.py')
| -rw-r--r-- | operationscore/PixelAssembler.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/operationscore/PixelAssembler.py b/operationscore/PixelAssembler.py index b6e35ac..c8563fb 100644 --- a/operationscore/PixelAssembler.py +++ b/operationscore/PixelAssembler.py @@ -1,4 +1,5 @@ from operationscore.SmootCoreObject import * +import util.Geo as Geo import Util import pdb class PixelAssembler(SmootCoreObject): @@ -17,7 +18,7 @@ class PixelAssembler(SmootCoreObject): if newLocation == None: raise Exception('Location cannot be null. layoutFunc not \ defined or improperly defined.') - if Util.dist(newLocation, locations[-1]) > \ + if Geo.dist(newLocation, locations[-1]) > \ self['pixelToPixelSpacing']: raise Exception('Illegal pixel location. Distance \ between adjacent pixels must be less than \ |