[Rivet-svn] r3469 - trunk/bin

[blackhole at projects.hepforge.org]

Author: holsch
Date: Wed Nov  2 15:58:04 2011
New Revision: 3469

Log:
Also be able to convert items stored in TCanvases

Modified:
   trunk/bin/root2flat

Modified: trunk/bin/root2flat
==============================================================================
--- trunk/bin/root2flat	Mon Oct 31 09:14:49 2011	(r3468)
+++ trunk/bin/root2flat	Wed Nov  2 15:58:04 2011	(r3469)
@@ -47,7 +47,7 @@
     f = ROOT.TFile(rootfile)
 
     # Initial browse to see the structure
-    subdirs, histonames, tgraphnames = browse(f)
+    subdirs, histonames, tgraphnames, tcanvases = browse(f)
 
     # Keep browsing if there are subdirectories TODO: Make this work for
     # arbitrarily deep directory structures
@@ -56,11 +56,15 @@
             t_s, t_h = browse(f, sd)
             histonames.extend(t_h)
 
+    from IPython.Shell import IPShellEmbed
     # This will convert and write the histos
     for num, histoname in enumerate(histonames):
         writeHisto(histoname, f.Get(histoname), num+nobs)
     for num, tgraphname in enumerate(tgraphnames):
         writeHisto(tgraphname, f.Get(tgraphname), num + len(histonames)+nobs, True)
+    # TCanvas items
+    for num, tc in enumerate(tcanvases):
+        writeHisto(tc[0], tc[-1], num + len(histonames) + len(tgraphnames) + nobs, tc[1])
 
     nobs += len(histonames)
     nobs += len(tgraphnames)
@@ -76,6 +80,7 @@
     histos  = []
     tgraphs = []
     subdirs = []
+    tcanvases = []
 
     # Get Iterator
     if branch:
@@ -105,8 +110,15 @@
                 histos.append(t_n)
             elif f.Get(t_n).InheritsFrom("TGraphAsymmErrors"):
                 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"):
+                        tcanvases.append((t_n,True,ci))
 
-    return subdirs, histos, tgraphs
+    return subdirs, histos, tgraphs, tcanvases
 
 
 def convertHisto(R_histo):