Skip to content

Remove ParameterSet usage from CondFormats/L1Trigger #33873

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

Merged
cmsbuild merged 3 commits into from
Jun 3, 2021
Merged

Remove ParameterSet usage from CondFormats/L1Trigger #33873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02a0752
Removed ParameterSet from L1MuCSCTFConfiguration
Dr15Jones May 27, 2021
c247c07
Moved parameters function to L1Trigger/CSCTrackFinder
Dr15Jones May 27, 2021
6b6213d
Removed *Rcd.h headers from CondFormats/L1TObjects
Dr15Jones May 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CondFormats/L1TObjects/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<use name="DataFormats/L1GlobalTrigger"/>
<use name="CondFormats/External"/>
<use name="DataFormats/L1CaloTrigger"/>
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<export>
<lib name="1"/>
Expand Down
7 changes: 5 additions & 2 deletions CondFormats/L1TObjects/interface/L1MuCSCTFConfiguration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include "CondFormats/Serialization/interface/Serializable.h"

#include <string>
#include <FWCore/ParameterSet/interface/ParameterSet.h>

class L1MuCSCTFConfiguration {
private:
Expand All @@ -13,7 +12,11 @@ class L1MuCSCTFConfiguration {
public:
const std::string* configAsText(void) const throw() { return registers; }

edm::ParameterSet parameters(int sp) const;
using const_iterator = const std::string*;
const_iterator begin() const { return registers; }
const_iterator end() const { return registers + 12; }

const std::string& operator[](int iIndex) const { return registers[iIndex]; }

L1MuCSCTFConfiguration& operator=(const L1MuCSCTFConfiguration& conf) {
for (int sp = 0; sp < 12; sp++)
Expand Down
Loading