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

Use standard file names in DQM/HcalTasks config files [14_0] #44480

Merged
merged 1 commit into from
Mar 21, 2024
Merged

Use standard file names in DQM/HcalTasks config files [14_0] #44480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
0 DQM/HcalTasks/python/DigiTask.py → DQM/HcalTasks/python/DigiTask_cfi.py
View file
Open in desktop
File renamed without changes.
0 DQM/HcalTasks/python/FCDTask.py → DQM/HcalTasks/python/FCDTask_cfi.py
View file
Open in desktop
File renamed without changes.
0 DQM/HcalTasks/python/HFRaddamTask.py → DQM/HcalTasks/python/HFRaddamTask_cfi.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...HcalTasks/python/HcalOfflineHarvesting.py → ...Tasks/python/HcalOfflineHarvesting_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion DQM/HcalTasks/python/HcalOnlineHarvesting.py → ...lTasks/python/HcalOnlineHarvesting_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
0 DQM/HcalTasks/python/HcalQualityTests.py → DQM/HcalTasks/python/HcalQualityTests_cfi.py
View file
Open in desktop
File renamed without changes.
0 DQM/HcalTasks/python/LEDTask.py → DQM/HcalTasks/python/LEDTask_cfi.py
View file
Open in desktop
File renamed without changes.
0 DQM/HcalTasks/python/LaserTask.py → DQM/HcalTasks/python/LaserTask_cfi.py
View file
Open in desktop
File renamed without changes.
0 DQM/HcalTasks/python/NoCQTask.py → DQM/HcalTasks/python/NoCQTask_cfi.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion DQM/HcalTasks/python/OfflineHarvestSequence_cosmic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion DQM/HcalTasks/python/OfflineHarvestSequence_hi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion DQM/HcalTasks/python/OfflineHarvestSequence_pp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion DQM/HcalTasks/python/OfflineHarvestingSequence_cosmic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion DQM/HcalTasks/python/OfflineHarvestingSequence_hi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion DQM/HcalTasks/python/OfflineHarvestingSequence_pp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions DQM/HcalTasks/python/OfflineSourceSequence_cosmic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions DQM/HcalTasks/python/OfflineSourceSequence_hi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions DQM/HcalTasks/python/OfflineSourceSequence_pp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 DQM/HcalTasks/python/PedestalTask.py → DQM/HcalTasks/python/PedestalTask_cfi.py
View file
Open in desktop
File renamed without changes.
0 DQM/HcalTasks/python/QIE10Task.py → DQM/HcalTasks/python/QIE10Task_cfi.py
View file
Open in desktop
File renamed without changes.
0 DQM/HcalTasks/python/QIE11Task.py → DQM/HcalTasks/python/QIE11Task_cfi.py
View file
Open in desktop
File renamed without changes.
0 DQM/HcalTasks/python/RawTask.py → DQM/HcalTasks/python/RawTask_cfi.py
View file
Open in desktop
File renamed without changes.
0 DQM/HcalTasks/python/RecHitTask.py → DQM/HcalTasks/python/RecHitTask_cfi.py
View file
Open in desktop
File renamed without changes.
0 DQM/HcalTasks/python/TPTask.py → DQM/HcalTasks/python/TPTask_cfi.py
View file
Open in desktop
File renamed without changes.
0 DQM/HcalTasks/python/TestTask.py → DQM/HcalTasks/python/TestTask_cfi.py
View file
Open in desktop
File renamed without changes.
0 DQM/HcalTasks/python/UMNioTask.py → DQM/HcalTasks/python/UMNioTask_cfi.py
View file
Open in desktop
File renamed without changes.
0 DQM/HcalTasks/python/ZDCTask.py → DQM/HcalTasks/python/ZDCTask_cff.py
View file
Open in desktop
File renamed without changes.
16 changes: 8 additions & 8 deletions DQM/Integration/python/clients/hcal_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')

#-------------------------------------
Expand Down
16 changes: 8 additions & 8 deletions DQM/Integration/python/clients/hcalcalib_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions DQM/Integration/python/clients/hcalgpu_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions DQM/Integration/python/clients/hcalreco_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down