Skip to content

Commit 903a837

Browse files
authored
Merge pull request cms-sw#33873 from Dr15Jones/rmParameterSetFromL1MuCSCTFConfiguration
Remove ParameterSet usage from CondFormats/L1Trigger
2 parents 3f59f88 + 6b6213d commit 903a837

File tree

14 files changed

+562
-550
lines changed

14 files changed

+562
-550
lines changed

CondFormats/L1TObjects/BuildFile.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<use name="DataFormats/L1GlobalTrigger"/>
88
<use name="CondFormats/External"/>
99
<use name="DataFormats/L1CaloTrigger"/>
10-
<use name="FWCore/Framework"/>
1110
<use name="FWCore/MessageLogger"/>
1211
<export>
1312
<lib name="1"/>

CondFormats/L1TObjects/interface/L1MuCSCTFConfiguration.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include "CondFormats/Serialization/interface/Serializable.h"
55

66
#include <string>
7-
#include <FWCore/ParameterSet/interface/ParameterSet.h>
87

98
class L1MuCSCTFConfiguration {
109
private:
@@ -13,7 +12,11 @@ class L1MuCSCTFConfiguration {
1312
public:
1413
const std::string* configAsText(void) const throw() { return registers; }
1514

16-
edm::ParameterSet parameters(int sp) const;
15+
using const_iterator = const std::string*;
16+
const_iterator begin() const { return registers; }
17+
const_iterator end() const { return registers + 12; }
18+
19+
const std::string& operator[](int iIndex) const { return registers[iIndex]; }
1720

1821
L1MuCSCTFConfiguration& operator=(const L1MuCSCTFConfiguration& conf) {
1922
for (int sp = 0; sp < 12; sp++)

0 commit comments

Comments
 (0)