From 99b7619b31d3f9d600b291d9f77b2c059ca93094 Mon Sep 17 00:00:00 2001 From: mmusich Date: Fri, 26 Aug 2022 16:31:37 +0200 Subject: [PATCH 1/3] remove useless DMQToken produce and consumes --- DQMOffline/Alignment/src/DiMuonMassBiasClient.cc | 3 --- DQMOffline/Alignment/src/DiMuonMassBiasMonitor.cc | 5 +---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/DQMOffline/Alignment/src/DiMuonMassBiasClient.cc b/DQMOffline/Alignment/src/DiMuonMassBiasClient.cc index 9e9a7f1a7cf49..279d090767706 100644 --- a/DQMOffline/Alignment/src/DiMuonMassBiasClient.cc +++ b/DQMOffline/Alignment/src/DiMuonMassBiasClient.cc @@ -24,9 +24,6 @@ DiMuonMassBiasClient::DiMuonMassBiasClient(edm::ParameterSet const& iConfig) { edm::LogInfo("DiMuonMassBiasClient") << "DiMuonMassBiasClient::Constructing DiMuonMassBiasClient "; - consumes(edm::InputTag("DiMuonMassBiasMonitor", "DQMGenerationDiMuonMassBiasMonitorRun")); - consumes(edm::InputTag("DiMuonMassBiasMonitor", "DQMGenerationDiMuonMassBiasMonitorLumi")); - // fill the parameters for the fit edm::ParameterSet fit_par = iConfig.getParameter("fit_par"); diMuonMassBias::fillArrayF(meanConfig_, fit_par, "mean_par"); diff --git a/DQMOffline/Alignment/src/DiMuonMassBiasMonitor.cc b/DQMOffline/Alignment/src/DiMuonMassBiasMonitor.cc index 16befc138614d..150bd498c7f3d 100644 --- a/DQMOffline/Alignment/src/DiMuonMassBiasMonitor.cc +++ b/DQMOffline/Alignment/src/DiMuonMassBiasMonitor.cc @@ -34,10 +34,7 @@ DiMuonMassBiasMonitor::DiMuonMassBiasMonitor(const edm::ParameterSet& iConfig) MEFolderName_(iConfig.getParameter("FolderName")), decayMotherName_(iConfig.getParameter("decayMotherName")), distanceScaleFactor_(iConfig.getParameter("distanceScaleFactor")), - DiMuMassConfiguration_(iConfig.getParameter("DiMuMassConfig")) { - produces("DQMGenerationDiMuonMassBiasMonitorRun"); - produces("DQMGenerationDiMuonMassBiasMonitorLumi"); -} + DiMuMassConfiguration_(iConfig.getParameter("DiMuMassConfig")) {} void DiMuonMassBiasMonitor::bookHistograms(DQMStore::IBooker& iBooker, edm::Run const&, edm::EventSetup const&) { iBooker.setCurrentFolder(MEFolderName_ + "/DiMuonMassBiasMonitor/MassBias"); From 6515a58a2c6cfe60763732a7fb87e7e1a3f9b4fb Mon Sep 17 00:00:00 2001 From: mmusich Date: Fri, 26 Aug 2022 16:32:20 +0200 Subject: [PATCH 2/3] move DiMuonMassBiasClient to be run in the '@muon' harvesting sequence --- DQMOffline/Alignment/python/ALCARECOTkAlDQM_cff.py | 6 ------ .../Alignment/python/DiMuonMassBiasHarvesting_cff.py | 10 ++++++++++ DQMOffline/Alignment/test/DiMuonVertexValidator_cfg.py | 2 +- .../Configuration/python/DQMOffline_SecondStep_cff.py | 4 +++- 4 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 DQMOffline/Alignment/python/DiMuonMassBiasHarvesting_cff.py diff --git a/DQMOffline/Alignment/python/ALCARECOTkAlDQM_cff.py b/DQMOffline/Alignment/python/ALCARECOTkAlDQM_cff.py index 8074dd4705926..51dabed8cae56 100644 --- a/DQMOffline/Alignment/python/ALCARECOTkAlDQM_cff.py +++ b/DQMOffline/Alignment/python/ALCARECOTkAlDQM_cff.py @@ -3,7 +3,6 @@ import DQMOffline.Alignment.TkAlCaRecoMonitor_cfi import DQMOffline.Alignment.DiMuonVertexMonitor_cfi import DQMOffline.Alignment.DiMuonMassBiasMonitor_cfi -import DQMOffline.Alignment.DiMuonMassBiasClient_cfi #Below all DQM modules for TrackerAlignment AlCaRecos are instantiated. ###################################################### @@ -97,12 +96,7 @@ FolderName = "AlCaReco/"+__selectionName ) -ALCARECOTkAlDiMuonMassBiasClient = DQMOffline.Alignment.DiMuonMassBiasClient_cfi.DiMuonMassBiasClient.clone( - FolderName = "AlCaReco/"+__selectionName -) - ALCARECOTkAlDiMuonAndVertexDQM = cms.Sequence(ALCARECOTkAlDiMuonAndVertexTkAlDQM + ALCARECOTkAlDiMuonAndVertexVtxDQM + ALCARECOTkAlDiMuonMassBiasDQM) -# comment for now, doesn't support concurrent lumis + ALCARECOTkAlDiMuonMassBiasClient) ######################################################### #############--- TkAlZMuMuHI ---######################## diff --git a/DQMOffline/Alignment/python/DiMuonMassBiasHarvesting_cff.py b/DQMOffline/Alignment/python/DiMuonMassBiasHarvesting_cff.py new file mode 100644 index 0000000000000..9f36739a899ab --- /dev/null +++ b/DQMOffline/Alignment/python/DiMuonMassBiasHarvesting_cff.py @@ -0,0 +1,10 @@ +import FWCore.ParameterSet.Config as cms + +from DQMOffline.Alignment.DiMuonMassBiasClient_cfi import DiMuonMassBiasClient as diMuonMassBiasClient + +__selectionName = 'TkAlDiMuonAndVertex' +ALCARECOTkAlZMuMuMassBiasClient = diMuonMassBiasClient.clone( + FolderName = "AlCaReco/"+__selectionName +) + +alcaTkAlZMuMuBiasClients = cms.Sequence(ALCARECOTkAlZMuMuMassBiasClient) diff --git a/DQMOffline/Alignment/test/DiMuonVertexValidator_cfg.py b/DQMOffline/Alignment/test/DiMuonVertexValidator_cfg.py index 87fd3eff7cf8e..4e9f7543b5ab1 100644 --- a/DQMOffline/Alignment/test/DiMuonVertexValidator_cfg.py +++ b/DQMOffline/Alignment/test/DiMuonVertexValidator_cfg.py @@ -89,7 +89,7 @@ process.load("DQMOffline.Configuration.AlCaRecoDQM_cff") -process.seqALCARECOTkAlDiMuonAndVertex = cms.Sequence(process.ALCARECOTkAlDiMuonAndVertexVtxDQM + process.ALCARECOTkAlDiMuonMassBiasDQM + process.ALCARECOTkAlDiMuonMassBiasClient) +process.seqALCARECOTkAlDiMuonAndVertex = cms.Sequence(process.ALCARECOTkAlDiMuonAndVertexVtxDQM + process.ALCARECOTkAlDiMuonMassBiasDQM) process.dqmoffline_step = cms.EndPath(process.seqALCARECOTkAlDiMuonAndVertex) process.DQMoutput_step = cms.EndPath(process.DQMoutput) diff --git a/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py b/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py index cc81c4fcea6da..7543f494c671c 100644 --- a/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py +++ b/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py @@ -126,6 +126,7 @@ from Validation.RecoTau.DQMSequences_cfi import * from DQM.TrackingMonitorClient.pixelTrackingEffFromHitPattern_cff import * from DQM.TrackingMonitorClient.pixelVertexResolutionClient_cfi import * +from DQMOffline.Alignment.DiMuonMassBiasHarvesting_cff import * DQMHarvestTrackerStrip = cms.Sequence ( SiStripOfflineDQMClient ) @@ -203,7 +204,8 @@ DQMHarvestMuon = cms.Sequence( dtClients * rpcTier0Client * cscOfflineCollisionsClients * - muonQualityTests + muonQualityTests * + alcaTkAlZMuMuBiasClients ) _run3_GEM_DQMHarvestMuon = DQMHarvestMuon.copy() From 1ec6145bdfe368436bfcdb5a795c0eea8829c535 Mon Sep 17 00:00:00 2001 From: Helena Date: Sat, 27 Aug 2022 17:23:52 +0200 Subject: [PATCH 3/3] include new Production workflow, including DQM harvesting --- .../python/relval_production.py | 2 ++ .../PyReleaseValidation/python/relval_steps.py | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Configuration/PyReleaseValidation/python/relval_production.py b/Configuration/PyReleaseValidation/python/relval_production.py index 0e68fc9ed9a77..07c4428688712 100644 --- a/Configuration/PyReleaseValidation/python/relval_production.py +++ b/Configuration/PyReleaseValidation/python/relval_production.py @@ -14,6 +14,8 @@ workflows[1001.2] = [ '',['RunZeroBias2017F','TIER0EXPRUN2','ALCAEXPRUN2','ALCAHARVDSIPIXELCAL','ALCAHARVDSIPIXELCALLA','ALCAHARVD4','ALCAHARVDSIPIXELALIHG']] workflows[1001.3] = [ '',['RunSingleMuon2022B','TIER0EXPRUN3','ALCAEXPRUN3','ALCAHARVDEXPRUN3']] workflows[1002.3] = [ '',['RunZeroBias2022B','TIER0PROMPTRUN3','ALCASPLITRUN3','ALCAHARVDEXPRUN3']] +workflows[1002.4] = [ '',['RunDoubleMuon2022B','TIER0PROMPTRUN3','HARVESTPROMPTRUN3']] + workflows[1002]=['RRD',['RunMinBias2011A','RECODR1','COPYPASTE']] workflows[1003]=['', ['RunMinBias2012A','RECODDQM','HARVESTDDQM']] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index f8c11a5792220..93e8846f382a3 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -481,6 +481,8 @@ Run2022B={355130: [[1, 40]]} steps['RunSingleMuon2022B']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2022B-v1/RAW',label='2022B',events=100000,location='STD', ls=Run2022B)} steps['RunZeroBias2022B']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2022B-v1/RAW',label='2022B',events=100000,location='STD', ls=Run2022B)} +Run2022B={355680: [[21, 24]]} +steps['RunDoubleMuon2022B']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2022B-v1/RAW',label='2022B',events=100000,location='STD', ls=Run2022B)} # Highstat HLTPhysics @@ -2039,7 +2041,7 @@ def lhegensim2018ml(fragment,howMuch): '--conditions':'auto:run3_data_express' },steps['TIER0']]) -steps['TIER0PROMPTRUN3']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,ALCAPRODUCER:@allForPrompt+@allForExpress,DQM:@express,ENDJOB', +steps['TIER0PROMPTRUN3']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,ALCAPRODUCER:@allForPrompt+@allForExpress,DQM:@allForPrompt,ENDJOB', '--process':'RECO', '--datatier':'ALCARECO,DQMIO', '--eventcontent':'ALCARECO,DQM', @@ -3167,6 +3169,18 @@ def gen2021HiMix(fragment,howMuch): '--era' : 'Run2_2018_pp_on_AA', '--filetype':'DQM', '-n':100},hiDefaults2018_ppReco]) + +steps['HARVESTDRUN3']={'-s':'HARVESTING:@standardDQMFakeHLT+@miniAODDQM+@nanoAODDQM', + '--conditions':'auto:run3_data', + '--data':'', + '--filetype':'DQM', + '--scenario':'pp'} + +steps['HARVESTPROMPTRUN3']=merge([{'--data':'', '-s':'HARVESTING:@allForPrompt','--era':'Run3'},steps['HARVESTDRUN3']]) + + +steps['HARVESTRUN3']=merge([{'--data':'', '-s':'HARVESTING:@miniAODDQM+@nanoAODDQM'},steps['HARVESTDRUN3']]) + #MC steps['HARVEST']={'-s':'HARVESTING:validationHarvestingNoHLT+dqmHarvestingFakeHLT', '--conditions':'auto:run1_mc',