Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

28 sliding regions #40

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
fade757
initial commit for sliding regions
jamie-mcclelland Aug 21, 2017
bee7e41
implemented GetDeformationField() and GetSimilarityMeasureGradient() …
jamie-mcclelland Aug 22, 2017
b1f29ae
implemented methods for penalty term
jamie-mcclelland Aug 28, 2017
8f528e5
added several more methods to reg_f3d_sli, and rearranged order of some
jamie-mcclelland Sep 3, 2017
ef8df3b
work in progress
jamie-mcclelland Sep 18, 2017
70c2ed2
finished implementing reg_f3d_sli class
jamie-mcclelland Oct 8, 2017
ea62eae
had forgotten to modify reg_f3d (executable) so that saves CPP from b…
jamie-mcclelland Oct 9, 2017
c6a7814
fixed copy-paste error
jamie-mcclelland Oct 10, 2017
27d2ada
corrected tests for different file extensions when appending 'region1…
jamie-mcclelland Nov 20, 2017
0f18902
corrected GetDeformationField() method in reg_f3d_sli to work when no…
jamie-mcclelland Nov 20, 2017
42d26ee
modified resample image methods to work when deformation field contai…
jamie-mcclelland Nov 20, 2017
6ba9d9a
Merge branch 'master' of https://[email protected]/mmo…
jamie-mcclelland Nov 21, 2017
8cdfb87
added missing minus sign when calculating the gap-overlap gradient
jamie-mcclelland Nov 24, 2017
97de7c7
Added reference for sliding registration to readme and usage message.
b-eiben Sep 27, 2018
aef5009
Issue #28: merging the CI
mmodat Jan 9, 2019
14da6fa
masking different time points with nans
BBillot Mar 14, 2019
3de6327
Sliding: Fixed compiliation error on Linux (due to polymorphism).
b-eiben Apr 30, 2019
4214bcf
Merge branch 'master' into 28-sliding-regions
b-eiben Aug 21, 2020
320333d
Merging multi-channel-masking to solve multi-channel issues with lncc.
Aug 24, 2020
cea262b
Added missing openMP declarations.
b-eiben Aug 24, 2020
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
Prev Previous commit
Next Next commit
added missing minus sign when calculating the gap-overlap gradient
sliding region registrations now appear to be working, but sensible default gap-overlap constraint term weight still needs to be determined
jamie-mcclelland committed Nov 24, 2017
commit 8cdfb87d2c7a655309cf7f5a7fee4d819cd527c6
2 changes: 1 addition & 1 deletion niftyreg_build_version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
55
56
12 changes: 6 additions & 6 deletions reg-lib/_reg_f3d_sli.cpp
Original file line number Diff line number Diff line change
@@ -803,16 +803,16 @@ void reg_f3d_sli<T>::GetGapOverlapGradient()
if (warpedDMR1Ptr[n] * warpedDMR2Ptr[n] < 0)
{
//dGO / dDF1 = -WDM2*(dWDM1 / dDF1)
gapOverlapGradR1PtrX[n] = warpedDMR2Ptr[n] * warpedDMGradR1PtrX[n];
gapOverlapGradR1PtrY[n] = warpedDMR2Ptr[n] * warpedDMGradR1PtrY[n];
gapOverlapGradR1PtrX[n] = -warpedDMR2Ptr[n] * warpedDMGradR1PtrX[n];
gapOverlapGradR1PtrY[n] = -warpedDMR2Ptr[n] * warpedDMGradR1PtrY[n];
//dGO / dDF2 = -WDM1*(dWDM2 / dDF2)
gapOverlapGradR2PtrX[n] = warpedDMR1Ptr[n] * warpedDMGradR2PtrX[n];
gapOverlapGradR2PtrY[n] = warpedDMR1Ptr[n] * warpedDMGradR2PtrY[n];
gapOverlapGradR2PtrX[n] = -warpedDMR1Ptr[n] * warpedDMGradR2PtrX[n];
gapOverlapGradR2PtrY[n] = -warpedDMR1Ptr[n] * warpedDMGradR2PtrY[n];
//check for 3D
if (gapOverlapGradR1PtrZ != NULL)
{
gapOverlapGradR1PtrZ[n] = warpedDMR2Ptr[n] * warpedDMGradR1PtrZ[n];
gapOverlapGradR2PtrZ[n] = warpedDMR1Ptr[n] * warpedDMGradR2PtrZ[n];
gapOverlapGradR1PtrZ[n] = -warpedDMR2Ptr[n] * warpedDMGradR1PtrZ[n];
gapOverlapGradR2PtrZ[n] = -warpedDMR1Ptr[n] * warpedDMGradR2PtrZ[n];
}
}//if (warpedDMR1Ptr[n] * warpedDMR2Ptr[n])
}//for (size_t n = 0; n < numVox; n++)