Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Adding infra. for L1T object scaling constants from DB" #32436

Merged
merged 1 commit into from Dec 14, 2020
Merged

Revert "Adding infra. for L1T object scaling constants from DB" #32436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions CondCore/HLTPlugins/src/plugin.cc
View file
Open in desktop
Expand Up @@ -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);
29 changes: 0 additions & 29 deletions CondFormats/DataRecord/interface/L1TObjScalingRcd.h
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions CondFormats/DataRecord/src/L1TObjScalingRcd.cc
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions CondFormats/HLTObjects/interface/L1TObjScalingConstants.h
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions CondFormats/HLTObjects/src/T_EventSetup_L1TObjScalingConstants.cc
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion CondFormats/HLTObjects/src/classes.h
View file
Open in desktop
@@ -1,3 +1,2 @@
#include "CondFormats/HLTObjects/interface/AlCaRecoTriggerBits.h"
#include "CondFormats/HLTObjects/interface/HLTPrescaleTableCond.h"
#include "CondFormats/HLTObjects/interface/L1TObjScalingConstants.h"
3 changes: 0 additions & 3 deletions CondFormats/HLTObjects/src/classes_def.xml
View file
Open in desktop
Expand Up @@ -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>

4 changes: 1 addition & 3 deletions CondFormats/HLTObjects/test/testSerializationHLTObjects.cpp
View file
Open in desktop
Expand Up @@ -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;
}