From 22dfcdeb5c2fab932e641288bf68834ce4f2a8c7 Mon Sep 17 00:00:00 2001
From: Dave Casper <dcasper@uci.edu>
Date: Sat, 12 Sep 2020 16:23:54 -0700
Subject: [PATCH] Fix python issue caused by ROOT 6.22
---
.../python/FaserISF_ServicesConfigNew.py | 9 ++++++---
.../python/FaserISF_HepMC_ToolsConfigNew.py | 19 +++++++++++++------
2 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/Simulation/ISF/ISF_Core/FaserISF_Services/python/FaserISF_ServicesConfigNew.py b/Simulation/ISF/ISF_Core/FaserISF_Services/python/FaserISF_ServicesConfigNew.py
index 08bcc38f..6f7478c4 100644
--- a/Simulation/ISF/ISF_Core/FaserISF_Services/python/FaserISF_ServicesConfigNew.py
+++ b/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,
diff --git a/Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Tools/python/FaserISF_HepMC_ToolsConfigNew.py b/Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Tools/python/FaserISF_HepMC_ToolsConfigNew.py
index 5555ef8b..4d84c137 100644
--- a/Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Tools/python/FaserISF_HepMC_ToolsConfigNew.py
+++ b/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
#
--
GitLab