[yoda-svn] yoda: 2 new changesets

[YODA Mercurial]

details:   https://yoda.hepforge.org/hg/yoda/rev/42d3ef38da94
branches:  
changeset: 1080:42d3ef38da94
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Jul 30 16:24:30 2015 +0100
description:
Remove # markers from YODA format BEGIN/END output. The parser will continue to accept them.

details:   https://yoda.hepforge.org/hg/yoda/rev/b1e572c36e3d
branches:  
changeset: 1081:b1e572c36e3d
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Jul 30 16:27:11 2015 +0100
description:
Adding drop-in replacement for ReaderYODA, currently in files called ReaderYODA2.h/.cc but with the internal type still ReaderYODA. Currently doesn't do much other than set up a state machine for YODA format reading which does a bit of simple handling. Activate for development by telling src/Makefile.am to build ReaderYODA.cc rather than ReaderYODA.cc

diffs (truncated from 427 to 50 lines):

--- a/ChangeLog	Wed Jul 29 15:59:09 2015 +0100
+++ b/ChangeLog	Thu Jul 30 16:27:11 2015 +0100
@@ -1,3 +1,8 @@
+2015-07-30  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Remove # markers from YODA format BEGIN/END output. The parser
+	will continue to accept them.
+
 2015-07-29  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Add SFINAE trait magic to restrict write(RANGE) functions to
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/include/YODA/ReaderYODA2.h	Thu Jul 30 16:27:11 2015 +0100
@@ -0,0 +1,38 @@
+// -*- C++ -*-
+//
+// This file is part of YODA -- Yet more Objects for Data Analysis
+// Copyright (C) 2008-2015 The YODA collaboration (see AUTHORS for details)
+//
+#ifndef YODA_READERYODA_H
+#define YODA_READERYODA_H
+
+#include "YODA/AnalysisObject.h"
+#include "YODA/Reader.h"
+
+namespace YODA {
+
+
+  /// Persistency reader from YODA flat text data format.
+  class ReaderYODA : public Reader {
+  public:
+
+    /// Singleton creation function
+    static Reader& create() {
+      static ReaderYODA _instance;
+      return _instance;
+    }
+
+    void read(std::istream& stream, std::vector<AnalysisObject*>& aos);
+
+
+  private:
+
+    /// Private constructor, since it's a singleton.
+    ReaderYODA() { }
+
+  };
+
+
+}