Skip to content

Commit 023d550

Browse files
patinkaewpatinkaew
committed
apply code check and code format
1 parent 5005b94 commit 023d550

File tree

7 files changed

+73
-84
lines changed

7 files changed

+73
-84
lines changed

‎DataFormats/L1Scouting/interface/OrbitFlatTable.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,9 @@ namespace l1ScoutingRun3 {
2525
bool singleton = false,
2626
bool extension = false)
2727
: nanoaod::FlatTable(bxOffsets.back(), name, singleton, extension), bxOffsets_(bxOffsets) {
28-
2928
if (bxOffsets.size() != orbitBufferSize_ + 1) {
30-
throw cms::Exception("LogicError") <<
31-
"Mismatch between bxOffsets.size() " << bxOffsets.size() <<
32-
" and orbitBufferSize_ + 1" << (orbitBufferSize_ + 1);
29+
throw cms::Exception("LogicError") << "Mismatch between bxOffsets.size() " << bxOffsets.size()
30+
<< " and orbitBufferSize_ + 1" << (orbitBufferSize_ + 1);
3331
}
3432
}
3533

‎L1TriggerScouting/Utilities/plugins/L1ScoutingEtSumOrbitFlatTableProducer.cc‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ class L1ScoutingEtSumOrbitFlatTableProducer : public edm::stream::EDProducer<> {
2020
void produce(edm::Event&, edm::EventSetup const&) override;
2121

2222
private:
23-
2423
std::unique_ptr<l1ScoutingRun3::OrbitFlatTable> produceSingle(l1ScoutingRun3::BxSumsOrbitCollection const&) const;
2524
std::unique_ptr<l1ScoutingRun3::OrbitFlatTable> produceMultiple(l1ScoutingRun3::BxSumsOrbitCollection const&) const;
2625

@@ -56,7 +55,7 @@ L1ScoutingEtSumOrbitFlatTableProducer::L1ScoutingEtSumOrbitFlatTableProducer(con
5655
phiPrecision_(params.getParameter<int>("phiPrecision")) {
5756
if (!writePhysicalValues_ && !writeHardwareValues_) {
5857
throw cms::Exception("L1ScoutingEtSumOrbitFlatTableProducer")
59-
<< "writePhysicalValues and writeHardwareValues cannot be false at the same time!";
58+
<< "writePhysicalValues and writeHardwareValues cannot be false at the same time!";
6059
}
6160
produces<l1ScoutingRun3::OrbitFlatTable>();
6261
}
@@ -68,7 +67,7 @@ void L1ScoutingEtSumOrbitFlatTableProducer::fillDescriptions(edm::ConfigurationD
6867
desc.add<std::string>("name");
6968
desc.add<std::string>("doc");
7069
desc.add<bool>("singleton", true)
71-
->setComment("whether to output as singleton (one EtSum per bx) or not (multiple EtSums per bx)");
70+
->setComment("whether to output as singleton (one EtSum per bx) or not (multiple EtSums per bx)");
7271
desc.add<bool>("writePhysicalValues", true);
7372
desc.add<bool>("writeHardwareValues", false);
7473
desc.add<bool>("writeHF", true);
@@ -97,7 +96,7 @@ std::unique_ptr<l1ScoutingRun3::OrbitFlatTable> L1ScoutingEtSumOrbitFlatTablePro
9796
out->setDoc(doc_);
9897

9998
unsigned int nobjs = out->size();
100-
99+
101100
// physical values (float)
102101
std::vector<float> totalEt(nobjs);
103102
std::vector<float> totalEtEm(nobjs);
@@ -114,7 +113,7 @@ std::unique_ptr<l1ScoutingRun3::OrbitFlatTable> L1ScoutingEtSumOrbitFlatTablePro
114113
std::vector<float> asymHt(nobjs);
115114
std::vector<float> asymEtHF(nobjs);
116115
std::vector<float> asymHtHF(nobjs);
117-
116+
118117
// hardware values (int)
119118
std::vector<int> hwTotalEt(nobjs);
120119
std::vector<int> hwTotalEtEm(nobjs);
@@ -140,7 +139,7 @@ std::unique_ptr<l1ScoutingRun3::OrbitFlatTable> L1ScoutingEtSumOrbitFlatTablePro
140139
std::vector<int> centrality(nobjs);
141140

142141
for (unsigned int i = 0; i < nobjs; i++) {
143-
const auto &sums = src[i];
142+
const auto& sums = src[i];
144143

145144
// physical values
146145
totalEt[i] = demux::fEt(sums.hwTotalEt());
@@ -159,7 +158,7 @@ std::unique_ptr<l1ScoutingRun3::OrbitFlatTable> L1ScoutingEtSumOrbitFlatTablePro
159158
asymEtHF[i] = demux::fEt(sums.hwAsymEtHF());
160159
asymHtHF[i] = demux::fEt(sums.hwAsymHtHF());
161160

162-
// hardware values
161+
// hardware values
163162
hwTotalEt[i] = sums.hwTotalEt();
164163
hwTotalEtEm[i] = sums.hwTotalEtEm();
165164
hwMissEt[i] = sums.hwMissEt();
@@ -218,14 +217,13 @@ std::unique_ptr<l1ScoutingRun3::OrbitFlatTable> L1ScoutingEtSumOrbitFlatTablePro
218217
out->template addColumn<int>("hwMissHtHF", hwMissHtHF, "hardware missHtHF");
219218
out->template addColumn<int>("hwMissHtHFPhi", hwMissHtHFPhi, "hardware missHtHF phi");
220219
}
221-
222220
}
223221
if (writeAsym_) {
224222
if (writePhysicalValues_) {
225223
out->template addColumn<float>("asymEt", asymEt, "asymEt", ptPrecision_);
226224
out->template addColumn<float>("asymHt", asymHt, "asymHt", ptPrecision_);
227225
}
228-
if (writeHardwareValues_) {
226+
if (writeHardwareValues_) {
229227
out->template addColumn<int>("hwAsymEt", hwAsymEt, "hardware asymEt");
230228
out->template addColumn<int>("hwAsymHt", hwAsymHt, "hardware asymHt");
231229
}
@@ -257,7 +255,6 @@ std::unique_ptr<l1ScoutingRun3::OrbitFlatTable> L1ScoutingEtSumOrbitFlatTablePro
257255
out->template addColumn<int>("centrality", centrality, "centrality");
258256
}
259257

260-
261258
return out;
262259
}
263260

@@ -267,24 +264,24 @@ std::unique_ptr<l1ScoutingRun3::OrbitFlatTable> L1ScoutingEtSumOrbitFlatTablePro
267264
// compute number of objects per bx to adjust bxOffsets
268265
unsigned int nitems = 5; // totalEt, totalEtEm, missEt, totalHt, missHt
269266
if (writeHF_)
270-
nitems += 2; // missEtHF, missHtHF
267+
nitems += 2; // missEtHF, missHtHF
271268
if (writeAsym_)
272-
nitems += (writeHF_ ? 4 : 2); // asymEt, asymHt, asymEtHF, asymHtHF
269+
nitems += (writeHF_ ? 4 : 2); // asymEt, asymHt, asymEtHF, asymHtHF
273270
if (writeMinBias_)
274-
nitems += 4; // minBiasHFP0, minBiasHFM0, minBiasHFP1, minBiasHFM1
271+
nitems += 4; // minBiasHFP0, minBiasHFM0, minBiasHFP1, minBiasHFM1
275272
if (writeTowerCount_)
276-
nitems += 1; // towerCount
273+
nitems += 1; // towerCount
277274
if (writeCentrality_)
278-
nitems += 1; // centrality
279-
275+
nitems += 1; // centrality
276+
280277
// adjust bxOffsets since each bx now contains multiple objects instead of single object
281278
std::vector<unsigned> offsets(src.bxOffsets());
282279
for (auto& v : offsets)
283280
v *= nitems;
284281

285282
auto out = std::make_unique<l1ScoutingRun3::OrbitFlatTable>(offsets, name_, /*singleton=*/false);
286283
out->setDoc(doc_);
287-
284+
288285
unsigned int nobjs = out->size();
289286

290287
// physical values
@@ -296,11 +293,11 @@ std::unique_ptr<l1ScoutingRun3::OrbitFlatTable> L1ScoutingEtSumOrbitFlatTablePro
296293
std::vector<int> hwPhi(nobjs, 0);
297294

298295
std::vector<int> sumType(nobjs);
299-
296+
300297
unsigned int i = 0;
301298
for (const l1ScoutingRun3::BxSums& sums : src) {
302299
assert(i + nitems <= nobjs && i % nitems == 0);
303-
300+
304301
// totalEt
305302
pt[i] = demux::fEt(sums.hwTotalEt());
306303
hwEt[i] = sums.hwTotalEt();
@@ -408,10 +405,11 @@ std::unique_ptr<l1ScoutingRun3::OrbitFlatTable> L1ScoutingEtSumOrbitFlatTablePro
408405
out->template addColumn<int>("hwPhi", phi, "hardware phi");
409406
}
410407

411-
out->template addColumn<int>("etSumType",
412-
sumType,
413-
"the type of the EtSum "
414-
"(https://github.com/cms-sw/cmssw/blob/master/DataFormats/L1Trigger/interface/EtSum.h#L27-L56)");
408+
out->template addColumn<int>(
409+
"etSumType",
410+
sumType,
411+
"the type of the EtSum "
412+
"(https://github.com/cms-sw/cmssw/blob/master/DataFormats/L1Trigger/interface/EtSum.h#L27-L56)");
415413
return out;
416414
}
417415

‎L1TriggerScouting/Utilities/plugins/L1ScoutingPhysicalValueMapProducer.cc‎

Lines changed: 26 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ class L1ScoutingPhysicalValueMapProducer : public edm::stream::EDProducer<> {
2525
public:
2626
using TOrbitCollection = OrbitCollection<T>;
2727

28-
L1ScoutingPhysicalValueMapProducer(edm::ParameterSet const&);
28+
L1ScoutingPhysicalValueMapProducer(edm::ParameterSet const &);
2929
~L1ScoutingPhysicalValueMapProducer() override = default;
30-
30+
3131
static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
3232

3333
private:
34-
void produce(edm::Event&, edm::EventSetup const&) override;
35-
36-
void putValueMap(edm::Event&, edm::Handle<TOrbitCollection>&, const std::vector<float>&, const std::string&);
34+
void produce(edm::Event &, edm::EventSetup const &) override;
35+
36+
void putValueMap(edm::Event &, edm::Handle<TOrbitCollection> &, const std::vector<float> &, const std::string &);
3737

3838
edm::EDGetTokenT<TOrbitCollection> src_;
39-
39+
4040
static const std::unordered_map<std::string, std::function<float(int)>> func_lookup_;
4141

4242
std::vector<std::string> labels_;
@@ -46,21 +46,20 @@ class L1ScoutingPhysicalValueMapProducer : public edm::stream::EDProducer<> {
4646

4747
template <typename T>
4848
const std::unordered_map<std::string, std::function<float(int)>> L1ScoutingPhysicalValueMapProducer<T>::func_lookup_ = {
49-
{"ugmt::fPt", l1ScoutingRun3::ugmt::fPt},
50-
{"ugmt::fEta", l1ScoutingRun3::ugmt::fEta},
51-
{"ugmt::fPhi", l1ScoutingRun3::ugmt::fPhi},
52-
{"ugmt::fPtUnconstrained", l1ScoutingRun3::ugmt::fPtUnconstrained},
53-
{"ugmt::fEtaAtVtx", l1ScoutingRun3::ugmt::fEtaAtVtx},
54-
{"ugmt::fPhiAtVtx", l1ScoutingRun3::ugmt::fPhiAtVtx},
55-
{"demux::fEt", l1ScoutingRun3::demux::fEt},
56-
{"demux::fEta", l1ScoutingRun3::demux::fEta},
57-
{"demux::fPhi", l1ScoutingRun3::demux::fPhi},
49+
{"ugmt::fPt", l1ScoutingRun3::ugmt::fPt},
50+
{"ugmt::fEta", l1ScoutingRun3::ugmt::fEta},
51+
{"ugmt::fPhi", l1ScoutingRun3::ugmt::fPhi},
52+
{"ugmt::fPtUnconstrained", l1ScoutingRun3::ugmt::fPtUnconstrained},
53+
{"ugmt::fEtaAtVtx", l1ScoutingRun3::ugmt::fEtaAtVtx},
54+
{"ugmt::fPhiAtVtx", l1ScoutingRun3::ugmt::fPhiAtVtx},
55+
{"demux::fEt", l1ScoutingRun3::demux::fEt},
56+
{"demux::fEta", l1ScoutingRun3::demux::fEta},
57+
{"demux::fPhi", l1ScoutingRun3::demux::fPhi},
5858
};
5959

6060
template <typename T>
61-
L1ScoutingPhysicalValueMapProducer<T>::L1ScoutingPhysicalValueMapProducer(edm::ParameterSet const& params)
61+
L1ScoutingPhysicalValueMapProducer<T>::L1ScoutingPhysicalValueMapProducer(edm::ParameterSet const &params)
6262
: src_(consumes(params.getParameter<edm::InputTag>("src"))) {
63-
6463
auto conversionsPSet = params.getParameter<edm::ParameterSet>("conversions");
6564
for (const std::string &retname : conversionsPSet.getParameterNamesForType<edm::ParameterSet>()) {
6665
labels_.emplace_back(retname);
@@ -72,7 +71,7 @@ L1ScoutingPhysicalValueMapProducer<T>::L1ScoutingPhysicalValueMapProducer(edm::P
7271
if (it != func_lookup_.end()) {
7372
funcs_.emplace_back(it->second);
7473
} else {
75-
std::stringstream ss;
74+
std::stringstream ss;
7675
for (auto const &func : func_lookup_)
7776
ss << "\n" << func.first;
7877
throw cms::Exception("L1ScoutingPhysicalValueMapProducer")
@@ -87,28 +86,22 @@ void L1ScoutingPhysicalValueMapProducer<T>::fillDescriptions(edm::ConfigurationD
8786
edm::ParameterSetDescription desc;
8887

8988
desc.add<edm::InputTag>("src");
90-
91-
std::vector<std::string> allowed_funcs;
92-
for (auto const &func : func_lookup_)
93-
allowed_funcs.push_back(func.first);
9489

9590
edm::ParameterSetDescription conversion;
96-
conversion.add<std::string>("func")
97-
->setComment("function used to convert");
98-
conversion.add<std::string>("arg")
99-
->setComment("attribute of src to be converted");
100-
91+
conversion.add<std::string>("func")->setComment("function used to convert");
92+
conversion.add<std::string>("arg")->setComment("attribute of src to be converted");
93+
10194
edm::ParameterSetDescription conversions;
10295
conversions.setComment("a parameter set to define all conversions");
10396
conversions.addNode(
104-
edm::ParameterWildcard<edm::ParameterSetDescription>("*", edm::RequireZeroOrMore, true, conversion));
97+
edm::ParameterWildcard<edm::ParameterSetDescription>("*", edm::RequireZeroOrMore, true, conversion));
10598
desc.add<edm::ParameterSetDescription>("conversions", conversions);
10699

107100
descriptions.addWithDefaultLabel(desc);
108101
}
109102

110103
template <typename T>
111-
void L1ScoutingPhysicalValueMapProducer<T>::produce(edm::Event& iEvent, edm::EventSetup const&) {
104+
void L1ScoutingPhysicalValueMapProducer<T>::produce(edm::Event &iEvent, edm::EventSetup const &) {
112105
edm::Handle<TOrbitCollection> src = iEvent.getHandle(src_);
113106

114107
unsigned int nobjs = src->size();
@@ -131,10 +124,10 @@ void L1ScoutingPhysicalValueMapProducer<T>::produce(edm::Event& iEvent, edm::Eve
131124
}
132125

133126
template <typename T>
134-
void L1ScoutingPhysicalValueMapProducer<T>::putValueMap(edm::Event& iEvent,
135-
edm::Handle<TOrbitCollection>& handle,
136-
const std::vector<float>& values,
137-
const std::string& label) {
127+
void L1ScoutingPhysicalValueMapProducer<T>::putValueMap(edm::Event &iEvent,
128+
edm::Handle<TOrbitCollection> &handle,
129+
const std::vector<float> &values,
130+
const std::string &label) {
138131
std::unique_ptr<edm::ValueMap<float>> valuemap(new edm::ValueMap<float>());
139132
edm::ValueMap<float>::Filler filler(*valuemap);
140133
filler.insert(handle, values.begin(), values.end());

‎L1TriggerScouting/Utilities/plugins/OrbitNanoAODOutputModule.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// Adapt from NanoAODOutputModule for OrbitFlatTable
88
// This handles rotating OrbitCollection to Event
99
//
10-
//
10+
//
1111
// Author original version: Giovanni Petrucciani
1212
// adapted by Patin Inkaew
1313

‎L1TriggerScouting/Utilities/plugins/OrbitTableOutputBranches.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ void OrbitTableOutputBranches::defineBranchesFromFirstEvent(const l1ScoutingRun3
1515
// get columnIndex
1616
int columnIndex = tab.columnIndex(var);
1717
if (columnIndex == -1)
18-
throw cms::Exception("LogicError", "Missing column in input for " + m_baseName + "_" + var);
18+
throw cms::Exception("LogicError", "Missing column in input for " + m_baseName + "_" + var);
1919

2020
switch (tab.columnType(i)) {
2121
case l1ScoutingRun3::OrbitFlatTable::ColumnType::UInt8:

‎L1TriggerScouting/Utilities/plugins/OrbitTableOutputBranches.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,10 @@ class OrbitTableOutputBranches {
6363
template <typename T>
6464
void fillColumn(NamedBranchPtr &pair, uint32_t bx) {
6565
pair.branch->SetAddress(
66-
m_counter == 0 ? static_cast<T *>(nullptr)
67-
: const_cast<T *>(&m_table->columnData<T>(pair.columnIndex, bx).front())); // SetAddress should take a const * !
66+
m_counter == 0
67+
? static_cast<T *>(nullptr)
68+
: const_cast<T *>(
69+
&m_table->columnData<T>(pair.columnIndex, bx).front())); // SetAddress should take a const * !
6870
}
6971
};
7072

0 commit comments

Comments
 (0)