Commit 55af9b02 authored by Pilar Cossio's avatar Pilar Cossio

Merge branch 'bugfix' into 'master'

bugfix (from valgrind): even when CC is not used, it should be initialized to a…

See merge request !4
parents 12cde389 521127c4
Pipeline #15152 passed with stage
in 58 seconds
......@@ -105,6 +105,7 @@ int bioem_param::readParameters(const char* fileinput)
param_device.sigmaPriorbctf=100.;
param_device.sigmaPriordefo=1.0;
param_device.Priordefcent=3.0;
param_device.CCdisplace=0;
ifstream input(fileinput);
if (!input.good())
......@@ -1330,7 +1331,7 @@ int bioem_param::CalculateRefCTF()
param_device.NtotDist = (2 * (int) (param_device.maxDisplaceCenter / param_device.GridSpaceCenter) + 1 ) * (2 * (int) (param_device.maxDisplaceCenter / param_device.GridSpaceCenter) + 1);
}
nTotCC = (int) ((myfloat_t) param_device.NumberPixels / (myfloat_t) param_device.CCdisplace + 1) * (int) ((myfloat_t) param_device.NumberPixels / (myfloat_t) param_device.CCdisplace + 1);
nTotCC = (param_device.CCdisplace != 0) ? ((int) ((myfloat_t) param_device.NumberPixels / (myfloat_t) param_device.CCdisplace + 1) * (int) ((myfloat_t) param_device.NumberPixels / (myfloat_t) param_device.CCdisplace + 1)) : 0;
return(0);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment