Skip to content
Snippets Groups Projects
  1. Apr 21, 2016
  2. Mar 23, 2016
  3. Mar 09, 2016
  4. Mar 04, 2016
    • Jan Caron's avatar
      Added fieldconverter module! · 4725e6cf
      Jan Caron authored
      fieldconverter: methods to convert M to A to B
      magdata: a bit more parameters for quiver_plot3d(), added contour_plot3d()
      phasemapper: pm() extended for different projections (not just simple)
      kernel: u and v switched (now named after the unit magnetization direction, which makes much more sense)
      4725e6cf
  5. Feb 28, 2016
  6. Feb 22, 2016
    • Jan Caron's avatar
      Hopefully made hyperspy import (now at beginning of pyramid package) work! · bce38269
      Jan Caron authored
      Added PyCharm files!
      Commit before Reformatting with PyCharms!
      bce38269
    • Jan Caron's avatar
      First use of PyCharms! · 7aae4499
      Jan Caron authored
      Added .idea folder with PyCharms settings.
      Changed icon.ico (now round).
      PhaseMap and MagData: Now use h5py to load/save data (via HyperSpy).
      Deprecated loading routines (x3d) are gone now!
      tests: All tests now reflect this change.
      scripts: Streamlined some scripts. Many are now in separate project:
      Script-Vault
      7aae4499
  7. Oct 02, 2015
  8. Sep 02, 2015
  9. Jul 30, 2015
  10. Jul 21, 2015
    • Jan Caron's avatar
      Dedicated class for polynomial ramps of arbitrary order! · d136112f
      Jan Caron authored
      Cleanup and documentation!
      ramp: New class for polynomial ramps. Instantiated in the ForwardModel.
      forwardmodel: Now uses new ramp class.
      phasemapper: Ramp functionality moved to ramp class.
      reconstruction: Ramp order not used, ramp can be now retrieved from the ramp
                      class after reconstruction.
      analytic, magcreator: Better and consistent definition of pixel centers and
                            their influence on the phase.
      testing: Minor corrections for new syntax.
      d136112f
  11. Jul 16, 2015
    • Jan Caron's avatar
      Phase offset and ramp can now be fitted! Many updates and fixes to plotting! · 622c59d8
      Jan Caron authored
      colormap: New module with colormap subclass which has special functions to
                calculate directional rgb-colors, now used in many plots!
      __init__: On star import now also has abbreviations for a few modules.
      fwd_model: Now has flags for fitting an offset and/or ramp.
                 CAUTION: will be moved next update to new class!
      magdata: Removed colorwheel stuff (all moved to 'colormap'). Overhaul of quiver
               plot in 2D and 3D. Now shows mask and uses new colormap for angular
               color coding.
      phasemap: Now uses the new colormap for holo plots. Removed color wheel (moved
                to the new class). Added function to add ramps.
      phasemapper: Now handles also offsets and ramps in the phase.
                   CAUTION: will be moved next update to new class!
      projector: Fixed bugs in SimpleProjector. 1) leftmost pixels are no longer moved
                 moved to left corner of padded projection (when dim_uv is not None).
                 2) odd padding when using dim_uv are now handled properly (one more
                 pixel on top and right if necessary).
      costfunction: n is now taken from the fwd_model instead of the data_set.
      dataset: Introduced the count variable which gives the number of images.
      magcreator: In the process of updating, more on next commit.
      reconstruction: Also handles ramps and offsets now, properly extracts them after
                      reconstruction.
      regularisator: New argument 'add_params' is used to cut off input (for offset
                     and ramp) which are not used in the regularisation.
      scripts: several small changes...
      622c59d8
  12. Jun 25, 2015
    • Jan Caron's avatar
      New quiver plots (with color) and argument structure changes. · f9da271a
      Jan Caron authored
      costfunction: Now takes a ForwardModel as input instead of DataSet.
      forwardmodel: New private function for processing one image (multiprocessing).
      magdata: Quiver Plots (2D/3D) now support color encoding (angle or amplitude).
               Private method for creating the appropriate colormap.
      reconstruction: Now takes Costfunction as argument instead of DataSet.
      regularisator: Introduced ComboRegularisator.
      scripts: New scripts.
      f9da271a
  13. Jun 02, 2015
    • Jan Caron's avatar
      Smaller changes, cleanup and script structure changes! · 42f8bc5f
      Jan Caron authored
      Phase maps now also have a mask and a confidence matrix.
      Began new script structure (temporary folders created).
      Cleanup, logging and documentation done.
      config: NTHREADS is now set here.
      dataset: Method for creating 3D masks added.
      phasemap: Mask and confidence matrix added. Padding and cropping supported.
      forwardmodel: Stubs for multiprocessing added (next TODO!).
      kernel: Added support for perturbed reference wave.
      magdata: Padding and cropping supported.
      projector: New property 'sparsity' introduced.
      regularisator: Stub for ComboRegularisator added (next TODO!).
      tests: Changed accordingly.
      42f8bc5f
  14. Mar 15, 2015
  15. Mar 07, 2015
    • Jan Caron's avatar
      Convenience functions and bug fixes! · af849c72
      Jan Caron authored
      magdata: added convenience functions for flipping and rotating of magnetic
               distributions, fixed bug with ar_dens.
      phasemap: now also has a mask which will be used to construct a 3D-mask for the
                magnetic distribution during reconstruction. Added setter/getter.
                Added copy(), scale_down()/scale_up() convenience functions.
                !CAUTION! Only NetCDF4 files save every new parameter!
      projector: Fixed hidden bug in X/YTiltProjector, which was problematic during
                 tilts over 360°. Now uses linear algebra (much clearer!).
                 get_info() function now can be used non-verbose (for filenames).
      dataset: added several setter/getter, addes set_3d_mask() for simple 2D tasks,
               renamed mask to confidence (for Se_inv construction)
      tests: updated to include the fixes and new functions introduced in this update!
      af849c72
  16. Feb 20, 2015
  17. Feb 19, 2015
  18. Feb 03, 2015
    • Jan Caron's avatar
      Mainly implementation of diagnostics class! ... And stuff! · fc55842d
      Jan Caron authored
      docstrings: updated!
      costfunction: CFAdapterScipyCG obsolete, deleted estimate_lambda()
      dataset: use_fftw and threads obsolete
      diagnostics: implemented stuff... much stuff...
      fft: Docstrings and implementation of threads
      magcreator: fixed bug in slab (dimension mix-up)
      phasemap: plot now also returns colorbar
      reconstruction: PrintIterator and optimize_simple_leastsq obsolete
      regularisator: Docstrings
      scripts: minor modifications
      scripts - reconstruct_random_pixels: now use optimize_linear
      testcases: analytic, compliance, kernel, magcreator, magdata, projector
      fc55842d
  19. Dec 30, 2014
  20. Dec 09, 2014
  21. Nov 28, 2014
    • Jan Caron's avatar
      Implementation of FFTW and covariance matrix functionality added · cfea0d77
      Jan Caron authored
      Se_inv: is now handled differently, defaults to eye-matrix, but can be set
              later (added a few convenience functions to DataSet)
      utility: (re-)added utility module for index conversion
      kernel/phasemapper: can now use FFTW library and operate on pre-allocated
              arrays
      dtype: set dtype of arrays to np.float32/np.complex64 (halves memory size),
             also applied to numcore routines!
      magdata: quiver_plot can now plot every n-th arrow (yet untested!)
      reconstruction scripts: modified several reconstruction scripts.
      cfea0d77
  22. Nov 24, 2014
    • Jan Caron's avatar
      Big Bunch of small updates! · 4ab7bc63
      Jan Caron authored
      setup: Changes to setup.py, pyramid.version to fit to numpy and jutil
             now uses __all__ magic and supports from pyramid import *
      tests: changes to test_compliance/magcreator/analytic (should now work)
      collaborations: added several scripts for Patrick
      reconstruction: added batch file for the reconstruction of several configs
      test methods: (unfinished) scripts for fftw tests and kernel comparisons
      paper 1: ch5-4 changed padding values to 0, 1, 3 and 7
      plotting: deleted plt.show() lines (have to be done manually now or via Spyder)
      logging: now named _log instead of LOG (private variable instead of constant)
               also some logs were disabled, because Pylint says they are slow...
      reconstruction: now has info argument (pass a list in which cost info is copied)
      phasemapper: changed sign of constant PHI_0, is now correctly positive (instead
                   the negative z-integration is taken into account which was not done
                   before!)
      kernel: now uses FFTW, numpy code was changed accordingly and is still available
      phasemapper: also uses FFTW now, work in progress: FFTW for jac_T_dot
      4ab7bc63
  23. Nov 04, 2014
  24. Oct 31, 2014
  25. Oct 30, 2014
  26. Oct 29, 2014
  27. Oct 28, 2014
  28. Sep 26, 2014
  29. Sep 25, 2014
    • Jan Caron's avatar
      Intermediat commit on the way to implement norms and more regularizations. · e39061e3
      Jan Caron authored
      minor changes to plotting methods (PhaseMap now plottable without colorbar).
      phase_map: gain can now be set to 'auto' (5 fringes, determined by max. phase).
      renamed 'density' to 'gain' (makes more sense).
      regularisator: started to include norms and more kinds of regularisations.
      mag_slicer: GUI which can go through loaded magnetizations along the major axes.
      paper 1: minor changes to the scripts for the results.
      e39061e3
  30. Sep 01, 2014
    • Jan Caron's avatar
      Quality of life improvements, docstrings, and new gui-based method! · de58b03c
      Jan Caron authored
      Many Doctring corrections, all plots now have a "show" parameter to not show a
      plot at the end of the method (needed for guis and such).
      magdata: quiver_plot: axis switch for x-projection, implemented logarithmic
               arrows and scaling feature.
      projector: added to_mag_data() method to directly produce a projected
                 magnetization distribution.
      gui/create_logo: removed (obsolete and unuseful).
      gui/mag_slicer: added!
      de58b03c
Loading