Skip to content

Commit

Permalink
Use standard file names in DQM/HcalTasks config files
Browse files Browse the repository at this point in the history
Added cfi or cff extensions.
  • Loading branch information
Dr15Jones committed Mar 14, 2024
1 parent 5fe7484 commit 22c387f
Show file tree
Hide file tree
Showing 31 changed files with 40 additions and 40 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
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
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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion DQM/HcalTasks/python/OfflineHarvestSequence_cosmic.py
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
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
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
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
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
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
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
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
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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
16 changes: 8 additions & 8 deletions DQM/Integration/python/clients/hcal_dqm_sourceclient-live_cfg.py
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
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
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
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

0 comments on commit 22c387f

Please sign in to comment.