Merge branch 'master' into develop/update-externals

Dan Smith · Dan Smith · commit 41ba677e3418 · 2022-01-05T14:03:26.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -25,8 +25,7 @@ install/
 install.dbg/
 **/install-*/
 test_package/build/
-out/build/
-out/install/
+out/
 test_package/build/
 *.pyc
 *.swp
diff --git a/six/modules/c++/six.sicd/CMakeLists.txt b/six/modules/c++/six.sicd/CMakeLists.txt
@@ -1,6 +1,6 @@
 coda_add_module(
     six.sicd
-    DEPS six-c++
+    DEPS six-c++ units-c++
     SOURCES
         source/Antenna.cpp
         source/AreaPlaneUtility.cpp
diff --git a/six/modules/c++/six.sicd/source/Utilities.cpp b/six/modules/c++/six.sicd/source/Utilities.cpp
@@ -46,6 +46,7 @@
 #include <str/Manip.h>
 #include <sys/Conf.h>
 #include <types/RowCol.h>
+#include <units/Angles.h>
 #include <six/sicd/AreaPlaneUtility.h>
 #include <six/sicd/GeoLocator.h>
 #include <six/sicd/ImageData.h>
@@ -98,9 +99,9 @@ std::complex<float> six::sicd::Utilities::from_AMP8I_PHS8I(uint8_t input_amplitu
 
     // To convert the amplitude and phase values to complex float (i.e. real and imaginary):
     // S = A * cos(2 * pi * P) + j * A * sin(2 * pi * P)
-    const auto angle = 2 * M_PI * P;
+    const auto angle = units::Radians<long double>{ 2 * M_PI * P };
     long double sin_angle, cos_angle;
-    math::SinCos(angle, sin_angle, cos_angle);
+    SinCos(angle, sin_angle, cos_angle);
 
     const auto real = A * cos_angle;
     const auto imaginary = A * sin_angle;
diff --git a/six/modules/c++/six.sicd/wscript b/six/modules/c++/six.sicd/wscript
@@ -1,6 +1,5 @@
 NAME            = 'six.sicd'
-MAINTAINER      = 'adam.sylvester@mdaus.com'
-MODULE_DEPS     = 'scene nitf xml.lite six mem'
+MODULE_DEPS     = 'scene nitf xml.lite six mem units'
 TEST_DEPS       = 'cli'
 UNITTEST_DEPS   = 'cli sio.lite'
 
diff --git a/six/modules/c++/six.sidd/include/six/sidd/SFA.h b/six/modules/c++/six.sidd/include/six/sidd/SFA.h
diff --git a/test_create_sicd_from_mem_32f.sicd b/test_create_sicd_from_mem_32f.sicd
