Skip to content

Commit eedda6e

Browse files
committed
[ANALYSIS] apply code-format
1 parent 7156c19 commit eedda6e

File tree

5 files changed

+28
-22
lines changed

5 files changed

+28
-22
lines changed

MuonAnalysis/MomentumScaleCalibration/plugins/Histograms.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "TMath.h"
3434
#include <iostream>
3535
#include <string>
36-
#include <vector>
36+
#include <vector>
3737

3838
class Histograms {
3939
public:

PhysicsTools/UtilAlgos/interface/StringBasedNTupler.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class TreeBranch {
6666
}
6767
const std::string& branchAlias() const { return branchAlias_; }
6868
const std::string& branchTitle() const { return branchTitle_; }
69-
typedef std::unique_ptr<std::vector<float> > value;
69+
typedef std::unique_ptr<std::vector<float>> value;
7070
value branch(const edm::Event& iEvent);
7171

7272
std::vector<float>** dataHolderPtrAdress() { return &dataHolderPtr_; }
@@ -120,7 +120,7 @@ class StringLeaveHelper {
120120
value value_;
121121
};
122122

123-
template <typename Object, typename Collection = std::vector<Object> >
123+
template <typename Object, typename Collection = std::vector<Object>>
124124
class StringBranchHelper {
125125
public:
126126
typedef TreeBranch::value value;
@@ -233,7 +233,7 @@ class StringBasedNTupler : public NTupler {
233233

234234
//do it once with configuration [vstring vars = { "x:x" ,... } ] where ":"=separator
235235
if (leavesPSet.exists("vars")) {
236-
std::vector<std::string> leavesS = leavesPSet.getParameter<std::vector<std::string> >("vars");
236+
std::vector<std::string> leavesS = leavesPSet.getParameter<std::vector<std::string>>("vars");
237237
for (uint l = 0; l != leavesS.size(); ++l) {
238238
uint sep = leavesS[l].find(separator);
239239
std::string name = leavesS[l].substr(0, sep);
@@ -347,7 +347,7 @@ class StringBasedNTupler : public NTupler {
347347
for (; iL != iL_end; ++iL) {
348348
TreeBranch& b = *iL;
349349
//a vector of float for each leave
350-
producesCollector.produces<std::vector<float> >(b.branchName()).setBranchAlias(b.branchAlias());
350+
producesCollector.produces<std::vector<float>>(b.branchName()).setBranchAlias(b.branchAlias());
351351
nLeaves++;
352352
}
353353
}
@@ -371,7 +371,7 @@ class StringBasedNTupler : public NTupler {
371371
for (; iL != iL_end; ++iL) {
372372
TreeBranch& b = *iL;
373373
// grab the vector of values from the interpretation of expression for the associated collection
374-
std::unique_ptr<std::vector<float> > branch(b.branch(iEvent));
374+
std::unique_ptr<std::vector<float>> branch(b.branch(iEvent));
375375
// calculate the maximum index size.
376376
if (branch->size() > maxS)
377377
maxS = branch->size();
@@ -430,7 +430,7 @@ class StringBasedNTupler : public NTupler {
430430
uint maxS = 0;
431431
for (; iL != iL_end; ++iL) {
432432
TreeBranch& b = *iL;
433-
std::unique_ptr<std::vector<float> > branch(b.branch(iEvent));
433+
std::unique_ptr<std::vector<float>> branch(b.branch(iEvent));
434434
if (branch->size() > maxS)
435435
maxS = branch->size();
436436
iEvent.put(std::move(branch), b.branchName());
@@ -470,7 +470,7 @@ class StringBasedNTupler : public NTupler {
470470
}
471471

472472
protected:
473-
typedef std::map<std::string, std::vector<TreeBranch> > Branches;
473+
typedef std::map<std::string, std::vector<TreeBranch>> Branches;
474474
Branches branches_;
475475

476476
bool ownTheTree_;

PhysicsTools/Utilities/interface/Primitive.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ namespace funct {
155155
// /
156156

157157
template <TYPXT2,
158-
bool bint = not::std::is_same<PRIMIT(X, B), UndefinedIntegral>::value,
159-
bool aint = not::std::is_same<PRIMIT(X, A), UndefinedIntegral>::value>
158+
bool bint = not ::std::is_same<PRIMIT(X, B), UndefinedIntegral>::value,
159+
bool aint = not ::std::is_same<PRIMIT(X, A), UndefinedIntegral>::value>
160160
struct PartIntegral {
161161
typedef UndefinedIntegral type;
162162
GET(PROD_S(A, B), type());
@@ -213,8 +213,8 @@ namespace funct {
213213
// /
214214

215215
template <TYPXT2,
216-
bool bint = not::std::is_same<PRIMIT(X, RATIO(NUM(1), B)), UndefinedIntegral>::value,
217-
bool aint = not::std::is_same<PRIMIT(X, A), UndefinedIntegral>::value>
216+
bool bint = not ::std::is_same<PRIMIT(X, RATIO(NUM(1), B)), UndefinedIntegral>::value,
217+
bool aint = not ::std::is_same<PRIMIT(X, A), UndefinedIntegral>::value>
218218
struct PartIntegral2 {
219219
typedef UndefinedIntegral type;
220220
GET(RATIO_S(A, B), type());

TopQuarkAnalysis/TopEventSelection/interface/TtFullHadSignalSel.h

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,19 @@ class TtFullHadSignalSel {
5656
double pt(unsigned short i) const { return (pts_.size() >= i) ? pts_.at(i - 1) : -1.; }
5757

5858
double EtSin2Theta(unsigned short i, bool boosted = false) const {
59-
return boosted ? ((EtStars_.size() >= i) ? EtStars_.at(i - 1) : -1.)
60-
: (EtSin2Thetas_.size() >= i) ? EtSin2Thetas_.at(i - 1) : -1.;
59+
return boosted ? ((EtStars_.size() >= i) ? EtStars_.at(i - 1) : -1.)
60+
: (EtSin2Thetas_.size() >= i) ? EtSin2Thetas_.at(i - 1)
61+
: -1.;
6162
}
6263
double theta(unsigned short i, bool boosted = false) const {
63-
return boosted ? ((thetaStars_.size() >= i) ? thetaStars_.at(i - 1) : -1.)
64-
: (thetas_.size() >= i) ? thetas_.at(i - 1) : -1.;
64+
return boosted ? ((thetaStars_.size() >= i) ? thetaStars_.at(i - 1) : -1.)
65+
: (thetas_.size() >= i) ? thetas_.at(i - 1)
66+
: -1.;
6567
}
6668
double sinTheta(unsigned short i, bool boosted = false) const {
67-
return boosted ? ((thetaStars_.size() >= i) ? sin(thetaStars_.at(i - 1)) : -1.)
68-
: (thetas_.size() >= i) ? sin(thetas_.at(i - 1)) : -1.;
69+
return boosted ? ((thetaStars_.size() >= i) ? sin(thetaStars_.at(i - 1)) : -1.)
70+
: (thetas_.size() >= i) ? sin(thetas_.at(i - 1))
71+
: -1.;
6972
}
7073

7174
double EtSin2Theta3jet(bool boosted = false) const { return boosted ? EtStar3jet_ : EtSin2Theta3jet_; }
@@ -78,15 +81,18 @@ class TtFullHadSignalSel {
7881

7982
double jet_etaetaMoment(unsigned short i, bool noB = false) const {
8083
return noB ? ((etaetaMomentsNoB_.size() >= i) ? etaetaMomentsNoB_.at(etaetaMomentsNoB_.size() - i) : -100.)
81-
: (etaetaMoments_.size() >= i) ? etaetaMoments_.at(etaetaMoments_.size() - i) : -100.;
84+
: (etaetaMoments_.size() >= i) ? etaetaMoments_.at(etaetaMoments_.size() - i)
85+
: -100.;
8286
}
8387
double jet_etaphiMoment(unsigned short i, bool noB = false) const {
8488
return noB ? ((etaphiMomentsNoB_.size() >= i) ? etaphiMomentsNoB_.at(etaphiMomentsNoB_.size() - i) : -100.)
85-
: (etaphiMoments_.size() >= i) ? etaphiMoments_.at(etaphiMoments_.size() - i) : -100.;
89+
: (etaphiMoments_.size() >= i) ? etaphiMoments_.at(etaphiMoments_.size() - i)
90+
: -100.;
8691
}
8792
double jet_phiphiMoment(unsigned short i, bool noB = false) const {
8893
return noB ? ((phiphiMomentsNoB_.size() >= i) ? phiphiMomentsNoB_.at(phiphiMomentsNoB_.size() - i) : -100.)
89-
: (phiphiMoments_.size() >= i) ? phiphiMoments_.at(phiphiMoments_.size() - i) : -100.;
94+
: (phiphiMoments_.size() >= i) ? phiphiMoments_.at(phiphiMoments_.size() - i)
95+
: -100.;
9096
}
9197

9298
double jet_etaetaMomentMoment(unsigned short i) const {

TopQuarkAnalysis/TopKinFitter/plugins/TtFullLepKinSolutionProducer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ void TtFullLepKinSolutionProducer::produce(edm::Event& evt, const edm::EventSetu
409409
//create dmummy vector
410410
std::vector<int> idcs;
411411
idcs.reserve(6);
412-
for (int i = 0; i < 6; ++i)
412+
for (int i = 0; i < 6; ++i)
413413
idcs.push_back(-1);
414414

415415
idcsV.push_back(idcs);

0 commit comments

Comments
 (0)