Merge pull request #37848 from NiharSaha/CMSSW_12_4_X_DQM_BeamMonitor

Migration of input collection parameters to untracked in DQM/BeamMonitor package
cms-sw · Jul 9, 2022 · 757f273 · 757f273
2 parents 32b61c2 + d00e750
commit 757f273
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 17 deletions.
diff --git a/DQM/BeamMonitor/plugins/BeamMonitor.cc b/DQM/BeamMonitor/plugins/BeamMonitor.cc
@@ -131,7 +131,7 @@ BeamMonitor::BeamMonitor(const ParameterSet& ps)
   tracksLabel_ = consumes<reco::TrackCollection>(
       ps.getParameter<ParameterSet>("BeamFitter").getUntrackedParameter<InputTag>("TrackCollection"));
   pvSrc_ = consumes<reco::VertexCollection>(ps.getUntrackedParameter<InputTag>("primaryVertex"));
-  hltSrc_ = consumes<TriggerResults>(ps.getParameter<InputTag>("hltResults"));
+  hltSrc_ = consumes<TriggerResults>(ps.getUntrackedParameter<InputTag>("hltResults"));
   intervalInSec_ = ps.getUntrackedParameter<int>("timeInterval", 920);  //40 LS X 23"
   fitNLumi_ = ps.getUntrackedParameter<int>("fitEveryNLumi", -1);
   resetFitNLumi_ = ps.getUntrackedParameter<int>("resetEveryNLumi", -1);
@@ -166,7 +166,7 @@ BeamMonitor::BeamMonitor(const ParameterSet& ps)
   nextlumi_ = 0;
   processed_ = false;
 
-  tcdsToken_ = consumes<TCDSRecord>(ps.getParameter<InputTag>("tcdsRecord"));
+  tcdsToken_ = consumes<TCDSRecord>(ps.getUntrackedParameter<InputTag>("tcdsRecord"));
 }
 
 //--------------------------------------------------------

diff --git a/DQM/BeamMonitor/plugins/BeamSpotDipServer.cc b/DQM/BeamMonitor/plugins/BeamSpotDipServer.cc
@@ -50,7 +50,7 @@ BeamSpotDipServer::BeamSpotDipServer(const edm::ParameterSet& ps) {
   //
   bsLegacyToken_ = esConsumes<edm::Transition::EndLuminosityBlock>();
 
-  dcsRecordInputTag_ = ps.getParameter<edm::InputTag>("dcsRecordInputTag");
+  dcsRecordInputTag_ = ps.getUntrackedParameter<edm::InputTag>("dcsRecordInputTag");
   dcsRecordToken_ = consumes<DCSRecord>(dcsRecordInputTag_);
 
   //

diff --git a/DQM/BeamMonitor/plugins/PixelVTXMonitor.cc b/DQM/BeamMonitor/plugins/PixelVTXMonitor.cc
@@ -79,9 +79,9 @@ PixelVTXMonitor::PixelVTXMonitor(const edm::ParameterSet& ps)
     : parameters_(ps),
       moduleName_(parameters_.getParameter<std::string>("ModuleName")),
       folderName_(parameters_.getParameter<std::string>("FolderName")),
-      pixelClusterInputTag_(parameters_.getParameter<edm::InputTag>("PixelClusterInputTag")),
-      pixelVertexInputTag_(parameters_.getParameter<edm::InputTag>("PixelVertexInputTag")),
-      hltInputTag_(parameters_.getParameter<edm::InputTag>("HLTInputTag")),
+      pixelClusterInputTag_(parameters_.getUntrackedParameter<edm::InputTag>("PixelClusterInputTag")),
+      pixelVertexInputTag_(parameters_.getUntrackedParameter<edm::InputTag>("PixelVertexInputTag")),
+      hltInputTag_(parameters_.getUntrackedParameter<edm::InputTag>("HLTInputTag")),
       pixelClusterInputTagToken_(consumes<SiPixelClusterCollectionNew>(pixelClusterInputTag_)),
       pixelVertexInputTagToken_(consumes<reco::VertexCollection>(pixelVertexInputTag_)),
       hltInputTagToken_(consumes<edm::TriggerResults>(hltInputTag_)),

diff --git a/DQM/BeamMonitor/python/BeamMonitor_Cosmics_cff.py b/DQM/BeamMonitor/python/BeamMonitor_Cosmics_cff.py
@@ -13,7 +13,7 @@
                               recordName = cms.untracked.string('BeamSpotOnlineHLTObjectsRcd'),
                               useLockRecords = cms.untracked.bool(False),
                               nLSForUpload = cms.untracked.int32(5),
-                              tcdsRecord = cms.InputTag('tcdsDigis','tcdsRecord'),
+                              tcdsRecord = cms.untracked.InputTag('tcdsDigis','tcdsRecord'),
                               BeamFitter = cms.PSet(
         			Debug = cms.untracked.bool(False),
         			TrackCollection = cms.untracked.InputTag('ctfWithMaterialTracksP5'), ## ctfWithMaterialTracksP5 for CRAFT

diff --git a/DQM/BeamMonitor/python/BeamMonitor_MC_cff.py b/DQM/BeamMonitor/python/BeamMonitor_MC_cff.py
@@ -14,7 +14,7 @@
                               recordName = cms.untracked.string('BeamSpotOnlineHLTObjectsRcd'),
                               useLockRecords = cms.untracked.bool(False),
                               nLSForUpload = cms.untracked.int32(5),
-                              tcdsRecord = cms.InputTag('tcdsDigis','tcdsRecord'),
+                              tcdsRecord = cms.untracked.InputTag('tcdsDigis','tcdsRecord'),
                               BeamFitter = cms.PSet(
         			Debug = cms.untracked.bool(False),
         			TrackCollection = cms.untracked.InputTag('generalTracks'), ## ctfWithMaterialTracksP5 for CRAFT

diff --git a/DQM/BeamMonitor/python/BeamMonitor_PixelLess_cff.py b/DQM/BeamMonitor/python/BeamMonitor_PixelLess_cff.py
@@ -12,7 +12,7 @@
                               recordName = cms.untracked.string('BeamSpotOnlineHLTObjectsRcd'),
                               useLockRecords = cms.untracked.bool(False),
                               nLSForUpload = cms.untracked.int32(5),
-                              tcdsRecord = cms.InputTag('tcdsDigis','tcdsRecord'),
+                              tcdsRecord = cms.untracked.InputTag('tcdsDigis','tcdsRecord'),
                               BeamFitter = cms.PSet(
         			Debug = cms.untracked.bool(False),
         			TrackCollection = cms.untracked.InputTag('ctfPixelLess'),

diff --git a/DQM/BeamMonitor/python/BeamMonitor_Pixel_cff.py b/DQM/BeamMonitor/python/BeamMonitor_Pixel_cff.py
@@ -15,9 +15,9 @@
                               recordName = cms.untracked.string('BeamSpotOnlineHLTObjectsRcd'),
                               useLockRecords = cms.untracked.bool(False),
                               jetTrigger  = cms.untracked.vstring(),
-                              hltResults = cms.InputTag("TriggerResults","","HLT"),
+                              hltResults = cms.untracked.InputTag("TriggerResults","","HLT"),
                               nLSForUpload = cms.untracked.int32(5),
-                              tcdsRecord = cms.InputTag('tcdsDigis','tcdsRecord'),
+                              tcdsRecord = cms.untracked.InputTag('tcdsDigis','tcdsRecord'),
                               BeamFitter = cms.PSet(
                                 Debug = cms.untracked.bool(False),
                                 TrackCollection = cms.untracked.InputTag('pixelTracks'),

diff --git a/DQM/BeamMonitor/python/BeamMonitor_cff.py b/DQM/BeamMonitor/python/BeamMonitor_cff.py
@@ -14,9 +14,9 @@
                               OnlineMode = cms.untracked.bool(True),
                               recordName = cms.untracked.string('BeamSpotOnlineHLTObjectsRcd'),
                               useLockRecords = cms.untracked.bool(False),
-                              hltResults = cms.InputTag("TriggerResults::HLT"),
+                              hltResults = cms.untracked.InputTag("TriggerResults::HLT"),
                               nLSForUpload = cms.untracked.int32(5),
-                              tcdsRecord = cms.InputTag('tcdsDigis','tcdsRecord'),
+                              tcdsRecord = cms.untracked.InputTag('tcdsDigis','tcdsRecord'),
                               BeamFitter = cms.PSet(
                                 Debug = cms.untracked.bool(False),
                                 TrackCollection = cms.untracked.InputTag('generalTracks'),

diff --git a/DQM/BeamMonitor/python/BeamSpotDipServer_cff.py b/DQM/BeamMonitor/python/BeamSpotDipServer_cff.py
@@ -13,7 +13,7 @@
   #
   readFromNFS = cms.untracked.bool(True),
   #
-  dcsRecordInputTag = cms.InputTag ( "onlineMetaDataDigis" ),
+  dcsRecordInputTag = cms.untracked.InputTag ( "onlineMetaDataDigis" ),
   #
   sourceFile  = cms.untracked.string(
     "/nfshome0/dqmpro/BeamMonitorDQM/BeamFitResults.txt"),

diff --git a/DQM/BeamMonitor/python/PixelVTXMonitor_cfi.py b/DQM/BeamMonitor/python/PixelVTXMonitor_cfi.py
@@ -4,12 +4,13 @@
 pixelVTXMonitor = DQMEDAnalyzer("PixelVTXMonitor",
     ModuleName          = cms.string('BeamPixel'),
     FolderName          = cms.string('PixelVertex'),
-    PixelClusterInputTag = cms.InputTag('siPixelClusters'),                                 
-    PixelVertexInputTag = cms.InputTag('pixelVertices'),
+    PixelClusterInputTag = cms.untracked.InputTag('siPixelClusters'),                                 
+    PixelVertexInputTag = cms.untracked.InputTag('pixelVertices'),
     TH1ClusPar = cms.PSet(Xbins = cms.int32(150),Xmin = cms.double(0.5),Xmax = cms.double(7500.5)),
     TH1VtxPar  = cms.PSet(Xbins = cms.int32(100),Xmin = cms.double(-0.5),Xmax = cms.double(100.5)),
-    HLTInputTag         = cms.InputTag('TriggerResults','','HLT'),
+    HLTInputTag         = cms.untracked.InputTag('TriggerResults','','HLT'),
     MinVtxDoF           = cms.double(4.0),
+
 #    HLTPathsOfInterest = cms.vstring('HLT_JetE30_NoBPTX_NoHalo_v8', 'HLT_JetE30_NoBPTX_v6', 'HLT_JetE50_NoBPTX3BX_NoHalo_v3', 'HLT_Physics_v2', 'HLT_PixelTracks_Multiplicity100_v6', 'HLT_PixelTracks_Multiplicity80_v6', 'HLT_ZeroBias_v4')
     HLTPathsOfInterest = cms.vstring('HLT_60Jet10', 'HLT_70Jet10','HLT_70Jet13', 'HLT_ZeroBias','HLT_Physics_v')                                 
 )