Merge branch 'PhaseChargeMapper' into 'master'

test charge finished

See merge request !3

pyramid/tests/test_phasemapper.py

@@ -180,20 +180,20 @@ class TestCasePhaseMapperMIP(unittest.TestCase):
 class TestCasePhaseMapperCharge(unittest.TestCase):
     def setUp(self):
         self.path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'test_phasemapper')
-        self.Charge_proj = load_scalardata(os.path.join(self.path, 'Charge_proj.hdf5'))
-        self.mapper = PhaseMapperCharge(self.Charge_proj.a, self.Charge_proj.dim[1:])
+        self.charge_proj = load_scalardata(os.path.join(self.path, 'charge_proj.hdf5'))
+        self.mapper = PhaseMapperCharge(self.charge_proj.a, self.charge_proj.dim[1:])
 
     def tearDown(self):
         self.path = None
-        self.Charge_proj = None
+        self.charge_proj = None
         self.mapper = None
 
     def test_call(self):
-        Charge_phase_ref = load_phasemap(os.path.join(self.path, 'Charge_phase_ref.hdf5'))
-        phasemap = self.mapper(self.Charge_proj)
-        assert_allclose(phasemap.phase, Charge_phase_ref.phase, atol=1E-7,
+        charge_phase_ref = load_phasemap(os.path.join(self.path, 'charge_phase_ref.hdf5'))
+        phasemap = self.mapper(self.charge_proj)
+        assert_allclose(phasemap.phase, charge_phase_ref.phase, atol=1E-7,
                         err_msg='Unexpected behavior in __call__()!')
-        assert_allclose(phasemap.a, Charge_phase_ref.a, err_msg='Unexpected behavior in __call__()!')
+        assert_allclose(phasemap.a, charge_phase_ref.a, err_msg='Unexpected behavior in __call__()!')
 
     def test_jac_dot(self):
         self.assertRaises(NotImplementedError, self.mapper.jac_dot, None)

pyramid/utils/__init__.py

@@ -7,8 +7,8 @@
 from .pm import pm
 from .reconstruction_2d_from_phasemap import reconstruction_2d_from_phasemap
 from .reconstruction_3d_from_magdata import reconstruction_3d_from_magdata
-from .phasemap_creator import gui_phasemap_creator
-from .mag_slicer import gui_mag_slicer
+#from .phasemap_creator import gui_phasemap_creator
+#from .mag_slicer import gui_mag_slicer
 
-__all__ = ['pm', 'reconstruction_2d_from_phasemap', 'reconstruction_3d_from_magdata',
-           'gui_phasemap_creator', 'gui_mag_slicer']
+__all__ = ['pm', 'reconstruction_2d_from_phasemap', 'reconstruction_3d_from_magdata']#,
+           #'gui_phasemap_creator', 'gui_mag_slicer']