[yoda-svn] r544 - in trunk: . include/YODA

[blackhole at projects.hepforge.org]

Author: buckley
Date: Fri Nov 16 16:38:39 2012
New Revision: 544

Log:
Adding YODA/ROOTCnv.h. for data object converter functions. Two (untested) functions added for TH1 -> YODA.

Added:
   trunk/include/YODA/ROOTCnv.h
Modified:
   trunk/ChangeLog
   trunk/include/YODA/Makefile.am

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Fri Nov 16 16:28:51 2012	(r543)
+++ trunk/ChangeLog	Fri Nov 16 16:38:39 2012	(r544)
@@ -4,6 +4,9 @@
 
 2012-11-16  Andy Buckley  <andy.buckley at cern.ch>
 
+	* Adding YODA/ROOTCnv.h. for data object converter functions. Two
+ 	(untested) functions added for TH1 -> YODA.
+
 	* Adding toIntegralHisto(Histo1D&) function.
 
 2012-11-15  Dave Mallows  <dave.mallows at gmail.com>

Modified: trunk/include/YODA/Makefile.am
==============================================================================
--- trunk/include/YODA/Makefile.am	Fri Nov 16 16:28:51 2012	(r543)
+++ trunk/include/YODA/Makefile.am	Fri Nov 16 16:38:39 2012	(r544)
@@ -13,7 +13,8 @@
     Scatter2D.h Point2D.h \
     Scatter3D.h Point3D.h \
     Writer.h WriterAIDA.h WriterFLAT.h WriterYODA.h \
-    Reader.h ReaderAIDA.h ReaderYODA.h
+    Reader.h ReaderAIDA.h ReaderYODA.h \
+	ROOTCnv.h
 
 nobase_pkginclude_HEADERS = \
 	WriterMethods.icc \

Added: trunk/include/YODA/ROOTCnv.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/include/YODA/ROOTCnv.h	Fri Nov 16 16:38:39 2012	(r544)
@@ -0,0 +1,118 @@
+// -*- C++ -*-
+//
+// This file is part of YODA -- Yet more Objects for Data Analysis
+// Copyright (C) 2008-2012 The YODA collaboration (see AUTHORS for details)
+//
+#ifndef YODA_ROOTCnv_h
+#define YODA_ROOTCnv_h
+
+#include "YODA/Histo1D.h"
+#include "YODA/Histo2D.h"
+#include "YODA/Profile1D.h"
+
+#include "TH1.h"
+#include "TH2.h"
+#include "TProfile.h"
+
+namespace YODA {
+
+
+  /// @name Conversion functions from ROOT to YODA data types
+  //@{
+
+  /// @todo Check that direct Scatter filling gives the same result at mkScatter(h) for ROOT -> YODA
+
+  /// @todo toProfile1D: TProfile -> Profile1D
+
+  /// @todo toScatter2D: TProfile -> Scatter2D
+
+  /// @todo toScatter2D: TGraph(AsymmErrs) -> Scatter2D
+
+
+  /// @brief Convert a ROOT 1D histogram to a YODA Histo1D
+  ///
+  /// Note that ROOT's histograms do not contain enough information to properly rebuild
+  /// @a x distributions within bins, in underflow and overflow bins, or across the whole histogram.
+  inline Histo1D toHisto1D(const TH1& th1) {
+    std::vector<HistoBin1D> bins;
+    TArrayD sumw2s = th1.GetSumw2();
+    Dbn1D dbn_uflow, dbn_oflow;
+    double sumWtot(0), sumW2tot(0)
+    for (int i = 0; i =< th1.GetNbinsX()+1; ++i) {
+      Dbn1D dbn(static_cast<unsigned long>(th1.GetBinContent(i)), th1.GetBinContent(i), sumw2s[i], 0, 0);
+                // th1.GetBinContent(i)*th1.GetBinCenter(i), th1.GetBinContent(i)*sqr(th1.GetBinCenter(i)));
+      if (i == 0) dbn_uflow = dbn;
+      else if (i == th1.GetNbinsX()+1) dbn_oflow = dbn;
+      else bins.push_back(HistoBin1D(std::make_pair(th1.GetBinLowEdge(i), th1.GetBinLowEdge(i+1)), dbn));
+      sumWtot += th1.GetBinContent(i);
+      sumW2tot += sumw2s[i];
+    }
+    Dbn1D dbn_tot(static_cast<unsigned long>(th1.GetEntries()), sumWtot, sumW2tot, 0, 0);
+
+    Histo1D rtn(bins, dbn_tot, dbn_uflow, const Dbn1D& dbn_oflow, th1.GetName(), th1.GetTitle());
+    rtn.addAnnotation("XLabel", th1.GetXaxis->GetTitle());
+    rtn.addAnnotation("YLabel", th1.GetYaxis->GetTitle());
+  }
+
+
+  /// @brief Convert a ROOT 1D histogram to a YODA Histo1D
+  ///
+  /// Note that ROOT's histograms do not contain enough information to properly rebuild
+  /// @a x distributions within bins, in underflow and overflow bins, or across the whole histogram.
+  inline Histo1D toHisto1D(const TH1* th1) {
+    return toHisto1D(*th1);
+  }
+
+
+  /////////////////////
+
+
+  /// @brief Convert a ROOT 1D histogram to a YODA Histo1D
+  ///
+  /// Note that ROOT's histograms do not contain enough information to properly rebuild
+  /// @a x distributions within bins, in underflow and overflow bins, or across the whole histogram.
+  inline Scatter2D toScatter2D(const TH1& th1) {
+    Scatter2D rtn;
+    for (int i = 1; i =< th1.GetNbinsX(); ++i) {
+      const double x = GetBinCenter(i);
+      const double exminus = x - GetBinLowEdge(i);
+      const double explus = GetBinLowEdge(i+1) - x;
+      rtn.addPoint(x, GetBinContent(i), exminus, explus, GetBinErrorLow(i), GetBinErrorUp(i));
+    }
+    rtn.addAnnotation("XLabel", th1.GetXaxis->GetTitle());
+    rtn.addAnnotation("YLabel", th1.GetYaxis->GetTitle());
+  }
+
+
+  /// @brief Convert a ROOT 1D histogram to a YODA Histo1D
+  ///
+  /// Note that ROOT's histograms do not contain enough information to properly rebuild
+  /// @a x distributions within bins, in underflow and overflow bins, or across the whole histogram.
+  inline Scatter2D toScatter2D(const TH1* th1) {
+    return toScatter2D(*th1);
+  }
+
+
+  //@}
+
+
+
+  /////////////////////
+
+
+
+  /// @name Conversion functions from YODA to ROOT data types
+  //@{
+
+  /// @todo toTH1D: Histo1D -> TH1D
+
+  /// @todo toTProfile: Profile1D -> TProfile
+
+  /// @todo toTGraphAsymmErrs: Scatter2D -> TGraphAsymmErrs
+
+  //@}
+
+
+}
+
+#endif