--- trunk/OOPSE-4/src/io/StatWriter.hpp	2005/04/15 22:04:00	2204
+++ trunk/OOPSE-4/src/io/StatWriter.hpp	2005/10/17 23:13:44	2380
@@ -54,34 +54,27 @@
 #include <bitset>
 #include <fstream>
 #include <iostream>
+#include <string>
 #include <string.h>
 
 #include "brains/Stats.hpp"
+#include "utils/StringTokenizer.hpp"
+#include "utils/CaseConversion.hpp"
+#include "utils/simError.h"
 
 namespace oopse {
 
   typedef std::bitset<Stats::ENDINDEX-Stats::BEGININDEX> StatsBitSet;
 
+  StatsBitSet parseStatFileFormat(const std::string& format);
+  
   /**
-   * DefaultStatsBitSet includes 
-   *    StatsIndex::TIME
-   *    StatsIndex::TOTAL_ENERGY
-   *    StatsIndex::POTENTIAL_ENERGY
-   *    StatsIndex::KINETIC_ENERGY
-   *    StatsIndex::TEMPERATURE
-   *    StatsIndex::PRESSURE
-   *    StatsIndex::CONSERVED_QUANTITY
-   */
-  const StatsBitSet DefaultStatsBitSet(255ul);
-
-
-  /**
    * @class StatWriter StatWriter.hpp "io/StatWriter.hpp"
    * @brief A configurable Statistics Writer
    */
   class StatWriter {
   public:
-    StatWriter(const std::string& filename, const StatsBitSet& mask = DefaultStatsBitSet);
+    StatWriter(const std::string& filename, const StatsBitSet& mask);
     ~StatWriter();
 
     void writeStat(const Stats& s);