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 3885e92b2bafb..e7404d66353d3 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -2106,7 +2106,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', @@ -3271,7 +3271,10 @@ def gen2021HiMix(fragment,howMuch): '--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 diff --git a/DQMOffline/Alignment/python/ALCARECOTkAlDQM_cff.py b/DQMOffline/Alignment/python/ALCARECOTkAlDQM_cff.py index 18b2d710fed7b..8efca053a6e83 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. ###################################################### @@ -87,12 +86,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/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"); diff --git a/DQMOffline/Alignment/test/DiMuonVertexValidator_cfg.py b/DQMOffline/Alignment/test/DiMuonVertexValidator_cfg.py index 0c987e1600367..7eefad16a4a45 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()