Merge pull request #23759 from rekovic/EMTF_PR_2018_10_2X_O2O_from_ab…

…rinke1 L1T EMTF O2O 2018
cms-sw · Jul 19, 2018 · e569679 · e569679
2 parents 2ade063 + e5a53a0
commit e569679
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 49 deletions.
diff --git a/CondCore/L1TPlugins/src/UpgradeRecords2.cc b/CondCore/L1TPlugins/src/UpgradeRecords2.cc
@@ -1,9 +1,5 @@
 #include "CondCore/ESSources/interface/registration_macros.h"
 
-#include "CondFormats/DataRecord/interface/L1TMuonEndcapParamsRcd.h" // Temporary copy to avoid crashes - AWB 28.08.17
-// Required to satisfy current convention for "Record" in "Global Tag Entries" 
-// https://cms-conddb-prod.cern.ch/cmsDbBrowser/search/Prod/L1TMuonEndCapParams
-
 #include "CondFormats/L1TObjects/interface/L1TMuonEndCapParams.h"
 #include "CondFormats/DataRecord/interface/L1TMuonEndCapParamsRcd.h"
 #include "CondFormats/DataRecord/interface/L1TMuonEndCapParamsO2ORcd.h"
@@ -26,8 +22,6 @@
 #include "CondFormats/DataRecord/interface/L1TMuonGlobalParamsRcd.h"
 #include "CondFormats/DataRecord/interface/L1TMuonGlobalParamsO2ORcd.h"
 
-REGISTER_PLUGIN(L1TMuonEndcapParamsRcd,  L1TMuonEndCapParams); // Temporary copy to avoid crashes - AWB 28.08.17
-
 REGISTER_PLUGIN(L1TMuonEndCapParamsRcd,  L1TMuonEndCapParams);
 REGISTER_PLUGIN(L1TMuonEndCapForestRcd,  L1TMuonEndCapForest);
 REGISTER_PLUGIN(L1TMuonOverlapParamsRcd, L1TMuonOverlapParams);

diff --git a/CondFormats/DataRecord/interface/L1TMuonEndcapParamsRcd.h b/CondFormats/DataRecord/interface/L1TMuonEndcapParamsRcd.h
diff --git a/CondFormats/DataRecord/src/L1TMuonEndcapParamsRcd.cc b/CondFormats/DataRecord/src/L1TMuonEndcapParamsRcd.cc
diff --git a/CondTools/L1TriggerExt/python/L1O2OTagsExt_cfi.py b/CondTools/L1TriggerExt/python/L1O2OTagsExt_cfi.py
@@ -12,7 +12,7 @@ def initL1O2OTagsExt():
     initL1O2OTagsExt.tagBaseVec[ L1CondEnumExt.L1TGlobalPrescalesVetos ] = "Stage2v0_hlt"
     initL1O2OTagsExt.tagBaseVec[ L1CondEnumExt.L1TMuonBarrelParams ] = "Stage2v1_hlt"
     initL1O2OTagsExt.tagBaseVec[ L1CondEnumExt.L1TMuonOverlapParams ] = "Stage2v0_hlt"
-    initL1O2OTagsExt.tagBaseVec[ L1CondEnumExt.L1TMuonEndCapParams ] = "Stage2v1_hlt"
+    initL1O2OTagsExt.tagBaseVec[ L1CondEnumExt.L1TMuonEndCapParams ] = "Stage2v3_hlt"
     initL1O2OTagsExt.tagBaseVec[ L1CondEnumExt.L1TMuonEndCapForest ] = "Stage2v1_hlt"
     initL1O2OTagsExt.tagBaseVec[ L1CondEnumExt.L1TMuonGlobalParams ] = "Stage2v0_hlt"
     initL1O2OTagsExt.tagBaseVec[ L1CondEnumExt.L1TCaloParams ] = "Stage2v3_hlt"

diff --git a/L1TriggerConfig/L1TConfigProducers/src/L1TMuonEndCapObjectKeysOnlineProd.cc b/L1TriggerConfig/L1TConfigProducers/src/L1TMuonEndCapObjectKeysOnlineProd.cc
@@ -98,7 +98,9 @@ void L1TMuonEndCapObjectKeysOnlineProd::fillObjectKeys( ReturnType pL1TriggerKey
         }
     }
 
-    std::map<std::string, l1t::Parameter> conf = trgSys.getParameters("EMTF-1"); // any processor will do
+    // Changed from "EMTF-1" to "EMTFp1", but is this backwards compatible? Does it need to be? - AWB 10.04.2018
+    std::map<std::string, l1t::Parameter> conf = trgSys.getParameters("EMTFp1"); // any processor will do
+    // if (conf still empty) conf = trgSys.getParameters("EMTF+1"); // Should add some conditional for backwards-compatibility
 
 ////////////////////////
 

diff --git a/L1TriggerConfig/L1TConfigProducers/src/L1TMuonEndCapParamsOnlineProd.cc b/L1TriggerConfig/L1TConfigProducers/src/L1TMuonEndCapParamsOnlineProd.cc
@@ -117,7 +117,9 @@ std::shared_ptr<L1TMuonEndCapParams> L1TMuonEndCapParamsOnlineProd::newObject(co
         }
     }
 
-    std::map<std::string, l1t::Parameter> conf = trgSys.getParameters("EMTF-1"); // any processor will do
+    // Changed from "EMTF-1" to "EMTFp1", but is this backwards compatible? Does it need to be? - AWB 10.04.2018
+    std::map<std::string, l1t::Parameter> conf = trgSys.getParameters("EMTFp1"); // any processor will do
+    // if (conf still empty) conf = trgSys.getParameters("EMTF+1"); // Should add some conditional for backwards-compatibility
 
     std::string core_fwv = conf["core_firmware_version"].getValueAsStr();
     tm brokenTime;

diff --git a/L1TriggerConfig/Utilities/test/dumpAll.py b/L1TriggerConfig/Utilities/test/dumpAll.py
@@ -17,7 +17,7 @@
 
 # 2016_3_3 and 3_3_HI
 
-process.l1ew = cms.EDAnalyzer("L1TMuonEndcapWriter")
+process.l1ew = cms.EDAnalyzer("L1TMuonEndCapParamsWriter") ## What does this string match / refer to? - AWB 10.04.18
 process.l1bw = cms.EDAnalyzer("L1TMuonBarrelParamsWriter")
 process.l1gw = cms.EDAnalyzer("L1TMuonGlobalParamsWriter")
 process.l1cw = cms.EDAnalyzer("L1TCaloStage2ParamsWriter")

diff --git a/L1TriggerConfig/Utilities/test/dumpL1TMuonEndCapParams.py b/L1TriggerConfig/Utilities/test/dumpL1TMuonEndCapParams.py
@@ -61,13 +61,13 @@
     process.load("CondTools.L1TriggerExt.L1TriggerKeyOnlineExt_cfi")
     process.L1TriggerKeyOnlineExt.subsystemLabels = cms.vstring('EMTF')
     # include the system-specific subkeys ESProducer (generates EMTF labeled L1TriggerKey)
-    process.load("L1TriggerConfig.L1TConfigProducers.L1TMuonEndcapObjectKeysOnline_cfi")
-    process.L1TMuonEndcapObjectKeysOnline.onlineAuthentication = cms.string( options.DBAuth    )
-    process.L1TMuonEndcapObjectKeysOnline.onlineDB             = cms.string( options.DBConnect )
+    process.load("L1TriggerConfig.L1TConfigProducers.L1TMuonEndCapObjectKeysOnline_cfi")
+    process.L1TMuonEndCapObjectKeysOnline.onlineAuthentication = cms.string( options.DBAuth    )
+    process.L1TMuonEndCapObjectKeysOnline.onlineDB             = cms.string( options.DBConnect )
 else :
     # instantiate manually the system-specific L1TriggerKey using the subsystemKey option
     process.load("CondTools.L1TriggerExt.L1TriggerKeyDummyExt_cff")
-    process.L1TriggerKeyDummyExt.tscKey = cms.string('dummyL1TMuonEndcap')
+    process.L1TriggerKeyDummyExt.tscKey = cms.string('dummyL1TMuonEndCap')
     process.L1TriggerKeyDummyExt.objectKeys = cms.VPSet(
         cms.PSet(
             record = cms.string('L1TMuonEndCapParamsO2ORcd'),