Merge pull request #19164 from kkotov/o2oCaloNewLuts

New CaloL{1,2} LUTs are taken care of by the L1T O2O
cms-sw · Jul 2, 2017 · b1580cd · b1580cd
2 parents 72e9f44 + b9c6c4d
commit b1580cd
Show file tree

Hide file tree

Showing 5 changed files with 578 additions and 103 deletions.
diff --git a/CondFormats/DataRecord/interface/L1TCaloParamsO2ORcd.h b/CondFormats/DataRecord/interface/L1TCaloParamsO2ORcd.h
@@ -14,8 +14,8 @@
 #include "FWCore/Framework/interface/DependentRecordImplementation.h"
 #include "CondFormats/DataRecord/interface/L1TriggerKeyListExtRcd.h"
 #include "CondFormats/DataRecord/interface/L1TriggerKeyExtRcd.h"
-#include "CondFormats/DataRecord/interface/L1TCaloStage2ParamsRcd.h"
-class L1TCaloParamsO2ORcd : public edm::eventsetup::DependentRecordImplementation<L1TCaloParamsO2ORcd, boost::mpl::vector<L1TriggerKeyListExtRcd,L1TriggerKeyExtRcd,L1TCaloStage2ParamsRcd> > {};
+#include "CondFormats/DataRecord/interface/L1TCaloParamsRcd.h"
+class L1TCaloParamsO2ORcd : public edm::eventsetup::DependentRecordImplementation<L1TCaloParamsO2ORcd, boost::mpl::vector<L1TriggerKeyListExtRcd,L1TriggerKeyExtRcd,L1TCaloParamsRcd> > {};
 
 
 #endif
diff --git a/L1TriggerConfig/L1TConfigProducers/python/L1TCaloParamsOnline_cfi.py b/L1TriggerConfig/L1TConfigProducers/python/L1TCaloParamsOnline_cfi.py
@@ -9,7 +9,7 @@
        CondDB,
        toGet   = cms.VPSet(
             cms.PSet(
-                 record = cms.string('L1TCaloStage2ParamsRcd'),
+                 record = cms.string('L1TCaloParamsRcd'),
                  tag = cms.string("L1TCaloParamsPrototype_Stage2v0_hlt")
             )
        )
@@ -18,6 +18,7 @@
 L1TCaloParamsOnlineProd = cms.ESProducer("L1TCaloParamsOnlineProd",
     onlineAuthentication = cms.string('.'),
     forceGeneration = cms.bool(False),
-    onlineDB = cms.string('oracle://CMS_OMDS_LB/CMS_TRG_R')
+    onlineDB = cms.string('oracle://CMS_OMDS_LB/CMS_TRG_R'),
+    exclusiveLayer = cms.uint32(0)
 )