[Rivet-svn] r4144 - in trunk: . bin

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Thu Feb 14 12:17:29 2013
New Revision: 4144

Log:
merge c4059 from branches/2012-06-aidarivet

Modified:
   trunk/ChangeLog
   trunk/bin/root2flat

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Thu Feb 14 11:53:55 2013	(r4143)
+++ trunk/ChangeLog	Thu Feb 14 12:17:29 2013	(r4144)
@@ -24,6 +24,8 @@
 
 	* Added ATLAS_2012_I1188891 analysis
 
+	* Added TGraphErrors support to root2flat
+
 2012-11-27  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Converting CMS_2012_I1102908 analysis to use YODA.

Modified: trunk/bin/root2flat
==============================================================================
--- trunk/bin/root2flat	Thu Feb 14 11:53:55 2013	(r4143)
+++ trunk/bin/root2flat	Thu Feb 14 12:17:29 2013	(r4144)
@@ -107,14 +107,14 @@
             # Check if the curent object is a histogram
             elif f.Get(t_n).InheritsFrom("TH1") or f.Get(t_n).InheritsFrom("TProfile"):
                 histos.append(t_n)
-            elif f.Get(t_n).InheritsFrom("TGraphAsymmErrors"):
+            elif f.Get(t_n).InheritsFrom("TGraphAsymmErrors") or f.Get(t_n).InheritsFrom("TGraphErrors"):
                 tgraphs.append(t_n)
             # Also support graphs, histos stored in TCanvases
             elif f.Get(t_n).InheritsFrom("TCanvas"):
                 for ci in f.Get(t_n).GetListOfPrimitives():
                     if ci.InheritsFrom("TH1") or ci.InheritsFrom("TProfile"):
                         tcanvases.append((t_n,False,ci))
-                    elif ci.InheritsFrom("TGraphAsymmErrors"):
+                    elif ci.InheritsFrom("TGraphAsymmErrors") or ci.InheritsFrom("TGraphErrors"):
                         tcanvases.append((t_n,True,ci))
 
     return subdirs, histos, tgraphs, tcanvases