diff --git a/analysis/uCT.cpp b/analysis/uCT.cpp index 590cc676..315f441f 100644 --- a/analysis/uCT.cpp +++ b/analysis/uCT.cpp @@ -154,8 +154,8 @@ void solve( const Array& VOL, Array& Mean, Array& ID, fillFloat.fill(Dist); smooth( VOL, Dist, 2.0, MultiScaleSmooth, fillFloat ); // Compute non-local mean - int depth = 5; - float sigsq=0.1; + // int depth = 5; + // float sigsq=0.1; int nlm_count = NLM3D( MultiScaleSmooth, Mean, Dist, NonLocalMean, depth, sigsq); fillFloat.fill(NonLocalMean); } diff --git a/example/uCT/input.db b/example/uCT/input.db index 4e66c13e..6e0091a3 100644 --- a/example/uCT/input.db +++ b/example/uCT/input.db @@ -6,11 +6,15 @@ Domain { BC = 0 // Boundary condition type } uCT { - InputFile = "static_Dry_Scan_recon.volume" - rough_cutoff = 0.01 + InputFile = "MG_dryrecon.volume" + rough_cutoff = 0.0 lamda = 0.5 nlm_sigsq = 0.25 nlm_depth = 3 + center_x = 960 + center_y = 960 + center_z = 600 + radius = 750 } Analysis { } diff --git a/tests/lbpm_uCT_pp.cpp b/tests/lbpm_uCT_pp.cpp index 39d1289e..57c36193 100644 --- a/tests/lbpm_uCT_pp.cpp +++ b/tests/lbpm_uCT_pp.cpp @@ -75,6 +75,10 @@ int main(int argc, char **argv) auto lamda=uct_db->getScalar( "lamda" ); auto nlm_sigsq=uct_db->getScalar( "nlm_sigsq" ); auto nlm_depth=uct_db->getScalar( "nlm_depth" ); + auto cx=uct_db->getScalar( "center_x" ); + auto cy=uct_db->getScalar( "center_y" ); + auto cz=uct_db->getScalar( "center_z" ); + auto CylRad=uct_db->getScalar( "cylinder_radius" ); //....................................................................... // Reading the domain information file @@ -181,7 +185,7 @@ int main(int argc, char **argv) filter_src( *Dm[0], LOCVOL[0] ); // Set up the mask to be distance to cylinder (crop outside cylinder) - float CylRad=900; + // float CylRad=900; for (int k=0;k