Skip to content
Snippets Groups Projects
  1. Oct 19, 2017
  2. Sep 20, 2017
    • Jan Caron's avatar
      Few new features, many new TODOs! · f32e01b0
      Jan Caron authored
      costfunction: chisq_m/a now track their results (better way?)
      diagnostics: added LCurve class (not finished), comments for SVD
      fielddata: properly ordered properties, added plot_field for ScalarField
      phasemap: fixed bug for symmetric=False, cmap=None (no proper default!)
      f32e01b0
  3. Aug 29, 2017
  4. Aug 24, 2017
  5. Aug 23, 2017
  6. Aug 22, 2017
  7. Aug 18, 2017
  8. Jan 09, 2017
    • Jan Caron's avatar
      A lot of stuff for a lot of things... · cb12bddb
      Jan Caron authored
      reconstruction: jutil.TakeTime is now used here.
      scalebars: Module which allows nice scalebars to be displayed in all plots.
                 This is the new default and can be turned off.
      ramp: Now stores everything from the dataset directly to self, instead of
            keeping a reference to the DataSet (construct without Dataset in future!).
      projector: tqdm now uses tqdm_notebook if used in IPython Notebook!
      magcreator: Added functionality for smooth vortices (see de Graef et al.).
      kernel: Corrected behaviour of slab geometry (u and v were still switched!).
      dataset: phasemappers now accessable as dictionary or list. The append function
               now also takes lists (but projectors and phasemappers can in turn not
               set directly anymore). Se_inv will be updated automatically.
      diagnostics: Functionality to access total, directional and magnitude error,
                   according to Kemp et al.
      cb12bddb
  9. Oct 19, 2016
    • Jan Caron's avatar
      Kernel corrections and ForwardModel properties enhancement (more modular now). · 68453aaa
      Jan Caron authored
      kernel: u and v are switched and now finally correct.
              get_elementary_phase is also switched and corrected.
      phasemapper: added PhaseMapperCharge from Feng Shan.
      forward_model: now uses y instead of phase_vec/Se_inv and now direct properties.
      costfunction: corrected some docstrings and documentation comments.
      fielddata: corrected some missing integer divisions (// instead of /),
              added plot_streamline().
      68453aaa
  10. Jul 26, 2016
  11. Jul 17, 2016
  12. Apr 21, 2016
  13. Mar 09, 2016
  14. Feb 28, 2016
  15. Oct 02, 2015
  16. Sep 02, 2015
  17. Jul 30, 2015
  18. 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
  19. 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
  20. 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
  21. 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
  22. Feb 19, 2015
  23. 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
  24. Dec 30, 2014
  25. Dec 09, 2014
  26. 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
  27. Oct 29, 2014
  28. Oct 28, 2014
  29. Sep 26, 2014
  30. Aug 19, 2014
    • Jan Caron's avatar
      Implementation of the Regularisator class · 325ea464
      Jan Caron authored
      regularisator: new module to represent different regularisation strategies
      costfunction: changed to use the new Regularisator classes, changed arguments!
      dataset: fixed bug that always displayed the own phase maps instead of provided
      reconstruction: changed to use the new Regularisator classes, changed arguments!
      scripts/rueffner_file: tried to avoid Memory Error (no success)
      scripts/zi_an: added holographic contour plots with overlayd magnetization
      scripts/reconstruction_sparse_cg_test: now uses Regularisator classes and plots
                                             phase differences (original - reconstr.)
      325ea464
  31. 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
  32. 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
  33. 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
  34. 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
  35. Jan 02, 2014
Loading