rearrange

Author: arahlin

core/include/core/G3Reader.h

@@ -21,7 +21,6 @@ class G3Reader : public G3Module {
 	off_t Tell();
 
 protected:
-	virtual void StartFile(const std::string &path);
 	virtual G3FramePtr FillFrame();
 	std::string cur_file_;
 	std::istream stream_;
@@ -30,6 +29,7 @@ class G3Reader : public G3Module {
 	int n_frames_cur_;
 
 private:
+	void StartFile(const std::string &path);
 	bool prefix_file_;
 	std::deque<std::string> filename_;
 	float timeout_;

gcp/src/ARCFileReader.cxx

@@ -88,7 +88,6 @@ class ARCFileReader : public G3Reader {
 	    size_t buffersize=1024*1024);
 
 private:
-	void StartFile(const std::string &path) override;
 	G3FramePtr FillFrame() override;
 	void ReadHeader();
 
@@ -130,7 +129,6 @@ ARCFileReader::ARCFileReader(const std::string &path, Experiment experiment,
     G3Reader(path, n_frames_to_read, timeout, track_filename, buffersize, ".dat")
 {
 	SetExperiment(experiment);
-	ReadHeader();
 }
 
 ARCFileReader::ARCFileReader(const std::vector<std::string> &filename,
@@ -139,7 +137,6 @@ ARCFileReader::ARCFileReader(const std::vector<std::string> &filename,
     G3Reader(filename, n_frames_to_read, timeout, track_filename, buffersize, ".dat")
 {
 	SetExperiment(experiment);
-	ReadHeader();
 }
 
 
@@ -156,12 +153,6 @@ void ARCFileReader::SetExperiment(Experiment exp)
 	}
 }
 
-void ARCFileReader::StartFile(const std::string &path)
-{
-	G3Reader::StartFile(path);
-	ReadHeader();
-}
-
 void ARCFileReader::ReadHeader()
 {
 	int32_t size, opcode;
@@ -775,6 +766,9 @@ G3FramePtr ARCFileReader::FillFrame()
 	int32_t size, opcode;
 	uint8_t *buffer;
 
+	if (n_frames_cur_ == 0)
+		ReadHeader();
+
 	stream_.read((char *)&size, sizeof(size));
 	size = ntohl(size) - 8;
 	stream_.read((char *)&opcode, sizeof(opcode));