From 3896b8bb0f4026f5259bf23f43b0c991c002102f Mon Sep 17 00:00:00 2001 From: Martin Miller Date: Fri, 31 Mar 2017 16:39:17 -0500 Subject: yaw flags --- src/camera.cpp | 10 ++++++++++ src/camera.h | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/camera.cpp b/src/camera.cpp index a3816ac..f9a3ccf 100644 --- a/src/camera.cpp +++ b/src/camera.cpp @@ -75,11 +75,15 @@ Camera::Camera (const char *fin) Matrix Camera::Rc2b ( ) { +#ifdef DOYAWCORRECT double yaw; yaw = M_PI*( YAWCORRECT )/180.; Matrix Ry; Ry = Eigen::AngleAxisd(yaw, Vector3d::UnitZ()); return Ry*_T.block<3,3>(0,0).transpose(); +#else + return _T.block<3,3>(0,0).transpose(); +#endif } /* ----- end of method Camera::Rc2b ----- */ /* @@ -92,6 +96,7 @@ Camera::Rc2b ( ) Matrix Camera::Rc2b4 ( ) { +#ifdef DOYAWCORRECT double yaw; yaw = M_PI*( YAWCORRECT )/180.; Matrix Ry; @@ -100,6 +105,11 @@ Camera::Rc2b4 ( ) Matrix R; R = Matrix::Identity(); R.block<3,3>(0,0) = Ry*Rc2b(); +#else + Matrix R; + R = Matrix::Identity(); + R.block<3,3>(0,0) = Rc2b(); +#endif return R ; } /* ----- end of method Camera::Rc2b4 ----- */ diff --git a/src/camera.h b/src/camera.h index 7dd83e7..a08eb0c 100644 --- a/src/camera.h +++ b/src/camera.h @@ -5,8 +5,8 @@ #include #define BINNING 0.5 // set the binning factor -//#define YAWCORRECT 7.5 -#define YAWCORRECT 0.0 +#define YAWCORRECT 7.5 +//#define DOYAWCORRECT using Eigen::Matrix; using Eigen::Vector4d; using Eigen::Vector3d; -- cgit v1.1