Remaining conversions to absolute imports. Closes #292

algorithms/background/glm/__init__.py

@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import absolute_import, division
 from dials.array_family import flex # import dependency
 from dials_algorithms_background_glm_ext import *
-from algorithm import BackgroundAlgorithm
+from dials.algorithms.background.glm.algorithm import BackgroundAlgorithm

algorithms/background/glm/algorithm.py

@@ -9,7 +9,7 @@
 #  This code is distributed under the BSD license, a copy of which is
 #  included in the root directory of this package.
 
-from __future__ import division
+from __future__ import absolute_import, division
 
 class BackgroundAlgorithm(object):
   ''' Class to do background subtraction. '''

algorithms/background/median/__init__.py

@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import absolute_import, division
 from dials.array_family import flex # import dependency
 from dials_algorithms_background_median_ext import *
-from algorithm import BackgroundAlgorithm
+from dials.algorithms.background.median.algorithm import BackgroundAlgorithm

algorithms/background/median/algorithm.py

@@ -9,7 +9,7 @@
 #  This code is distributed under the BSD license, a copy of which is
 #  included in the root directory of this package.
 
-from __future__ import division
+from __future__ import absolute_import, division
 
 class BackgroundAlgorithm(object):
   ''' Class to do background subtraction. '''

algorithms/background_lookup/__init__.py

@@ -1,3 +1,3 @@
-from __future__ import division
-from background_and_gain import *
-from detector_noise import *
+from __future__ import absolute_import, division
+from dials.algorithms.background_lookup.background_and_gain import *
+from dials.algorithms.background_lookup.detector_noise import *

algorithms/background_lookup/background_and_gain.py

@@ -9,7 +9,7 @@
 #  This code is distributed under the BSD license, a copy of which is
 #  included in the root directory of this package.
 
-from __future__ import division
+from __future__ import absolute_import, division
 
 class ComputeBackgroundAndGain(object):
   '''Class to calculate the gain map of a detector.'''

algorithms/background_lookup/detector_noise.py

@@ -9,7 +9,7 @@
 #  This code is distributed under the BSD license, a copy of which is
 #  included in the root directory of this package.
 
-from __future__ import division
+from __future__ import absolute_import, division
 
 class ComputeDetectorNoise(object):
   '''Calculate the detector noise. Estimate this by calculating the mean

algorithms/centroid/__init__.py

@@ -1,3 +1,3 @@
-from __future__ import division
+from __future__ import absolute_import, division
 from dials.array_family import flex # import dependency
-from centroid_px_to_mm import *
+from dials.algorithms.centroid.centroid_px_to_mm import *

algorithms/centroid/centroid_px_to_mm.py

@@ -8,7 +8,7 @@
 #  This code is distributed under the BSD license, a copy of which is
 #  included in the root directory of this package.
 
-from __future__ import division
+from __future__ import absolute_import, division
 
 def centroid_px_to_mm(detector, scan, position, variance, sd_error):
   '''Convenience function to calculate centroid in mm/rad from px'''

algorithms/centroid/simple/__init__.py

@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import absolute_import, division
 from dxtbx import model
 from dials.array_family import flex
 from dials_algorithms_centroid_simple_ext import *

algorithms/centroid/simple/algorithm.py

@@ -9,7 +9,7 @@
 #  This code is distributed under the BSD license, a copy of which is
 #  included in the root directory of this package.
 
-from __future__ import division
+from __future__ import absolute_import, division
 
 class Algorithm(object):
   '''

algorithms/filtering/__init__.py

@@ -1,2 +1,2 @@
-from __future__ import division
+from __future__ import absolute_import, division
 from dials_algorithms_filter_ext import *

algorithms/image/centroid/__init__.py

@@ -1,3 +1,3 @@
-from __future__ import division
+from __future__ import absolute_import, division
 from scitbx.array_family import flex # import dependency
 from dials_algorithms_image_centroid_ext import *

algorithms/image/connected_components/__init__.py

@@ -1,3 +1,3 @@
-from __future__ import division
+from __future__ import absolute_import, division
 from scitbx.array_family import flex # import dependency
 from dials_algorithms_image_connected_components_ext import *

algorithms/image/fill_holes/__init__.py

@@ -1,3 +1,3 @@
-from __future__ import division
+from __future__ import absolute_import, division
 from scitbx.array_family import flex # import dependency
 from dials_algorithms_image_fill_holes_ext import *

algorithms/image/filter/__init__.py

@@ -1,3 +1,3 @@
-from __future__ import division
+from __future__ import absolute_import, division
 from scitbx.array_family import flex # import dependency
 from dials_algorithms_image_filter_ext import *

algorithms/indexing/__init__.py

@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import absolute_import, division
 
 from cctbx.array_family import flex
 from dials_algorithms_indexing_ext import *

algorithms/indexing/compare_orientation_matrices.py

@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import absolute_import, division
 from scitbx.math import r3_rotation_axis_and_angle_from_matrix
 from scitbx import matrix
 import math

algorithms/indexing/fft1d.py

@@ -10,7 +10,7 @@
 #  This code is distributed under the BSD license, a copy of which is
 #  included in the root directory of this package.
 
-from __future__ import division
+from __future__ import absolute_import, division
 
 from scitbx.array_family import flex
 from dials.algorithms.indexing.indexer import indexer_base

algorithms/indexing/fft3d.py

@@ -10,7 +10,7 @@
 #  This code is distributed under the BSD license, a copy of which is
 #  included in the root directory of this package.
 
-from __future__ import division
+from __future__ import absolute_import, division
 import math
 
 import libtbx

algorithms/indexing/indexer.py

@@ -10,7 +10,7 @@
 #  This code is distributed under the BSD license, a copy of which is
 #  included in the root directory of this package.
 
-from __future__ import division
+from __future__ import absolute_import, division
 import math
 import logging
 logger = logging.getLogger(__name__)

algorithms/indexing/known_orientation.py

@@ -10,7 +10,7 @@
 #  This code is distributed under the BSD license, a copy of which is
 #  included in the root directory of this package.
 
-from __future__ import division
+from __future__ import absolute_import, division
 
 from dials.algorithms.indexing.indexer import indexer_base
 from dxtbx.model.experiment.experiment_list import Experiment, ExperimentList

algorithms/indexing/nave_parameters.py

@@ -2,7 +2,7 @@
 # -*- mode: python; coding: utf-8; indent-tabs-mode: nil; python-indent: 2 -*-
 #
 
-from __future__ import division
+from __future__ import absolute_import, division
 from scitbx.matrix import sqr,col
 from dials.array_family import flex
 import math

algorithms/indexing/nearest_neighbor.py

@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import absolute_import, division
 import math
 
 class neighbor_analysis(object):

algorithms/indexing/real_space_grid_search.py

@@ -10,7 +10,7 @@
 #  This code is distributed under the BSD license, a copy of which is
 #  included in the root directory of this package.
 
-from __future__ import division
+from __future__ import absolute_import, division
 import math
 import logging
 logger = logging.getLogger(__name__)

algorithms/indexing/refinement.py

@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import absolute_import, division
 #!/usr/bin/env python
 # -*- mode: python; coding: utf-8; indent-tabs-mode: nil; python-indent: 2 -*-
 #

algorithms/indexing/stills_indexer.py

@@ -2,7 +2,7 @@
 # -*- mode: python; coding: utf-8; indent-tabs-mode: nil; python-indent: 2 -*-
 #
 
-from __future__ import division
+from __future__ import absolute_import, division
 import logging
 logger = logging.getLogger(__name__)
 

algorithms/indexing/symmetry.py

@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import absolute_import, division
 import copy
 import logging
 import math

algorithms/integration/__init__.py

@@ -1,7 +1,7 @@
-from __future__ import division
+from __future__ import absolute_import, division
 import boost.python
 from cctbx import sgtbx # import dependency
 from dials.array_family import flex # import dependency
 from dials.model import data # import dependency
 from dials_algorithms_integration_ext import *
-from integrator_stills import *
+from dials.algorithms.integration.integrator_stills import *

algorithms/integration/filtering.py

@@ -7,7 +7,7 @@
 #
 #  This code is distributed under the BSD license, a copy of which is
 #  included in the root directory of this package.
-from __future__ import division
+from __future__ import absolute_import, division
 from iotbx.phil import parse
 
 # The phil scope

algorithms/integration/fit/__init__.py

@@ -1,3 +1,3 @@
-from __future__ import division
+from __future__ import absolute_import, division
 from dials.array_family import flex # import dependency
 from dials_algorithms_integration_fit_ext import *

algorithms/integration/image_integrator.py

@@ -9,7 +9,7 @@
 #  included in the root directory of this package.
 
 
-from __future__ import division
+from __future__ import absolute_import, division
 
 import logging
 logger = logging.getLogger(__name__)

algorithms/integration/integrator.py

@@ -8,7 +8,7 @@
 #  This code is distributed under the BSD license, a copy of which is
 #  included in the root directory of this package.
 
-from __future__ import division
+from __future__ import absolute_import, division
 from dials_algorithms_integration_integrator_ext import *
 from dials.algorithms.integration.processor import Processor3D
 from dials.algorithms.integration.processor import ProcessorFlat3D

algorithms/integration/integrator_stills.py

@@ -8,7 +8,7 @@
 #  This code is distributed under the BSD license, a copy of which is
 #  included in the root directory of this package.
 
-from __future__ import division
+from __future__ import absolute_import, division
 
 
 class ReflectionBlockIntegratorStills(object):

algorithms/integration/processor.py

@@ -8,7 +8,7 @@
 #  This code is distributed under the BSD license, a copy of which is
 #  included in the root directory of this package.
 
-from __future__ import division
+from __future__ import absolute_import, division
 import logging
 logger = logging.getLogger(__name__)
 from dials_algorithms_integration_integrator_ext import *

algorithms/integration/report.py

@@ -7,7 +7,7 @@
 #
 #  This code is distributed under the BSD license, a copy of which is
 #  included in the root directory of this package.
-from __future__ import division
+from __future__ import absolute_import, division
 from dials.array_family import flex
 from dials.array_family.flex import Binner
 from dials.util.report import Report, Table, Array

algorithms/integration/sum/__init__.py

@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import absolute_import, division
 from dials.array_family import flex # import dependency
 from dials_algorithms_integration_sum_ext import *
-from algorithm import IntegrationAlgorithm
+from dials.algorithms.integration.sum.algorithm import IntegrationAlgorithm

algorithms/integration/sum/algorithm.py

@@ -8,7 +8,7 @@
 #  This code is distributed under the BSD license, a copy of which is
 #  included in the root directory of this package.
 
-from __future__ import division
+from __future__ import absolute_import, division
 
 class IntegrationAlgorithm(object):
   '''A class to perform 3D summation integration'''

algorithms/integration/validation.py

@@ -8,7 +8,7 @@
 #  This code is distributed under the BSD license, a copy of which is
 #  included in the root directory of this package.
 
-from __future__ import division
+from __future__ import absolute_import, division
 
 
 class ValidatedMultiExpProfileModeller(object):

algorithms/polygon/__init__.py

@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import absolute_import, division
 from scitbx.array_family import flex # import dependency
 from dials_algorithms_polygon_ext import *
 

algorithms/polygon/clip/__init__.py

@@ -1,3 +1,3 @@
-from __future__ import division
+from __future__ import absolute_import, division
 from scitbx.array_family import flex # import dependency
 from dials_algorithms_polygon_clip_ext import *

algorithms/polygon/spatial_interpolation.py

@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import absolute_import, division
 from scitbx.array_family import *
 from dials_algorithms_polygon_ext import *
 from dials_algorithms_polygon_spatial_interpolation_ext import *

algorithms/profile_model/factory.py

@@ -7,7 +7,7 @@
 #
 #  This code is distributed under the BSD license, a copy of which is
 #  included in the root directory of this package.
-from __future__ import division
+from __future__ import absolute_import, division
 
 def generate_phil_scope():
   '''

algorithms/profile_model/gaussian_rs/__init__.py

@@ -1,10 +1,10 @@
-from __future__ import division
+from __future__ import absolute_import, division
 from dials.array_family import flex # import dependency
 from dials.algorithms.profile_model import modeller # import dependency
 from dials_algorithms_profile_model_gaussian_rs_ext import *
 
-from model import phil_scope        # implicit dependency
-from model import Model             # implicit dependency
+from dials.algorithms.profile_model.gaussian_rs.model import phil_scope        # implicit dependency
+from dials.algorithms.profile_model.gaussian_rs.model import Model             # implicit dependency
 
 
 def BBoxCalculator(crystal, beam, detector, goniometer, scan, delta_b, delta_m):

algorithms/profile_model/gaussian_rs/calculator.py

@@ -16,7 +16,7 @@
 # FIXME Should maybe be scan varying
 # FIXME Don't know how XDS calculated the n_sigma
 
-from __future__ import division
+from __future__ import absolute_import, division
 
 import logging
 logger = logging.getLogger(__name__)

algorithms/profile_model/gaussian_rs/model.py

@@ -8,7 +8,7 @@
 #  This code is distributed under the BSD license, a copy of which is
 #  included in the root directory of this package.
 
-from __future__ import division
+from __future__ import absolute_import, division
 from libtbx.phil import parse
 from dials.model.experiment.profile import ProfileModelIface
 

algorithms/profile_model/gaussian_rs/transform/__init__.py

@@ -1,2 +1,2 @@
-from __future__ import division
+from __future__ import absolute_import, division
 from dials_algorithms_profile_model_gaussian_rs_transform_ext import *

algorithms/profile_model/modeller/__init__.py

@@ -1,3 +1,3 @@
-from __future__ import division
+from __future__ import absolute_import, division
 from dials.array_family import flex # import dependency
 from dials_algorithms_profile_model_modeller_ext import *

algorithms/refinement/__init__.py

@@ -1,3 +1,2 @@
-from __future__ import division
-from refiner import Refiner # import dependency
-from refiner import RefinerFactory # import dependency
+from __future__ import absolute_import, division
+from dials.algorithms.refinement.refiner import Refiner, RefinerFactory # import dependency

algorithms/refinement/analysis/centroid_analysis.py

@@ -10,7 +10,7 @@
 """Analysis of centroid residuals for determining suitable refinement and
 outlier rejection parameters automatically"""
 
-from __future__ import division
+from __future__ import absolute_import, division
 from math import pi
 from dials.array_family import flex
 from scitbx.math.periodogram import Periodogram

algorithms/refinement/analysis/tst_vs_R.py

@@ -9,7 +9,7 @@
 #
 """Compare Periodogram with R's spec.pgram"""
 
-from __future__ import division
+from __future__ import absolute_import, division
 try:
   import rpy2.robjects as robjects
 except ImportError as e:

algorithms/refinement/engine.py

@@ -11,7 +11,7 @@
 LevenbergMarquardtIterations, GaussNewtonIterations, SimpleLBFGS and LBFGScurvs
 are the current concrete implementations"""
 
-from __future__ import division
+from __future__ import absolute_import, division
 import logging
 logger = logging.getLogger(__name__)