Merge branch 'master-loose-truth' into 'master'

Add secondaries from hadronic processes to the truth record

See merge request faser/calypso!281

DetectorDescription/GeoModel/FaserGeoModel/python/GeoModelInit.py

@@ -97,7 +97,7 @@ def _setupGeoModel():
 
     #conddb.addFolderSplitOnline("SCT","/Tracker/Onl/Align","/Tracker/Align",className="AlignableTransformContainer")
     print("Override Alignment dbname to OFLP200, fix this when alignment available in CONDBR3")
-    conddb.addFolder("/Tracker/Align", "SCT_OFL",className="AlignableTransformContainer",db="OFLP200")
+    conddb.addFolder("/Tracker/Align", "SCT_OFL",className="AlignableTransformContainer")
     from AthenaCommon.AlgSequence import AthSequencer
     condSeq = AthSequencer("AthCondSeq")
     if not hasattr(condSeq, "FaserSCT_AlignCondAlg"):

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

@@ -11,7 +11,7 @@ from AthenaConfiguration.ComponentFactory import CompFactory
 from BarcodeServices.BarcodeServicesConfigNew import MC15aPlusBarcodeSvcCfg
 from ISF_HepMC_Tools.ISF_HepMC_ToolsConfigNew import ParticleFinalStateFilterCfg, GenParticleInteractingFilterCfg
 # from FaserISF_HepMC_Tools.FaserISF_HepMC_ToolsConfigNew import FaserTruthStrategyCfg, FaserDipoleTruthStrategyCfg
-from FaserISF_HepMC_Tools.FaserISF_HepMC_ToolsConfigNew import TruthStrategyGroupCfg
+from FaserISF_HepMC_Tools.FaserISF_HepMC_ToolsConfigNew import TruthStrategyGroupCfg, TrenchStrategyGroupCfg
 
 ISF__FaserTruthSvc, ISF__FaserGeoIDSvc, ISF__FaserInputConverter = CompFactory.getComps("ISF::FaserTruthSvc","ISF::FaserGeoIDSvc","ISF::FaserInputConverter")
 
@@ -65,8 +65,10 @@ def FaserTruthServiceCfg(ConfigFlags, name="FaserISF_TruthService", **kwargs):
     # acc2= FaserDipoleTruthStrategyCfg(ConfigFlags)
     # kwargs.setdefault('TruthStrategies',[result.popToolsAndMerge(acc), result.popToolsAndMerge(acc2)])
     acc = TruthStrategyGroupCfg(ConfigFlags)
-    kwargs.setdefault('TruthStrategies', [result.popToolsAndMerge(acc)])
-    
+    # FaserNu hack
+    acc2 = TrenchStrategyGroupCfg(ConfigFlags)
+    kwargs.setdefault('TruthStrategies', [result.popToolsAndMerge(acc), result.popToolsAndMerge(acc2)])
+
     kwargs.setdefault('SkipIfNoChildren', True)
     kwargs.setdefault('SkipIfNoParentBarcode', True)
 

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

@@ -162,7 +162,7 @@ def TruthStrategyGroupCfg(ConfigFlags, name="ISF_MCTruthStrategyGroupID", **kwar
     result = ComponentAccumulator()
     kwargs.setdefault("ParentMinEkin", 100.*MeV)
     kwargs.setdefault("ChildMinEkin" , 100.*MeV)
-    kwargs.setdefault("VertexTypes", [3, 14, 15, 4, 5, 6, 7, 2, 12, 13])
+    kwargs.setdefault("VertexTypes", [3, 14, 15, 4, 5, 6, 7, 2, 12, 13, 111, 121, 131, 132, 141, 151, 152, 161, 310])  # EM *and* nuclear
     kwargs.setdefault("VertexTypeRangeLow"  , 201)  # All kinds of decay processes
     kwargs.setdefault("VertexTypeRangeHigh" , 298)  # ...
     kwargs.setdefault("Regions", [FaserRegion.fFaserNeutrino,
@@ -173,6 +173,23 @@ def TruthStrategyGroupCfg(ConfigFlags, name="ISF_MCTruthStrategyGroupID", **kwar
     result.setPrivateTools(CompFactory.ISF.FaserTruthStrategy(name, **kwargs))
     return result
 
+# FaserNu hack
+def TrenchStrategyGroupCfg(ConfigFlags, name="ISF_TrenchStrategyGroupID", **kwargs):
+
+    import ROOT, cppyy
+    cppyy.load_library('FaserDetDescrDict')
+    FaserRegion = ROOT.FaserDetDescr.FaserRegion
+
+    result = ComponentAccumulator()
+    kwargs.setdefault("ParentMinEkin", 10000.*MeV)
+    kwargs.setdefault("ChildMinEkin" , 10000.*MeV)
+    kwargs.setdefault("VertexTypes", [3, 14, 15, 4, 5, 6, 7, 2, 12, 13, 111, 121, 131, 132, 141, 151, 152, 161, 310])  # EM *and* nuclear
+    kwargs.setdefault("VertexTypeRangeLow"  , 201)  # All kinds of decay processes
+    kwargs.setdefault("VertexTypeRangeHigh" , 298)  # ...
+    kwargs.setdefault("Regions", [FaserRegion.fFaserTrench])
+    result.setPrivateTools(CompFactory.ISF.FaserTruthStrategy(name, **kwargs))
+    return result
+
 
 # def FaserDipoleTruthStrategyCfg(ConfigFlags, name="ISF_FaserDipoleTruthStrategy", **kwargs):
 #     result = ComponentAccumulator()