Merge branch 'master' into coadd_utils

calibration/include/calibration/BoloProperties.h

@@ -13,7 +13,8 @@ class BolometerProperties : public G3FrameObject
 {
 public:
 	BolometerProperties() : x_offset(NAN), y_offset(NAN), band(NAN),
-	    pol_angle(NAN), pol_efficiency(NAN), coupling(Unknown) {}
+	    center_frequency(NAN), bandwidth(NAN), pol_angle(NAN),
+	    pol_efficiency(NAN), coupling(Unknown) {}
 	std::string Description() const;
 
 	std::string physical_name; /* e.g. D4.A2.3.Y */
@@ -23,6 +24,8 @@ class BolometerProperties : public G3FrameObject
 	double y_offset; /* and el */
 
 	double band;		/* Standard frequency units */
+	double center_frequency;
+	double bandwidth;
 	double pol_angle;	/* Standard angular units */
 	double pol_efficiency;	/* 0-1 */
 
@@ -44,7 +47,7 @@ class BolometerProperties : public G3FrameObject
 };
 
 G3_POINTERS(BolometerProperties);
-G3_SERIALIZABLE(BolometerProperties, 6);
+G3_SERIALIZABLE(BolometerProperties, 7);
 
 G3MAP_OF(std::string, BolometerProperties, BolometerPropertiesMap);
 

calibration/src/BoloProperties.cxx

@@ -40,6 +40,10 @@ template <class A> void BolometerProperties::serialize(A &ar, unsigned v)
 		ar & make_nvp("pixel_type", pixel_type);
 	}
 
+	if (v > 6) {
+		ar & make_nvp("center_frequency", center_frequency);
+		ar & make_nvp("bandwidth", bandwidth);
+	}
 }
 
 std::string BolometerProperties::Description() const
@@ -63,7 +67,11 @@ PYBINDINGS("calibration") {
 	    .def_readwrite("y_offset", &BolometerProperties::y_offset,
 	       "Vertical pointing offset relative to boresight in angular units.")
 	    .def_readwrite("band", &BolometerProperties::band,
-	       "Center of detector observing band in frequency units")
+	       "Nominal center of detector observing band in frequency units")
+	    .def_readwrite("center_frequency", &BolometerProperties::center_frequency,
+	       "Measured center of detector observing band in frequency units")
+	    .def_readwrite("bandwidth", &BolometerProperties::bandwidth,
+	       "Measured bandwidth of detector observing band in frequency units")
 	    .def_readwrite("pol_angle", &BolometerProperties::pol_angle,
 	       "Polarization angle in angular units")
 	    .def_readwrite("pol_efficiency", &BolometerProperties::pol_efficiency,
@@ -72,7 +80,7 @@ PYBINDINGS("calibration") {
 	       "Optical coupling type")
 
 	    .def_readwrite("wafer_id", &BolometerProperties::wafer_id,
-	       "Name of the name this detector is on")
+	       "Name of the wafer this detector is on")
 	    .def_readwrite("pixel_id", &BolometerProperties::pixel_id,
 	       "Name of the pixel of which this detector is a part")
 	    .def_readwrite("pixel_type", &BolometerProperties::pixel_type,

dfmux/include/dfmux/DfMuxBuilder.h

@@ -15,13 +15,15 @@
  */
 struct DfMuxBoardSamples : public G3FrameObject, public std::map<int32_t, DfMuxSamplePtr> {
 	size_t nmodules; // Total number of modules expected from this board
+	size_t nblocks; // Total number of sub-module blocks expected from this board
+	size_t nchannels; // Total number of channels per block expected from this board
 
-	bool Complete() const { return (size() == nmodules); };
+	bool Complete() const { return (size() == nmodules * nblocks); };
 	template <class A> void serialize(A &ar, unsigned v);
 };
 
 G3_POINTERS(DfMuxBoardSamples);
-G3_SERIALIZABLE(DfMuxBoardSamples, 1);
+G3_SERIALIZABLE(DfMuxBoardSamples, 2);
 
 /*
  * DfMuxMetaSample: collection of DfMuxBoardSamples, indexed by board serial

dfmux/include/dfmux/DfMuxCollector.h

@@ -16,7 +16,10 @@ class DfMuxSamplePacket : public G3FrameObject {
 public:
 	int32_t board;		/* Board serial number */
 	int32_t module;		/* Module number (0-7) */
-	int32_t nmodules;	/* Total number of modules on board (8) */
+	int32_t block;          /* Sub-module block number (0-7 for hidfmux, 0 for dfmux) */
+	int32_t nmodules;	/* Total number of modules on board (8 for dfmux) */
+	int32_t nblocks;        /* Total number of blocks per module (8 for hidfmux, 1 for dfmux) */
+	int32_t nchannels;      /* Total number of channels per block (128) */
 	DfMuxSamplePtr sample;	/* Pointer to the DfMuxSample */
 };
 
@@ -50,6 +53,10 @@ class DfMuxCollector {
 	int Start();	// Start listening thread
 	int Stop();	// Stop listening thread
 
+	// Configure iceboard clock rate (defaults to 100 MHz)
+	void SetClockRate(double rate);
+	double GetClockRate() { return clock_rate_; };
+
 private:
 	int SetupUDPSocket(const char *listenaddr);
 	int SetupSCTPSocket(std::vector<std::string> hosts);
@@ -67,6 +74,8 @@ class DfMuxCollector {
 	std::vector<int32_t> board_list_;
 	int fd_;
 	in_addr_t listenaddr_;
+	double clock_rate_;
+	double clock_scale_;
 
 	SET_LOGGER("DfMuxCollector");
 };

dfmux/src/DfMuxBuilder.cxx

@@ -19,6 +19,14 @@ template <class A> void DfMuxBoardSamples::serialize(A &ar, const unsigned v)
 	ar & make_nvp("G3FrameObject", base_class<G3FrameObject>(this));
 	ar & make_nvp("samples", base_class<std::map<int, DfMuxSamplePtr> >(this));
 	ar & make_nvp("nmodules", nmodules);
+
+	if (v > 1) {
+		ar & make_nvp("nblocks", nblocks);
+		ar & make_nvp("nchannels", nchannels);
+	} else {
+		nblocks = 1;
+		nchannels = 128;
+	}
 }
 
 G3_SERIALIZABLE_CODE(DfMuxBoardSamples);
@@ -124,10 +132,13 @@ void DfMuxBuilder::ProcessNewData()
 	}
 
 	// Add to meta sample
-	g3_assert((*sample->sample)[pkt->board].find(pkt->module) ==
+	int idx = pkt->module * pkt->nblocks + pkt->block;
+	g3_assert((*sample->sample)[pkt->board].find(idx) ==
 	    (*sample->sample)[pkt->board].end());
-	(*sample->sample)[pkt->board][pkt->module] = pkt->sample;
+	(*sample->sample)[pkt->board][idx] = pkt->sample;
 	(*sample->sample)[pkt->board].nmodules = pkt->nmodules;
+	(*sample->sample)[pkt->board].nblocks = pkt->nblocks;
+	(*sample->sample)[pkt->board].nchannels = pkt->nchannels;
 
 	while (oqueue_.size() > 0 && oqueue_.front().sample->size() ==
 	    nboards_) {
@@ -203,12 +214,16 @@ PYBINDINGS("dfmux")
 	class_<DfMuxBoardSamples, bases<G3FrameObject>,
 	  DfMuxBoardSamplesPtr>("DfMuxBoardSamples",
 	  "Container structure for samples from modules on one board, mapping "
-	  "0-indexed module IDs to a dfmux.DfMuxSample.")
+	  "0-indexed module and block IDs to a dfmux.DfMuxSample.")
 	    .def(std_map_indexing_suite<DfMuxBoardSamples, true>())
 	    .def_readwrite("nmodules", &DfMuxBoardSamples::nmodules,
 	      "Number of modules expected to report from this board")
+	    .def_readwrite("nblocks", &DfMuxBoardSamples::nblocks,
+	      "Number of sub-module blocks expected to report from this board")
+	    .def_readwrite("nchannels", &DfMuxBoardSamples::nchannels,
+	      "Number of channels per block expected to report from this board")
 	    .def("Complete", &DfMuxBoardSamples::Complete,
-	      "True if this structure contains data from all expected modules")
+	      "True if this structure contains data from all expected modules and blocks")
 	    .def_pickle(g3frameobject_picklesuite<DfMuxBoardSamples>())
 	;
 	register_pointer_conversions<DfMuxBoardSamples>();

dfmux/src/DfMuxCollator.cxx

@@ -141,24 +141,34 @@ void DfMuxCollator::Process(G3FramePtr frame, std::deque<G3FramePtr> &out)
 			if (board == metasamp->end())
 				continue;
 
-			auto module = board->second.find(chan->mapping->module);
+			int mod_idx, chan_idx;
+			// slight hackery for indexing timepoint frames with modules split into blocks (e.g. with hidfmux)
+			if (board->second.nblocks != 1) {
+				mod_idx = chan->mapping->module * board->second.nblocks + (int)(chan->mapping->channel / board->second.nchannels);
+				chan_idx = chan->mapping->channel % board->second.nchannels;
+			} else {
+				mod_idx = chan->mapping->module;
+				chan_idx = chan->mapping->channel;
+			}
+
+			auto module = board->second.find(mod_idx);
 			if (module == board->second.end())
 				continue;
 
 			if (module->second->size()/2 <
-			    size_t(chan->mapping->channel)) {
-				log_fatal("Board %d, module %d only has %zd "
+			    size_t(chan_idx)) {
+				log_fatal("Board %d, module block %d only has %zd "
 				    "channels, but trying to read %d",
 				    chan->mapping->board_serial,
-				    chan->mapping->module,
+				    mod_idx,
 				    module->second->size()/2,
-				    chan->mapping->channel);
+				    chan_idx);
 			}
 
 			(*chan->i)[sample] =
-			    (*module->second)[chan->mapping->channel*2];
+			    (*module->second)[chan_idx*2];
 			(*chan->q)[sample] =
-			    (*module->second)[chan->mapping->channel*2 + 1];
+			    (*module->second)[chan_idx*2 + 1];
 		}
 
 		// Next run through aux data. Missing points get filled in