remove all file actions and rationalize passing of arguments

src/OutputByOrbit.h

@@ -6,34 +6,16 @@
 #include <cstdio>
 #include <string>
 
-#include "config.h"
-#include "controls.h"
 #include "tbb/pipeline.h"
 
-class OutFile {
- public:
-  OutFile() {
-    file_ = NULL;
-    index_ = NULL;
-  }
-
-  ~OutFile(){};
-
-  FILE *getFile() { return file_; }
-  void setFile(FILE *file) { file_ = file; }
-  uint32_t getIndex() { return index_; }
-  void setIndex(uint32_t index) { index_ = index; }
-
- private:
-  FILE *file_;
-  uint32_t index_;
-};
+class OutputFileHandler;
+class ctrl;
+class config;
 
 //! Filter that writes each buffer to a file.
 class OutputByOrbitStream : public tbb::filter {
  public:
-  OutputByOrbitStream(const std::string output_filename_base,
-                      const std::string output_filename_prefix, ctrl &c, config &conf_);
+  OutputByOrbitStream(ctrl &c, config &conf_);
   void *operator()(void *item) /*override*/;
   void *OutputFixedOrbits(Slice &out);
 
@@ -52,7 +34,7 @@ class OutputByOrbitStream : public tbb::filter {
   uint32_t current_run_number;
   ctrl &control;
   config &conf;
-  const bool fixedOrbitsPerFile;
+  OutputFileHandler output_file_handler_;
 };
 
 #endif