Merge branch 'master-cppyy-fix' into 'master'

Fix python issue caused by ROOT 6.22

See merge request !88

Simulation/ISF/ISF_Core/FaserISF_Services/python/FaserISF_ServicesConfigNew.py

@@ -87,9 +87,12 @@ def FaserTruthServiceCfg(ConfigFlags, name="FaserISF_TruthService", **kwargs):
     kwargs.setdefault('SkipIfNoChildren', True)
     kwargs.setdefault('SkipIfNoParentBarcode', True)
 
-    import ROOT, cppyy
-    cppyy.loadDictionary('FaserDetDescrDict')
-    FaserRegion = ROOT.FaserDetDescr
+    import PyUtils.RootUtils as rootUtils
+    ROOT = rootUtils.import_root()
+
+    import cppyy
+    cppyy.load_library('FaserDetDescrDict')
+    from ROOT.FaserDetDescr import FaserRegion
 
     kwargs.setdefault('ForceEndVtxInRegions', [FaserRegion.fFaserNeutrino,
                                                FaserRegion.fFaserScintillator,

Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Tools/python/FaserISF_HepMC_ToolsConfigNew.py

@@ -155,9 +155,12 @@ def FaserParticleGenericFilterCfg(ConfigFlags, name="ISF_FaserGenericFilter", **
 
 def FaserDipoleTruthStrategyCfg(ConfigFlags, name="ISF_FaserDipoleTruthStrategy", **kwargs):
     result = ComponentAccumulator()
-    import ROOT, cppyy
-    cppyy.loadDictionary('FaserDetDescrDict')
-    FaserRegion = ROOT.FaserDetDescr
+
+    import PyUtils.RootUtils as rootUtils
+    ROOT = rootUtils.import_root()
+    import cppyy
+    cppyy.load_library('FaserDetDescrDict')
+    from ROOT.FaserDetDescr import FaserRegion
     #
     # Save truth in Dipole region
     #
@@ -170,9 +173,13 @@ def FaserDipoleTruthStrategyCfg(ConfigFlags, name="ISF_FaserDipoleTruthStrategy"
 
 def FaserTruthStrategyCfg(ConfigFlags, name="ISF_FaserTruthStrategy", **kwargs):
     result = ComponentAccumulator()
-    import ROOT, cppyy
-    cppyy.loadDictionary('FaserDetDescrDict')
-    FaserRegion = ROOT.FaserDetDescr
+
+    import PyUtils.RootUtils as rootUtils
+    ROOT = rootUtils.import_root()
+
+    import cppyy
+    cppyy.load_library('FaserDetDescrDict')
+    from ROOT.FaserDetDescr import FaserRegion
     #
     # Save truth in all regions except Dipole
     #