|
|
@@ -113,13 +113,11 @@ reco_graph_new (Params *params)
|
|
|
data->writer = make_task (data->pm, "writer");
|
|
|
|
|
|
fwidth = ((guint) params->px) * 2;
|
|
|
- padded_width = next_power_of_two (fwidth) * 2;
|
|
|
+ padded_width = next_power_of_two ((guint32) params->width + 1);
|
|
|
padded_height = next_power_of_two ((guint32) params->height + 1);
|
|
|
|
|
|
- xl = params->px - params->width / 2;
|
|
|
- xr = padded_width - params->width - xl;
|
|
|
- yt = params->py - params->height / 2;
|
|
|
- yb = padded_height - params->height - yt;
|
|
|
+ xl = xr = (padded_width - params->width) / 2;
|
|
|
+ yt = yb = (padded_height - params->height) / 2;
|
|
|
|
|
|
angle_step = (G_PI * 2.0) / params->num_radios;
|
|
|
theta_rad = params->theta / 360. * G_PI * 2;
|
|
|
@@ -127,8 +125,8 @@ reco_graph_new (Params *params)
|
|
|
info ("Axis x=%.1f y=%.1f variation=%.1f\n",
|
|
|
params->px, params->py, params->px_variation);
|
|
|
|
|
|
- info ("Lamino theta=%.3f tau=%.3f step=%.5f fwidth=%d\n",
|
|
|
- theta_rad, params->tau, angle_step, fwidth);
|
|
|
+ info ("Lamino theta=%.3f tau=%.3f step=%.5f\n",
|
|
|
+ theta_rad, params->tau, angle_step);
|
|
|
|
|
|
info ("Padding size=[%d %d] (xl=%d xr=%d yt=%d yb=%d)\n",
|
|
|
padded_width, padded_height, xl, xr, yt, yb);
|
|
|
@@ -159,8 +157,8 @@ reco_graph_new (Params *params)
|
|
|
"angle-step", angle_step,
|
|
|
"theta", theta_rad,
|
|
|
"psi", params->psi,
|
|
|
- "proj-ox", params->px,
|
|
|
- "proj-oy", params->py,
|
|
|
+ "proj-ox", params->px * 2,
|
|
|
+ "proj-oy", params->py * 2,
|
|
|
"proj-ox-variation", params->px_variation,
|
|
|
"vol-ox", params->v_size[0] / 2 + params->v_origin[0],
|
|
|
"vol-oy", params->v_size[1] / 2 + params->v_origin[1],
|
