Merge branch 'master' into arc_reader_subclass

Author: arahlin

gcp/src/ARCFileReader.cxx

@@ -114,7 +114,7 @@ class ARCFileReader : public G3Reader {
 
 	void ParseArrayMap(uint8_t *buffer, size_t size);
 	G3FrameObjectPtr GCPToFrameObject(uint8_t *buffer,
-	    const struct block_stats &block, bool has_string_flag,
+	    const struct block_stats &block,
 	    int depth = 0, int base_offset = 0);
 
 	Experiment experiment;
@@ -616,8 +616,7 @@ static double GCP64ToFloat(uint8_t *buffer, off_t offset)
 }
 
 G3FrameObjectPtr ARCFileReader::GCPToFrameObject(uint8_t *buffer,
-    const struct ARCFileReader::block_stats &block, bool has_string_flag,
-    int depth, int base_offset)
+    const struct ARCFileReader::block_stats &block, int depth, int base_offset)
 {
 	if (base_offset == 0)
 		base_offset = block.offset;
@@ -637,7 +636,7 @@ G3FrameObjectPtr ARCFileReader::GCPToFrameObject(uint8_t *buffer,
 
 		for (int i = 0; i < block.dim[depth]; i++) {
 			root->push_back(GCPToFrameObject(buffer, block,
-			    has_string_flag, depth+1, base_offset));
+			    depth+1, base_offset));
 			base_offset += block.width*stride;
 		}
 
@@ -662,7 +661,7 @@ G3FrameObjectPtr ARCFileReader::GCPToFrameObject(uint8_t *buffer,
 			 * best we can.
 			 */
 			bool is_a_string = false;
-			if (has_string_flag) {
+			if (has_string_flag_) {
 				// Are we lucky enough that GCP tells us?
 				is_a_string = (block.flags & REG_STRING);
 			} else if (block.flags & REG_FAST) {
@@ -807,7 +806,7 @@ G3FramePtr ARCFileReader::FillFrame()
 			for (auto reg = board->second.begin();
 			    reg != board->second.end(); reg++) {
 				(*boarddat)[reg->first] = GCPToFrameObject(
-				    buffer, reg->second, has_string_flag_);
+				    buffer, reg->second);
 			}
 			(*templ)[board->first] = boarddat;
 		}