diff --git a/CDTools/models/__init__.py b/CDTools/models/__init__.py index 1e991fb..37ad0e9 100644 --- a/CDTools/models/__init__.py +++ b/CDTools/models/__init__.py @@ -27,6 +27,7 @@ defining a new ptychography model before attempting to do so. from CDTools.models.base import CDIModel from CDTools.models.simple_ptycho import SimplePtycho from CDTools.models.fancy_ptycho import FancyPtycho +from CDTools.models.polarized_fancy_ptycho import PolarizedFancyPtycho from CDTools.models.bragg_2d_ptycho import Bragg2DPtycho from CDTools.models.multislice_2d_ptycho import Multislice2DPtycho from CDTools.models.rpi import RPI diff --git a/CDTools/models/fancy_ptycho_polarized.py b/CDTools/models/polarized_fancy_ptycho.py similarity index 99% rename from CDTools/models/fancy_ptycho_polarized.py rename to CDTools/models/polarized_fancy_ptycho.py index 4d0c885..c73b1f3 100644 --- a/CDTools/models/fancy_ptycho_polarized.py +++ b/CDTools/models/polarized_fancy_ptycho.py @@ -1,6 +1,3 @@ -cd .. -_future__ import division, print_function, absolute_import - import torch as t from CDTools.models import CDIModel, FancyPtycho from CDTools.datasets import Ptycho2DDataset diff --git a/CDTools/tools/__init__.py b/CDTools/tools/__init__.py index ff1cc7f..b10bc2e 100644 --- a/CDTools/tools/__init__.py +++ b/CDTools/tools/__init__.py @@ -14,9 +14,6 @@ having numpy and torch defined under CDTools.tools.cmath, you know? """ -from __future__ import division, print_function, absolute_import - - from CDTools.tools import losses from CDTools.tools import data from CDTools.tools import image_processing @@ -27,3 +24,4 @@ from CDTools.tools import propagators from CDTools.tools import measurements from CDTools.tools import analysis from CDTools.tools import atoms +from CDTools.tools import polarization diff --git a/CDTools/tools/image_processing/__init__.py b/CDTools/tools/image_processing/__init__.py index 583a3f8..a6bdee2 100644 --- a/CDTools/tools/image_processing/__init__.py +++ b/CDTools/tools/image_processing/__init__.py @@ -1,3 +1 @@ -from __future__ import division, print_function, absolute_import - from CDTools.tools.image_processing.image_processing import * diff --git a/CDTools/tools/polarization/__init__.py b/CDTools/tools/polarization/__init__.py new file mode 100644 index 0000000..904cb85 --- /dev/null +++ b/CDTools/tools/polarization/__init__.py @@ -0,0 +1 @@ +from CDTools.tools.polarization.polarization import *