Skip to content
Snippets Groups Projects
  1. Dec 28, 2016
  2. Dec 26, 2016
  3. Dec 24, 2016
  4. Dec 19, 2016
    • Jan Caron's avatar
      Additional functionality for phasemap manipulation, masks and more plots. · db43e39a
      Jan Caron authored
      phasemap: Now supports flips, rotations and shifts with ndimage.
                Added plot_phase_with_hist to plot histograms (for difference plots).
      fielddata: FieldData now properly plots contours and masks (new).
      dataset: set_3d_mask now uses the new mask capability of FieldData.
               Default is no longer "logical backprojection".
      io_phasemap: Now includes .tif (although that does not always work).
      setup.py: Deleted deprecated depencencies.
      Renamed a few plot commands to plot_...
      Rollback to RdBu as colormap (back from Spectral).
      db43e39a
  5. Nov 10, 2016
    • Jan Caron's avatar
      Overhaul of plotting capabilities. Plots now look nicer. Now all in nm. · ccb5f9dd
      Jan Caron authored
      fielddata: Added plot_quiver_field convenience function.
      io_phasemap: Added functionality for images separately from HyperSpy.
      phasemap: Automatically normalise confidence.
      projector: Quaternion for tilt around x-axis corrected (was falsely around y).
      reconstruction: Added verbose option (True by default).
      reconstruction_2d_from_phasemap: Plotting optimised.
      ccb5f9dd
  6. Nov 03, 2016
    • Jan Caron's avatar
      Switched from Pyramid fft (obsolete) to Jutil fft. · 4f1991fd
      Jan Caron authored
      Renaming of variables in PhaseMapperRDFC.jac_T_dot to make more sense...
      4f1991fd
    • Jan Caron's avatar
      PhaseMapperRDFC and fft corrections. · e1014166
      Jan Caron authored
      phasemapper: PhasemapperRDFC: Now the adjoint is calculated correctly (switched
              slicing order, took conjugate of kernel FFTs, deleted superfluous minus
              sign). Results are the same, but calculation is now CORRECT!
      fft: Correction of numpy rfftn_adj.
      fielddata: Added option for uniform color specification.
      e1014166
  7. Jul 26, 2016
  8. Jul 17, 2016
  9. Apr 21, 2016
  10. Mar 23, 2016
  11. Mar 09, 2016
  12. Feb 28, 2016
  13. 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
  14. 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
  15. 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
  16. Mar 15, 2015
  17. 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
  18. Feb 19, 2015
  19. 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
  20. Dec 09, 2014
  21. 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
  22. Oct 29, 2014
  23. 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
  24. Aug 17, 2014
  25. Aug 13, 2014
  26. Aug 12, 2014
  27. Aug 06, 2014
    • Jan Caron's avatar
      Small stuff, collaborations and processing scripts · 3f460d45
      Jan Caron authored
      magdata: implemented save_to_x3d (Bielefeld collaboration)
      template.x3d: template for the x3d output (header file with spin-blueprints)
      numcore.kernel_core: implemented multiply_jacobi_T_core
      scripts: added vtk scripts for full nanowires and segments
               script to process file by Daniel Rüffner
      3f460d45
  28. May 15, 2014
    • Jan Caron's avatar
      Further optimization · ce62f949
      Jan Caron authored
      pep8: optimizations
      phasemapper_core: numcore module for phasemapper
      scripts: compatibility with new structure
      reconstruction: new scripts
      ce62f949
  29. Apr 17, 2014
    • Jan Caron's avatar
      Further optimization of the new structure and scripts. · 838fb104
      Jan Caron authored
      package: some minor corrections (mainly import statements), some old functions
               were revived (e.g. in MagData)
      
      scripts: adaption to the new structure and sorting (more work is to do here...)
      
      _version: __version__ string is now imported from this file
      
      phasemapper_core.pyx: added to separate the corresponding numcore_functions
                            from kernel_core.pyx
      838fb104
  30. Apr 16, 2014
    • Jan Caron's avatar
      Documentation and cleanup of the pyramid package! · 6fc82b2f
      Jan Caron authored
      Renames:
      datacollection --> dataset
      optimizer      --> reconstruction
      
      scripts:
      interactive_setup is now implemented in an extended Spyder startup file.
      some other scripts are now
      the rest is NOT adapted, yet, which is the next task at hand
      furthermore scripts will be sorted and unused ones deleted in the next commit
      6fc82b2f
  31. Mar 11, 2014
    • Jan Caron's avatar
      Fixed problems with the transposed operations of the forward model which did · a088c4f5
      Jan Caron authored
      not represent the correct matrizes (hopefully, now they do).
      
      >>> PACKAGE
      forwardmodel, kernel, phasemapper:
              b_0 is now again inherent part of the kernel.
      projector:
              Corrected .jac_T_dot, now delivers product for the correct matrix.
      >>> SCRIPTS
      simple_reconstruction:
              Does simple compliance tests for 1 and 2 projections and tests a simple
              solver via scipy.sparse.linalg.cg for the reconstruction.
      a088c4f5
    • Jan Caron's avatar
      First simple reconstruction approach · ec080940
      Jan Caron authored
      documentation: minor changes and updates of docstrings
      ec080940
  32. Feb 10, 2014
    • Jan Caron's avatar
      Intermediate commit on the way to the new structure. · 355a7e41
      Jan Caron authored
      regrid: Added many scripts for regridding by Jörn
      logging: Introduced logging
      scripts: Added Scripts for regridding and simulating stuff for cooperations
      removed: Unused test scripts
      structure: Many new restructuring aspects already implemented
      355a7e41
  33. Jan 02, 2014
  34. Dec 05, 2013
  35. Dec 03, 2013
  36. Nov 18, 2013
    • Jan Caron's avatar
      holoimage, magdata, phasemap: Made plotting more flexible (now return axes) · 27f46b6f
      Jan Caron authored
      phasemapper: new function get_kernel() for convenience, mag_real_fast() for
      calculation of the phase with pre-computed lookup-tables
      projector: single_tilt_projection() now works as intended
      Added scripts for the creation of core-shell-structures
      Added script for charge calculation by contour integration
      Added script for creating tilt series of core-shell-structure for reconstruction
      Various minor modifications, mostly nomenclature and streamlining
      27f46b6f
  37. Sep 18, 2013
  38. Aug 25, 2013
    • Jan Caron's avatar
      Sphinx and NetCDF4 support implemented, new features for pyramid objects · c1d56ac8
      Jan Caron authored
      pyramid: all docstrings in numpydoc (package installed) format (used by spinx)
      holoimage: removed error, phase was falsely multiplied by pi/2
      magcreator: removed create_mag_dist_comb, renamed functions for disc and vortex
      magdata: Allows creation of empty MagData objects and easy adding of magnitudes
      phasemap: Allows units to be set for plots, added 3D plot
      phasemapper: Electrostatic component implemented
      projector: Projection now includes thickness profile
      docs: support for html, latex and pdf (experimental), use "make *" in shell
      scripts: new structure, deleted some compare_* functions, added test_methods
      .hpignore: now also ignores *.c and _* files (_build used in docs)
      c1d56ac8
Loading