Fixed certification sequence

cms-sw · Mar 6, 2014 · be8d2ac · be8d2ac
1 parent c40a7c8
commit be8d2ac
Show file tree

Hide file tree

Showing 14 changed files with 131 additions and 77 deletions.
diff --git a/DQM/EcalBarrelMonitorClient/python/EcalCertification_cfi.py b/DQM/EcalBarrelMonitorClient/python/EcalCertification_cfi.py
@@ -12,8 +12,8 @@
     ),
     # task parameters (included from indivitual cfis)
     workerParameters = cms.untracked.PSet(
-        CertificationClient = ecalCertificationClient
+        CertificationClient = ecalCertificationClient.clone()
     ),
-    commonParameters = ecalCommonParams,
+    commonParameters = ecalCommonParams.clone(willConvertToEDM = cms.untracked.bool(False)),
     verbosity = cms.untracked.int32(0)
 )
diff --git a/DQM/EcalBarrelMonitorTasks/plugins/EcalDQMonitorTask.cc b/DQM/EcalBarrelMonitorTasks/plugins/EcalDQMonitorTask.cc
@@ -58,9 +58,11 @@ EcalDQMonitorTask::EcalDQMonitorTask(edm::ParameterSet const& _ps) :
   edm::ParameterSet const& collectionTags(_ps.getUntrackedParameterSet("collectionTags"));
 
   for(unsigned iCol(0); iCol < ecaldqm::nCollections; iCol++){
-    if(hasTaskToRun[iCol] || iCol == ecaldqm::kEcalRawData)
+    if(hasTaskToRun[iCol])
       dependencies.push_back(ecaldqm::Dependency(ecaldqm::Collections(iCol)));
   }
+  if(collectionTags.existsAs<edm::InputTag>("EcalRawData"))
+    dependencies.push_back(ecaldqm::Dependency(ecaldqm::kEcalRawData));
 
   formSchedule(dependencies.formSequence(), collectionTags);
 

diff --git a/DQM/EcalBarrelMonitorTasks/python/EBDaqInfoTask_cfi.py b/DQM/EcalBarrelMonitorTasks/python/EBDaqInfoTask_cfi.py
@@ -1,30 +1,42 @@
 import FWCore.ParameterSet.Config as cms
 
-from DQM.EcalCommon.CommonParams_cfi import ecalCommonParams
-
-from DQM.EcalBarrelMonitorTasks.CollectionTags_cfi import ecalDQMCollectionTags
-
-from DQM.EcalBarrelMonitorTasks.TowerStatusTask_cfi import ecalTowerStatusTask
-
-ecalDaqInfoTask = cms.EDAnalyzer("EcalDQMonitorTask",
-    moduleName = cms.untracked.string("Ecal Certification Monitor"),
-    # tasks to be turned on
-    workers = cms.untracked.vstring(
-        "TowerStatusTask"
-    ),
-    # task parameters (included from indivitual cfis)
-    workerParameters =  cms.untracked.PSet(
-        TowerStatusTask = ecalTowerStatusTask
-    ),
-    commonParameters = ecalCommonParams,
-    collectionTags = ecalDQMCollectionTags,
-    allowMissingCollections = cms.untracked.bool(True),
-    verbosity = cms.untracked.int32(0),
-    evaluateTime = cms.untracked.bool(False),
-    resetInterval = cms.untracked.double(2.)
+ecalBarrelDaqInfoTask = cms.EDAnalyzer("EBDaqInfoTask",
+    prefixME = cms.untracked.string('EcalBarrel'),
+    enableCleanup = cms.untracked.bool(False),
+    mergeRuns = cms.untracked.bool(False)
 )
 
-ecalDaqInfoTask.workerParameters.TowerStatusTask.params.doDAQInfo = True
-ecalDaqInfoTask.workerParameters.TowerStatusTask.params.doDCSInfo = False
+# from DQM.EcalCommon.dqmpset import *
+# from DQM.EcalCommon.CollectionTags_cfi import *
+# from DQM.EcalCommon.CommonParams_cfi import *
 
-ecalBarrelDaqInfoTask = ecalDaqInfoTask.clone()
+# from DQM.EcalCommon.EcalDQMBinningService_cfi import *
+
+# import DQM.EcalBarrelMonitorTasks.TowerStatusTask_cfi as ecalTowerStatusTask
+
+# ecalMonitorTaskParams = dict(
+#     TowerStatusTask = ecalTowerStatusTask.towerStatusTask,
+#     Common = ecalCommonParams
+# )
+
+# ecalMonitorTaskPaths = dict(
+#     TowerStatusTask = ecalTowerStatusTask.towerStatusTaskPaths
+# )
+
+# ecalBarrelDaqInfoTask = cms.EDAnalyzer("EcalDQMonitorTask",
+#     moduleName = cms.untracked.string("Ecal DAQ Info"),
+#     # tasks to be turned on
+#     tasks = cms.untracked.vstring(
+#         "TowerStatusTask"
+#     ),
+#     # task parameters (included from indivitual cfis)
+#     taskParameters = dqmpset(ecalMonitorTaskParams),
+#     # ME paths for each task (included from inidividual cfis)
+#     mePaths = dqmpaths("Ecal", ecalMonitorTaskPaths),
+#     collectionTags = ecalDQMCollectionTags,
+#     allowMissingCollections = cms.untracked.bool(False),
+#     verbosity = cms.untracked.int32(0)
+# )
+
+# ecalBarrelDaqInfoTask.taskParameters.TowerStatusTask.doDAQInfo = True
+# ecalBarrelDaqInfoTask.taskParameters.TowerStatusTask.doDAQInfo = False
diff --git a/DQM/EcalBarrelMonitorTasks/python/EBDataCertificationTask_cfi.py b/DQM/EcalBarrelMonitorTasks/python/EBDataCertificationTask_cfi.py
diff --git a/DQM/EcalBarrelMonitorTasks/python/EBDcsInfoTask_cfi.py b/DQM/EcalBarrelMonitorTasks/python/EBDcsInfoTask_cfi.py
@@ -1,30 +1,42 @@
 import FWCore.ParameterSet.Config as cms
 
-from DQM.EcalCommon.CommonParams_cfi import ecalCommonParams
-
-from DQM.EcalBarrelMonitorTasks.CollectionTags_cfi import ecalDQMCollectionTags
-
-from DQM.EcalBarrelMonitorTasks.TowerStatusTask_cfi import ecalTowerStatusTask
-
-ecalDcsInfoTask = cms.EDAnalyzer("EcalDQMonitorTask",
-    moduleName = cms.untracked.string("Ecal Certification Monitor"),
-    # tasks to be turned on
-    workers = cms.untracked.vstring(
-        "TowerStatusTask"
-    ),
-    # task parameters (included from indivitual cfis)
-    workerParameters =  cms.untracked.PSet(
-        TowerStatusTask = ecalTowerStatusTask
-    ),
-    commonParameters = ecalCommonParams,
-    collectionTags = ecalDQMCollectionTags,
-    allowMissingCollections = cms.untracked.bool(True),
-    verbosity = cms.untracked.int32(0),
-    evaluateTime = cms.untracked.bool(False),
-    resetInterval = cms.untracked.double(2.)
+ecalBarrelDcsInfoTask = cms.EDAnalyzer("EBDcsInfoTask",
+    prefixME = cms.untracked.string('EcalBarrel'),
+    enableCleanup = cms.untracked.bool(False),
+    mergeRuns = cms.untracked.bool(False)
 )
 
-ecalDcsInfoTask.workerParameters.TowerStatusTask.params.doDAQInfo = False
-ecalDcsInfoTask.workerParameters.TowerStatusTask.params.doDCSInfo = True
+# from DQM.EcalCommon.dqmpset import *
+# from DQM.EcalCommon.CollectionTags_cfi import *
+# from DQM.EcalCommon.CommonParams_cfi import *
 
-ecalBarrelDcsInfoTask = ecalDcsInfoTask.clone()
+# from DQM.EcalCommon.EcalDQMBinningService_cfi import *
+
+# import DQM.EcalBarrelMonitorTasks.TowerStatusTask_cfi as ecalTowerStatusTask
+
+# ecalMonitorTaskParams = dict(
+#     TowerStatusTask = ecalTowerStatusTask.towerStatusTask,
+#     Common = ecalCommonParams
+# )
+
+# ecalMonitorTaskPaths = dict(
+#     TowerStatusTask = ecalTowerStatusTask.towerStatusTaskPaths
+# )
+
+# ecalBarrelDcsInfoTask = cms.EDAnalyzer("EcalDQMonitorTask",
+#     moduleName = cms.untracked.string("Ecal DCS Info"),
+#     # tasks to be turned on
+#     tasks = cms.untracked.vstring(
+#         "TowerStatusTask"
+#     ),
+#     # task parameters (included from indivitual cfis)
+#     taskParameters = dqmpset(ecalMonitorTaskParams),
+#     # ME paths for each task (included from inidividual cfis)
+#     mePaths = dqmpaths("Ecal", ecalMonitorTaskPaths),
+#     collectionTags = ecalDQMCollectionTags,
+#     allowMissingCollections = cms.untracked.bool(False),
+#     verbosity = cms.untracked.int32(0)
+# )
+
+# ecalBarrelDcsInfoTask.taskParameters.TowerStatusTask.doDAQInfo = False
+# ecalBarrelDcsInfoTask.taskParameters.TowerStatusTask.doDAQInfo = True
diff --git a/DQM/EcalBarrelMonitorTasks/python/EcalDaqInfoTask_cfi.py b/DQM/EcalBarrelMonitorTasks/python/EcalDaqInfoTask_cfi.py
@@ -0,0 +1,21 @@
+import FWCore.ParameterSet.Config as cms
+
+from DQM.EcalCommon.CommonParams_cfi import ecalCommonParams
+
+from DQM.EcalBarrelMonitorTasks.TowerStatusTask_cfi import ecalTowerStatusTask
+
+ecalDaqInfoTask = cms.EDAnalyzer("EcalDQMonitorTask",
+    moduleName = cms.untracked.string("Ecal DAQ Monitor"),
+    # tasks to be turned on
+    workers = cms.untracked.vstring(
+        "TowerStatusTask"
+    ),
+    # task parameters (included from indivitual cfis)
+    workerParameters =  cms.untracked.PSet(
+        TowerStatusTask = ecalTowerStatusTask.clone()
+    ),
+    commonParameters = ecalCommonParams.clone(willConvertToEDM = cms.untracked.bool(False)),
+    verbosity = cms.untracked.int32(0)
+)
+
+ecalDaqInfoTask.workerParameters.TowerStatusTask.params.doDCSInfo = False
diff --git a/DQM/EcalBarrelMonitorTasks/python/EcalDcsInfoTask_cfi.py b/DQM/EcalBarrelMonitorTasks/python/EcalDcsInfoTask_cfi.py
@@ -0,0 +1,21 @@
+import FWCore.ParameterSet.Config as cms
+
+from DQM.EcalCommon.CommonParams_cfi import ecalCommonParams
+
+from DQM.EcalBarrelMonitorTasks.TowerStatusTask_cfi import ecalTowerStatusTask
+
+ecalDcsInfoTask = cms.EDAnalyzer("EcalDQMonitorTask",
+    moduleName = cms.untracked.string("Ecal DCS Monitor"),
+    # tasks to be turned on
+    workers = cms.untracked.vstring(
+        "TowerStatusTask"
+    ),
+    # task parameters (included from indivitual cfis)
+    workerParameters =  cms.untracked.PSet(
+        TowerStatusTask = ecalTowerStatusTask.clone()
+    ),
+    commonParameters = ecalCommonParams.clone(willConvertToEDM = cms.untracked.bool(False)),
+    verbosity = cms.untracked.int32(0)
+)
+
+ecalDcsInfoTask.workerParameters.TowerStatusTask.params.doDAQInfo = False
diff --git a/DQM/EcalBarrelMonitorTasks/src/TowerStatusTask.cc b/DQM/EcalBarrelMonitorTasks/src/TowerStatusTask.cc
@@ -44,7 +44,7 @@ namespace ecaldqm {
       MEs_.erase(std::string("DAQContents"));
     }
     else
-      throw cms::Exception("InvalidConfiguration") << "Nonthing to do in TowerStatusTask";
+      throw cms::Exception("InvalidConfiguration") << "Nothing to do in TowerStatusTask";
   }
 
   void

diff --git a/DQMOffline/Configuration/python/DQMOfflineCosmicsMC_cff.py b/DQMOffline/Configuration/python/DQMOfflineCosmicsMC_cff.py
@@ -7,12 +7,6 @@
 SiPixelHLTSource.RawInput = 'rawDataCollector'
 dqmCSCClient.InputObjects = 'rawDataCollector'
 cscMonitor.FEDRawDataCollectionTag = 'rawDataCollector'
-ecalBarrelHltTask.FEDRawDataCollection = 'rawDataCollector'
-ecalBarrelSelectiveReadoutTask.FEDRawDataCollection = 'rawDataCollector'
-ecalBarrelRawDataTask.FEDRawDataCollection = 'rawDataCollector'
-ecalEndcapHltTask.FEDRawDataCollection = 'rawDataCollector'
-ecalEndcapSelectiveReadoutTask.FEDRawDataCollection = 'rawDataCollector'
-ecalEndcapRawDataTask.FEDRawDataCollection = 'rawDataCollector'
 dtDataIntegrityUnpacker.inputLabel = 'rawDataCollector'
 hcalMonitor.FEDRawDataCollection = 'rawDataCollector'
 hcalDetDiagNoiseMonitor.RawDataLabel = 'rawDataCollector'

diff --git a/DQMOffline/Configuration/python/DQMOfflineCosmics_Certification_cff.py b/DQMOffline/Configuration/python/DQMOfflineCosmics_Certification_cff.py
@@ -3,4 +3,3 @@
 from DQMOffline.Configuration.DQMOffline_Certification_cff import *
 
 DQMOfflineCosmics_Certification = cms.Sequence(daq_dqmoffline*dcs_dqmoffline*crt_dqmoffline)
-
diff --git a/DQMOffline/Configuration/python/DQMOffline_CRT_cff.py b/DQMOffline/Configuration/python/DQMOffline_CRT_cff.py
@@ -2,8 +2,7 @@
 
 siStripCertificationInfo = cms.EDAnalyzer("SiStripCertificationInfo")
 from DQM.SiPixelCommon.SiPixelOfflineDQM_client_cff import *
-from DQM.EcalEndcapMonitorTasks.EEDataCertificationTask_cfi import *
-from DQM.EcalBarrelMonitorTasks.EBDataCertificationTask_cfi import *
+from DQM.EcalBarrelMonitorClient.EcalCertification_cfi import *
 from DQM.HcalMonitorClient.HcalDataCertification_cfi import *
 from DQM.DTMonitorClient.dtDQMOfflineCertification_cff import *
 from DQM.RPCMonitorClient.RPCDataCertification_cfi import *
@@ -17,8 +16,7 @@
 
 crt_dqmoffline = cms.Sequence( siStripCertificationInfo *
                                sipixelCertification *
-                               ecalEndcapDataCertificationTask *
-                               ecalBarrelDataCertificationTask *
+                               ecalCertification *
                                hcalDataCertification *
                                dtCertificationSummary *
                                rpcDataCertification *

diff --git a/DQMOffline/Configuration/python/DQMOffline_Certification_cff.py b/DQMOffline/Configuration/python/DQMOffline_Certification_cff.py
@@ -18,9 +18,9 @@
                            dtDCSByLumiSummary * rpcDCSSummary * cscDcsInfo *
                            dtCertificationSummary * rpcDataCertification * cscCertificationInfo)
 
-DQMCertEcal = cms.Sequence(ecalBarrelDaqInfoTask * ecalEndcapDaqInfoTask * ecalPreshowerDaqInfoTask *
-                           ecalBarrelDcsInfoTask * ecalEndcapDcsInfoTask * ecalPreshowerDcsInfoTask *
-                           ecalEndcapDataCertificationTask * ecalBarrelDataCertificationTask * ecalPreshowerDataCertificationTask)
+DQMCertEcal = cms.Sequence(ecalDaqInfoTask * ecalPreshowerDaqInfoTask *
+                           ecalDcsInfoTask * ecalPreshowerDcsInfoTask *
+                           ecalCertification * ecalPreshowerDataCertificationTask)
 
 DQMCertHcal = cms.Sequence(hcalDAQInfo *
                            hcalDCSInfo *

diff --git a/DQMOffline/Configuration/python/DQMOffline_DAQ_cff.py b/DQMOffline/Configuration/python/DQMOffline_DAQ_cff.py
@@ -2,14 +2,13 @@
 
 from DQM.DTMonitorClient.dtDAQInfo_cfi import *
 from DQM.RPCMonitorClient.RPCDaqInfo_cfi import *
-from DQM.EcalBarrelMonitorTasks.EBDaqInfoTask_cfi import *
-from DQM.EcalEndcapMonitorTasks.EEDaqInfoTask_cfi import *
+from DQM.EcalBarrelMonitorTasks.EcalDaqInfoTask_cfi import *
 siStripDaqInfo = cms.EDAnalyzer("SiStripDaqInfo")
 from DQM.CSCMonitorModule.csc_daq_info_cfi import *
 from DQM.SiPixelCommon.SiPixelOfflineDQM_client_cff import *
 from DQM.HcalMonitorClient.HcalDAQInfo_cfi import *
 from DQM.RPCMonitorClient.RPCDaqInfo_cfi import *
 from DQM.EcalPreshowerMonitorModule.ESDaqInfoTask_cfi import *
 
-daq_dqmoffline = cms.Sequence(dtDAQInfo*rpcDaqInfo*ecalBarrelDaqInfoTask*ecalEndcapDaqInfoTask*siStripDaqInfo*cscDaqInfo*sipixelDaqInfo*hcalDAQInfo*ecalPreshowerDaqInfoTask)
+daq_dqmoffline = cms.Sequence(dtDAQInfo*rpcDaqInfo*ecalDaqInfoTask*siStripDaqInfo*cscDaqInfo*sipixelDaqInfo*hcalDAQInfo*ecalPreshowerDaqInfoTask)
 
diff --git a/DQMOffline/Configuration/python/DQMOffline_DCS_cff.py b/DQMOffline/Configuration/python/DQMOffline_DCS_cff.py
@@ -2,13 +2,12 @@
 
 siStripDcsInfo = cms.EDAnalyzer("SiStripDcsInfo")
 from DQM.SiPixelCommon.SiPixelOfflineDQM_client_cff import *
-from DQM.EcalBarrelMonitorTasks.EBDcsInfoTask_cfi import *
-from DQM.EcalEndcapMonitorTasks.EEDcsInfoTask_cfi import *
+from DQM.EcalBarrelMonitorTasks.EcalDcsInfoTask_cfi import *
 from DQM.DTMonitorClient.dtDCSByLumiSummary_cfi import *
 from DQM.HcalMonitorClient.HcalDCSInfo_cfi import *
 from DQM.RPCMonitorClient.RPCDCSSummary_cfi import *
 from DQM.CSCMonitorModule.csc_dcs_info_cfi import *
 from DQM.EcalPreshowerMonitorModule.ESDcsInfoTask_cfi import *
 
-dcs_dqmoffline = cms.Sequence(siStripDcsInfo*sipixelDcsInfo*ecalBarrelDcsInfoTask*ecalEndcapDcsInfoTask*dtDCSByLumiSummary*hcalDCSInfo*rpcDCSSummary*cscDcsInfo*ecalPreshowerDcsInfoTask)
+dcs_dqmoffline = cms.Sequence(siStripDcsInfo*sipixelDcsInfo*ecalDcsInfoTask*dtDCSByLumiSummary*hcalDCSInfo*rpcDCSSummary*cscDcsInfo*ecalPreshowerDcsInfoTask)