Commit a2585366 authored by Pilar Cossio's avatar Pilar Cossio

Corrections Manual; Prior Norm and bug in projection

parent e89360c7
......@@ -1696,9 +1696,10 @@ int bioem::createProjection(int iMap, mycomplex_t *mapFFT)
irad = int(Model.points[n].radius / param.pixelSize) + 1;
rad2 = Model.points[n].radius * Model.points[n].radius;
if (i < 0 || j < 0 || i >= param.param_device.NumberPixels ||
j >= param.param_device.NumberPixels)
if (i < irad || j < irad || i >= param.param_device.NumberPixels-irad ||
j >= param.param_device.NumberPixels-irad )
{
if (DebugOutput >= 0)
cout << "WARNING::: Model Point out of Projection map: " << i << ", "
<< j << "\n";
......@@ -1717,7 +1718,7 @@ int bioem::createProjection(int iMap, mycomplex_t *mapFFT)
// continue;
if (not param.ignorepointsout)
exit(1);
}
}else{
// Projecting over the radius
for (int ii = i - irad; ii < i + irad + 1; ii++)
......@@ -1736,6 +1737,7 @@ int bioem::createProjection(int iMap, mycomplex_t *mapFFT)
sqrt(rad2 - dist) * Model.points[n].density * 3 /
(4 * M_PI * Model.points[n].radius * rad2);
}
}
}
}
}
......
This diff is collapsed.
......@@ -1695,7 +1695,7 @@ int bioem_param::CalculateRefCTF()
exit(1);
}
// ********** Calculating normalized volumen element *********
// ********** Calculating normalized volume element *********
if (!printModel)
{
......@@ -1709,7 +1709,7 @@ int bioem_param::CalculateRefCTF()
((2.f * (myfloat_t) param_device.maxDisplaceCenter + 1.)) /
(2.f * (myfloat_t)(param_device.maxDisplaceCenter + 1.)) /
(myfloat_t) numberGridPointsCTF_amp * gridEnvelop * gridCTF_phase /
M_PI / param_device.sigmaPriorbctf / param_device.sigmaPriordefo;
4.f / M_PI / sqrt(2.f * M_PI) / param_device.sigmaPriorbctf / param_device.sigmaPriordefo / param_device.sigmaPrioramp;
// cout << "VOLU " << param_device.volu << " " << gridCTF_amp << "\n";
// *** Number of total pixels***
......
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