[Rivet-svn] r2220 - trunk/src/Core

[blackhole at projects.hepforge.org]

Author: jmonk
Date: Mon Jan 18 17:00:00 2010
New Revision: 2220

Log:
fix dyn cast problem on SLC4 - see #373

Modified:
   trunk/src/Core/AnalysisHandler.cc

Modified: trunk/src/Core/AnalysisHandler.cc
==============================================================================
--- trunk/src/Core/AnalysisHandler.cc	Mon Jan 18 11:33:40 2010	(r2219)
+++ trunk/src/Core/AnalysisHandler.cc	Mon Jan 18 17:00:00 2010	(r2220)
@@ -192,8 +192,13 @@
    
       IManagedObject* hobj = tree.find(path);
       if (hobj) {
-        IHistogram1D* histo = dynamic_cast<IHistogram1D*>(hobj);
+        
+        // Weird seg fault on SLC4 when trying to dyn cast an IProfile ptr to a IHistogram
+        // Fix by attempting to cast to IProfile first, only try IHistogram if it fails.
+        IHistogram1D *histo = 0;
         IProfile1D* prof = dynamic_cast<IProfile1D*>(hobj);
+        if(!prof) histo = dynamic_cast<IHistogram1D*>(hobj);
+        
         // If it's a normal histo:
         if (histo) {
           log << Log::TRACE << "Converting histo " << path << " to DPS" << endl;