diff --git a/k4MarlinWrapper/examples/clicRec_e4h_input.py b/k4MarlinWrapper/examples/clicRec_e4h_input.py index e95f30c0..2e2629b0 100644 --- a/k4MarlinWrapper/examples/clicRec_e4h_input.py +++ b/k4MarlinWrapper/examples/clicRec_e4h_input.py @@ -19,12 +19,12 @@ import os -from Gaudi.Configuration import * +from Gaudi.Configuration import DEBUG, WARNING -from Configurables import LcioEvent, MarlinProcessorWrapper -from k4MarlinWrapper.parseConstants import * +from Configurables import MarlinProcessorWrapper +from k4MarlinWrapper.parseConstants import parseConstants -from Configurables import ToolSvc, Lcio2EDM4hepTool, EDM4hep2LcioTool +from Configurables import Lcio2EDM4hepTool, EDM4hep2LcioTool from Configurables import k4DataSvc, PodioInput, PodioOutput, EventDataSvc from k4FWCore import ApplicationMgr, IOSvc @@ -1183,7 +1183,7 @@ "DropCollectionTypes": [], "FullSubsetCollections": ["EfficientMCParticles", "InefficientMCParticles"], "KeepCollectionNames": [], - "LCIOOutputFile": ["Output_REC_e4h_input.slcio"], + "LCIOOutputFile": [args.rec_output], "LCIOWriteMode": ["WRITE_NEW"], } @@ -1249,7 +1249,7 @@ "RefinedVertices", "RefinedVertices_RP", ], - "LCIOOutputFile": ["Output_DST_e4h_input.slcio"], + "LCIOOutputFile": [args.dst_output], "LCIOWriteMode": ["WRITE_NEW"], } diff --git a/k4MarlinWrapper/src/components/Lcio2EDM4hep.cpp b/k4MarlinWrapper/src/components/Lcio2EDM4hep.cpp index 500f4c58..b29654da 100644 --- a/k4MarlinWrapper/src/components/Lcio2EDM4hep.cpp +++ b/k4MarlinWrapper/src/components/Lcio2EDM4hep.cpp @@ -223,14 +223,14 @@ StatusCode Lcio2EDM4hepTool::convertCollections(lcio::LCEventImpl* the_event) { if (m_podioDataSvc) { auto& metadataFrame = m_podioDataSvc->getMetaDataFrame(); for (const auto& [collName, pidInfo] : pidInfos) { - edm4hep::utils::PIDHandler::setAlgoInfo(metadataFrame, collName, pidInfo); + edm4hep::utils::PIDHandler::setAlgoInfo(metadataFrame, collName, pidInfo); } - } - else { + } else { for (const auto& [collName, pidInfo] : pidInfos) { k4FWCore::putParameter(podio::collMetadataParamName(collName, edm4hep::labels::PIDAlgoName), pidInfo.algoName); k4FWCore::putParameter(podio::collMetadataParamName(collName, edm4hep::labels::PIDAlgoType), pidInfo.algoType()); - k4FWCore::putParameter(podio::collMetadataParamName(collName, edm4hep::labels::PIDParameterNames), pidInfo.paramNames); + k4FWCore::putParameter(podio::collMetadataParamName(collName, edm4hep::labels::PIDParameterNames), + pidInfo.paramNames); } }