From 6515a58a2c6cfe60763732a7fb87e7e1a3f9b4fb Mon Sep 17 00:00:00 2001
From: mmusich <marco.musich@cern.ch>
Date: Fri, 26 Aug 2022 16:32:20 +0200
Subject: [PATCH] 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()