diff --git a/include/SVFit/FastMTT.hxx b/include/SVFit/FastMTT.hxx index 9cb6b6f8..61d2f0df 100644 --- a/include/SVFit/FastMTT.hxx +++ b/include/SVFit/FastMTT.hxx @@ -95,8 +95,8 @@ class FastMTT { void initialize(); /// Run fastMTT algorithm for given input - void run(const std::vector &, - const double &, const double &, const TMatrixD &); + void run(const std::vector &, const double &, + const double &, const TMatrixD &); /// Set likelihood shape parameters. Two parameters are expected: /// power of 1/mVis, and scaling factor of mTest diff --git a/include/quantities.hxx b/include/quantities.hxx index 80e37018..0f9a1daa 100644 --- a/include/quantities.hxx +++ b/include/quantities.hxx @@ -26,23 +26,16 @@ ROOT::RDF::RNode charge(ROOT::RDF::RNode df, const std::string &outputname, const std::string &chargecolumn); ROOT::RDF::RNode m_vis(ROOT::RDF::RNode df, const std::string &outputname, const std::vector &inputvectors); -ROOT::RDF::RNode p4_fastmtt(ROOT::RDF::RNode df, const std::string &outputname, - const std::string &pt_1, - const std::string &pt_2, - const std::string &eta_1, - const std::string &eta_2, - const std::string &phi_1, - const std::string &phi_2, - const std::string &mass_1, - const std::string &mass_2, - const std::string &met_pt, - const std::string &met_phi, - const std::string &met_cov_xx, - const std::string &met_cov_xy, - const std::string &met_cov_yy, - const std::string &decay_mode_1, - const std::string &decay_mode_2, - const std::string &finalstate); +ROOT::RDF::RNode +p4_fastmtt(ROOT::RDF::RNode df, const std::string &outputname, + const std::string &pt_1, const std::string &pt_2, + const std::string &eta_1, const std::string &eta_2, + const std::string &phi_1, const std::string &phi_2, + const std::string &mass_1, const std::string &mass_2, + const std::string &met_pt, const std::string &met_phi, + const std::string &met_cov_xx, const std::string &met_cov_xy, + const std::string &met_cov_yy, const std::string &decay_mode_1, + const std::string &decay_mode_2, const std::string &finalstate); ROOT::RDF::RNode pt_vis(ROOT::RDF::RNode df, const std::string &outputname, const std::vector &inputvectors); ROOT::RDF::RNode pzetamissvis(ROOT::RDF::RNode df, diff --git a/src/SVFit/MeasuredTauLepton.cxx b/src/SVFit/MeasuredTauLepton.cxx index e70b8f44..8acc9c5d 100644 --- a/src/SVFit/MeasuredTauLepton.cxx +++ b/src/SVFit/MeasuredTauLepton.cxx @@ -51,7 +51,8 @@ MeasuredTauLepton::MeasuredTauLepton(int type, double pt, double eta, // type_string = "tau -> had decay"; // else { // std::cerr << "Error: Invalid type " << type_ - // << " declared for leg: Pt = " << pt_ << ", eta = " << eta_ + // << " declared for leg: Pt = " << pt_ << ", eta = " << + // eta_ // << ", phi = " << phi_ << ", mass = " << mass_ << " !!" // << std::endl; // assert(0); diff --git a/src/quantities.cxx b/src/quantities.cxx index b308b8f1..7cd0d9bb 100644 --- a/src/quantities.cxx +++ b/src/quantities.cxx @@ -179,10 +179,11 @@ ROOT::RDF::RNode m_vis(ROOT::RDF::RNode df, const std::string &outputname, inputvectors); } - /** - * @brief Function used to calculate the FastMTT p4 from the given inputs. The implementation is based on https://github.com/SVfit/ClassicSVfit/tree/fastMTT_19_02_2019 - * + * @brief Function used to calculate the FastMTT p4 from the given inputs. The + * implementation is based on + * https://github.com/SVfit/ClassicSVfit/tree/fastMTT_19_02_2019 + * * @param df The dataframe to add the quantity to * @param outputname name of the new column containing the lorentz vector value * @param pt_1 the name of the column containing the pt of the first particle @@ -191,16 +192,21 @@ ROOT::RDF::RNode m_vis(ROOT::RDF::RNode df, const std::string &outputname, * @param eta_2 the name of the column containing the eta of the second particle * @param phi_1 the name of the column containing the phi of the first particle * @param phi_2 the name of the column containing the phi of the second particle - * @param mass_1 the name of the column containing the mass of the first particle - * @param mass_2 the name of the column containing the mass of the second particle + * @param mass_1 the name of the column containing the mass of the first + * particle + * @param mass_2 the name of the column containing the mass of the second + * particle * @param met_pt the name of the column containing the met pt * @param met_phi the name of the column containing the met phi * @param met_cov_xx the name of the column containing the met covariance xx * @param met_cov_xy the name of the column containing the met covariance xy * @param met_cov_yy the name of the column containing the met covariance yy - * @param decay_mode_1 the name of the column containing the decay mode of the first particle - * @param decay_mode_2 the name of the column containing the decay mode of the second particle - * @param finalstate the final state of the ditaudecay. Supported are "mt", "et", "tt", "em" + * @param decay_mode_1 the name of the column containing the decay mode of the + * first particle + * @param decay_mode_2 the name of the column containing the decay mode of the + * second particle + * @param finalstate the final state of the ditaudecay. Supported are "mt", + * "et", "tt", "em" * @return ROOT::RDF::RNode */ ROOT::RDF::RNode @@ -212,15 +218,15 @@ p4_fastmtt(ROOT::RDF::RNode df, const std::string &outputname, const std::string &met_pt, const std::string &met_phi, const std::string &met_cov_xx, const std::string &met_cov_xy, const std::string &met_cov_yy, const std::string &decay_mode_1, - const std::string &decay_mode_2, const std::string &finalstate) - { + const std::string &decay_mode_2, const std::string &finalstate) { auto calculate_fast_mtt = [finalstate](const float &pt_1, const float &pt_2, const float &eta_1, - const float &eta_2, const float &phi_1, const float &phi_2, - const float &mass_1, const float &mass_2, const float &met_pt, - const float &met_phi, const float &met_cov_xx, - const float &met_cov_xy, const float &met_cov_yy, - const int &decay_mode_1, const int &decay_mode_2) { + const float &eta_2, const float &phi_1, const float &phi_2, + const float &mass_1, const float &mass_2, + const float &met_pt, const float &met_phi, + const float &met_cov_xx, const float &met_cov_xy, + const float &met_cov_yy, const int &decay_mode_1, + const int &decay_mode_2) { std::vector measuredTauLeptons; TMatrixD covMET(2, 2); covMET[0][0] = met_cov_xx;