Merge pull request #32436 from cms-sw/revert-32137-PR-112X-HLTL1T

Revert "Adding infra. for L1T object scaling constants from DB"
cms-sw · Dec 14, 2020 · 11fb37a · 11fb37a
2 parents bd3cb80 + 04d8f20
commit 11fb37a
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 82 deletions.
diff --git a/CondCore/HLTPlugins/src/plugin.cc b/CondCore/HLTPlugins/src/plugin.cc
@@ -6,9 +6,5 @@
 #include "CondFormats/HLTObjects/interface/HLTPrescaleTableCond.h"
 #include "CondFormats/DataRecord/interface/HLTPrescaleTableRcd.h"
 
-#include "CondFormats/HLTObjects/interface/L1TObjScalingConstants.h"
-#include "CondFormats/DataRecord/interface/L1TObjScalingRcd.h"
-
 REGISTER_PLUGIN(AlCaRecoTriggerBitsRcd, AlCaRecoTriggerBits);
 REGISTER_PLUGIN(HLTPrescaleTableRcd, trigger::HLTPrescaleTableCond);
-REGISTER_PLUGIN(L1TObjScalingRcd, L1TObjScalingConstants);
diff --git a/CondFormats/DataRecord/interface/L1TObjScalingRcd.h b/CondFormats/DataRecord/interface/L1TObjScalingRcd.h
diff --git a/CondFormats/DataRecord/src/L1TObjScalingRcd.cc b/CondFormats/DataRecord/src/L1TObjScalingRcd.cc
diff --git a/CondFormats/HLTObjects/interface/L1TObjScalingConstants.h b/CondFormats/HLTObjects/interface/L1TObjScalingConstants.h
diff --git a/CondFormats/HLTObjects/src/T_EventSetup_L1TObjScalingConstants.cc b/CondFormats/HLTObjects/src/T_EventSetup_L1TObjScalingConstants.cc
diff --git a/CondFormats/HLTObjects/src/classes.h b/CondFormats/HLTObjects/src/classes.h
@@ -1,3 +1,2 @@
 #include "CondFormats/HLTObjects/interface/AlCaRecoTriggerBits.h"
 #include "CondFormats/HLTObjects/interface/HLTPrescaleTableCond.h"
-#include "CondFormats/HLTObjects/interface/L1TObjScalingConstants.h"
diff --git a/CondFormats/HLTObjects/src/classes_def.xml b/CondFormats/HLTObjects/src/classes_def.xml
@@ -4,8 +4,5 @@
  <class name="trigger::HLTPrescaleTableCond">
    <field name ="hltPrescaleTable_" mapping ="blob"/>
  </class>
-<class name="L1TObjScalingConstants" class_version="0"/>
-<class name="L1TObjScalingConstants::Scaling"/>
-<class name="std::vector<L1TObjScalingConstants::Scaling>"/>
 </lcgdict>   
 
diff --git a/CondFormats/HLTObjects/test/testSerializationHLTObjects.cpp b/CondFormats/HLTObjects/test/testSerializationHLTObjects.cpp
@@ -6,8 +6,6 @@ int main() {
   testSerialization<AlCaRecoTriggerBits>();
   testSerialization<std::pair<const std::string, std::vector<unsigned int>>>();
   //testSerialization<trigger::HLTPrescaleTableCond>(); never serialized in the old DB
-  testSerialization<L1TObjScalingConstants>();
-  testSerialization<std::vector<L1TObjScalingConstants>>();
-  testSerialization<std::vector<L1TObjScalingConstants::Scaling>>();
+
   return 0;
 }