Removed workarounds for ROOT-5850 and ROOT-5847.

https://sft.its.cern.ch/jira/browse/ROOT-5850
https://sft.its.cern.ch/jira/browse/ROOT-5847

From: Marco Clemencic <marco.clemencic@cern.ch>


git-svn-id: svn+ssh://svn.cern.ch/reps/gaudi/Gaudi/trunk@7382 53ecefc3-a64d-0410-9bdf-b8581fa3287e

GaudiPython/GaudiPython/Helpers.h

@@ -143,14 +143,6 @@ struct Helper {
     if ( 0 != hsvc && hsvc->findObject ( path , h ).isSuccess() ) { return h ; }
     return 0 ;
   }
-  // FIXME: (MCl) workaround for ROOT-5847
-  static const Property* WorkaroundROOT5847(const Property* p) { return p; }
-  // FIXME: (MCl) workaround for ROOT-5850
-  static const AIDA::IProfile1D* WorkaroundROOT5850(const AIDA::IProfile1D* p) { return p; }
-  static const AIDA::IProfile2D* WorkaroundROOT5850(const AIDA::IProfile2D* p) { return p; }
-  static const AIDA::IHistogram1D* WorkaroundROOT5850(const AIDA::IHistogram1D* p) { return p; }
-  static const AIDA::IHistogram2D* WorkaroundROOT5850(const AIDA::IHistogram2D* p) { return p; }
-  static const AIDA::IHistogram3D* WorkaroundROOT5850(const AIDA::IHistogram3D* p) { return p; }
 
 // Array support
 private:

GaudiPython/doc/release.notes

 Package: GaudiPython
 Package manager : Marco Clemencic
 
+! 2014-01-06 - Marco Clemencic
+ - Removed workarounds for ROOT-5850 and ROOT-5847.
+   https://sft.its.cern.ch/jira/browse/ROOT-5850
+   https://sft.its.cern.ch/jira/browse/ROOT-5847
+
 ! 2013-12-16 - Marco Clemencic
  - Added workaround for ROOT-5850.
    https://sft.its.cern.ch/jira/browse/ROOT-5850

GaudiPython/python/GaudiPython/Bindings.py

@@ -243,8 +243,6 @@ class iProperty(object) :
             props = self._optsvc.getProperties(self._name)
             for p in props :
                 if not p.name() == name : continue
-                if ROOT6WorkAroundEnabled('ROOT-5847'):
-                    p = gbl.GaudiPython.Helper.WorkaroundROOT5847(p)
                 # from JobOptionsSvc we always have only strings
                 try:    return eval( p.value(), {}, {} )
                 except: return p.value()

GaudiPython/python/GaudiPython/GaudiAlgs.py

@@ -68,7 +68,6 @@ from GaudiPython.Bindings import (
 from GaudiPython.Bindings   import gbl as cpp         ##  global C++ namepspace
 from GaudiPython.HistoUtils import aida2root          ## AIDA -> ROTO converter
 
-from GaudiKernel import ROOT6WorkAroundEnabled
 # =============================================================================
 # std C++ namespace
 std = cpp.std                                         ## std C++ namespace
@@ -1362,10 +1361,7 @@ def _get_all_histos_  ( component , method , name ) :
             if   _id.numeric() : _id = _id.numericID  ()
             elif _id.literal() : _id = _id.literalID  ()
             else               : _id = _is.idAsString ()
-            h = _his[ _i ]
-            if ROOT6WorkAroundEnabled('ROOT-5850'):
-                h = cpp.GaudiPython.Helper.WorkaroundROOT5850(h)
-            _res [ _id ] = h
+            _res[ _id ] = _his[ _i ]
 
     if not name : return _res                          ## return the dictionary