Merge pull request #44480 from Dr15Jones/fixNamesDQMHcalTasks_14_0

Use standard file names in DQM/HcalTasks config files [14_0]
cms-sw · Mar 21, 2024 · 03146c9 · 03146c9
2 parents e7dbdb1 + 605537f
commit 03146c9
Show file tree

Hide file tree

Showing 31 changed files with 40 additions and 40 deletions.
diff --git a/DQM/HcalTasks/python/DigiTask.py → DQM/HcalTasks/python/DigiTask_cfi.py b/DQM/HcalTasks/python/DigiTask.py → DQM/HcalTasks/python/DigiTask_cfi.py
diff --git a/DQM/HcalTasks/python/FCDTask.py → DQM/HcalTasks/python/FCDTask_cfi.py b/DQM/HcalTasks/python/FCDTask.py → DQM/HcalTasks/python/FCDTask_cfi.py
diff --git a/DQM/HcalTasks/python/HFRaddamTask.py → DQM/HcalTasks/python/HFRaddamTask_cfi.py b/DQM/HcalTasks/python/HFRaddamTask.py → DQM/HcalTasks/python/HFRaddamTask_cfi.py
diff --git a/...HcalTasks/python/HcalOfflineHarvesting.py → ...Tasks/python/HcalOfflineHarvesting_cfi.py b/...HcalTasks/python/HcalOfflineHarvesting.py → ...Tasks/python/HcalOfflineHarvesting_cfi.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 from DQMServices.Core.DQMEDHarvester import DQMEDHarvester
-from DQM.HcalTasks.DigiTask import digiTask
+from DQM.HcalTasks.DigiTask_cfi import digiTask
 
 hcalOfflineHarvesting = DQMEDHarvester(
 	"HcalOfflineHarvesting",

diff --git a/DQM/HcalTasks/python/HcalOnlineHarvesting.py → ...lTasks/python/HcalOnlineHarvesting_cfi.py b/DQM/HcalTasks/python/HcalOnlineHarvesting.py → ...lTasks/python/HcalOnlineHarvesting_cfi.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 from DQMServices.Core.DQMEDHarvester import DQMEDHarvester
-from DQM.HcalTasks.DigiTask import digiTask
+from DQM.HcalTasks.DigiTask_cfi import digiTask
 
 hcalOnlineHarvesting = DQMEDHarvester(
 	"HcalOnlineHarvesting",

diff --git a/DQM/HcalTasks/python/HcalQualityTests.py → DQM/HcalTasks/python/HcalQualityTests_cfi.py b/DQM/HcalTasks/python/HcalQualityTests.py → DQM/HcalTasks/python/HcalQualityTests_cfi.py
diff --git a/DQM/HcalTasks/python/LEDTask.py → DQM/HcalTasks/python/LEDTask_cfi.py b/DQM/HcalTasks/python/LEDTask.py → DQM/HcalTasks/python/LEDTask_cfi.py
diff --git a/DQM/HcalTasks/python/LaserTask.py → DQM/HcalTasks/python/LaserTask_cfi.py b/DQM/HcalTasks/python/LaserTask.py → DQM/HcalTasks/python/LaserTask_cfi.py
diff --git a/DQM/HcalTasks/python/NoCQTask.py → DQM/HcalTasks/python/NoCQTask_cfi.py b/DQM/HcalTasks/python/NoCQTask.py → DQM/HcalTasks/python/NoCQTask_cfi.py
diff --git a/DQM/HcalTasks/python/OfflineHarvestSequence_cosmic.py b/DQM/HcalTasks/python/OfflineHarvestSequence_cosmic.py
@@ -1,5 +1,5 @@
 import FWCore.ParameterSet.Config as cms
-from DQM.HcalTasks.HcalOfflineHarvesting import *
+from DQM.HcalTasks.HcalOfflineHarvesting_cfi import *
 
 # apply some customization
 # -	ptype = 1 Offlien processing

diff --git a/DQM/HcalTasks/python/OfflineHarvestSequence_hi.py b/DQM/HcalTasks/python/OfflineHarvestSequence_hi.py
@@ -1,5 +1,5 @@
 import FWCore.ParameterSet.Config as cms
-from DQM.HcalTasks.HcalOfflineHarvesting import *
+from DQM.HcalTasks.HcalOfflineHarvesting_cfi import *
 
 # apply some customization
 # -	ptype = 1 Offlien processing

diff --git a/DQM/HcalTasks/python/OfflineHarvestSequence_pp.py b/DQM/HcalTasks/python/OfflineHarvestSequence_pp.py
@@ -1,5 +1,5 @@
 import FWCore.ParameterSet.Config as cms
-from DQM.HcalTasks.HcalOfflineHarvesting import *
+from DQM.HcalTasks.HcalOfflineHarvesting_cfi import *
 
 # apply some customization
 # -	ptype = 1 Offlien processing

diff --git a/DQM/HcalTasks/python/OfflineHarvestingSequence_cosmic.py b/DQM/HcalTasks/python/OfflineHarvestingSequence_cosmic.py
@@ -1,5 +1,5 @@
 import FWCore.ParameterSet.Config as cms
-from DQM.HcalTasks.HcalOfflineHarvesting import *
+from DQM.HcalTasks.HcalOfflineHarvesting_cfi import *
 
 # apply some customization
 # -	ptype = 1 Offlien processing

diff --git a/DQM/HcalTasks/python/OfflineHarvestingSequence_hi.py b/DQM/HcalTasks/python/OfflineHarvestingSequence_hi.py
@@ -1,5 +1,5 @@
 import FWCore.ParameterSet.Config as cms
-from DQM.HcalTasks.HcalOfflineHarvesting import *
+from DQM.HcalTasks.HcalOfflineHarvesting_cfi import *
 
 # apply some customization
 # -	ptype = 1 Offlien processing

diff --git a/DQM/HcalTasks/python/OfflineHarvestingSequence_pp.py b/DQM/HcalTasks/python/OfflineHarvestingSequence_pp.py
@@ -1,5 +1,5 @@
 import FWCore.ParameterSet.Config as cms
-from DQM.HcalTasks.HcalOfflineHarvesting import *
+from DQM.HcalTasks.HcalOfflineHarvesting_cfi import *
 
 # apply some customization
 # -	ptype = 1 Offlien processing

diff --git a/DQM/HcalTasks/python/OfflineSourceSequence_cosmic.py b/DQM/HcalTasks/python/OfflineSourceSequence_cosmic.py
@@ -6,10 +6,10 @@
 #-----------------
 
 #	import the tasks
-from DQM.HcalTasks.DigiTask import digiTask
-from DQM.HcalTasks.RawTask import rawTask
-from DQM.HcalTasks.TPTask import tpTask
-from DQM.HcalTasks.RecHitTask import recHitTask
+from DQM.HcalTasks.DigiTask_cfi import digiTask
+from DQM.HcalTasks.RawTask_cfi import rawTask
+from DQM.HcalTasks.TPTask_cfi import tpTask
+from DQM.HcalTasks.RecHitTask_cfi import recHitTask
 
 #	set processing type to Offine
 digiTask.ptype = 1

diff --git a/DQM/HcalTasks/python/OfflineSourceSequence_hi.py b/DQM/HcalTasks/python/OfflineSourceSequence_hi.py
@@ -6,10 +6,10 @@
 #-----------------
 
 #	import the tasks
-from DQM.HcalTasks.DigiTask import digiTask
-from DQM.HcalTasks.RawTask import rawTask
-from DQM.HcalTasks.TPTask import tpTask
-from DQM.HcalTasks.RecHitTask import recHitTask
+from DQM.HcalTasks.DigiTask_cfi import digiTask
+from DQM.HcalTasks.RawTask_cfi import rawTask
+from DQM.HcalTasks.TPTask_cfi import tpTask
+from DQM.HcalTasks.RecHitTask_cfi import recHitTask
 
 #	set processing type to Offine
 digiTask.ptype = 1

diff --git a/DQM/HcalTasks/python/OfflineSourceSequence_pp.py b/DQM/HcalTasks/python/OfflineSourceSequence_pp.py
@@ -6,10 +6,10 @@
 #-----------------
 
 #   import the tasks
-from DQM.HcalTasks.DigiTask import digiTask
-from DQM.HcalTasks.RawTask import rawTask
-from DQM.HcalTasks.TPTask import tpTask
-from DQM.HcalTasks.RecHitTask import recHitTask, recHitPreRecoTask
+from DQM.HcalTasks.DigiTask_cfi import digiTask
+from DQM.HcalTasks.RawTask_cfi import rawTask
+from DQM.HcalTasks.TPTask_cfi import tpTask
+from DQM.HcalTasks.RecHitTask_cfi import recHitTask, recHitPreRecoTask
 from DQM.HcalTasks.hcalGPUComparisonTask_cfi import hcalGPUComparisonTask
 
 #   set processing type to Offine

diff --git a/DQM/HcalTasks/python/PedestalTask.py → DQM/HcalTasks/python/PedestalTask_cfi.py b/DQM/HcalTasks/python/PedestalTask.py → DQM/HcalTasks/python/PedestalTask_cfi.py
diff --git a/DQM/HcalTasks/python/QIE10Task.py → DQM/HcalTasks/python/QIE10Task_cfi.py b/DQM/HcalTasks/python/QIE10Task.py → DQM/HcalTasks/python/QIE10Task_cfi.py
diff --git a/DQM/HcalTasks/python/QIE11Task.py → DQM/HcalTasks/python/QIE11Task_cfi.py b/DQM/HcalTasks/python/QIE11Task.py → DQM/HcalTasks/python/QIE11Task_cfi.py
diff --git a/DQM/HcalTasks/python/RawTask.py → DQM/HcalTasks/python/RawTask_cfi.py b/DQM/HcalTasks/python/RawTask.py → DQM/HcalTasks/python/RawTask_cfi.py
diff --git a/DQM/HcalTasks/python/RecHitTask.py → DQM/HcalTasks/python/RecHitTask_cfi.py b/DQM/HcalTasks/python/RecHitTask.py → DQM/HcalTasks/python/RecHitTask_cfi.py
diff --git a/DQM/HcalTasks/python/TPTask.py → DQM/HcalTasks/python/TPTask_cfi.py b/DQM/HcalTasks/python/TPTask.py → DQM/HcalTasks/python/TPTask_cfi.py
diff --git a/DQM/HcalTasks/python/TestTask.py → DQM/HcalTasks/python/TestTask_cfi.py b/DQM/HcalTasks/python/TestTask.py → DQM/HcalTasks/python/TestTask_cfi.py
diff --git a/DQM/HcalTasks/python/UMNioTask.py → DQM/HcalTasks/python/UMNioTask_cfi.py b/DQM/HcalTasks/python/UMNioTask.py → DQM/HcalTasks/python/UMNioTask_cfi.py
diff --git a/DQM/HcalTasks/python/ZDCTask.py → DQM/HcalTasks/python/ZDCTask_cff.py b/DQM/HcalTasks/python/ZDCTask.py → DQM/HcalTasks/python/ZDCTask_cff.py
diff --git a/DQM/Integration/python/clients/hcal_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/hcal_dqm_sourceclient-live_cfg.py
@@ -142,15 +142,15 @@
 #	Hcal DQM Tasks and Harvesters import
 #	New Style
 #-------------------------------------
-process.load("DQM.HcalTasks.DigiTask")
-process.load('DQM.HcalTasks.TPTask')
-process.load('DQM.HcalTasks.RawTask')
-process.load('DQM.HcalTasks.NoCQTask')
-process.load('DQM.HcalTasks.FCDTask')
-process.load('DQM.HcalTasks.ZDCTask')
+process.load("DQM.HcalTasks.DigiTask_cfi")
+process.load('DQM.HcalTasks.TPTask_cfi')
+process.load('DQM.HcalTasks.RawTask_cfi')
+process.load('DQM.HcalTasks.NoCQTask_cfi')
+process.load('DQM.HcalTasks.FCDTask_cfi')
+process.load('DQM.HcalTasks.ZDCTask_cff')
 #process.load('DQM.HcalTasks.QIE11Task') # 2018: integrate QIE11Task into DigiTask
-process.load('DQM.HcalTasks.HcalOnlineHarvesting')
-process.load('DQM.HcalTasks.HcalQualityTests')
+process.load('DQM.HcalTasks.HcalOnlineHarvesting_cfi')
+process.load('DQM.HcalTasks.HcalQualityTests_cfi')
 process.load('DQM.HcalTasks.hcalMLTask_cfi')
 
 #-------------------------------------

diff --git a/DQM/Integration/python/clients/hcalcalib_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/hcalcalib_dqm_sourceclient-live_cfg.py
@@ -106,14 +106,14 @@
 #-------------------------------------
 #	Hcal DQM Tasks and Clients import
 #-------------------------------------
-process.load("DQM.HcalTasks.PedestalTask")
-process.load('DQM.HcalTasks.RawTask')
-process.load("DQM.HcalTasks.LaserTask")
-process.load("DQM.HcalTasks.LEDTask")
-process.load("DQM.HcalTasks.UMNioTask")
-process.load('DQM.HcalTasks.HcalOnlineHarvesting')
-process.load("DQM.HcalTasks.HFRaddamTask")
-process.load('DQM.HcalTasks.QIE11Task')
+process.load("DQM.HcalTasks.PedestalTask_cfi")
+process.load('DQM.HcalTasks.RawTask_cfi')
+process.load("DQM.HcalTasks.LaserTask_cfi")
+process.load("DQM.HcalTasks.LEDTask_cfi")
+process.load("DQM.HcalTasks.UMNioTask_cfi")
+process.load('DQM.HcalTasks.HcalOnlineHarvesting_cfi')
+process.load("DQM.HcalTasks.HFRaddamTask_cfi")
+process.load('DQM.HcalTasks.QIE11Task_cfi')
 
 #-------------------------------------
 #	To force using uTCA

diff --git a/DQM/Integration/python/clients/hcalgpu_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/hcalgpu_dqm_sourceclient-live_cfg.py
@@ -100,8 +100,8 @@
 #	New Style
 #-------------------------------------
 process.load('DQM.HcalTasks.hcalGPUComparisonTask_cfi')
-process.load('DQM.HcalTasks.HcalOnlineHarvesting')
-process.load('DQM.HcalTasks.HcalQualityTests')
+process.load('DQM.HcalTasks.HcalOnlineHarvesting_cfi')
+process.load('DQM.HcalTasks.HcalQualityTests_cfi')
 
 #-------------------------------------
 #	Some Settings before Finishing up

diff --git a/DQM/Integration/python/clients/hcalreco_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/hcalreco_dqm_sourceclient-live_cfg.py
@@ -116,8 +116,8 @@
 #	Hcal DQM Tasks and Clients import
 #	New Style
 #-------------------------------------
-process.load('DQM.HcalTasks.RecHitTask')
-process.load('DQM.HcalTasks.HcalOnlineHarvesting')
+process.load('DQM.HcalTasks.RecHitTask_cfi')
+process.load('DQM.HcalTasks.HcalOnlineHarvesting_cfi')
 
 #-------------------------------------
 #	To force using uTCA