Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[12.5.X] Move DiMuonMassBiasClient to a regular harvesting path #39247

Merged
merged 3 commits into from
Aug 31, 2022
Merged

[12.5.X] Move DiMuonMassBiasClient to a regular harvesting path #39247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5bab3b
remove useless DMQToken produce and consumes
mmusich Aug 26, 2022
8bbdda6
move DiMuonMassBiasClient to be run in the '@muon' harvesting sequence
mmusich Aug 26, 2022
9b3144c
include new Production workflow, including DQM harvesting
malbouis Aug 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Configuration/PyReleaseValidation/python/relval_production.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']]
Expand Down
7 changes: 5 additions & 2 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions DQMOffline/Alignment/python/ALCARECOTkAlDQM_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
######################################################
Expand Down Expand Up @@ -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 ---########################
Expand Down
10 changes: 10 additions & 0 deletions DQMOffline/Alignment/python/DiMuonMassBiasHarvesting_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
3 changes: 0 additions & 3 deletions DQMOffline/Alignment/src/DiMuonMassBiasClient.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ DiMuonMassBiasClient::DiMuonMassBiasClient(edm::ParameterSet const& iConfig)
{
edm::LogInfo("DiMuonMassBiasClient") << "DiMuonMassBiasClient::Constructing DiMuonMassBiasClient ";

consumes<DQMToken, edm::InRun>(edm::InputTag("DiMuonMassBiasMonitor", "DQMGenerationDiMuonMassBiasMonitorRun"));
consumes<DQMToken, edm::InLumi>(edm::InputTag("DiMuonMassBiasMonitor", "DQMGenerationDiMuonMassBiasMonitorLumi"));

// fill the parameters for the fit
edm::ParameterSet fit_par = iConfig.getParameter<edm::ParameterSet>("fit_par");
diMuonMassBias::fillArrayF(meanConfig_, fit_par, "mean_par");
Expand Down
5 changes: 1 addition & 4 deletions DQMOffline/Alignment/src/DiMuonMassBiasMonitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,7 @@ DiMuonMassBiasMonitor::DiMuonMassBiasMonitor(const edm::ParameterSet& iConfig)
MEFolderName_(iConfig.getParameter<std::string>("FolderName")),
decayMotherName_(iConfig.getParameter<std::string>("decayMotherName")),
distanceScaleFactor_(iConfig.getParameter<double>("distanceScaleFactor")),
DiMuMassConfiguration_(iConfig.getParameter<edm::ParameterSet>("DiMuMassConfig")) {
produces<DQMToken, edm::Transition::EndRun>("DQMGenerationDiMuonMassBiasMonitorRun");
produces<DQMToken, edm::Transition::EndLuminosityBlock>("DQMGenerationDiMuonMassBiasMonitorLumi");
}
DiMuMassConfiguration_(iConfig.getParameter<edm::ParameterSet>("DiMuMassConfig")) {}

void DiMuonMassBiasMonitor::bookHistograms(DQMStore::IBooker& iBooker, edm::Run const&, edm::EventSetup const&) {
iBooker.setCurrentFolder(MEFolderName_ + "/DiMuonMassBiasMonitor/MassBias");
Expand Down
2 changes: 1 addition & 1 deletion DQMOffline/Alignment/test/DiMuonVertexValidator_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 3 additions & 1 deletion DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )

Expand Down Expand Up @@ -203,7 +204,8 @@
DQMHarvestMuon = cms.Sequence( dtClients *
rpcTier0Client *
cscOfflineCollisionsClients *
muonQualityTests
muonQualityTests *
alcaTkAlZMuMuBiasClients
)

_run3_GEM_DQMHarvestMuon = DQMHarvestMuon.copy()
Expand Down