From f9dc29eea06459e9f02ab95ac3d9375fe5e9ab76 Mon Sep 17 00:00:00 2001 From: Norraphat Date: Mon, 11 Mar 2019 22:35:09 +0100 Subject: [PATCH] bypassVersionCheck should not apply to DQMRootSource --- Configuration/DataProcessing/python/Merge.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Configuration/DataProcessing/python/Merge.py b/Configuration/DataProcessing/python/Merge.py index 384b1699b0109..ac3dc11a7b0e4 100644 --- a/Configuration/DataProcessing/python/Merge.py +++ b/Configuration/DataProcessing/python/Merge.py @@ -27,6 +27,7 @@ def mergeProcess(*inputFiles, **options): - newDQMIO : specifies if the new DQM format should be used to merge the files - output_file : sets the output file name - output_lfn : sets the output LFN + - mergeNANO : to merge NanoAOD - bypassVersionCheck : to bypass version check in case merging happened in lower version of CMSSW (i.e. UL HLT case). This will be TRUE by default. """ @@ -54,6 +55,7 @@ def mergeProcess(*inputFiles, **options): process.add_(Service("DQMStore")) else: process.source = Source("PoolSource") + process.source.bypassVersionCheck = CfgTypes.untracked.bool(bypassVersionCheck) if dropDQM: process.source.inputCommands = CfgTypes.untracked.vstring('keep *','drop *_EDMtoMEConverter_*_*') process.source.fileNames = CfgTypes.untracked(CfgTypes.vstring()) @@ -71,9 +73,6 @@ def mergeProcess(*inputFiles, **options): else: outMod = OutputModule("PoolOutputModule") - # To bypass the version check in the merge process (TRUE by default) - process.source.bypassVersionCheck = CfgTypes.untracked.bool(bypassVersionCheck) - outMod.fileName = CfgTypes.untracked.string(outputFilename) if outputLFN != None: outMod.logicalFileName = CfgTypes.untracked.string(outputLFN)