Merge pull request #28485 from DryRun/CMSSW_10_6_5_patch1_ngHO_feds

HCALDQM: Run3 era, add compatibility for new uTCA HO (10_6_X)
cms-sw · Jan 8, 2020 · 33b8d82 · 33b8d82
2 parents e2d389a + 7b14f87
commit 33b8d82
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 23 deletions.
diff --git a/DQM/HcalCommon/interface/Constants.h b/DQM/HcalCommon/interface/Constants.h
@@ -39,6 +39,11 @@ namespace hcaldqm {
         {29, 1120},
         {32, 1122},
         {38, 1134},
+        {23, 1124},
+        {27, 1126},
+        {26, 1128},
+        {33, 1130},
+        // Old HO VME assigments
         {3, 724},
         {7, 726},
         {6, 728},
@@ -49,18 +54,21 @@ namespace hcaldqm {
         {724, 3},   {725, 3},   {726, 7},   {727, 7},   {728, 6},   {729, 6},   {730, 13},  {731, 13},  {1100, 24},
         {1101, 24}, {1102, 20}, {1103, 20}, {1104, 21}, {1105, 21}, {1106, 25}, {1107, 25}, {1108, 31}, {1109, 31},
         {1110, 35}, {1111, 35}, {1112, 37}, {1113, 37}, {1114, 34}, {1115, 34}, {1116, 30}, {1117, 30}, {1118, 22},
-        {1119, 22}, {1120, 29}, {1121, 29}, {1122, 32}, {1123, 32}, {1134, 38}, {1135, 38},
+        {1119, 22}, {1120, 29}, {1121, 29}, {1122, 32}, {1123, 32}, {1124, 23}, {1125, 23}, {1126, 27}, {1127, 27},
+        {1128, 26}, {1129, 26}, {1130, 33}, {1131, 33}, {1134, 38}, {1135, 38},
     };
 
     std::vector<unsigned int> const fedList = {724,  725,  726,  727,  728,  729,  730,  731,  1100, 1101, 1102, 1103,
                                                1104, 1105, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115,
                                                1116, 1117, 1118, 1119, 1120, 1121, 1122, 1123, 1134, 1135};
-    std::vector<unsigned int> const fedListuTCA = {1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108,
-                                                   1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117,
-                                                   1118, 1119, 1120, 1121, 1122, 1123, 1134, 1135};
+    std::vector<unsigned int> const fedListuTCA = {
+        1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116,
+        1117, 1118, 1119, 1120, 1121, 1122, 1123, 1124, 1125, 1126, 1127, 1128, 1129, 1130, 1131, 1134, 1135};
     std::vector<unsigned int> const fedListVME = {724, 725, 726, 727, 728, 729, 730, 731};
-    std::vector<unsigned int> const crateList = {3, 6, 7, 13, 20, 21, 22, 24, 25, 29, 30, 31, 32, 34, 35, 37, 38};
-    std::vector<unsigned int> const crateListuTCA = {20, 21, 22, 24, 25, 29, 30, 31, 32, 34, 35, 37, 38};
+    std::vector<unsigned int> const crateList = {3,  6,  7,  13, 20, 21, 22, 23, 24, 25, 26,
+                                                 27, 29, 30, 31, 32, 33, 34, 35, 37, 38};
+    std::vector<unsigned int> const crateListuTCA = {
+        20, 21, 22, 23, 24, 25, 26, 27, 29, 30, 31, 32, 33, 34, 35, 37, 38};
     std::vector<unsigned int> const crateListVME = {3, 6, 7, 13};
     std::vector<unsigned int> const crateListHF = {22, 29, 32};
 

diff --git a/DQM/Integration/python/clients/hcal2_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/hcal2_dqm_sourceclient-live_cfg.py
@@ -19,8 +19,8 @@
 # Configuration/StandardSequences/python/Eras.py
 # PRocess accepts a (*list) of modifiers
 #
-from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
-process      = cms.Process('HCALDQM', Run2_2018)
+from Configuration.Eras.Era_Run3_cff import Run3
+process      = cms.Process('HCALDQM', Run3)
 subsystem    = 'Hcal2'
 cmssw        = os.getenv("CMSSW_VERSION").split("_")
 debugstr     = "### HcalDQM::cfg::DEBUG: "
@@ -37,8 +37,9 @@
 from DQM.Integration.config.online_customizations_cfi import *
 if useOfflineGT:
 	process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
+	process.GlobalTag.globaltag = '106X_dataRun3_HLT_Candidate_2019_11_26_14_48_16'
 	#process.GlobalTag.globaltag = '100X_dataRun2_HLT_Candidate_2018_01_31_16_04_35'
-	process.GlobalTag.globaltag = '100X_dataRun2_HLT_v1'
+	#process.GlobalTag.globaltag = '100X_dataRun2_HLT_v1'
 else:
 	process.load('DQM.Integration.config.FrontierCondition_GT_cfi')
 if useFileInput:
@@ -56,7 +57,8 @@
 process.DQMStore.referenceFileName = referenceFileName
 process = customise(process)
 process.DQMStore.verbose = 0
-process.source.minEventsPerLumi=5
+if not useFileInput:
+	process.source.minEventsPerLumi = 5
 
 #	Note, runType is obtained after importing DQM-related modules
 #	=> DQM-dependent
@@ -113,7 +115,8 @@
 if useMap:
 	process.GlobalTag.toGet.append(cms.PSet(
 		record = cms.string("HcalElectronicsMapRcd"),
-		tag = cms.string("HcalElectronicsMap_v7.05_hlt")
+		#tag = cms.string("HcalElectronicsMap_v7.05_hlt")
+		tag = cms.string("HcalElectronicsMap_v9.0_hlt")
 		)
 	)
 

diff --git a/DQM/Integration/python/clients/hcal_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/hcal_dqm_sourceclient-live_cfg.py
@@ -11,8 +11,8 @@
 #	Standard CMSSW Imports/Definitions
 #-------------------------------------
 import FWCore.ParameterSet.Config as cms
-from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
-process      = cms.Process('HCALDQM', Run2_2018)
+from Configuration.Eras.Era_Run3_cff import Run3
+process      = cms.Process('HCALDQM', Run3)
 subsystem    = 'Hcal'
 cmssw        = os.getenv("CMSSW_VERSION").split("_")
 debugstr     = "### HcalDQM::cfg::DEBUG: "
@@ -28,7 +28,8 @@
 from DQM.Integration.config.online_customizations_cfi import *
 if useOfflineGT:
 	process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff")
-	process.GlobalTag.globaltag = '106X_dataRun2_PromptLike_Candidate_2019_05_04_08_47_47'
+	process.GlobalTag.globaltag = '106X_dataRun3_HLT_Candidate_2019_11_26_14_48_16'
+	#process.GlobalTag.globaltag = '106X_dataRun2_PromptLike_Candidate_2019_05_04_08_47_47'
 	#process.GlobalTag.globaltag = '100X_dataRun2_HLT_Candidate_2018_01_31_16_04_35'
 else:
 	process.load('DQM.Integration.config.FrontierCondition_GT_cfi')
@@ -47,7 +48,8 @@
 process.DQMStore.referenceFileName = referenceFileName
 process = customise(process)
 process.DQMStore.verbose = 0
-process.source.minEventsPerLumi=100
+if not useFileInput:
+	process.source.minEventsPerLumi = 100
 
 #-------------------------------------
 #	CMSSW/Hcal non-DQM Related Module import
@@ -92,6 +94,7 @@
 process.emulTPDigis.InputTagFEDRaw = rawTag
 process.emulTPDigis.upgradeHF = cms.bool(True)
 process.emulTPDigis.upgradeHE = cms.bool(True)
+process.emulTPDigis.upgradeHB = cms.bool(True)
 process.emulTPDigis.inputLabel = cms.VInputTag("hcalDigis", "hcalDigis")
 process.emulTPDigis.inputUpgradeLabel = cms.VInputTag("hcalDigis", "hcalDigis")
 # Enable ZS on emulated TPs, to match what is done in data
@@ -147,7 +150,8 @@
 if useMap:
     process.GlobalTag.toGet.append(cms.PSet(
 		record = cms.string("HcalElectronicsMapRcd"),
-        tag = cms.string("HcalElectronicsMap_v7.05_hlt"),
+        #tag = cms.string("HcalElectronicsMap_v7.05_hlt"),
+        tag = cms.string("HcalElectronicsMap_v9.0_hlt"),
         )
     )    
 

diff --git a/DQM/Integration/python/clients/hcalcalib_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/hcalcalib_dqm_sourceclient-live_cfg.py
@@ -11,7 +11,8 @@
 #	Standard CMSSW Imports/Definitions
 #-------------------------------------
 import FWCore.ParameterSet.Config as cms
-process      = cms.Process('HCALDQM')
+from Configuration.Eras.Era_Run3_cff import Run3
+process      = cms.Process('HCALDQM', Run3)
 subsystem    = 'HcalCalib'
 cmssw        = os.getenv("CMSSW_VERSION").split("_")
 debugstr     = "### HcalDQM::cfg::DEBUG: "
@@ -27,7 +28,8 @@
 from DQM.Integration.config.online_customizations_cfi import *
 if useOfflineGT:
 	process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff')
-	process.GlobalTag.globaltag = '100X_dataRun2_HLT_v1'
+	process.GlobalTag.globaltag = '106X_dataRun3_HLT_Candidate_2019_11_26_14_48_16'
+	#process.GlobalTag.globaltag = '100X_dataRun2_HLT_v1'
 else:
 	process.load('DQM.Integration.config.FrontierCondition_GT_cfi')
 if useFileInput:
@@ -46,7 +48,8 @@
 referenceFileName = '/dqmdata/dqm/reference/hcal_reference.root'
 process.DQMStore.referenceFileName = referenceFileName
 process = customise(process)
-process.source.minEventsPerLumi=100
+if not useFileInput:
+	process.source.minEventsPerLumi=100
 
 
 #-------------------------------------
@@ -114,10 +117,11 @@
 #	Absent for Online Running
 #-------------------------------------
 if useMap:
-    process.GlobalTag.toGet.append(cms.PSet(record = cms.string("HcalElectronicsMapRcd"),
-                                            tag = cms.string("HcalElectronicsMap_v7.05_hlt"),
-                                            )
-                                   )
+    process.GlobalTag.toGet.append(
+    	cms.PSet(record = cms.string("HcalElectronicsMapRcd"),
+                 #tag = cms.string("HcalElectronicsMap_v7.05_hlt"),
+                 tag = cms.string("HcalElectronicsMap_v9.0_hlt"),
+        ))
 
 #-------------------------------------
 #	Some Settings before Finishing up