Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
157 commits
Select commit Hold shift + click to select a range
a0f26b8
Included image flip introduced by the lens system
albusdemens May 10, 2017
5c1c90a
Set off option to compare original and flipped image
albusdemens May 10, 2017
d7d1543
Binning angular values (irregular motor steps)
albusdemens May 11, 2017
26d0d5a
Binning angular values
albusdemens May 11, 2017
42862e9
Plot npy files from getdata.py
albusdemens May 12, 2017
b0fdf7e
Adapt the code to continuous angle distribution
albusdemens May 12, 2017
f5ee1cd
Script to plot alpha, beta distr now ready to use
albusdemens May 13, 2017
ec64aa7
Added functionality to plot center of hist values used to group data
albusdemens May 13, 2017
d83163a
Added hist plot for alpha, beta
albusdemens May 13, 2017
6fdee66
Done with data binning
albusdemens May 13, 2017
3f1066e
Testing reconstruction code; included code to plot 3D reocnstr
albusdemens May 13, 2017
a3516a6
Why nans in first reconstruction?
albusdemens May 13, 2017
119f7f1
parameters from global to class; redefined output as uint16
albusdemens May 15, 2017
009796f
Fixing bugs
albusdemens May 15, 2017
aa205e4
Added file to plot unbinned data
albusdemens May 15, 2017
fe3b35b
Removed script to get unbinned data
albusdemens May 15, 2017
a98b85b
Plot alpha, beta distr for one omega
albusdemens May 16, 2017
104625b
Tip added
albusdemens May 16, 2017
b31002a
Plot alpha, beta distr for an omega
albusdemens May 16, 2017
916719e
Ud detector flip already in original code
albusdemens May 18, 2017
f980fc9
Added (omega, theta, eta) function
albusdemens May 18, 2017
5aa48d9
Modifications to read theta
albusdemens May 18, 2017
163455e
Included image flip introduced by the lens system
albusdemens May 10, 2017
d0da2f4
Set off option to compare original and flipped image
albusdemens May 10, 2017
c16256f
Clean
albusdemens May 23, 2017
07d1be2
Binning angular values
albusdemens May 11, 2017
ab828f9
Plot npy files from getdata.py
albusdemens May 12, 2017
a79556b
Adapt the code to continuous angle distribution
albusdemens May 12, 2017
1a1a2e2
Script to plot alpha, beta distr now ready to use
albusdemens May 13, 2017
e7c88c2
Added functionality to plot center of hist values used to group data
albusdemens May 13, 2017
9399324
Added hist plot for alpha, beta
albusdemens May 13, 2017
7d3ddaa
Done with data binning
albusdemens May 13, 2017
351ff05
Upstream sync
albusdemens May 23, 2017
049b3ec
Resolved merge conflict
albusdemens May 23, 2017
050a3fe
Why nans in first reconstruction?
albusdemens May 13, 2017
fa1db5f
Reducing phi, chi array size
albusdemens May 24, 2017
3d34c64
Add phi_0, chi_0 as input
albusdemens May 24, 2017
7199ad7
Checked data distr in (alpha, beta, theta)
albusdemens May 24, 2017
9b770af
Updated readme
albusdemens May 24, 2017
ef21ffe
Alpha and beta reduced to single index list
albusdemens May 24, 2017
814bb77
New output format
albusdemens May 25, 2017
aed527e
Output getdata.py should be correct
albusdemens May 29, 2017
8b1077b
Working on recon3d
albusdemens May 29, 2017
27a4c85
Introduced theta angle
albusdemens May 30, 2017
d3603ca
Added gamma, combination of alpha and omega
albusdemens May 30, 2017
44edcf7
Code works
albusdemens Jun 1, 2017
cc5979b
Update README.md
albusdemens Jun 2, 2017
d664157
plotting results
albusdemens Jun 2, 2017
ed7bdf8
Added scripts to plot npy from recon3d
albusdemens Jun 3, 2017
88ddd34
Introduced Blobs_finder function
albusdemens Jun 3, 2017
b9f5004
Added combined volume plot
albusdemens Jun 3, 2017
d20d049
Backup
albusdemens Jun 6, 2017
2e03901
Correct version
albusdemens Jun 6, 2017
1fd5314
Included diverging colormap
albusdemens Jun 7, 2017
35ba2aa
Remove unused files from lib
albusdemens Jun 7, 2017
d224e50
Included analysis backgorund images
albusdemens Jun 18, 2017
d13b6ab
First working 3D map
albusdemens Jun 19, 2017
cb6bc1d
Scripts to plot preliminary results
albusdemens Jun 27, 2017
1c9f325
New clean background approach
albusdemens Jul 7, 2017
c6c9705
Checking IO
albusdemens Jul 14, 2017
5a73236
Script to list name and properties of the imahes
albusdemens Jul 14, 2017
796f7bc
Updated gitignore
albusdemens Jul 14, 2017
552e0a7
Code forked to avoid memory problems
albusdemens Jul 16, 2017
077febf
Analysis motor angles
albusdemens Jul 16, 2017
cdbeac1
Done with cleaning for ASTRA
albusdemens Jul 17, 2017
dabd919
Exclude vtk
albusdemens Jul 17, 2017
84d670a
Done with image cleaning fro ASTRA
albusdemens Jul 17, 2017
7b237d9
Bug fixed
albusdemens Jul 19, 2017
02a0f6b
Do not consider jpg
albusdemens Jul 20, 2017
f37c050
Script to plot angles
albusdemens Jul 20, 2017
313f18e
Add to the procedure: script to plot motor values
albusdemens Jul 20, 2017
3ea5e73
Motor check - done
albusdemens Jul 20, 2017
e07ca0f
Little error fixed
albusdemens Jul 20, 2017
3cd3817
Array of images recorded at one proj --> improved
albusdemens Jul 20, 2017
47a8c2d
getdata no longer requires background
albusdemens Jul 20, 2017
930810d
Elegance is an attitude
albusdemens Jul 20, 2017
55d4189
Satisfactory plots
albusdemens Jul 20, 2017
09cb101
Generalized code
albusdemens Jul 20, 2017
f0b154d
Dine with integrated intebnsity mapping
albusdemens Jul 20, 2017
f6e4ff6
Added suggestions for rolling filter
albusdemens Jul 20, 2017
10a7807
Bug fixed
albusdemens Jul 20, 2017
6c66231
Now works
albusdemens Jul 20, 2017
7444a8c
Plot data phiscamn
albusdemens Jul 21, 2017
b982839
manual rebasing
albusdemens Aug 8, 2017
f32f4d1
Manual cleaning
albusdemens Aug 8, 2017
2141cdf
Set off old background option
albusdemens Aug 8, 2017
83e439d
Added cleaning by low int images
albusdemens Aug 9, 2017
89891ca
Cleaning works
albusdemens Aug 9, 2017
9c4bead
Dataset cleaning using rolling median approach
albusdemens Aug 10, 2017
9722864
Included rolling median image cleaning
albusdemens Aug 10, 2017
87898ea
Added: clean using the mean
albusdemens Aug 11, 2017
50e205b
Testing normalization procedure
albusdemens Aug 11, 2017
92228f7
Normalization succesfully implemented
albusdemens Aug 12, 2017
2e1265c
Angular step and number of angular steps as input
albusdemens Aug 12, 2017
a5328cc
Adding angular parameter
albusdemens Aug 16, 2017
c9412cc
Adding angular parameter
albusdemens Aug 16, 2017
c029cbb
All good
albusdemens Aug 16, 2017
89b5dce
Clean images using frame
albusdemens Aug 16, 2017
b6add8f
Included mophological operations
albusdemens Aug 18, 2017
26a33af
Test 3D reco
albusdemens Aug 22, 2017
e51f7db
Merge branch 'master' of https://github.com/albusdemens/Recon3D
albusdemens Aug 22, 2017
713b3f2
Improved reconstruction
albusdemens Aug 22, 2017
84a6e22
Testing scripts with data sample 2
albusdemens Aug 23, 2017
808b107
New script to check getdata input parameters
albusdemens Aug 23, 2017
9f92a22
Script to check results from getdata
albusdemens Aug 23, 2017
c9eb7f3
Structure agrees with other scripts
albusdemens Aug 23, 2017
8f3100b
Introduced (and commented) option to plot images before and after cle…
albusdemens Aug 31, 2017
e2a98dc
Added special case: only 1-2 images with nonzero int
albusdemens Sep 4, 2017
4cd51f7
backup morning work
albusdemens Sep 4, 2017
9344bf4
Files from iMac
albusdemens Sep 4, 2017
dbeb1b9
Files from iMac
albusdemens Sep 4, 2017
af1d121
Put together stuff
albusdemens Sep 4, 2017
ce7fa01
Revert to previous version
albusdemens Sep 4, 2017
f669650
Looking at data from Phil & included rebinning code
albusdemens Sep 4, 2017
fb9f716
Added case with no intensity for a givemn projection
albusdemens Sep 5, 2017
d2e21a4
Production code (plot removed)
albusdemens Sep 5, 2017
f7e6a16
Shape reconstruction only when a frame is defined
albusdemens Sep 5, 2017
1646d38
Added todo list file
albusdemens Sep 5, 2017
e8c0389
Final version
albusdemens Sep 6, 2017
260d5d6
Added options to include axis shift as code input
albusdemens Sep 8, 2017
62f8295
Fixed conflict
albusdemens Sep 8, 2017
fd37614
Definitive code version
albusdemens Sep 8, 2017
d50f37f
Updating the readme text
albusdemens Sep 9, 2017
92a31eb
Improved readibility section on getdata.py
albusdemens Sep 9, 2017
98027af
Unifying Recon3d & Astra code for manual
albusdemens Sep 9, 2017
6eb93f9
Implemented completeness and other changes for shape reconstruction
albusdemens Sep 10, 2017
9d7f964
Introduced script to plot 3D grain reconstruction as a vtk file
albusdemens Sep 10, 2017
fd31e9d
Comparing projections and reconstructions
albusdemens Sep 13, 2017
847c0b2
Working code to compare projections and summed diffraction signal
albusdemens Sep 20, 2017
b171d88
Small changes in shape comparison script
albusdemens Sep 21, 2017
934372b
Working on the documentation
albusdemens Sep 23, 2017
a527556
Included manual in package
albusdemens Sep 23, 2017
1da9161
Added pdf manual v 0.02
albusdemens Sep 23, 2017
567bb31
Changed name manual, so will work with future versions
albusdemens Sep 23, 2017
dfbf397
Modified readme, now all info from pdf
albusdemens Sep 23, 2017
45d8a82
Fixed lin
albusdemens Sep 23, 2017
ae64583
New version of the file, now CM of summed diff instead that max to es…
albusdemens Sep 25, 2017
0beb2cd
Little changes in production code
albusdemens Sep 25, 2017
004350f
Added option to save 4d matrix, to plot mosaicity volume
albusdemens Sep 26, 2017
9ef26fa
Files used for preparing presentation
albusdemens Sep 27, 2017
9822093
Sonja corrected moasaicity maps to orientation distr
albusdemens Sep 27, 2017
c89b1a3
Updated version of the manual files
albusdemens Sep 27, 2017
33582f3
added header
albusdemens Oct 18, 2017
c407b78
Added comments and authorship notes
Oct 18, 2017
67c7ec7
Back to the manual
albusdemens Nov 1, 2017
26011ee
Trying to change file name
albusdemens Nov 1, 2017
c9259dd
Changed name
albusdemens Nov 1, 2017
f80c0ef
Rename Plot_EDF.py to plot_EDF.py
albusdemens Nov 1, 2017
5689e10
Rename Estimate_precession.m to estimate_precession.m
albusdemens Nov 1, 2017
095c2d4
Rename Rebin_img.py to rebin_img.py
albusdemens Nov 1, 2017
fe592d9
Improved comments readability
albusdemens Nov 1, 2017
4c4e27e
New verison of the manual
albusdemens Nov 6, 2017
a64954f
Edits from Mart
albusdemens Nov 6, 2017
1a9b643
New version of the manual
albusdemens Nov 6, 2017
0388b2a
Create LICENSE
albusdemens Nov 7, 2017
d6ba7f1
Added license
albusdemens Nov 7, 2017
c6f4d1e
Added copyright info
albusdemens Nov 7, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,11 @@
*.DS_Store

lib/.DS_Store

*.pyc

*.npy

*.vtk

*.jpg
674 changes: 674 additions & 0 deletions LICENSE

Large diffs are not rendered by default.

Binary file added Manual_Recon3D.pdf
Binary file not shown.
Binary file added Manual_files/ASTRA_recon3d_geom.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Manual_files/Animation.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Manual_files/Background_characterization.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Manual_files/Comparison_ART_recon3d.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Manual_files/Distr_I_int.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Manual_files/Estimate_CM.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Manual_files/I_before_after_normalization.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 40 additions & 0 deletions Manual_files/Img_cleaning.bib
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
@article{henning_joac,
author={Poulsen, Henning Friis and et al.},
journal={In preparation},
year = 2017
}

@article{knudsen2013fabio,
title="{FabIO: easy access to two-dimensional X-ray detector images in Python}",
author={Knudsen, Erik B and S{\o}rensen, Henning O and Wright, Jonathan P and Goret, Gaeel and Kieffer, J{\'e}r{\^o}me},
journal={Journal of Applied Crystallography},
volume={46},
number={2},
pages={537--539},
year={2013},
publisher={International Union of Crystallography}
}

@article{dfxrm_nat_comm,
title="{Dark-field X-ray microscopy for multiscale structural characterization}",
author={Simons, Hugh and King, A and Ludwig, W and Detlefs, C and Pantleon, Wolfgang and Schmidt, S{\o}ren and Snigireva, I and Snigirev, A and Poulsen, Henning Friis},
journal={Nature Communications},
volume={6},
year={2015},
publisher={Nature Publishing Group}
}

@Misc{Recon3D_git,
author = {Cereser, Alberto and Anders, Clemens Jakobsen},
title = {Recon3D - software for {\footnotesize{3D}} reconstruction of topo-tomographic datasets from {\footnotesize{ID06}} at {\footnotesize{ESRF}}},
howpublished = {\url{https://github.com/albusdemens/Recon3D}},
year = {2016--2017}
}

@book{image_book,
author = "Russ, C. J.",
title = "The Image Processing Handbook",
year = "2016",
publisher = "CRC Press",
address = "Boca Raton, Florida"
}
504 changes: 504 additions & 0 deletions Manual_files/Img_cleaning.tex

Large diffs are not rendered by default.

Binary file added Manual_files/Img_one_proj.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions Manual_files/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
All files contained herein are licensed under the
Creative Commons Attribution-NonCommercial-Sharealike 3.0 License
unless explictly marked otherwise.

Information about this license can be found here: http://creativecommons.org/licenses/by-nc-sa/3.0/
83 changes: 83 additions & 0 deletions Manual_files/Manual_DFXRM_software.bib
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
@article{van2015astra,
title={The ASTRA Toolbox: A platform for advanced algorithm development in electron tomography},
author={van Aarle, Wim and Palenstijn, Willem Jan and De Beenhouwer, Jan and Altantzis, Thomas and Bals, Sara and Batenburg, K Joost and Sijbers, Jan},
journal={Ultramicroscopy},
volume={157},
pages={35--47},
year={2015},
publisher={Elsevier}
}

@article{van2016fast,
title={Fast and flexible X-ray tomography using the ASTRA toolbox},
author={van Aarle, Wim and Palenstijn, Willem Jan and Cant, Jeroen and Janssens, Eline and Bleichrodt, Folkert and Dabravolski, Andrei and De Beenhouwer, Jan and Batenburg, K Joost and Sijbers, Jan},
journal={Optics express},
volume={24},
number={22},
pages={25129--25147},
year={2016},
publisher={Optical Society of America}
}

@article{laroque2008accurate,
title={Accurate image reconstruction from few-view and limited-angle data in diffraction tomography},
author={LaRoque, Samuel J and Sidky, Emil Y and Pan, Xiaochuan},
journal={JOSA A},
volume={25},
number={7},
pages={1772--1782},
year={2008},
publisher={Optical Society of America}
}

@TECHREPORT{report_jette_anders,
AUTHOR={Oddershede, Jette and C. Jakobsen, Anders},
TITLE="{3D reconstruction of {\footnotesize{DFXRM}} - derivation and implementation}",
INSTITUTION={DTU Physics},
MONTH={October},
YEAR={2016},
}

@article{henning_joac,
author={Poulsen, Henning Friis and C. Jakobsen, Anders and Simons, Hugh and R. Ahl, Sonja and Cook, P. K. and Deflets, Carsten.},
title="{X-ray diffraction microscopy based on refractive optics}",
journal={Journal of Applied Crystallography},
volume = {50},
number = {5},
year = 2017
}

@article{knudsen2013fabio,
title="{FabIO: easy access to two-dimensional X-ray detector images in Python}",
author={Knudsen, Erik B and S{\o}rensen, Henning O and Wright, Jonathan P and Goret, Gaeel and Kieffer, J{\'e}r{\^o}me},
journal={Journal of Applied Crystallography},
volume={46},
number={2},
pages={537--539},
year={2013},
publisher={International Union of Crystallography}
}

@article{dfxrm_nat_comm,
title="{Dark-field X-ray microscopy for multiscale structural characterization}",
author={Simons, Hugh and King, A and Ludwig, W and Detlefs, C and Pantleon, Wolfgang and Schmidt, S{\o}ren and Snigireva, I and Snigirev, A and Poulsen, Henning Friis},
journal={Nature Communications},
volume={6},
year={2015},
publisher={Nature Publishing Group}
}

@Misc{Recon3D_git,
author = {Cereser, Alberto and Anders, Clemens Jakobsen},
title = {Recon3D - software for {\footnotesize{3D}} reconstruction of topo-tomographic datasets from {\footnotesize{ID06}} at {\footnotesize{ESRF}}},
howpublished = {\url{https://github.com/albusdemens/Recon3D}},
year = {2016--2017}
}

@book{image_book,
author = "Russ, C. J.",
title = "The Image Processing Handbook",
year = "2016",
publisher = "CRC Press",
address = "Boca Raton, Florida"
}
Loading