Merge branch 'master' into quat_pointing

CMB-S4 · Oct 23, 2023 · 5e2dcbb · 5e2dcbb
2 parents 502fcf5 + b02c746
commit 5e2dcbb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/core/include/core/G3Map.h b/core/include/core/G3Map.h
@@ -3,6 +3,7 @@
 
 #include <G3Frame.h>
 #include <G3Vector.h>
+#include <G3Quat.h>
 #include <map>
 #include <sstream>
 #include <complex>
@@ -78,6 +79,8 @@ G3MAP_OF(std::string, std::vector<std::complex<double> >, G3MapVectorComplexDoub
 G3MAP_OF(std::string, G3VectorTime, G3MapVectorTime);
 G3MAP_OF(std::string, int32_t, G3MapInt);
 G3MAP_OF(std::string, std::string, G3MapString);
+G3MAP_OF(std::string, quat, G3MapQuat);
+G3MAP_OF(std::string, G3VectorQuat, G3MapVectorQuat);
 
 namespace cereal {
         template <class A> struct specialize<A, G3MapFrameObject, cereal::specialization::member_load_save> {};

diff --git a/core/src/G3Map.cxx b/core/src/G3Map.cxx
@@ -74,13 +74,15 @@ G3_SERIALIZABLE_CODE(G3MapInt);
 G3_SERIALIZABLE_CODE(G3MapDouble);
 G3_SERIALIZABLE_CODE(G3MapMapDouble);
 G3_SERIALIZABLE_CODE(G3MapString);
+G3_SERIALIZABLE_CODE(G3MapQuat);
 G3_SERIALIZABLE_CODE(G3MapVectorBool);
 G3_SERIALIZABLE_CODE(G3MapVectorInt);
 G3_SERIALIZABLE_CODE(G3MapVectorDouble);
 G3_SERIALIZABLE_CODE(G3MapVectorString);
 G3_SERIALIZABLE_CODE(G3MapVectorVectorString);
 G3_SERIALIZABLE_CODE(G3MapVectorComplexDouble);
 G3_SERIALIZABLE_CODE(G3MapVectorTime);
+G3_SERIALIZABLE_CODE(G3MapVectorQuat);
 
 G3_SPLIT_SERIALIZABLE_CODE(G3MapFrameObject);
 
@@ -95,6 +97,8 @@ PYBINDINGS("core") {
 	register_g3map<G3MapInt>("G3MapInt", "Mapping from strings to ints.");
 	register_g3map<G3MapString>("G3MapString", "Mapping from strings to "
 	    "strings.");
+	register_g3map<G3MapQuat>("G3MapQuat", "Mapping from strings to "
+	    "quaternions.");
 	register_g3map<G3MapVectorBool>("G3MapVectorBool", "Mapping from "
 	    "strings to arrays of booleans.");
 	register_g3map<G3MapVectorDouble>("G3MapVectorDouble", "Mapping from "
@@ -109,6 +113,8 @@ PYBINDINGS("core") {
 	    "Mapping from strings to lists of lists of strings.");
 	register_g3map<G3MapVectorTime>("G3MapVectorTime", "Mapping from "
 	    "strings to lists of G3 time objects.");
+	register_g3map<G3MapVectorQuat>("G3MapVectorQuat", "Mapping from "
+	    "strings to lists of quaternions.");
 
 	// Special handling to get the object proxying right
 	register_g3map<G3MapFrameObject, true>("G3MapFrameObject", "Mapping "

diff --git a/core/src/G3Quat.cxx b/core/src/G3Quat.cxx
@@ -606,7 +606,7 @@ PYBINDINGS("core")
 	     .def("dot3", dot3, "Dot product of last three entries")
 	     .def("cross3", cross3, "Cross product of last three entries")
 	;
-	register_vector_of<quat>("QuatVector");
+	register_vector_of<quat>("Quat");
 	object vq =
 	    register_g3vector<quat>("G3VectorQuat",
 	     "List of quaternions. Convertible to a 4xN numpy array. "

diff --git a/gcp/python/G3RegCal.txt b/gcp/python/G3RegCal.txt
@@ -76,5 +76,9 @@ antenna0.tracker.tilts                          0.0000  3.600000e+06  degrees
 antenna0.tracker.ut1utc                         0.0000  1.000000e+03  sec
 array.dc.currents[0-7]                      -1000.0000  1.000000e+02  volt
 array.weather.airTemperature                  273.1500  1.000000e+00  K
+array.weather.battery                           0.0000  1.000000e+00  mV
+array.weather.internalTemperature             273.1500  1.000000e+00  K
+array.weather.pressure                          0.0000  1.000000e+00  millibar
 array.weather.relativeHumidity                  0.0000  1.000000e-02  
 array.weather.windDirection                   -80.0000  1.000000e+00  deg
+array.weather.windSpeed                         0.0000  1.000000e+00  m/s