Skip to content

Commit

Permalink
Change object passed by value to object passed by const reference
Browse files Browse the repository at this point in the history
  • Loading branch information
Patrick Gartung committed May 30, 2013
1 parent a7460ad commit 9b10def
Show file tree
Hide file tree
Showing 13 changed files with 95 additions and 95 deletions.
10 changes: 5 additions & 5 deletions TopQuarkAnalysis/TopKinFitter/interface/CovarianceMatrix.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ class CovarianceMatrix {
/// default constructor
CovarianceMatrix(){};
/// constructor for the fully-hadronic channel
CovarianceMatrix(const std::vector<edm::ParameterSet> udscResolutions, const std::vector<edm::ParameterSet> bResolutions,
const std::vector<double> jetEnergyResolutionScaleFactors, const std::vector<double> jetEnergyResolutionEtaBinning);
CovarianceMatrix(const std::vector<edm::ParameterSet>& udscResolutions, const std::vector<edm::ParameterSet>& bResolutions,
const std::vector<double>& jetEnergyResolutionScaleFactors, const std::vector<double>& jetEnergyResolutionEtaBinning);
/// constructor for the lepton+jets channel
CovarianceMatrix(const std::vector<edm::ParameterSet> udscResolutions, const std::vector<edm::ParameterSet> bResolutions,
const std::vector<edm::ParameterSet> lepResolutions, const std::vector<edm::ParameterSet> metResolutions,
const std::vector<double> jetEnergyResolutionScaleFactors, const std::vector<double> jetEnergyResolutionEtaBinning);
CovarianceMatrix(const std::vector<edm::ParameterSet>& udscResolutions, const std::vector<edm::ParameterSet>& bResolutions,
const std::vector<edm::ParameterSet>& lepResolutions, const std::vector<edm::ParameterSet>& metResolutions,
const std::vector<double>& jetEnergyResolutionScaleFactors, const std::vector<double>& jetEnergyResolutionEtaBinning);
// destructor
~CovarianceMatrix(){};

Expand Down
6 changes: 3 additions & 3 deletions TopQuarkAnalysis/TopKinFitter/interface/StKinFitter.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// $Id: StKinFitter.h,v 1.3 2010/09/06 11:07:13 snaumann Exp $
// $Id: StKinFitter.h,v 1.4 2010/09/06 13:46:16 snaumann Exp $
//

#ifndef TopKinFitter_StKinFitter_h
Expand All @@ -22,8 +22,8 @@ class StKinFitter : public TopKinFitter {
public:

StKinFitter();
StKinFitter(int jetParam, int lepParam, int metParam, int maxNrIter, double maxDeltaS, double maxF, std::vector<int> constraints);
StKinFitter(Param jetParam, Param lepParam, Param metParam, int maxNrIter, double maxDeltaS, double maxF, std::vector<int> constraints);
StKinFitter(int jetParam, int lepParam, int metParam, int maxNrIter, double maxDeltaS, double maxF,const std::vector<int>& constraints);
StKinFitter(Param jetParam, Param lepParam, Param metParam, int maxNrIter, double maxDeltaS, double maxF, const std::vector<int>& constraints);
~StKinFitter();

StEvtSolution addKinFitInfo(StEvtSolution * asol);
Expand Down
22 changes: 11 additions & 11 deletions TopQuarkAnalysis/TopKinFitter/interface/TtFullHadKinFitter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@ class TtFullHadKinFitter : public TopKinFitter {
/// default constructor
TtFullHadKinFitter();
/// used to convert vector of int's to vector of constraints (just used in TtFullHadKinFitter(int, int, double, double, std::vector<unsigned int>))
std::vector<TtFullHadKinFitter::Constraint> intToConstraint(std::vector<unsigned int> constraints);
std::vector<TtFullHadKinFitter::Constraint> intToConstraint(const std::vector<unsigned int>& constraints);
/// constructor initialized with build-in types as custom parameters (only included to keep TtHadEvtSolutionMaker.cc running)
TtFullHadKinFitter(int jetParam, int maxNrIter, double maxDeltaS, double maxF, std::vector<unsigned int> constraints,
TtFullHadKinFitter(int jetParam, int maxNrIter, double maxDeltaS, double maxF, const std::vector<unsigned int>& constraints,
double mW=80.4, double mTop=173.,
const std::vector<edm::ParameterSet>* udscResolutions=0,
const std::vector<edm::ParameterSet>* bResolutions =0,
const std::vector<double>* jetEnergyResolutionScaleFactors=0,
const std::vector<double>* jetEnergyResolutionEtaBinning =0);
/// constructor initialized with built-in types and class enum's custom parameters
TtFullHadKinFitter(Param jetParam, int maxNrIter, double maxDeltaS, double maxF, std::vector<Constraint> constraints,
TtFullHadKinFitter(Param jetParam, int maxNrIter, double maxDeltaS, double maxF, const std::vector<Constraint>& constraints,
double mW=80.4, double mTop=173.,
const std::vector<edm::ParameterSet>* udscResolutions=0,
const std::vector<edm::ParameterSet>* bResolutions =0,
Expand Down Expand Up @@ -138,9 +138,9 @@ class TtFullHadKinFitter : public TopKinFitter {
KinFit();
/// special constructor
KinFit(bool useBTagging, unsigned int bTags, std::string bTagAlgo, double minBTagValueBJet, double maxBTagValueNonBJet,
std::vector<edm::ParameterSet> udscResolutions, std::vector<edm::ParameterSet> bResolutions, std::vector<double> jetEnergyResolutionScaleFactors,
std::vector<double> jetEnergyResolutionEtaBinning, std::string jetCorrectionLevel, int maxNJets, int maxNComb,
unsigned int maxNrIter, double maxDeltaS, double maxF, unsigned int jetParam, std::vector<unsigned> constraints, double mW, double mTop);
const std::vector<edm::ParameterSet>& udscResolutions, const std::vector<edm::ParameterSet>& bResolutions, const std::vector<double>& jetEnergyResolutionScaleFactors,
const std::vector<double>& jetEnergyResolutionEtaBinning, std::string jetCorrectionLevel, int maxNJets, int maxNComb,
unsigned int maxNrIter, double maxDeltaS, double maxF, unsigned int jetParam, const std::vector<unsigned>& constraints, double mW, double mTop);
/// default destructor
~KinFit();

Expand All @@ -153,16 +153,16 @@ class TtFullHadKinFitter : public TopKinFitter {
maxBTagValueNonBJet_ = maxBTagValueNonBJet;
}
/// set resolutions
void setResolutions(std::vector<edm::ParameterSet> udscResolutions, std::vector<edm::ParameterSet> bResolutions,
std::vector<double> jetEnergyResolutionScaleFactors, std::vector<double> jetEnergyResolutionEtaBinning){
void setResolutions(const std::vector<edm::ParameterSet>& udscResolutions, const std::vector<edm::ParameterSet>& bResolutions,
const std::vector<double>& jetEnergyResolutionScaleFactors, const std::vector<double>& jetEnergyResolutionEtaBinning){
udscResolutions_ = udscResolutions;
bResolutions_ = bResolutions;
jetEnergyResolutionScaleFactors_ = jetEnergyResolutionScaleFactors;
jetEnergyResolutionEtaBinning_ = jetEnergyResolutionEtaBinning;
}
/// set parameters for fitter
void setFitter(int maxNJets, unsigned int maxNrIter, double maxDeltaS, double maxF,
unsigned int jetParam, std::vector<unsigned> constraints, double mW, double mTop){
unsigned int jetParam, const std::vector<unsigned>& constraints, double mW, double mTop){
maxNJets_ = maxNJets;
maxNrIter_ = maxNrIter;
maxDeltaS_ = maxDeltaS;
Expand All @@ -181,7 +181,7 @@ class TtFullHadKinFitter : public TopKinFitter {
useOnlyMatch_ = useOnlyMatch;
}
/// set match to be used
void setMatch(std::vector<int> match){
void setMatch(const std::vector<int>& match){
match_ = match;
}
/// set the validity of a match
Expand All @@ -208,7 +208,7 @@ class TtFullHadKinFitter : public TopKinFitter {
// convert unsigned int to Constraint
TtFullHadKinFitter::Constraint constraint(unsigned int configParameter);
// convert vector of unsigned int's to vector of Contraint's
std::vector<TtFullHadKinFitter::Constraint> constraints(std::vector<unsigned int>& configParameters);
std::vector<TtFullHadKinFitter::Constraint> constraints(const std::vector<unsigned int>& configParameters);

/// switch to tell whether all possible
/// combinations should be used for the
Expand Down
26 changes: 13 additions & 13 deletions TopQuarkAnalysis/TopKinFitter/interface/TtFullLepKinSolver.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class TtFullLepKinSolver {
/// default constructor
TtFullLepKinSolver();
/// constructor with parameters to configure the top-mass scan and the neutrino spectrum
TtFullLepKinSolver(const double, const double, const double, const std::vector<double>, const double=80.4, const double=4.8);
TtFullLepKinSolver(const double, const double, const double, const std::vector<double>&, const double=80.4, const double=4.8);
/// destructor
~TtFullLepKinSolver();

Expand All @@ -47,25 +47,25 @@ class TtFullLepKinSolver {
///
void SetConstraints(const double xx=0, const double yy=0);
///
NeutrinoSolution getNuSolution(TLorentzVector LV_l,
TLorentzVector LV_l_,
TLorentzVector LV_b,
TLorentzVector LV_b_);
NeutrinoSolution getNuSolution(const TLorentzVector& LV_l,
const TLorentzVector& LV_l_,
const TLorentzVector& LV_b,
const TLorentzVector& LV_b_);

private:

///
void FindCoeff(const TLorentzVector al,
const TLorentzVector l,
const TLorentzVector b_al,
const TLorentzVector b_l,
void FindCoeff(const TLorentzVector& al,
const TLorentzVector& l,
const TLorentzVector& b_al,
const TLorentzVector& b_l,
const double mt, const double mat, const double pxboost, const double pyboost,
double* q_coeff);
///
void TopRec(const TLorentzVector al,
const TLorentzVector l,
const TLorentzVector b_al,
const TLorentzVector b_l, const double sol);
void TopRec(const TLorentzVector& al,
const TLorentzVector& l,
const TLorentzVector& b_al,
const TLorentzVector& b_l, const double sol);
///
double WeightSolfromMC() const;
/// use the parametrized event shape to obtain the solution weight.
Expand Down
10 changes: 5 additions & 5 deletions TopQuarkAnalysis/TopKinFitter/src/CovarianceMatrix.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#include "CommonTools/Utils/interface/StringObjectFunction.h"
#include "CommonTools/Utils/interface/StringCutObjectSelector.h"

CovarianceMatrix::CovarianceMatrix(const std::vector<edm::ParameterSet> udscResolutions, const std::vector<edm::ParameterSet> bResolutions,
const std::vector<double> jetEnergyResolutionScaleFactors, const std::vector<double> jetEnergyResolutionEtaBinning):
CovarianceMatrix::CovarianceMatrix(const std::vector<edm::ParameterSet>& udscResolutions, const std::vector<edm::ParameterSet>& bResolutions,
const std::vector<double>& jetEnergyResolutionScaleFactors, const std::vector<double>& jetEnergyResolutionEtaBinning):
jetEnergyResolutionScaleFactors_(jetEnergyResolutionScaleFactors), jetEnergyResolutionEtaBinning_(jetEnergyResolutionEtaBinning)
{
for(std::vector<edm::ParameterSet>::const_iterator iSet = udscResolutions.begin(); iSet != udscResolutions.end(); ++iSet){
Expand All @@ -27,9 +27,9 @@ CovarianceMatrix::CovarianceMatrix(const std::vector<edm::ParameterSet> udscReso
}
}

CovarianceMatrix::CovarianceMatrix(const std::vector<edm::ParameterSet> udscResolutions, const std::vector<edm::ParameterSet> bResolutions,
const std::vector<edm::ParameterSet> lepResolutions, const std::vector<edm::ParameterSet> metResolutions,
const std::vector<double> jetEnergyResolutionScaleFactors, const std::vector<double> jetEnergyResolutionEtaBinning):
CovarianceMatrix::CovarianceMatrix(const std::vector<edm::ParameterSet>& udscResolutions, const std::vector<edm::ParameterSet>& bResolutions,
const std::vector<edm::ParameterSet>& lepResolutions, const std::vector<edm::ParameterSet>& metResolutions,
const std::vector<double>& jetEnergyResolutionScaleFactors, const std::vector<double>& jetEnergyResolutionEtaBinning):
jetEnergyResolutionScaleFactors_(jetEnergyResolutionScaleFactors), jetEnergyResolutionEtaBinning_(jetEnergyResolutionEtaBinning)
{
if(jetEnergyResolutionScaleFactors_.size()+1!=jetEnergyResolutionEtaBinning_.size())
Expand Down
6 changes: 3 additions & 3 deletions TopQuarkAnalysis/TopKinFitter/src/StKinFitter.cc
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// $Id: StKinFitter.cc,v 1.7 2010/09/06 11:07:13 snaumann Exp $
// $Id: StKinFitter.cc,v 1.8 2010/09/06 13:46:16 snaumann Exp $
//

#include "PhysicsTools/KinFitter/interface/TKinFitter.h"
Expand Down Expand Up @@ -35,7 +35,7 @@ StKinFitter::StKinFitter() :
}

StKinFitter::StKinFitter(int jetParam, int lepParam, int metParam,
int maxNrIter, double maxDeltaS, double maxF, std::vector<int> constraints) :
int maxNrIter, double maxDeltaS, double maxF, const std::vector<int>& constraints) :
TopKinFitter(maxNrIter, maxDeltaS, maxF),
jetParam_((Param) jetParam),
lepParam_((Param) lepParam),
Expand All @@ -46,7 +46,7 @@ StKinFitter::StKinFitter(int jetParam, int lepParam, int metParam,
}

StKinFitter::StKinFitter(Param jetParam, Param lepParam, Param metParam,
int maxNrIter, double maxDeltaS, double maxF, std::vector<int> constraints) :
int maxNrIter, double maxDeltaS, double maxF, const std::vector<int>& constraints) :
TopKinFitter(maxNrIter, maxDeltaS, maxF),
jetParam_(jetParam),
lepParam_(lepParam),
Expand Down
14 changes: 7 additions & 7 deletions TopQuarkAnalysis/TopKinFitter/src/TtFullHadKinFitter.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ TtFullHadKinFitter::TtFullHadKinFitter():

/// used to convert vector of int's to vector of constraints (just used in TtFullHadKinFitter(int, int, double, double, std::vector<unsigned int>))
std::vector<TtFullHadKinFitter::Constraint>
TtFullHadKinFitter::intToConstraint(std::vector<unsigned int> constraints)
TtFullHadKinFitter::intToConstraint(const std::vector<unsigned int>& constraints)
{
std::vector<TtFullHadKinFitter::Constraint> cConstraints;
cConstraints.resize(constraints.size());
Expand All @@ -38,7 +38,7 @@ TtFullHadKinFitter::intToConstraint(std::vector<unsigned int> constraints)

/// constructor initialized with build-in types as custom parameters (only included to keep TtHadEvtSolutionMaker.cc running)
TtFullHadKinFitter::TtFullHadKinFitter(int jetParam, int maxNrIter, double maxDeltaS, double maxF,
const std::vector<unsigned int> constraints, double mW, double mTop,
const std::vector<unsigned int>& constraints, double mW, double mTop,
const std::vector<edm::ParameterSet>* udscResolutions,
const std::vector<edm::ParameterSet>* bResolutions,
const std::vector<double>* jetEnergyResolutionScaleFactors,
Expand All @@ -55,7 +55,7 @@ TtFullHadKinFitter::TtFullHadKinFitter(int jetParam, int maxNrIter, double maxDe

/// constructor initialized with build-in types and class enum's custom parameters
TtFullHadKinFitter::TtFullHadKinFitter(Param jetParam, int maxNrIter, double maxDeltaS, double maxF,
std::vector<Constraint> constraints, double mW, double mTop,
const std::vector<Constraint>& constraints, double mW, double mTop,
const std::vector<edm::ParameterSet>* udscResolutions,
const std::vector<edm::ParameterSet>* bResolutions,
const std::vector<double>* jetEnergyResolutionScaleFactors,
Expand Down Expand Up @@ -325,10 +325,10 @@ TtFullHadKinFitter::KinFit::KinFit() :

/// special constructor
TtFullHadKinFitter::KinFit::KinFit(bool useBTagging, unsigned int bTags, std::string bTagAlgo, double minBTagValueBJet, double maxBTagValueNonBJet,
std::vector<edm::ParameterSet> udscResolutions, std::vector<edm::ParameterSet> bResolutions,
std::vector<double> jetEnergyResolutionScaleFactors, std::vector<double> jetEnergyResolutionEtaBinning,
const std::vector<edm::ParameterSet>& udscResolutions, const std::vector<edm::ParameterSet>& bResolutions,
const std::vector<double>& jetEnergyResolutionScaleFactors, const std::vector<double>& jetEnergyResolutionEtaBinning,
std::string jetCorrectionLevel, int maxNJets, int maxNComb,
unsigned int maxNrIter, double maxDeltaS, double maxF, unsigned int jetParam, std::vector<unsigned> constraints, double mW, double mTop) :
unsigned int maxNrIter, double maxDeltaS, double maxF, unsigned int jetParam, const std::vector<unsigned>& constraints, double mW, double mTop) :
useBTagging_(useBTagging),
bTags_(bTags),
bTagAlgo_(bTagAlgo),
Expand Down Expand Up @@ -636,7 +636,7 @@ TtFullHadKinFitter::KinFit::constraint(unsigned configParameter)
}

std::vector<TtFullHadKinFitter::Constraint>
TtFullHadKinFitter::KinFit::constraints(std::vector<unsigned>& configParameters)
TtFullHadKinFitter::KinFit::constraints(const std::vector<unsigned>& configParameters)
{
std::vector<TtFullHadKinFitter::Constraint> result;
for(unsigned i=0; i<configParameters.size(); ++i){
Expand Down
26 changes: 13 additions & 13 deletions TopQuarkAnalysis/TopKinFitter/src/TtFullLepKinSolver.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ TtFullLepKinSolver::TtFullLepKinSolver():
EventShape_->SetParameters(30.7137,56.2880,23.0744,59.1015,24.9145);
}

TtFullLepKinSolver::TtFullLepKinSolver(const double b, const double e, const double s, const std::vector<double> nupars, const double mW, const double mB):
TtFullLepKinSolver::TtFullLepKinSolver(const double b, const double e, const double s, const std::vector<double>& nupars, const double mW, const double mB):
topmass_begin(b),
topmass_end(e),
topmass_step(s),
Expand Down Expand Up @@ -135,10 +135,10 @@ TtFullLepKinSolver::SetConstraints(const double xx, const double yy)
}

TtFullLepKinSolver::NeutrinoSolution
TtFullLepKinSolver::getNuSolution(TLorentzVector LV_l,
TLorentzVector LV_l_,
TLorentzVector LV_b,
TLorentzVector LV_b_)
TtFullLepKinSolver::getNuSolution(const TLorentzVector& LV_l,
const TLorentzVector& LV_l_,
const TLorentzVector& LV_b,
const TLorentzVector& LV_b_)
{
math::XYZTLorentzVector maxLV_n = math::XYZTLorentzVector(0,0,0,0);
math::XYZTLorentzVector maxLV_n_ = math::XYZTLorentzVector(0,0,0,0);
Expand Down Expand Up @@ -171,10 +171,10 @@ TtFullLepKinSolver::getNuSolution(TLorentzVector LV_l,
}

void
TtFullLepKinSolver::FindCoeff(const TLorentzVector al,
const TLorentzVector l,
const TLorentzVector b_al,
const TLorentzVector b_l,
TtFullLepKinSolver::FindCoeff(const TLorentzVector& al,
const TLorentzVector& l,
const TLorentzVector& b_al,
const TLorentzVector& b_l,
const double mt,
const double mat,
const double px_miss,
Expand Down Expand Up @@ -265,10 +265,10 @@ TtFullLepKinSolver::FindCoeff(const TLorentzVector al,
koeficienty[4]=koeficienty[4]/TMath::Power(10,moc);
}

void TtFullLepKinSolver::TopRec(const TLorentzVector al,
const TLorentzVector l,
const TLorentzVector b_al,
const TLorentzVector b_l,
void TtFullLepKinSolver::TopRec(const TLorentzVector& al,
const TLorentzVector& l,
const TLorentzVector& b_al,
const TLorentzVector& b_l,
const double sol)
{
TVector3 t_ttboost;
Expand Down
Loading

0 comments on commit 9b10def

Please sign in to comment.