From e15c1e3da6f9b6867326681b9dd35c3d3339a48c Mon Sep 17 00:00:00 2001 From: abellora Date: Thu, 15 Feb 2024 15:02:18 +0100 Subject: [PATCH] Added hltGtStage2Digis to seqALCARECOPPSCalMaxTracksReco --- .../python/ALCARECOPPSCalMaxTracks_Output_cff.py | 2 +- .../python/ALCARECOPPSCalMaxTracks_cff.py | 5 ++++- .../test/test_express_AlCaRecoProducer.sh | 5 +++-- .../PPSAlCaRecoProducer/test/test_prompt_AlCaRecoProducer.sh | 5 +++-- .../test/test_prompt_PPSAlCaReco_output.py | 4 ++-- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Calibration/PPSAlCaRecoProducer/python/ALCARECOPPSCalMaxTracks_Output_cff.py b/Calibration/PPSAlCaRecoProducer/python/ALCARECOPPSCalMaxTracks_Output_cff.py index c0a15113a9939..89d2fde63315e 100644 --- a/Calibration/PPSAlCaRecoProducer/python/ALCARECOPPSCalMaxTracks_Output_cff.py +++ b/Calibration/PPSAlCaRecoProducer/python/ALCARECOPPSCalMaxTracks_Output_cff.py @@ -29,7 +29,7 @@ 'keep recoForwardProtons_ctppsProtonsAlCaRecoProducer_*_*', # HLT info - 'keep *_hltGtStage2ObjectMap_*_*', + 'keep *_hltGtStage2Digis_*_*', 'keep edmTriggerResults_*_*_*', 'keep triggerTriggerEvent_*_*_*' ) diff --git a/Calibration/PPSAlCaRecoProducer/python/ALCARECOPPSCalMaxTracks_cff.py b/Calibration/PPSAlCaRecoProducer/python/ALCARECOPPSCalMaxTracks_cff.py index 8aca8139fe15d..1349baa295f3b 100644 --- a/Calibration/PPSAlCaRecoProducer/python/ALCARECOPPSCalMaxTracks_cff.py +++ b/Calibration/PPSAlCaRecoProducer/python/ALCARECOPPSCalMaxTracks_cff.py @@ -13,15 +13,18 @@ from EventFilter.CTPPSRawToDigi.ctppsRawToDigi_cff import ctppsDiamondRawToDigi as _ctppsDiamondRawToDigi from EventFilter.CTPPSRawToDigi.ctppsRawToDigi_cff import totemTimingRawToDigi as _totemTimingRawToDigi from EventFilter.CTPPSRawToDigi.ctppsRawToDigi_cff import ctppsPixelDigis as _ctppsPixelDigis +from EventFilter.L1TRawToDigi.gtStage2Digis_cfi import gtStage2Digis as _gtStage2Digis ctppsDiamondRawToDigiAlCaRecoProducer = _ctppsDiamondRawToDigi.clone(rawDataTag = 'hltPPSCalibrationRaw') totemTimingRawToDigiAlCaRecoProducer = _totemTimingRawToDigi.clone(rawDataTag = 'hltPPSCalibrationRaw') ctppsPixelDigisAlCaRecoProducer = _ctppsPixelDigis.clone(inputLabel = 'hltPPSCalibrationRaw') +hltGtStage2Digis = _gtStage2Digis.clone(InputLabel="hltFEDSelectorL1") ctppsRawToDigiTaskAlCaRecoProducer = cms.Task( ctppsDiamondRawToDigiAlCaRecoProducer, totemTimingRawToDigiAlCaRecoProducer, - ctppsPixelDigisAlCaRecoProducer + ctppsPixelDigisAlCaRecoProducer, + hltGtStage2Digis ) ALCARECOPPSCalMaxTracksRaw2Digi = cms.Sequence(ctppsRawToDigiTaskAlCaRecoProducer) diff --git a/Calibration/PPSAlCaRecoProducer/test/test_express_AlCaRecoProducer.sh b/Calibration/PPSAlCaRecoProducer/test/test_express_AlCaRecoProducer.sh index 697565d547e5f..e72383518f391 100755 --- a/Calibration/PPSAlCaRecoProducer/test/test_express_AlCaRecoProducer.sh +++ b/Calibration/PPSAlCaRecoProducer/test/test_express_AlCaRecoProducer.sh @@ -4,7 +4,8 @@ function die { echo $1: status $2; exit $2; } customise_commands="process.GlobalTag.toGet = cms.VPSet()\ \nprocess.GlobalTag.toGet.append(cms.PSet(record = cms.string(\"AlCaRecoTriggerBitsRcd\"),tag = cms.string(\"AlCaRecoHLTpaths_PPS2022_express_v1\"), connect = cms.string(\"frontier://FrontierProd/CMS_CONDITIONS\")))\ \nprocess.GlobalTag.toGet.append(cms.PSet(record = cms.string(\"PPSTimingCalibrationLUTRcd\"),tag = cms.string(\"PPSDiamondTimingCalibrationLUT_test\"), connect = cms.string(\"frontier://FrontierProd/CMS_CONDITIONS\")))\ -\nprocess.ALCARECOPPSCalMaxTracksFilter.TriggerResultsTag = cms.InputTag(\"TriggerResults\",\"\",\"HLTX\")" +\nprocess.ALCARECOPPSCalMaxTracksFilter.TriggerResultsTag = cms.InputTag(\"TriggerResults\",\"\",\"HLTX\")\ +\nprocess.hltGtStage2Digis.InputLabel = cms.InputTag(\"hltFEDSelectorL1\",\"\",\"HLTX\")" INPUTFILE="/store/group/alca_global/pps_alcareco_producer_tests/outputALCAPPS_single.root" COMMMAND=`xrdfs cms-xrd-global.cern.ch locate $INPUTFILE` @@ -15,7 +16,7 @@ if [ $STATUS -eq 0 ]; then (cmsDriver.py testExpressPPSAlCaRecoProducer -s ALCAPRODUCER:PPSCalMaxTracks,ENDJOB \ --process ALCARECO \ --scenario pp \ - --era ctpps_2018 \ + --era run3_common \ --conditions auto:run3_data_express \ --data \ --datatier ALCARECO \ diff --git a/Calibration/PPSAlCaRecoProducer/test/test_prompt_AlCaRecoProducer.sh b/Calibration/PPSAlCaRecoProducer/test/test_prompt_AlCaRecoProducer.sh index 6d485f1f40870..d1aae9798f4c7 100755 --- a/Calibration/PPSAlCaRecoProducer/test/test_prompt_AlCaRecoProducer.sh +++ b/Calibration/PPSAlCaRecoProducer/test/test_prompt_AlCaRecoProducer.sh @@ -4,7 +4,8 @@ function die { echo $1: status $2; exit $2; } customise_commands="process.GlobalTag.toGet = cms.VPSet()\ \nprocess.GlobalTag.toGet.append(cms.PSet(record = cms.string(\"AlCaRecoTriggerBitsRcd\"),tag = cms.string(\"AlCaRecoHLTpaths_PPS2022_prompt_v1\"), connect = cms.string(\"frontier://FrontierProd/CMS_CONDITIONS\")))\ \nprocess.GlobalTag.toGet.append(cms.PSet(record = cms.string(\"PPSTimingCalibrationLUTRcd\"),tag = cms.string(\"PPSDiamondTimingCalibrationLUT_test\"), connect = cms.string(\"frontier://FrontierProd/CMS_CONDITIONS\")))\ -\nprocess.ALCARECOPPSCalMaxTracksFilter.TriggerResultsTag = cms.InputTag(\"TriggerResults\",\"\",\"HLTX\")" +\nprocess.ALCARECOPPSCalMaxTracksFilter.TriggerResultsTag = cms.InputTag(\"TriggerResults\",\"\",\"HLTX\")\ +\nprocess.hltGtStage2Digis.InputLabel = cms.InputTag(\"hltFEDSelectorL1\",\"\",\"HLTX\")" INPUTFILE="/store/group/alca_global/pps_alcareco_producer_tests/outputALCAPPS_single.root" COMMMAND=`xrdfs cms-xrd-global.cern.ch locate $INPUTFILE` @@ -17,7 +18,7 @@ if [ $STATUS -eq 0 ]; then (cmsDriver.py testPromptPPSAlCaRecoProducer -s ALCAPRODUCER:PPSCalMaxTracks,ENDJOB \ --process ALCARECO \ --scenario pp \ - --era ctpps_2018 \ + --era run3_common \ --conditions auto:run3_data_express \ --data \ --datatier ALCARECO \ diff --git a/Calibration/PPSAlCaRecoProducer/test/test_prompt_PPSAlCaReco_output.py b/Calibration/PPSAlCaRecoProducer/test/test_prompt_PPSAlCaReco_output.py index 27cb8bb23aeb1..939f2468dea88 100644 --- a/Calibration/PPSAlCaRecoProducer/test/test_prompt_PPSAlCaReco_output.py +++ b/Calibration/PPSAlCaRecoProducer/test/test_prompt_PPSAlCaReco_output.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms # load era modifier to run on 2018 data -from Configuration.Eras.Modifier_ctpps_2018_cff import ctpps_2018 +from Configuration.Eras.Modifier_run3_common_cff import run3_common -process = cms.Process( 'TEST',ctpps_2018) +process = cms.Process( 'TEST',run3_common) # LHCInfo plotter process.load('Validation.CTPPS.ctppsLHCInfoPlotter_cfi')