Commits · 778073fff6a86f3ad9a6e65b776a7499ba8cba18 · graintracking / DCT

Apr 28, 2013

GtSample : improve handling of conflicts and simplify updating of sample.mat · 1cbf8e05
Laura Nervo authored 12 years ago and Nicola Vigano committed 11 years ago
```
Signed-off-by: Laura Nervo <laura.nervo@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@871 4c865b51-4357-4376-afb4-474e03ccb993
```
1cbf8e05

Benchmarks/Astra: added check on the transmission · 87314899

Nicola Vigano authored 12 years ago


Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@868 4c865b51-4357-4376-afb4-474e03ccb993

87314899

Benchmarks: Added ASTRA benchmarking · bd6b5ab6

Nicola Vigano authored 12 years ago


Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@854 4c865b51-4357-4376-afb4-474e03ccb993

bd6b5ab6

Cell Operations/C-functions: ported all the C functions to operate also with... · b289a91b

Nicola Vigano authored 12 years ago

Cell Operations/C-functions: ported all the C functions to operate also with single precision floats

This should be bug free (tested against the regression tests / benchmarks) and give no decrease in speed.

Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@843 4c865b51-4357-4376-afb4-474e03ccb993

b289a91b

Forward Simulate : fix to save 'difspotID' into the sample.mat · dd9333fa

Laura Nervo authored 12 years ago and

Nicola Vigano committed 11 years ago


Signed-off-by: Laura Nervo <laura.nervo@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@837 4c865b51-4357-4376-afb4-474e03ccb993

dd9333fa

GtSample : add methods 'convertToSample' and 'updateConflicts' to handle... · 9e64e4ca

Laura Nervo authored 12 years ago and

Nicola Vigano committed 11 years ago

GtSample : add methods 'convertToSample' and 'updateConflicts' to handle conflicts in the sample.mat, modified and fix methods 'merge' and 'mergeConflictsField'
GtPhase : add methods 'initConflicts', 'resetSummary' and 'resetConflicts' and add logical expression 'obj.selectedGrains == true' to get only selected grains if looking for conflicts

Signed-off-by: Laura Nervo <laura.nervo@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@803 4c865b51-4357-4376-afb4-474e03ccb993

9e64e4ca

GtGrainsManager: don't fail if the dataset is too old · bc03e8e0

Nicola Vigano authored 12 years ago


Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@750 4c865b51-4357-4376-afb4-474e03ccb993

bc03e8e0

Added message to show if the file is locked. · e0c587d8
Peter Reischig authored 12 years ago and Nicola Vigano committed 11 years ago
```
git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@746 4c865b51-4357-4376-afb4-474e03ccb993
```
e0c587d8
ForwardSimulation : fix problem with updating summary in sample.mat for vectors using GtLock · acc43a94
Laura Nervo authored 12 years ago and Nicola Vigano committed 11 years ago
```
Signed-off-by: Laura Nervo <laura.nervo@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@736 4c865b51-4357-4376-afb4-474e03ccb993
```
acc43a94
Removed executable bit on Matlab source files · 89271553
Yoann Guilhem authored 12 years ago and Nicola Vigano committed 11 years ago
```
git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@724 4c865b51-4357-4376-afb4-474e03ccb993
```
89271553
Just updating function headers for help · 01fa2225
Yoann Guilhem authored 12 years ago and Nicola Vigano committed 11 years ago
```
git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@723 4c865b51-4357-4376-afb4-474e03ccb993
```
01fa2225
zUtil_DataStructures : commented GtPhase and removed gtCreateGtSample · 19cfd39f
Laura Nervo authored 12 years ago and Nicola Vigano committed 11 years ago
```
Signed-off-by: Laura Nervo <laura.nervo@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@719 4c865b51-4357-4376-afb4-474e03ccb993
```
19cfd39f

DataStructures : fix bug in GtSample.GtSample, GtSample.mergeSummaryField and... · 6310d8c4

Laura Nervo authored 12 years ago and

Nicola Vigano committed 11 years ago

DataStructures : fix bug in GtSample.GtSample, GtSample.mergeSummaryField and add method GtPhase.getGrainsWithFieldValueEqualsTo.

Signed-off-by: Laura Nervo <laura.nervo@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@710 4c865b51-4357-4376-afb4-474e03ccb993

6310d8c4

Conflicts : fill variable "difspotID" in sample.mat after forward simulation · 3e4e70ba

Laura Nervo authored 12 years ago and

Nicola Vigano committed 11 years ago

            formatting and bug fix in gtCreateGtSample
            add flag -v7.3 to savinf mat files
            initialize to [] conflicts fields in sample.mat

Signed-off-by: Laura Nervo <laura.nervo@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@708 4c865b51-4357-4376-afb4-474e03ccb993

3e4e70ba

Gui: added GtGuiSample to modify properties in sample.mat file. It is both... · bebd093f

Nicola Vigano authored 12 years ago

Gui: added GtGuiSample to modify properties in sample.mat file. It is both standalone and callable from GtGrainsManager

Squashed commit of the following:

commit 984bfed4b3963a57080b43a1be57846489ba2d3c
Author: Nicola Vigano <nicola.vigano@esrf.fr>
Date:   Mon Aug 6 21:04:58 2012 +0200

    GtGrainsManager: GtGuiSample hooked in. It is now called from button Info.

Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr>

commit e6f7aed3d18b1b2c9bde38c928bfb410b321ac99
Author: Nicola Vigano <nicola.vigano@esrf.fr>
Date:   Mon Aug 6 20:50:22 2012 +0200

    Gui: Finished GtSample gui, with both possibility to use it standalone, and in other applications

Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr>

commit d5bb2a9724470aa201f594e172c9bb8a780b1401
Author: Nicola Vigano <nicola.vigano@esrf.fr>
Date:   Mon Aug 6 02:01:16 2012 +0200

    GUI Sample Metadata: initial gui to ease modification of GtSample informantion

    Initial-readonly commit!

Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr>

Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@684 4c865b51-4357-4376-afb4-474e03ccb993

bebd093f

Cell Operations: fixed copies and updated benchmarks · 2af16018

Nicola Vigano authored 12 years ago


Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@662 4c865b51-4357-4376-afb4-474e03ccb993

2af16018

Cell: added some functions to do expensive operations cell arrays · 9d8f8e49

Nicola Vigano authored 12 years ago

They are the equivalent of cellfun(@(x, y){x <op> y}, array1, array2) and similar

Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@661 4c865b51-4357-4376-afb4-474e03ccb993

9d8f8e49

TomoUtils: added a function to generate infoVol data structure (for gtRead*) · 05ed7aa1

Nicola Vigano authored 12 years ago


Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@658 4c865b51-4357-4376-afb4-474e03ccb993

05ed7aa1

GtPhase: added oversize feature to nighbours finding, and cleaned laura's code a little bit. · dcc69d61

Nicola Vigano authored 12 years ago


Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@657 4c865b51-4357-4376-afb4-474e03ccb993

dcc69d61

fixing a coordinate bug in gtForwardSimulate - fill sample.mat during processing · 6cff9bb9
Wolfgang Ludwig authored 12 years ago and Nicola Vigano committed 11 years ago
```
git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@648 4c865b51-4357-4376-afb4-474e03ccb993
```
6cff9bb9

OAR: fixed a bug in the oar stat reading · 01eedc86

Nicola Vigano authored 12 years ago


Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@634 4c865b51-4357-4376-afb4-474e03ccb993

01eedc86

database based version of file lock · 1398b343
Wolfgang Ludwig authored 12 years ago and Nicola Vigano committed 11 years ago
```
git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@610 4c865b51-4357-4376-afb4-474e03ccb993
```
1398b343

GtPhase: added method to get neighbors of a grain. · 4a6f2e25

Nicola Vigano authored 12 years ago


Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@569 4c865b51-4357-4376-afb4-474e03ccb993

4a6f2e25

Conflicts : routine updated. Now only gtAnalyseGrainsConflicts has to be run ONCE! · f0e535ce

Laura Nervo authored 12 years ago and

Nicola Vigano committed 11 years ago


USAGE :
grains_merge = gtAnalyseGrainsConflicts(update_flag, solve_flag, save_flag, minnum, maxnum)

Signed-off-by: Laura Nervo <laura.nervo@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@560 4c865b51-4357-4376-afb4-474e03ccb993

f0e535ce

speed up reading difspots from .edf files · 6afe67b2
Wolfgang Ludwig authored 12 years ago and Nicola Vigano committed 11 years ago
```
git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@556 4c865b51-4357-4376-afb4-474e03ccb993
```
6afe67b2

fixing a coordinate bug (detposcorner > pixels) in gtForwardSimulation_v2 -... · 28663a1f

Wolfgang Ludwig authored 12 years ago and

Nicola Vigano committed 11 years ago

fixing a coordinate bug (detposcorner > pixels) in gtForwardSimulation_v2  - load tables at beginning

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@554 4c865b51-4357-4376-afb4-474e03ccb993

28663a1f

Conflicts : update routine and add function to solve automatically some conflicts · e26983bb
Laura Nervo authored 12 years ago and Nicola Vigano committed 11 years ago
```
Signed-off-by: Laura Nervo <laura.nervo@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@549 4c865b51-4357-4376-afb4-474e03ccb993
```
e26983bb

GtPhase : add useful methods · 4769032e

Laura Nervo authored 12 years ago and

Nicola Vigano committed 11 years ago


Signed-off-by: Laura Nervo <laura.nervo@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@548 4c865b51-4357-4376-afb4-474e03ccb993

4769032e

EDF: added a tool to verify the header length and other misc errors in EDFs · 8d9e93c5

Nicola Vigano authored 12 years ago


Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@545 4c865b51-4357-4376-afb4-474e03ccb993

8d9e93c5

sample.mat : fix bug with spot2grain and sample loading and updating... · 31eaed50

Laura Nervo authored 12 years ago and

Nicola Vigano committed 11 years ago


routine:

gtSetupForwardSimulation
	gtFsimCheckMissingGrains
		gtFsimRunMissingGrains
gtSetupReconstruction
gtCreateGtSample

Conflicts : update and improving the routine.

gtAnalyseForwardSimulation
gtUpdateGrainsConflicts

Signed-off-by: Laura Nervo <laura.nervo@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@536 4c865b51-4357-4376-afb4-474e03ccb993

31eaed50

Conflicts : update sample.mat with conflicts info. Added field GtPhase.nofConflicts · 24572c1b
Laura Nervo authored 12 years ago and Nicola Vigano committed 11 years ago
```
Signed-off-by: Laura Nervo <laura.nervo@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@522 4c865b51-4357-4376-afb4-474e03ccb993
```
24572c1b
gtCreateGtSample : remove check of missing fields in grain_%%%%.mat · fd86ec28
Laura Nervo authored 12 years ago and Nicola Vigano committed 11 years ago
```
Signed-off-by: Laura Nervo <laura.nervo@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@521 4c865b51-4357-4376-afb4-474e03ccb993
```
fd86ec28
gtCreateGtSample : fix bug if grain.threshold or grain.seg don't exist · dcd5bb7c
Laura Nervo authored 12 years ago and Nicola Vigano committed 11 years ago
```
Signed-off-by: Laura Nervo <laura.nervo@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@518 4c865b51-4357-4376-afb4-474e03ccb993
```
dcd5bb7c

Grain Conflicts : start to handle the conflicts between grains...the road... · 6a612321

Laura Nervo authored 12 years ago and

Nicola Vigano committed 11 years ago

Grain Conflicts : start to handle the conflicts between grains...the road towards the detection of twins :-)

Signed-off-by: Laura Nervo <laura.nervo@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@488 4c865b51-4357-4376-afb4-474e03ccb993

6a612321

Changes in 5_reconstruction, zUtil_TomoUtils and zUtil_DataStructures · 286456dd

Laura Nervo authored 12 years ago and

Nicola Vigano committed 11 years ago

GtAssembleVol3D : fix the use of 5_reconstruction/archive folder
gtForwardSimulate_v2 : clean commented lines related to the use of sample.mat
GtGuiThresholdVolume : change default volume name for segmentation to volume_mask.mat
GtSample : add absvol_file input variable in the constructor
gtCreateGtSample : fix the indenting
GtGrainsManager : handle absorption and dilated volumes

Signed-off-by: Laura Nervo <laura.nervo@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@465 4c865b51-4357-4376-afb4-474e03ccb993

286456dd

DataStructures : start to add the "merging" grain variable to handle merging... · 7d3fe686

Laura Nervo authored 12 years ago and

Nicola Vigano committed 11 years ago

DataStructures : start to add the "merging" grain variable to handle merging from gtAnalyseForwardSimulation

Signed-off-by: Laura Nervo <laura.nervo@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@458 4c865b51-4357-4376-afb4-474e03ccb993

7d3fe686

gtCreateGtSample : fix database connection and access to grainInfo.threshold info · 1ee99692
Laura Nervo authored 12 years ago and Nicola Vigano committed 11 years ago
```
Signed-off-by: Laura Nervo <laura.nervo@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@438 4c865b51-4357-4376-afb4-474e03ccb993
```
1ee99692
remove access to sample.mat from gtChangeThreshold3D · e7a92f7c
Wolfgang Ludwig authored 12 years ago and Nicola Vigano committed 11 years ago
```
git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@433 4c865b51-4357-4376-afb4-474e03ccb993
```
e7a92f7c
change to FBP as default Reconstruction method for absorption volumes · 65508b59
Wolfgang Ludwig authored 12 years ago and Nicola Vigano committed 11 years ago
```
git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@430 4c865b51-4357-4376-afb4-474e03ccb993
```
65508b59
adding projection geometry output to gtCalculateGrain · 60b75d00
Wolfgang Ludwig authored 12 years ago and Nicola Vigano committed 11 years ago
```
git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@413 4c865b51-4357-4376-afb4-474e03ccb993
```
60b75d00