summaryrefslogtreecommitdiff
path: root/src/lsq_cylindrical.mac
diff options
context:
space:
mode:
Diffstat (limited to 'src/lsq_cylindrical.mac')
-rw-r--r--src/lsq_cylindrical.mac26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/lsq_cylindrical.mac b/src/lsq_cylindrical.mac
index 541e4ad..0bf9499 100644
--- a/src/lsq_cylindrical.mac
+++ b/src/lsq_cylindrical.mac
@@ -13,22 +13,22 @@ y_scale : y_rot * scale$
* Some mangling for C code generation
*/
+load("expr2c.mac")$
+
x_expand : trigexpand(x_scale)$
y_expand : trigexpand(y_scale)$
-args: "(double c_view, double c_nick, double c_tilt, double scale, double k0, double k1, double m_view, double m_nick)"$
+args: "double c_view, double c_nick, double c_tilt, double scale, double k0, double k1, double m_view, double m_nick"$
-printfunc(name, expression) := sprint("double ProjectionCylindrical::", name, args, "{ return ", string(subst(pow, "^", expression)), ";}", "
-")$
+expr2c("ProjectionCylindrical::mac_x", args, x_expand)$
+expr2c("ProjectionCylindrical::mac_y", args, y_expand)$
-printfunc("mac_x", x_expand)$
-printfunc("mac_y", y_expand)$
+expr2c("ProjectionCylindrical::mac_x_dc_view", args, diff(x_expand, c_view))$
+expr2c("ProjectionCylindrical::mac_x_dc_nick", args, diff(x_expand, c_nick))$
+expr2c("ProjectionCylindrical::mac_x_dc_tilt", args, diff(x_expand, c_tilt))$
+expr2c("ProjectionCylindrical::mac_x_dscale", args, diff(x_expand, scale))$
+expr2c("ProjectionCylindrical::mac_y_dc_view", args, diff(y_expand, c_view))$
+expr2c("ProjectionCylindrical::mac_y_dc_nick", args, diff(y_expand, c_nick))$
+expr2c("ProjectionCylindrical::mac_y_dc_tilt", args, diff(y_expand, c_tilt))$
+expr2c("ProjectionCylindrical::mac_y_dscale", args, diff(y_expand, scale))$
-printfunc("mac_x_dc_view", diff(x_expand, c_view))$
-printfunc("mac_x_dc_nick", diff(x_expand, c_nick))$
-printfunc("mac_x_dc_tilt", diff(x_expand, c_tilt))$
-printfunc("mac_x_dscale", diff(x_expand, scale))$
-printfunc("mac_y_dc_view", diff(y_expand, c_view))$
-printfunc("mac_y_dc_nick", diff(y_expand, c_nick))$
-printfunc("mac_y_dc_tilt", diff(y_expand, c_tilt))$
-printfunc("mac_y_dscale", diff(y_expand, scale))$