From 605537ffd442cf2c1ed50ffc25fb0554a76c9ad7 Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Thu, 14 Mar 2024 15:16:30 -0500 Subject: [PATCH] Use standard file names in DQM/HcalTasks config files Added cfi or cff extensions. --- .../python/{DigiTask.py => DigiTask_cfi.py} | 0 .../python/{FCDTask.py => FCDTask_cfi.py} | 0 .../{HFRaddamTask.py => HFRaddamTask_cfi.py} | 0 ...arvesting.py => HcalOfflineHarvesting_cfi.py} | 2 +- ...Harvesting.py => HcalOnlineHarvesting_cfi.py} | 2 +- ...alQualityTests.py => HcalQualityTests_cfi.py} | 0 .../python/{LEDTask.py => LEDTask_cfi.py} | 0 .../python/{LaserTask.py => LaserTask_cfi.py} | 0 .../python/{NoCQTask.py => NoCQTask_cfi.py} | 0 .../python/OfflineHarvestSequence_cosmic.py | 2 +- .../python/OfflineHarvestSequence_hi.py | 2 +- .../python/OfflineHarvestSequence_pp.py | 2 +- .../python/OfflineHarvestingSequence_cosmic.py | 2 +- .../python/OfflineHarvestingSequence_hi.py | 2 +- .../python/OfflineHarvestingSequence_pp.py | 2 +- .../python/OfflineSourceSequence_cosmic.py | 8 ++++---- DQM/HcalTasks/python/OfflineSourceSequence_hi.py | 8 ++++---- DQM/HcalTasks/python/OfflineSourceSequence_pp.py | 8 ++++---- .../{PedestalTask.py => PedestalTask_cfi.py} | 0 .../python/{QIE10Task.py => QIE10Task_cfi.py} | 0 .../python/{QIE11Task.py => QIE11Task_cfi.py} | 0 .../python/{RawTask.py => RawTask_cfi.py} | 0 .../python/{RecHitTask.py => RecHitTask_cfi.py} | 0 .../python/{TPTask.py => TPTask_cfi.py} | 0 .../python/{TestTask.py => TestTask_cfi.py} | 0 .../python/{UMNioTask.py => UMNioTask_cfi.py} | 0 .../python/{ZDCTask.py => ZDCTask_cff.py} | 0 .../clients/hcal_dqm_sourceclient-live_cfg.py | 16 ++++++++-------- .../hcalcalib_dqm_sourceclient-live_cfg.py | 16 ++++++++-------- .../clients/hcalgpu_dqm_sourceclient-live_cfg.py | 4 ++-- .../hcalreco_dqm_sourceclient-live_cfg.py | 4 ++-- 31 files changed, 40 insertions(+), 40 deletions(-) rename DQM/HcalTasks/python/{DigiTask.py => DigiTask_cfi.py} (100%) rename DQM/HcalTasks/python/{FCDTask.py => FCDTask_cfi.py} (100%) rename DQM/HcalTasks/python/{HFRaddamTask.py => HFRaddamTask_cfi.py} (100%) rename DQM/HcalTasks/python/{HcalOfflineHarvesting.py => HcalOfflineHarvesting_cfi.py} (94%) rename DQM/HcalTasks/python/{HcalOnlineHarvesting.py => HcalOnlineHarvesting_cfi.py} (91%) rename DQM/HcalTasks/python/{HcalQualityTests.py => HcalQualityTests_cfi.py} (100%) rename DQM/HcalTasks/python/{LEDTask.py => LEDTask_cfi.py} (100%) rename DQM/HcalTasks/python/{LaserTask.py => LaserTask_cfi.py} (100%) rename DQM/HcalTasks/python/{NoCQTask.py => NoCQTask_cfi.py} (100%) rename DQM/HcalTasks/python/{PedestalTask.py => PedestalTask_cfi.py} (100%) rename DQM/HcalTasks/python/{QIE10Task.py => QIE10Task_cfi.py} (100%) rename DQM/HcalTasks/python/{QIE11Task.py => QIE11Task_cfi.py} (100%) rename DQM/HcalTasks/python/{RawTask.py => RawTask_cfi.py} (100%) rename DQM/HcalTasks/python/{RecHitTask.py => RecHitTask_cfi.py} (100%) rename DQM/HcalTasks/python/{TPTask.py => TPTask_cfi.py} (100%) rename DQM/HcalTasks/python/{TestTask.py => TestTask_cfi.py} (100%) rename DQM/HcalTasks/python/{UMNioTask.py => UMNioTask_cfi.py} (100%) rename DQM/HcalTasks/python/{ZDCTask.py => ZDCTask_cff.py} (100%) diff --git a/DQM/HcalTasks/python/DigiTask.py b/DQM/HcalTasks/python/DigiTask_cfi.py similarity index 100% rename from DQM/HcalTasks/python/DigiTask.py rename to DQM/HcalTasks/python/DigiTask_cfi.py diff --git a/DQM/HcalTasks/python/FCDTask.py b/DQM/HcalTasks/python/FCDTask_cfi.py similarity index 100% rename from DQM/HcalTasks/python/FCDTask.py rename to DQM/HcalTasks/python/FCDTask_cfi.py diff --git a/DQM/HcalTasks/python/HFRaddamTask.py b/DQM/HcalTasks/python/HFRaddamTask_cfi.py similarity index 100% rename from DQM/HcalTasks/python/HFRaddamTask.py rename to DQM/HcalTasks/python/HFRaddamTask_cfi.py diff --git a/DQM/HcalTasks/python/HcalOfflineHarvesting.py b/DQM/HcalTasks/python/HcalOfflineHarvesting_cfi.py similarity index 94% rename from DQM/HcalTasks/python/HcalOfflineHarvesting.py rename to DQM/HcalTasks/python/HcalOfflineHarvesting_cfi.py index 089b59d70bcd9..bf763bfc61866 100644 --- a/DQM/HcalTasks/python/HcalOfflineHarvesting.py +++ b/DQM/HcalTasks/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 b/DQM/HcalTasks/python/HcalOnlineHarvesting_cfi.py similarity index 91% rename from DQM/HcalTasks/python/HcalOnlineHarvesting.py rename to DQM/HcalTasks/python/HcalOnlineHarvesting_cfi.py index a2f0c6b56ecfb..bee1ad63cb1c5 100644 --- a/DQM/HcalTasks/python/HcalOnlineHarvesting.py +++ b/DQM/HcalTasks/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 b/DQM/HcalTasks/python/HcalQualityTests_cfi.py similarity index 100% rename from DQM/HcalTasks/python/HcalQualityTests.py rename to DQM/HcalTasks/python/HcalQualityTests_cfi.py diff --git a/DQM/HcalTasks/python/LEDTask.py b/DQM/HcalTasks/python/LEDTask_cfi.py similarity index 100% rename from DQM/HcalTasks/python/LEDTask.py rename to DQM/HcalTasks/python/LEDTask_cfi.py diff --git a/DQM/HcalTasks/python/LaserTask.py b/DQM/HcalTasks/python/LaserTask_cfi.py similarity index 100% rename from DQM/HcalTasks/python/LaserTask.py rename to DQM/HcalTasks/python/LaserTask_cfi.py diff --git a/DQM/HcalTasks/python/NoCQTask.py b/DQM/HcalTasks/python/NoCQTask_cfi.py similarity index 100% rename from DQM/HcalTasks/python/NoCQTask.py rename to DQM/HcalTasks/python/NoCQTask_cfi.py diff --git a/DQM/HcalTasks/python/OfflineHarvestSequence_cosmic.py b/DQM/HcalTasks/python/OfflineHarvestSequence_cosmic.py index 73fe625c559f8..257c6e0b5b6fe 100644 --- 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 index 4101c6d655a9c..73ba7af4b0e11 100644 --- 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 index e4a8049261677..0a2ffdcde8af9 100644 --- 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 index 73fe625c559f8..257c6e0b5b6fe 100644 --- 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 index 4101c6d655a9c..73ba7af4b0e11 100644 --- 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 index e4a8049261677..0a2ffdcde8af9 100644 --- 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 index 03c6869ab94f2..c2c84431d9d52 100644 --- 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 index 752349818d900..95daa6e01f9db 100644 --- 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 index d929ad94d87d0..668543aca5d0d 100644 --- 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 b/DQM/HcalTasks/python/PedestalTask_cfi.py similarity index 100% rename from DQM/HcalTasks/python/PedestalTask.py rename to DQM/HcalTasks/python/PedestalTask_cfi.py diff --git a/DQM/HcalTasks/python/QIE10Task.py b/DQM/HcalTasks/python/QIE10Task_cfi.py similarity index 100% rename from DQM/HcalTasks/python/QIE10Task.py rename to DQM/HcalTasks/python/QIE10Task_cfi.py diff --git a/DQM/HcalTasks/python/QIE11Task.py b/DQM/HcalTasks/python/QIE11Task_cfi.py similarity index 100% rename from DQM/HcalTasks/python/QIE11Task.py rename to DQM/HcalTasks/python/QIE11Task_cfi.py diff --git a/DQM/HcalTasks/python/RawTask.py b/DQM/HcalTasks/python/RawTask_cfi.py similarity index 100% rename from DQM/HcalTasks/python/RawTask.py rename to DQM/HcalTasks/python/RawTask_cfi.py diff --git a/DQM/HcalTasks/python/RecHitTask.py b/DQM/HcalTasks/python/RecHitTask_cfi.py similarity index 100% rename from DQM/HcalTasks/python/RecHitTask.py rename to DQM/HcalTasks/python/RecHitTask_cfi.py diff --git a/DQM/HcalTasks/python/TPTask.py b/DQM/HcalTasks/python/TPTask_cfi.py similarity index 100% rename from DQM/HcalTasks/python/TPTask.py rename to DQM/HcalTasks/python/TPTask_cfi.py diff --git a/DQM/HcalTasks/python/TestTask.py b/DQM/HcalTasks/python/TestTask_cfi.py similarity index 100% rename from DQM/HcalTasks/python/TestTask.py rename to DQM/HcalTasks/python/TestTask_cfi.py diff --git a/DQM/HcalTasks/python/UMNioTask.py b/DQM/HcalTasks/python/UMNioTask_cfi.py similarity index 100% rename from DQM/HcalTasks/python/UMNioTask.py rename to DQM/HcalTasks/python/UMNioTask_cfi.py diff --git a/DQM/HcalTasks/python/ZDCTask.py b/DQM/HcalTasks/python/ZDCTask_cff.py similarity index 100% rename from DQM/HcalTasks/python/ZDCTask.py rename to 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 index 19e5cb43ebb70..cf98046ea893e 100644 --- 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 index 43dfb475db9d0..c5ca83ddc5f70 100644 --- 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 index 3b4d7630b2a92..886ec86875cfa 100644 --- 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 index aff9deaa17d77..5ecf1be55f300 100644 --- 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