Use correct file extension

Author: arahlin

core/include/core/G3Reader.h

@@ -11,10 +11,10 @@ class G3Reader : public G3Module {
 public:
 	G3Reader(const std::string &filename, int n_frames_to_read = -1,
                  float timeout = -1., bool track_filename = false,
-	         size_t buffersize = 1024*1024);
+	         size_t buffersize = 1024*1024, const std::string &ext=".g3");
 	G3Reader(const std::vector<std::string> &filenames, int n_frames_to_read = -1,
                  float timeout = -1., bool track_filename = false,
-	         size_t buffersize = 1024*1024);
+	         size_t buffersize = 1024*1024, const std::string &ext=".g3");
 
 	void Process(G3FramePtr frame, std::deque<G3FramePtr> &out);
 	off_t Seek(off_t offset);
@@ -33,6 +33,7 @@ class G3Reader : public G3Module {
 	float timeout_;
 	bool track_filename_;
 	size_t buffersize_;
+	std::string ext_;
 
 	SET_LOGGER("G3Reader");
 };

core/src/G3Reader.cxx

@@ -3,19 +3,19 @@
 #include <G3Reader.h>
 
 G3Reader::G3Reader(const std::string &filename, int n_frames_to_read,
-    float timeout, bool track_filename, size_t buffersize) :
+    float timeout, bool track_filename, size_t buffersize, const std::string &ext) :
     prefix_file_(false), stream_(nullptr), n_frames_to_read_(n_frames_to_read),
     n_frames_read_(0), n_frames_cur_(0), timeout_(timeout),
-    track_filename_(track_filename), buffersize_(buffersize)
+    track_filename_(track_filename), buffersize_(buffersize), ext_(ext)
 {
 	StartFile(filename);
 }
 
 G3Reader::G3Reader(const std::vector<std::string> &filename, int n_frames_to_read,
-    float timeout, bool track_filename, size_t buffersize) :
+    float timeout, bool track_filename, size_t buffersize, const std::string &ext) :
     prefix_file_(false), stream_(nullptr), n_frames_to_read_(n_frames_to_read),
     n_frames_read_(0), n_frames_cur_(0), timeout_(timeout),
-    track_filename_(track_filename), buffersize_(buffersize)
+    track_filename_(track_filename), buffersize_(buffersize), ext_(ext)
 {
 	if (filename.size() == 0)
 		log_fatal("Empty file list provided to G3Reader");
@@ -32,7 +32,7 @@ void G3Reader::StartFile(const std::string &path)
 	log_info("Starting file %s\n", path.c_str());
 	cur_file_ = path;
 	n_frames_cur_ = 0;
-	g3_istream_from_path(stream_, path, timeout_, buffersize_);
+	g3_istream_from_path(stream_, path, timeout_, buffersize_, ext_);
 }
 
 G3FramePtr G3Reader::FillFrame()

gcp/src/ARCFileReader.cxx

@@ -127,7 +127,7 @@ class ARCFileReader : public G3Reader {
 
 ARCFileReader::ARCFileReader(const std::string &path, Experiment experiment,
     int n_frames_to_read, float timeout, bool track_filename, size_t buffersize) :
-    G3Reader(path, n_frames_to_read, timeout, track_filename, buffersize)
+    G3Reader(path, n_frames_to_read, timeout, track_filename, buffersize, ".dat")
 {
 	SetExperiment(experiment);
 	ReadHeader();
@@ -136,7 +136,7 @@ ARCFileReader::ARCFileReader(const std::string &path, Experiment experiment,
 ARCFileReader::ARCFileReader(const std::vector<std::string> &filename,
     Experiment experiment, int n_frames_to_read, float timeout, bool track_filename,
     size_t buffersize) :
-    G3Reader(filename, n_frames_to_read, timeout, track_filename, buffersize)
+    G3Reader(filename, n_frames_to_read, timeout, track_filename, buffersize, ".dat")
 {
 	SetExperiment(experiment);
 	ReadHeader();
@@ -156,7 +156,7 @@ void ARCFileReader::SetExperiment(Experiment exp)
 	}
 }
 
-void ARCFileReader::StartFile(const std::string & path)
+void ARCFileReader::StartFile(const std::string &path)
 {
 	// Open file, including whatever decompression/network access/etc.
 	// may be required