Page Menu
Home
HEPForge
Search
Configure Global Search
Log In
Files
F19300509
D90.1759164699.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Award Token
Flag For Later
Size
73 KB
Referenced Files
None
Subscribers
None
D90.1759164699.diff
View Options
diff --git a/EvtGen/EvtGen.hh b/EvtGen/EvtGen.hh
--- a/EvtGen/EvtGen.hh
+++ b/EvtGen/EvtGen.hh
@@ -23,8 +23,8 @@
#include "EvtGenBase/EvtPDL.hh"
-#include <list>
#include <iostream>
+#include <list>
class EvtParticle;
class EvtRandomEngine;
diff --git a/EvtGenBase/EvtDecayProb.hh b/EvtGenBase/EvtDecayProb.hh
--- a/EvtGenBase/EvtDecayProb.hh
+++ b/EvtGenBase/EvtDecayProb.hh
@@ -34,8 +34,8 @@
inline void setWeight( double weight ) { _weight = weight; }
private:
- double _prob {1.0};
- double _weight {1.0};
+ double _prob{ 1.0 };
+ double _weight{ 1.0 };
};
#endif
diff --git a/EvtGenBase/EvtDiLog.hh b/EvtGenBase/EvtDiLog.hh
--- a/EvtGenBase/EvtDiLog.hh
+++ b/EvtGenBase/EvtDiLog.hh
@@ -46,6 +46,6 @@
0.00000000434545063, -0.00000000060578480, 0.00000000008612098,
-0.00000000001244332, 0.00000000000182256, -0.00000000000027007,
0.00000000000004042, -0.00000000000000610, 0.00000000000000093,
- -0.00000000000000014, 0.00000000000000002};
+ -0.00000000000000014, 0.00000000000000002 };
} // namespace EvtDiLog
#endif // EVTGENBASE_EVTDILOG_HH
diff --git a/EvtGenBase/EvtPDL.hh b/EvtGenBase/EvtPDL.hh
--- a/EvtGenBase/EvtPDL.hh
+++ b/EvtGenBase/EvtPDL.hh
@@ -26,10 +26,10 @@
#include "EvtGenBase/EvtSpinType.hh"
#include "EvtGenBase/EvtStringHash.hh"
+#include <iostream>
#include <map>
-#include <vector>
#include <string>
-#include <iostream>
+#include <vector>
const int SPIN_NAME_LENGTH = 100;
diff --git a/EvtGenBase/EvtSpinAmp.hh b/EvtGenBase/EvtSpinAmp.hh
--- a/EvtGenBase/EvtSpinAmp.hh
+++ b/EvtGenBase/EvtSpinAmp.hh
@@ -64,7 +64,7 @@
EvtSpinAmp& operator-=( const EvtSpinAmp& );
// Direct Product
- EvtSpinAmp operator*(const EvtSpinAmp&)const;
+ EvtSpinAmp operator*( const EvtSpinAmp& ) const;
EvtSpinAmp& operator*=( const EvtSpinAmp& );
EvtSpinAmp& operator*=( const EvtComplex& );
diff --git a/EvtGenModels/EvtBTo3hCP.hh b/EvtGenModels/EvtBTo3hCP.hh
--- a/EvtGenModels/EvtBTo3hCP.hh
+++ b/EvtGenModels/EvtBTo3hCP.hh
@@ -28,7 +28,6 @@
class EvtBTo3hCP {
public:
-
void EvtKpipi( double alpha, double beta, int iset, EvtVector4R& p_K_plus,
EvtVector4R& p_pi_minus, EvtVector4R& p_gamma_1,
EvtVector4R& p_gamma_2, double& Real_B0, double& Imag_B0,
@@ -97,8 +96,8 @@
NatKrho;
double alphaCP = 1.365;
double betaCP = 0.362;
- double MA2 = 27.927981186;
- double MB2 = 27.929242450;
+ double MA2 = 27.927981186;
+ double MB2 = 27.929242450;
double MC2 = 28.153482608;
double pi = 3.141592653;
double Mass_rho = 0.770;
diff --git a/EvtGenModels/EvtFlatSqDalitz.hh b/EvtGenModels/EvtFlatSqDalitz.hh
--- a/EvtGenModels/EvtFlatSqDalitz.hh
+++ b/EvtGenModels/EvtFlatSqDalitz.hh
@@ -30,7 +30,6 @@
class EvtFlatSqDalitz : public EvtDecayIncoherent {
public:
-
std::string getName() override;
EvtDecayBase* clone() override;
diff --git a/EvtGenModels/EvtFourBodyPhsp.hh b/EvtGenModels/EvtFourBodyPhsp.hh
--- a/EvtGenModels/EvtFourBodyPhsp.hh
+++ b/EvtGenModels/EvtFourBodyPhsp.hh
@@ -21,11 +21,11 @@
#ifndef EVTFOURBODYPHSP_HH
#define EVTFOURBODYPHSP_HH
-#include <vector>
+#include "EvtGenBase/EvtDecayProb.hh"
+
#include <array>
#include <utility>
-
-#include "EvtGenBase/EvtDecayProb.hh"
+#include <vector>
class EvtParticle;
@@ -84,9 +84,9 @@
Shape m_boundaryShape;
- bool m_stableMother{true};
- bool m_stableDaughters{true};
- bool m_fixedBoundary{true};
+ bool m_stableMother{ true };
+ bool m_stableDaughters{ true };
+ bool m_fixedBoundary{ true };
};
#endif
diff --git a/EvtGenModels/EvtRareLbToLllFFBase.hh b/EvtGenModels/EvtRareLbToLllFFBase.hh
--- a/EvtGenModels/EvtRareLbToLllFFBase.hh
+++ b/EvtGenModels/EvtRareLbToLllFFBase.hh
@@ -63,8 +63,10 @@
virtual ~EvtRareLbToLllFFBase(){};
protected:
- double calculateVdotV( const EvtParticle& parent, const EvtParticle& lambda ) const;
- double calculateVdotV( const EvtParticle&, const EvtParticle&, double qsq ) const;
+ double calculateVdotV( const EvtParticle& parent,
+ const EvtParticle& lambda ) const;
+ double calculateVdotV( const EvtParticle&, const EvtParticle&,
+ double qsq ) const;
EvtIdSet natural_;
};
diff --git a/src/EvtGenBase/EvtHepMCEvent.cpp b/src/EvtGenBase/EvtHepMCEvent.cpp
--- a/src/EvtGenBase/EvtHepMCEvent.cpp
+++ b/src/EvtGenBase/EvtHepMCEvent.cpp
@@ -77,7 +77,7 @@
int frameType )
{
// Create an HepMC GenParticle, with the 4-momenta in the frame given by the frameType integer
- GenParticlePtr genParticle{nullptr};
+ GenParticlePtr genParticle{ nullptr };
if ( theParticle != nullptr ) {
// Set the particle status integer to either stable or decayed
diff --git a/src/EvtGenBase/EvtMTree.cpp b/src/EvtGenBase/EvtMTree.cpp
--- a/src/EvtGenBase/EvtMTree.cpp
+++ b/src/EvtGenBase/EvtMTree.cpp
@@ -403,7 +403,6 @@
ret = true;
return ret;
-
}
void EvtMTree::addtree( const string& str )
diff --git a/src/EvtGenBase/EvtNonresonantAmp.cpp b/src/EvtGenBase/EvtNonresonantAmp.cpp
--- a/src/EvtGenBase/EvtNonresonantAmp.cpp
+++ b/src/EvtGenBase/EvtNonresonantAmp.cpp
@@ -39,7 +39,7 @@
EvtCyclic3::Pair pair2, double par2,
EvtSpinType::spintype spin ) :
EvtAmplitude<EvtDalitzPoint>(),
- _dalitzSpace{dp},
+ _dalitzSpace{ dp },
_type( type ),
_pair1( pair1 ),
_pair2( pair2 ),
diff --git a/src/EvtGenBase/EvtSemiLeptonicBaryonAmp.cpp b/src/EvtGenBase/EvtSemiLeptonicBaryonAmp.cpp
--- a/src/EvtGenBase/EvtSemiLeptonicBaryonAmp.cpp
+++ b/src/EvtGenBase/EvtSemiLeptonicBaryonAmp.cpp
@@ -439,7 +439,7 @@
FormFactors->getdiracff( par_num, bar_num, q2, baryonmass, &f1, &f2,
&f3, &g1, &g2, &g3 );
- const double form_fact[6] = {f1, f2, f3, g1, g2, g3};
+ const double form_fact[6] = { f1, f2, f3, g1, g2, g3 };
EvtVector4C b11, b12, b21, b22, l1, l2;
@@ -548,7 +548,7 @@
FormFactors->getraritaff( par_num, bar_num, q2, baryonmass, &f1, &f2,
&f3, &f4, &g1, &g2, &g3, &g4 );
- const double form_fact[8] = {f1, f2, f3, f4, g1, g2, g3, g4};
+ const double form_fact[8] = { f1, f2, f3, f4, g1, g2, g3, g4 };
EvtId l_num = parent->getDaug( 1 )->getId();
diff --git a/src/EvtGenModels/EvtBBScalar.cpp b/src/EvtGenModels/EvtBBScalar.cpp
--- a/src/EvtGenModels/EvtBBScalar.cpp
+++ b/src/EvtGenModels/EvtBBScalar.cpp
@@ -42,9 +42,9 @@
-0.000813 * cos( 60 / 180 * pi ) );
const EvtComplex EvtBBScalar::a4 = EvtComplex( -387.3e-4, -121e-4 );
const EvtComplex EvtBBScalar::a6 = EvtComplex( -555.3e-4, -121e-4 );
-const double EvtBBScalar::x[] = {420.96, -10485.50, 100639.97, -433916.61,
- 613780.15};
-const double EvtBBScalar::y[] = {292.62, -735.73};
+const double EvtBBScalar::x[] = { 420.96, -10485.50, 100639.97, -433916.61,
+ 613780.15 };
+const double EvtBBScalar::y[] = { 292.62, -735.73 };
const double EvtBBScalar::m_s = 0.120;
const double EvtBBScalar::m_u = 0.029 * 0.120;
const double EvtBBScalar::m_b = 4.88;
@@ -244,28 +244,28 @@
double EvtBBScalar::D_A( double t ) const
{
- const double d_tilde[] = {x[0] - 1.5 * y[0], -478};
+ const double d_tilde[] = { x[0] - 1.5 * y[0], -478 };
const vector<double> v_d_tilde( d_tilde, d_tilde + 2 );
return formFactorFit( t, v_d_tilde );
}
double EvtBBScalar::F_A( double t ) const
{
- const double f_tilde[] = {2. / 3 * x[0] + 0.5 * y[0], -478};
+ const double f_tilde[] = { 2. / 3 * x[0] + 0.5 * y[0], -478 };
const vector<double> v_f_tilde( f_tilde, f_tilde + 2 );
return formFactorFit( t, v_f_tilde );
}
double EvtBBScalar::D_P( double t ) const
{
- const double d_bar[] = {1.5 * y[0] * _massRatio, /*-952*/ 0};
+ const double d_bar[] = { 1.5 * y[0] * _massRatio, /*-952*/ 0 };
const vector<double> v_d_bar( d_bar, d_bar + 2 );
return formFactorFit( t, v_d_bar );
}
double EvtBBScalar::F_P( double t ) const
{
- const double f_bar[] = {( x[0] - 0.5 * y[0] ) * _massRatio, /*-952*/ 0};
+ const double f_bar[] = { ( x[0] - 0.5 * y[0] ) * _massRatio, /*-952*/ 0 };
const vector<double> v_f_bar( f_bar, f_bar + 2 );
return formFactorFit( t, v_f_bar );
}
diff --git a/src/EvtGenModels/EvtBTo3hCP.cpp b/src/EvtGenModels/EvtBTo3hCP.cpp
--- a/src/EvtGenModels/EvtBTo3hCP.cpp
+++ b/src/EvtGenModels/EvtBTo3hCP.cpp
@@ -127,7 +127,6 @@
NatKstar0 = EvtComplex( 0., 0. );
// B0bar -->-- K+ rho- Amplitudes (Trees + Penguins)
NatKrho = EvtComplex( 0., 0. );
-
}
void EvtBTo3hCP::Evt3pi( double alpha, int iset, EvtVector4R& p_pi_plus,
diff --git a/src/EvtGenModels/EvtBsMuMuKK.cpp b/src/EvtGenModels/EvtBsMuMuKK.cpp
--- a/src/EvtGenModels/EvtBsMuMuKK.cpp
+++ b/src/EvtGenModels/EvtBsMuMuKK.cpp
@@ -326,9 +326,9 @@
// Generate 4-momenta
double mKK = EvtRandom::Flat( kin_lower_limit, kin_upper_limit );
- double mass[10] = {MJpsi, mKK, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0};
- double Kmass[10] = {MKp, MKm, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0};
- double muMass[10] = {Mmu, Mmu, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0};
+ double mass[10] = { MJpsi, mKK, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 };
+ double Kmass[10] = { MKp, MKm, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 };
+ double muMass[10] = { Mmu, Mmu, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 };
EvtVector4R mypV[2], mypK[2], mypmu[2];
EvtGenKine::PhaseSpace( 2, mass, mypV, MBs );
diff --git a/src/EvtGenModels/EvtBtoKD3P.cpp b/src/EvtGenModels/EvtBtoKD3P.cpp
--- a/src/EvtGenModels/EvtBtoKD3P.cpp
+++ b/src/EvtGenModels/EvtBtoKD3P.cpp
@@ -87,7 +87,7 @@
const int D2IND = 2;
// generate kinematics of daughters (K and D):
- EvtId tempDaug[2] = {getDaug( KIND ), getDaug( D1IND )};
+ EvtId tempDaug[2] = { getDaug( KIND ), getDaug( D1IND ) };
p->initializePhaseSpace( 2, tempDaug );
// Get the D daughter particle and the decay models of the allowed
diff --git a/src/EvtGenModels/EvtBtoXsgammaFermiUtil.cpp b/src/EvtGenModels/EvtBtoXsgammaFermiUtil.cpp
--- a/src/EvtGenModels/EvtBtoXsgammaFermiUtil.cpp
+++ b/src/EvtGenModels/EvtBtoXsgammaFermiUtil.cpp
@@ -54,13 +54,13 @@
double EvtBtoXsgammaFermiUtil::FermiGaussFuncRoot(
double lambdabar, double lam1, double mb, std::vector<double>& gammaCoeffs )
{
- std::vector<double> coeffs1 = {0.2, lambdabar, 0.0};
- std::vector<double> coeffs2 = {0.2, lambdabar, -lam1 / 3.};
+ std::vector<double> coeffs1 = { 0.2, lambdabar, 0.0 };
+ std::vector<double> coeffs2 = { 0.2, lambdabar, -lam1 / 3. };
- auto lhFunc = EvtItgTwoCoeffFcn{&FermiGaussRootFcnA, -mb, lambdabar,
- coeffs1, gammaCoeffs};
- auto rhFunc = EvtItgTwoCoeffFcn{&FermiGaussRootFcnB, -mb, lambdabar,
- coeffs2, gammaCoeffs};
+ auto lhFunc = EvtItgTwoCoeffFcn{ &FermiGaussRootFcnA, -mb, lambdabar,
+ coeffs1, gammaCoeffs };
+ auto rhFunc = EvtItgTwoCoeffFcn{ &FermiGaussRootFcnB, -mb, lambdabar,
+ coeffs2, gammaCoeffs };
auto rootFinder = EvtBtoXsgammaRootFinder{};
return rootFinder.GetGaussIntegFcnRoot( &lhFunc, &rhFunc, 1.0e-4, 1.0e-4,
@@ -180,7 +180,7 @@
double EvtBtoXsgammaFermiUtil::FermiRomanFuncRoot( double lambdabar, double lam1 )
{
- auto lhFunc = EvtItgFunction{&FermiRomanRootFcnA, -1.e-6, 1.e6};
+ auto lhFunc = EvtItgFunction{ &FermiRomanRootFcnA, -1.e-6, 1.e6 };
auto rootFinder = EvtBtoXsgammaRootFinder{};
double rhSide = 1.0 - ( lam1 / ( 3.0 * lambdabar * lambdabar ) );
diff --git a/src/EvtGenModels/EvtBtoXsgammaKagan.cpp b/src/EvtGenModels/EvtBtoXsgammaKagan.cpp
--- a/src/EvtGenModels/EvtBtoXsgammaKagan.cpp
+++ b/src/EvtGenModels/EvtBtoXsgammaKagan.cpp
@@ -104,37 +104,37 @@
void EvtBtoXsgammaKagan::getDefaultHadronicMass()
{
- massHad = {0, 0.0625995, 0.125199, 0.187798, 0.250398, 0.312997,
- 0.375597, 0.438196, 0.500796, 0.563395, 0.625995, 0.688594,
- 0.751194, 0.813793, 0.876392, 0.938992, 1.00159, 1.06419,
- 1.12679, 1.18939, 1.25199, 1.31459, 1.37719, 1.43979,
- 1.50239, 1.56499, 1.62759, 1.69019, 1.75278, 1.81538,
- 1.87798, 1.94058, 2.00318, 2.06578, 2.12838, 2.19098,
- 2.25358, 2.31618, 2.37878, 2.44138, 2.50398, 2.56658,
- 2.62918, 2.69178, 2.75438, 2.81698, 2.87958, 2.94217,
- 3.00477, 3.06737, 3.12997, 3.19257, 3.25517, 3.31777,
- 3.38037, 3.44297, 3.50557, 3.56817, 3.63077, 3.69337,
- 3.75597, 3.81857, 3.88117, 3.94377, 4.00637, 4.06896,
- 4.13156, 4.19416, 4.25676, 4.31936, 4.38196, 4.44456,
- 4.50716, 4.56976, 4.63236, 4.69496, 4.75756, 4.82016,
- 4.88276, 4.94536, 5.00796};
- brHad = {0, 1.03244e-09, 3.0239e-08, 1.99815e-07, 7.29392e-07,
- 1.93129e-06, 4.17806e-06, 7.86021e-06, 1.33421e-05, 2.09196e-05,
- 3.07815e-05, 4.29854e-05, 5.74406e-05, 7.3906e-05, 9.2003e-05,
- 0.000111223, 0.000130977, 0.000150618, 0.000169483, 0.000186934,
- 0.000202392, 0.000215366, 0.000225491, 0.000232496, 0.000236274,
- 0.000236835, 0.000234313, 0.000228942, 0.000221042, 0.000210994,
- 0.000199215, 0.000186137, 0.000172194, 0.000157775, 0.000143255,
- 0.000128952, 0.000115133, 0.000102012, 8.97451e-05, 7.84384e-05,
- 6.81519e-05, 5.89048e-05, 5.06851e-05, 4.34515e-05, 3.71506e-05,
- 3.1702e-05, 2.70124e-05, 2.30588e-05, 1.96951e-05, 1.68596e-05,
- 1.44909e-05, 1.25102e-05, 1.08596e-05, 9.48476e-06, 8.34013e-06,
- 7.38477e-06, 6.58627e-06, 5.91541e-06, 5.35022e-06, 4.87047e-06,
- 4.46249e-06, 4.11032e-06, 3.80543e-06, 3.54051e-06, 3.30967e-06,
- 3.10848e-06, 2.93254e-06, 2.78369e-06, 2.65823e-06, 2.55747e-06,
- 2.51068e-06, 2.57179e-06, 2.74684e-06, 3.02719e-06, 3.41182e-06,
- 3.91387e-06, 4.56248e-06, 5.40862e-06, 6.53915e-06, 8.10867e-06,
- 1.04167e-05};
+ massHad = { 0, 0.0625995, 0.125199, 0.187798, 0.250398, 0.312997,
+ 0.375597, 0.438196, 0.500796, 0.563395, 0.625995, 0.688594,
+ 0.751194, 0.813793, 0.876392, 0.938992, 1.00159, 1.06419,
+ 1.12679, 1.18939, 1.25199, 1.31459, 1.37719, 1.43979,
+ 1.50239, 1.56499, 1.62759, 1.69019, 1.75278, 1.81538,
+ 1.87798, 1.94058, 2.00318, 2.06578, 2.12838, 2.19098,
+ 2.25358, 2.31618, 2.37878, 2.44138, 2.50398, 2.56658,
+ 2.62918, 2.69178, 2.75438, 2.81698, 2.87958, 2.94217,
+ 3.00477, 3.06737, 3.12997, 3.19257, 3.25517, 3.31777,
+ 3.38037, 3.44297, 3.50557, 3.56817, 3.63077, 3.69337,
+ 3.75597, 3.81857, 3.88117, 3.94377, 4.00637, 4.06896,
+ 4.13156, 4.19416, 4.25676, 4.31936, 4.38196, 4.44456,
+ 4.50716, 4.56976, 4.63236, 4.69496, 4.75756, 4.82016,
+ 4.88276, 4.94536, 5.00796 };
+ brHad = { 0, 1.03244e-09, 3.0239e-08, 1.99815e-07, 7.29392e-07,
+ 1.93129e-06, 4.17806e-06, 7.86021e-06, 1.33421e-05, 2.09196e-05,
+ 3.07815e-05, 4.29854e-05, 5.74406e-05, 7.3906e-05, 9.2003e-05,
+ 0.000111223, 0.000130977, 0.000150618, 0.000169483, 0.000186934,
+ 0.000202392, 0.000215366, 0.000225491, 0.000232496, 0.000236274,
+ 0.000236835, 0.000234313, 0.000228942, 0.000221042, 0.000210994,
+ 0.000199215, 0.000186137, 0.000172194, 0.000157775, 0.000143255,
+ 0.000128952, 0.000115133, 0.000102012, 8.97451e-05, 7.84384e-05,
+ 6.81519e-05, 5.89048e-05, 5.06851e-05, 4.34515e-05, 3.71506e-05,
+ 3.1702e-05, 2.70124e-05, 2.30588e-05, 1.96951e-05, 1.68596e-05,
+ 1.44909e-05, 1.25102e-05, 1.08596e-05, 9.48476e-06, 8.34013e-06,
+ 7.38477e-06, 6.58627e-06, 5.91541e-06, 5.35022e-06, 4.87047e-06,
+ 4.46249e-06, 4.11032e-06, 3.80543e-06, 3.54051e-06, 3.30967e-06,
+ 3.10848e-06, 2.93254e-06, 2.78369e-06, 2.65823e-06, 2.55747e-06,
+ 2.51068e-06, 2.57179e-06, 2.74684e-06, 3.02719e-06, 3.41182e-06,
+ 3.91387e-06, 4.56248e-06, 5.40862e-06, 6.53915e-06, 8.10867e-06,
+ 1.04167e-05 };
massHad.resize( 81 );
brHad.resize( 81 );
@@ -221,12 +221,12 @@
sCoeffs[0] = _z;
//Define s22 and s27 functions
- auto mys22Func = EvtItgPtrFunction{&s22Func, 0., yMax + 0.1, sCoeffs};
- auto mys27Func = EvtItgPtrFunction{&s27Func, 0., yMax + 0.1, sCoeffs};
+ auto mys22Func = EvtItgPtrFunction{ &s22Func, 0., yMax + 0.1, sCoeffs };
+ auto mys27Func = EvtItgPtrFunction{ &s27Func, 0., yMax + 0.1, sCoeffs };
//Use a simpson integrator
- auto mys22Simp = EvtItgSimpsonIntegrator{mys22Func, 1.0e-4, 20};
- auto mys27Simp = EvtItgSimpsonIntegrator{mys27Func, 1.0e-4, 50};
+ auto mys22Simp = EvtItgSimpsonIntegrator{ mys22Func, 1.0e-4, 20 };
+ auto mys27Simp = EvtItgSimpsonIntegrator{ mys27Func, 1.0e-4, 50 };
int i;
@@ -323,37 +323,38 @@
}
//Define functions
- auto myDeltaFermiFunc = EvtItgThreeCoeffFcn{&DeltaFermiFunc, -_mb,
- _mB - _mb, FermiCoeffs,
- varCoeffs, DeltaCoeffs};
- auto mys88FermiFunc = EvtItgThreeCoeffFcn{&s88FermiFunc, -_mb,
- _mB - _mb, FermiCoeffs,
- varCoeffs, s88Coeffs};
- auto mys77FermiFunc = EvtItgTwoCoeffFcn{&s77FermiFunc, -_mb, _mB - _mb,
- FermiCoeffs, varCoeffs};
- auto mys78FermiFunc = EvtItgTwoCoeffFcn{&s78FermiFunc, -_mb, _mB - _mb,
- FermiCoeffs, varCoeffs};
- auto mys22FermiFunc = EvtItgFourCoeffFcn{&sFermiFunc, -_mb,
- _mB - _mb, FermiCoeffs,
- varCoeffs, sInitCoeffs,
- s22Coeffs};
- auto mys27FermiFunc = EvtItgFourCoeffFcn{&sFermiFunc, -_mb,
- _mB - _mb, FermiCoeffs,
- varCoeffs, sInitCoeffs,
- s27Coeffs};
- auto mys28FermiFunc = EvtItgFourCoeffFcn{&sFermiFunc, -_mb,
- _mB - _mb, FermiCoeffs,
- varCoeffs, sInitCoeffs,
- s28Coeffs};
+ auto myDeltaFermiFunc = EvtItgThreeCoeffFcn{ &DeltaFermiFunc, -_mb,
+ _mB - _mb, FermiCoeffs,
+ varCoeffs, DeltaCoeffs };
+ auto mys88FermiFunc = EvtItgThreeCoeffFcn{ &s88FermiFunc, -_mb,
+ _mB - _mb, FermiCoeffs,
+ varCoeffs, s88Coeffs };
+ auto mys77FermiFunc = EvtItgTwoCoeffFcn{ &s77FermiFunc, -_mb, _mB - _mb,
+ FermiCoeffs, varCoeffs };
+ auto mys78FermiFunc = EvtItgTwoCoeffFcn{ &s78FermiFunc, -_mb, _mB - _mb,
+ FermiCoeffs, varCoeffs };
+ auto mys22FermiFunc = EvtItgFourCoeffFcn{ &sFermiFunc, -_mb,
+ _mB - _mb, FermiCoeffs,
+ varCoeffs, sInitCoeffs,
+ s22Coeffs };
+ auto mys27FermiFunc = EvtItgFourCoeffFcn{ &sFermiFunc, -_mb,
+ _mB - _mb, FermiCoeffs,
+ varCoeffs, sInitCoeffs,
+ s27Coeffs };
+ auto mys28FermiFunc = EvtItgFourCoeffFcn{ &sFermiFunc, -_mb,
+ _mB - _mb, FermiCoeffs,
+ varCoeffs, sInitCoeffs,
+ s28Coeffs };
//Define integrators
- auto myDeltaFermiSimp = EvtItgSimpsonIntegrator{myDeltaFermiFunc, 1.0e-4, 40};
- auto mys77FermiSimp = EvtItgSimpsonIntegrator{mys77FermiFunc, 1.0e-4, 40};
- auto mys88FermiSimp = EvtItgSimpsonIntegrator{mys88FermiFunc, 1.0e-4, 40};
- auto mys78FermiSimp = EvtItgSimpsonIntegrator{mys78FermiFunc, 1.0e-4, 40};
- auto mys22FermiSimp = EvtItgSimpsonIntegrator{mys22FermiFunc, 1.0e-4, 40};
- auto mys27FermiSimp = EvtItgSimpsonIntegrator{mys27FermiFunc, 1.0e-4, 40};
- auto mys28FermiSimp = EvtItgSimpsonIntegrator{mys28FermiFunc, 1.0e-4, 40};
+ auto myDeltaFermiSimp = EvtItgSimpsonIntegrator{ myDeltaFermiFunc, 1.0e-4,
+ 40 };
+ auto mys77FermiSimp = EvtItgSimpsonIntegrator{ mys77FermiFunc, 1.0e-4, 40 };
+ auto mys88FermiSimp = EvtItgSimpsonIntegrator{ mys88FermiFunc, 1.0e-4, 40 };
+ auto mys78FermiSimp = EvtItgSimpsonIntegrator{ mys78FermiFunc, 1.0e-4, 40 };
+ auto mys22FermiSimp = EvtItgSimpsonIntegrator{ mys22FermiFunc, 1.0e-4, 40 };
+ auto mys27FermiSimp = EvtItgSimpsonIntegrator{ mys27FermiFunc, 1.0e-4, 40 };
+ auto mys28FermiSimp = EvtItgSimpsonIntegrator{ mys28FermiFunc, 1.0e-4, 40 };
//Finally calculate mHVect for the range of hadronic masses
double mHmin = sqrt( _mB * _mB - 2. * _mB * eGammaMax );
diff --git a/src/EvtGenModels/EvtBtoXsgammaRootFinder.cpp b/src/EvtGenModels/EvtBtoXsgammaRootFinder.cpp
--- a/src/EvtGenModels/EvtBtoXsgammaRootFinder.cpp
+++ b/src/EvtGenModels/EvtBtoXsgammaRootFinder.cpp
@@ -123,10 +123,10 @@
// Iterates until find root to the accuracy of precision
//Need to work with integrators
- auto func1Integ = EvtItgSimpsonIntegrator{*theFunc1, integ1Precision,
- maxLoop1};
- auto func2Integ = EvtItgSimpsonIntegrator{*theFunc2, integ2Precision,
- maxLoop2};
+ auto func1Integ = EvtItgSimpsonIntegrator{ *theFunc1, integ1Precision,
+ maxLoop1 };
+ auto func2Integ = EvtItgSimpsonIntegrator{ *theFunc2, integ2Precision,
+ maxLoop2 };
//coefficient 1 of the integrators is the root to be found
//need to set this to lower value to start off with
diff --git a/src/EvtGenModels/EvtFourBodyPhsp.cpp b/src/EvtGenModels/EvtFourBodyPhsp.cpp
--- a/src/EvtGenModels/EvtFourBodyPhsp.cpp
+++ b/src/EvtGenModels/EvtFourBodyPhsp.cpp
@@ -18,14 +18,15 @@
* along with EvtGen. If not, see <https://www.gnu.org/licenses/>. *
***********************************************************************/
-#include <cmath>
+#include "EvtGenModels/EvtFourBodyPhsp.hh"
#include "EvtGenBase/EvtKine.hh"
#include "EvtGenBase/EvtPDL.hh"
#include "EvtGenBase/EvtParticle.hh"
#include "EvtGenBase/EvtRandom.hh"
#include "EvtGenBase/EvtReport.hh"
-#include "EvtGenModels/EvtFourBodyPhsp.hh"
+
+#include <cmath>
std::string EvtFourBodyPhsp::getName()
{
@@ -163,7 +164,7 @@
double mMother = EvtPDL::getMaxMass( parent );
double funcValue = 0;
- while (contCond){
+ while ( contCond ) {
++iteration;
double currentM12 = startM12;
double currentM34 = startM34;
@@ -225,14 +226,14 @@
}
// Check termination condition
- double m12Diff = currentM12 - startM12;
- double m34Diff = currentM34 - startM34;
- double distSq = m12Diff * m12Diff + m34Diff * m34Diff;
- if (distSq < 1e-8 || iteration > 50){
- contCond = false;
- }
- startM12 = currentM12;
- startM34 = currentM34;
+ double m12Diff = currentM12 - startM12;
+ double m34Diff = currentM34 - startM34;
+ double distSq = m12Diff * m12Diff + m34Diff * m34Diff;
+ if ( distSq < 1e-8 || iteration > 50 ) {
+ contCond = false;
+ }
+ startM12 = currentM12;
+ startM34 = currentM34;
}
setProbMax( funcValue * 1.05 );
@@ -240,7 +241,6 @@
void EvtFourBodyPhsp::decay( EvtParticle* parent )
{
-
parent->makeDaughters( getNDaug(), getDaugs() );
bool massTreeStatus = parent->generateMassTree();
if ( !massTreeStatus ) {
@@ -299,9 +299,9 @@
setProb( probEval[0] );
// initialise kinematics
- const double cosTheta1 = EvtRandom::Flat(-1.0, 1.0);
+ const double cosTheta1 = EvtRandom::Flat( -1.0, 1.0 );
const double sinTheta1 = std::sqrt( 1 - cosTheta1 * cosTheta1 );
- const double cosTheta3 = EvtRandom::Flat(-1.0, 1.0);
+ const double cosTheta3 = EvtRandom::Flat( -1.0, 1.0 );
const double sinTheta3 = std::sqrt( 1 - cosTheta3 * cosTheta3 );
const double phi = EvtRandom::Flat( 0., EvtConst::twoPi );
// m12 and m34 are put along z-axis, 1 and 2 go to x-z plane and 3-4
diff --git a/src/EvtGenModels/EvtLambdacPHH.cpp b/src/EvtGenModels/EvtLambdacPHH.cpp
--- a/src/EvtGenModels/EvtLambdacPHH.cpp
+++ b/src/EvtGenModels/EvtLambdacPHH.cpp
@@ -168,11 +168,11 @@
int nDaug( 3 );
EvtVector4R p4Daug[3];
- double mDaug[3] = {EvtPDL::getMeanMass( EvtPDL::getId( "K-" ) ),
- EvtPDL::getMeanMass( EvtPDL::getId( "pi+" ) ),
- EvtPDL::getMeanMass( EvtPDL::getId( "p+" ) )};
+ double mDaug[3] = { EvtPDL::getMeanMass( EvtPDL::getId( "K-" ) ),
+ EvtPDL::getMeanMass( EvtPDL::getId( "pi+" ) ),
+ EvtPDL::getMeanMass( EvtPDL::getId( "p+" ) ) };
- double norm[3] = {0.0, 0.0, 0.0};
+ double norm[3] = { 0.0, 0.0, 0.0 };
// sample size
int N( 100000 );
@@ -229,11 +229,11 @@
int nDaug( 3 );
EvtVector4R p4Daug[3];
- double mDaug[3] = {EvtPDL::getMeanMass( EvtPDL::getId( "K-" ) ),
- EvtPDL::getMeanMass( EvtPDL::getId( "pi+" ) ),
- EvtPDL::getMeanMass( EvtPDL::getId( "p+" ) )};
+ double mDaug[3] = { EvtPDL::getMeanMass( EvtPDL::getId( "K-" ) ),
+ EvtPDL::getMeanMass( EvtPDL::getId( "pi+" ) ),
+ EvtPDL::getMeanMass( EvtPDL::getId( "p+" ) ) };
- double FitFracTop[4] = {0.0, 0.0, 0.0, 0.0};
+ double FitFracTop[4] = { 0.0, 0.0, 0.0, 0.0 };
double FitFracDenom = 0.0;
// sample size
diff --git a/src/EvtGenModels/EvtLb2Lll.cpp b/src/EvtGenModels/EvtLb2Lll.cpp
--- a/src/EvtGenModels/EvtLb2Lll.cpp
+++ b/src/EvtGenModels/EvtLb2Lll.cpp
@@ -292,7 +292,7 @@
parent->setDiagonalSpinDensity();
EvtAmp amp;
- EvtId daughters[3] = {getDaug( 0 ), getDaug( 1 ), getDaug( 2 )};
+ EvtId daughters[3] = { getDaug( 0 ), getDaug( 1 ), getDaug( 2 ) };
amp.init( getParentId(), 3, daughters );
parent->makeDaughters( 3, daughters );
EvtParticle* lambda = parent->getDaug( 0 );
@@ -368,10 +368,10 @@
delete parent;
}
- if (m_maxProbability < 1e-10) {
- EvtGenReport( EVTGEN_INFO, "EvtLb2Lll")
- << "EvtLb2Lll found zero max prob, setting to 1.5e6" << std::endl;
- m_maxProbability = 1.5e6;
+ if ( m_maxProbability < 1e-10 ) {
+ EvtGenReport( EVTGEN_INFO, "EvtLb2Lll" )
+ << "EvtLb2Lll found zero max prob, setting to 1.5e6" << std::endl;
+ m_maxProbability = 1.5e6;
}
setProbMax( m_maxProbability );
@@ -400,7 +400,7 @@
char ch;
double r, M_L, M_Lb, M_s, M_c, M_b, q2, alpha, M_W, M_t;
- double M_psi[2] = {0, 0}, Gamma_psi[2] = {0, 0}, k_psi[2] = {0, 0};
+ double M_psi[2] = { 0, 0 }, Gamma_psi[2] = { 0, 0 }, k_psi[2] = { 0, 0 };
double F0_1, F0_2, a_F1, a_F2, b_F1, b_F2, F1, F2;
double f_1, f_2, f_3, g_1, g_2, g_3, f_1T, f_2T, f_3T, g_1T, g_2T, g_3T,
f_TV, f_TS, g_TV( 0.0 ), g_TS, f_T, g_T;
diff --git a/src/EvtGenModels/EvtMultibody.cpp b/src/EvtGenModels/EvtMultibody.cpp
--- a/src/EvtGenModels/EvtMultibody.cpp
+++ b/src/EvtGenModels/EvtMultibody.cpp
@@ -71,7 +71,7 @@
void EvtMultibody::initProbMax()
{
- setProbMax(1.0);
+ setProbMax( 1.0 );
}
void EvtMultibody::decay( EvtParticle* p )
diff --git a/src/EvtGenModels/EvtPhspDecaytimeCut.cpp b/src/EvtGenModels/EvtPhspDecaytimeCut.cpp
--- a/src/EvtGenModels/EvtPhspDecaytimeCut.cpp
+++ b/src/EvtGenModels/EvtPhspDecaytimeCut.cpp
@@ -26,9 +26,9 @@
#include "EvtGenBase/EvtPatches.hh"
#include "EvtGenBase/EvtReport.hh"
+#include <iostream>
#include <stdlib.h>
#include <string>
-#include <iostream>
std::string EvtPhspDecaytimeCut::getName()
{
diff --git a/src/EvtGenModels/EvtPi0Dalitz.cpp b/src/EvtGenModels/EvtPi0Dalitz.cpp
--- a/src/EvtGenModels/EvtPi0Dalitz.cpp
+++ b/src/EvtGenModels/EvtPi0Dalitz.cpp
@@ -65,8 +65,7 @@
double q2 = q2Min + ii * step;
const double mSqDiff = m_m0Sq - q2;
const double q2Sq = q2 * q2;
- double prob = ( q2Max - q2 ) * ( q2Max - q2 ) * ( q2 - q2Min ) /
- ( q2Sq );
+ double prob = ( q2Max - q2 ) * ( q2Max - q2 ) * ( q2 - q2Min ) / ( q2Sq );
prob *= ( 1.0 / ( mSqDiff * mSqDiff + m_m0SqG0Sq ) );
// When generating events, we do not start from phase-space, but
// add some pole to it, weight of which is taken into account
@@ -76,7 +75,7 @@
maxProb = prob;
}
}
- setProbMax( maxProb * 1.05 );
+ setProbMax( maxProb * 1.05 );
}
void EvtPi0Dalitz::init()
diff --git a/src/EvtGenModels/EvtRareLbToLll.cpp b/src/EvtGenModels/EvtRareLbToLll.cpp
--- a/src/EvtGenModels/EvtRareLbToLll.cpp
+++ b/src/EvtGenModels/EvtRareLbToLll.cpp
@@ -72,14 +72,14 @@
// Work out whether we have electron mode
const EvtIdSet leptons{ "e-", "e+" };
if ( leptons.contains( getDaug( 1 ) ) ) {
- m_electronMode = true;
- EvtGenReport( EVTGEN_ERROR, "EvtGen" )
- << " EvtRareLbToLll has dielectron final state" << std::endl;
+ m_electronMode = true;
+ EvtGenReport( EVTGEN_ERROR, "EvtGen" )
+ << " EvtRareLbToLll has dielectron final state" << std::endl;
}
std::string model{ "LQCD" };
- if ( getNArg() == 1) {
- model = getArgStr( 0 );
+ if ( getNArg() == 1 ) {
+ model = getArgStr( 0 );
}
if ( model == "Gutsche" ) {
ffmodel_ = std::make_unique<EvtRareLbToLllFFGutsche>();
@@ -115,7 +115,7 @@
parent.setDiagonalSpinDensity();
EvtAmp amp;
- EvtId daughters[3] = {getDaug( 0 ), getDaug( 1 ), getDaug( 2 )};
+ EvtId daughters[3] = { getDaug( 0 ), getDaug( 1 ), getDaug( 2 ) };
amp.init( getParentId(), 3, daughters );
parent.makeDaughters( 3, daughters );
EvtParticle* lambda = parent.getDaug( 0 );
@@ -146,7 +146,7 @@
for ( int i = 0; i <= nsteps; i++ ) {
const double q2 = q2min + i * ( q2max - q2min ) / nsteps;
const double elambda = ( M0 * M0 + mL * mL - q2 ) / 2 / M0;
- double pstar{0};
+ double pstar{ 0 };
if ( i != 0 ) {
pstar = sqrt( q2 - ( m1 + m2 ) * ( m1 + m2 ) ) *
sqrt( q2 - ( m1 - m2 ) * ( m1 - m2 ) ) / 2 / sqrt( q2 );
@@ -165,7 +165,7 @@
p4lep2.set( sqrt( pstar * pstar + m2 * m2 ), 0,
-pstar * sin( theta ), -pstar * cos( theta ) );
- if ( i != nsteps) // At maximal q2 we are already in correct frame as Lambda and W/Zvirtual are at rest
+ if ( i != nsteps ) // At maximal q2 we are already in correct frame as Lambda and W/Zvirtual are at rest
{
p4lep1 = boostTo( p4lep1, boost );
p4lep2 = boostTo( p4lep2, boost );
@@ -177,9 +177,9 @@
prob = rho.normalizedProb( amp.getSpinDensity() );
// In case of electron mode add pole
if ( m_electronMode ) {
- prob /= 1.0 + m_poleSize / ( q2*q2 );
+ prob /= 1.0 + m_poleSize / ( q2 * q2 );
}
-
+
if ( prob > m_maxProbability ) {
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< " - probability " << prob << " found at q2 = " << q2
diff --git a/src/EvtGenModels/EvtRareLbToLllFF.cpp b/src/EvtGenModels/EvtRareLbToLllFF.cpp
--- a/src/EvtGenModels/EvtRareLbToLllFF.cpp
+++ b/src/EvtGenModels/EvtRareLbToLllFF.cpp
@@ -154,7 +154,7 @@
FFMap_[EvtPDL::getId( "Lambda(1520)0" ).getId()] = L1520.get();
FFMap_[EvtPDL::getId( "anti-Lambda(1520)0" ).getId()] = L1520.get();
- FF_ = {std::move( L1115 ), std::move( L1520 )};
+ FF_ = { std::move( L1115 ), std::move( L1520 ) };
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< " EvtRareLbToLll is using form factors from arXiv:1108.6129 "
@@ -278,7 +278,8 @@
}
}
-void EvtRareLbToLllFF::getFF( const EvtParticle& parent, const EvtParticle& lambda,
+void EvtRareLbToLllFF::getFF( const EvtParticle& parent,
+ const EvtParticle& lambda,
EvtRareLbToLllFF::FormFactors& FF ) const
{
// Find the FF information for this particle, start by setting all to zero
diff --git a/src/EvtGenModels/EvtSLBaryonAmp.cpp b/src/EvtGenModels/EvtSLBaryonAmp.cpp
--- a/src/EvtGenModels/EvtSLBaryonAmp.cpp
+++ b/src/EvtGenModels/EvtSLBaryonAmp.cpp
@@ -461,7 +461,7 @@
FormFactors->getdiracff( par_num, bar_num, q2, baryonmass, &f1, &f2,
&f3, &g1, &g2, &g3 );
- const double form_fact[6] = {f1, f2, f3, g1, g2, g3};
+ const double form_fact[6] = { f1, f2, f3, g1, g2, g3 };
EvtVector4C b11, b12, b21, b22, l1, l2;
@@ -584,7 +584,7 @@
FormFactors->getraritaff( par_num, bar_num, q2, baryonmass, &f1, &f2,
&f3, &f4, &g1, &g2, &g3, &g4 );
- const double form_fact[8] = {f1, f2, f3, f4, g1, g2, g3, g4};
+ const double form_fact[8] = { f1, f2, f3, f4, g1, g2, g3, g4 };
EvtId l_num = parent->getDaug( 1 )->getId();
diff --git a/src/EvtGenModels/EvtTVP.cpp b/src/EvtGenModels/EvtTVP.cpp
--- a/src/EvtGenModels/EvtTVP.cpp
+++ b/src/EvtGenModels/EvtTVP.cpp
@@ -178,7 +178,7 @@
}
// Calculate the amplitude terms, looping over the psi and lepton states
- int iPols[4] = {0, 0, 0, 0};
+ int iPols[4] = { 0, 0, 0, 0 };
for ( int iChi = 0; iChi < 5; iChi++ ) {
iPols[0] = iChi;
diff --git a/src/EvtGenModels/EvtVVP.cpp b/src/EvtGenModels/EvtVVP.cpp
--- a/src/EvtGenModels/EvtVVP.cpp
+++ b/src/EvtGenModels/EvtVVP.cpp
@@ -156,7 +156,7 @@
factor = dSq / ( dSqDenom * kSq );
}
- int iPols[4] = {0, 0, 0, 0};
+ int iPols[4] = { 0, 0, 0, 0 };
// Calculate the amplitude terms, looping over the chi, psi and lepton states
for ( int iChi = 0; iChi < 3; iChi++ ) {
diff --git a/src/EvtGenModels/EvtVtoSll.cpp b/src/EvtGenModels/EvtVtoSll.cpp
--- a/src/EvtGenModels/EvtVtoSll.cpp
+++ b/src/EvtGenModels/EvtVtoSll.cpp
@@ -58,7 +58,7 @@
void EvtVtoSll::initProbMax()
{
- setProbMax(10.0);
+ setProbMax( 10.0 );
}
void EvtVtoSll::decay( EvtParticle* p )
diff --git a/src/EvtGenModels/EvtVub.cpp b/src/EvtGenModels/EvtVub.cpp
--- a/src/EvtGenModels/EvtVub.cpp
+++ b/src/EvtGenModels/EvtVub.cpp
@@ -274,8 +274,8 @@
sttmp = sqrt( 1 - ctH * ctH );
ptmp = sqrt( Eh * Eh - sh );
- double pHB[4] = {Eh, ptmp * sttmp * cos( phH ), ptmp * sttmp * sin( phH ),
- ptmp * ctH};
+ double pHB[4] = { Eh, ptmp * sttmp * cos( phH ), ptmp * sttmp * sin( phH ),
+ ptmp * ctH };
p4.set( pHB[0], pHB[1], pHB[2], pHB[3] );
xuhad->init( getDaug( 0 ), p4 );
@@ -299,7 +299,7 @@
// calculate the W 4 vector in the B Meson restrframe
double apWB = ptmp;
- double pWB[4] = {mB - Eh, -pHB[1], -pHB[2], -pHB[3]};
+ double pWB[4] = { mB - Eh, -pHB[1], -pHB[2], -pHB[3] };
// first go in the W restframe and calculate the lepton and
// the neutrino in the W frame
@@ -321,17 +321,17 @@
sttmp = sqrt( 1 - ctL * ctL );
// eX' = eZ x eW
- double xW[3] = {-pWB[2], pWB[1], 0};
+ double xW[3] = { -pWB[2], pWB[1], 0 };
// eZ' = eW
- double zW[3] = {pWB[1] / apWB, pWB[2] / apWB, pWB[3] / apWB};
+ double zW[3] = { pWB[1] / apWB, pWB[2] / apWB, pWB[3] / apWB };
double lx = sqrt( xW[0] * xW[0] + xW[1] * xW[1] );
for ( j = 0; j < 2; j++ )
xW[j] /= lx;
// eY' = eZ' x eX'
- double yW[3] = {-pWB[1] * pWB[3], -pWB[2] * pWB[3],
- pWB[1] * pWB[1] + pWB[2] * pWB[2]};
+ double yW[3] = { -pWB[1] * pWB[3], -pWB[2] * pWB[3],
+ pWB[1] * pWB[1] + pWB[2] * pWB[2] };
double ly = sqrt( yW[0] * yW[0] + yW[1] * yW[1] + yW[2] * yW[2] );
for ( j = 0; j < 3; j++ )
yW[j] /= ly;
@@ -356,8 +356,8 @@
if ( ctLL < -1 )
ctLL = -1;
- double pLB[4] = {El, 0, 0, 0};
- double pNB[4] = {pWB[0] - El, 0, 0, 0};
+ double pLB[4] = { El, 0, 0, 0 };
+ double pNB[4] = { pWB[0] - El, 0, 0, 0 };
for ( j = 1; j < 4; j++ ) {
pLB[j] = pLW[j] + ( ctLL * ptmp - ctL * apLW ) / apWB * pWB[j];
diff --git a/src/EvtGenModels/EvtVubBLNP.cpp b/src/EvtGenModels/EvtVubBLNP.cpp
--- a/src/EvtGenModels/EvtVubBLNP.cpp
+++ b/src/EvtGenModels/EvtVubBLNP.cpp
@@ -264,8 +264,8 @@
sttmp = sqrt( 1 - ctH * ctH );
ptmp = sqrt( EX * EX - sh );
- double pHB[4] = {EX, ptmp * sttmp * cos( phH ), ptmp * sttmp * sin( phH ),
- ptmp * ctH};
+ double pHB[4] = { EX, ptmp * sttmp * cos( phH ), ptmp * sttmp * sin( phH ),
+ ptmp * ctH };
p4.set( pHB[0], pHB[1], pHB[2], pHB[3] );
xuhad->init( getDaug( 0 ), p4 );
@@ -287,7 +287,7 @@
// calculate the W 4 vector in the B Meson restrframe
double apWB = ptmp;
- double pWB[4] = {mBB - EX, -pHB[1], -pHB[2], -pHB[3]};
+ double pWB[4] = { mBB - EX, -pHB[1], -pHB[2], -pHB[3] };
// first go in the W restframe and calculate the lepton and
// the neutrino in the W frame
@@ -309,17 +309,17 @@
sttmp = sqrt( 1 - ctL * ctL );
// eX' = eZ x eW
- double xW[3] = {-pWB[2], pWB[1], 0};
+ double xW[3] = { -pWB[2], pWB[1], 0 };
// eZ' = eW
- double zW[3] = {pWB[1] / apWB, pWB[2] / apWB, pWB[3] / apWB};
+ double zW[3] = { pWB[1] / apWB, pWB[2] / apWB, pWB[3] / apWB };
double lx = sqrt( xW[0] * xW[0] + xW[1] * xW[1] );
for ( j = 0; j < 2; j++ )
xW[j] /= lx;
// eY' = eZ' x eX'
- double yW[3] = {-pWB[1] * pWB[3], -pWB[2] * pWB[3],
- pWB[1] * pWB[1] + pWB[2] * pWB[2]};
+ double yW[3] = { -pWB[1] * pWB[3], -pWB[2] * pWB[3],
+ pWB[1] * pWB[1] + pWB[2] * pWB[2] };
double ly = sqrt( yW[0] * yW[0] + yW[1] * yW[1] + yW[2] * yW[2] );
for ( j = 0; j < 3; j++ )
yW[j] /= ly;
@@ -345,8 +345,8 @@
if ( ctLL < -1 )
ctLL = -1;
- double pLB[4] = {El, 0, 0, 0};
- double pNB[4] = {pWB[0] - El, 0, 0, 0};
+ double pLB[4] = { El, 0, 0, 0 };
+ double pNB[4] = { pWB[0] - El, 0, 0, 0 };
for ( j = 1; j < 4; j++ ) {
pLB[j] = pLW[j] + ( ctLL * ptmp - ctL * apLW ) / apWB * pWB[j];
@@ -498,8 +498,8 @@
double lowerlim = 0.001 * Pp;
double upperlim = ( 1.0 - 0.001 ) * Pp;
- auto func = EvtItgPtrFunction{&IntJS, lowerlim, upperlim, vars};
- auto integ = EvtItgSimpsonIntegrator{func, precision, maxLoop};
+ auto func = EvtItgPtrFunction{ &IntJS, lowerlim, upperlim, vars };
+ auto integ = EvtItgSimpsonIntegrator{ func, precision, maxLoop };
return integ.evaluate( lowerlim, upperlim );
}
@@ -515,8 +515,8 @@
double lowerlim = 0.001 * Pp;
double upperlim = ( 1.0 - 0.001 ) * Pp;
- auto func = EvtItgPtrFunction{&Int1, lowerlim, upperlim, vars};
- auto integ = EvtItgSimpsonIntegrator{func, precision, maxLoop};
+ auto func = EvtItgPtrFunction{ &Int1, lowerlim, upperlim, vars };
+ auto integ = EvtItgSimpsonIntegrator{ func, precision, maxLoop };
return integ.evaluate( lowerlim, upperlim );
}
@@ -532,8 +532,8 @@
double lowerlim = 0.001 * Pp;
double upperlim = ( 1.0 - 0.001 ) * Pp;
- auto func = EvtItgPtrFunction{&Int2, lowerlim, upperlim, vars};
- auto integ = EvtItgSimpsonIntegrator{func, precision, maxLoop};
+ auto func = EvtItgPtrFunction{ &Int2, lowerlim, upperlim, vars };
+ auto integ = EvtItgSimpsonIntegrator{ func, precision, maxLoop };
return integ.evaluate( lowerlim, upperlim );
}
@@ -549,8 +549,8 @@
double lowerlim = 0.001 * Pp;
double upperlim = ( 1.0 - 0.001 ) * Pp;
- auto func = EvtItgPtrFunction{&Int3, lowerlim, upperlim, vars};
- auto integ = EvtItgSimpsonIntegrator{func, precision, maxLoop};
+ auto func = EvtItgPtrFunction{ &Int3, lowerlim, upperlim, vars };
+ auto integ = EvtItgSimpsonIntegrator{ func, precision, maxLoop };
return integ.evaluate( lowerlim, upperlim );
}
diff --git a/src/EvtGenModels/EvtVubBLNPHybrid.cpp b/src/EvtGenModels/EvtVubBLNPHybrid.cpp
--- a/src/EvtGenModels/EvtVubBLNPHybrid.cpp
+++ b/src/EvtGenModels/EvtVubBLNPHybrid.cpp
@@ -342,8 +342,8 @@
sttmp = sqrt( 1 - ctH * ctH );
ptmp = sqrt( EX * EX - sh );
- double pHB[4] = {EX, ptmp * sttmp * cos( phH ), ptmp * sttmp * sin( phH ),
- ptmp * ctH};
+ double pHB[4] = { EX, ptmp * sttmp * cos( phH ), ptmp * sttmp * sin( phH ),
+ ptmp * ctH };
p4.set( pHB[0], pHB[1], pHB[2], pHB[3] );
xuhad->init( getDaug( 0 ), p4 );
@@ -363,7 +363,7 @@
// calculate the W 4 vector in the B Meson restrframe
double apWB = ptmp;
- double pWB[4] = {mBB - EX, -pHB[1], -pHB[2], -pHB[3]};
+ double pWB[4] = { mBB - EX, -pHB[1], -pHB[2], -pHB[3] };
// first go in the W restframe and calculate the lepton and
// the neutrino in the W frame
@@ -385,17 +385,17 @@
sttmp = sqrt( 1 - ctL * ctL );
// eX' = eZ x eW
- double xW[3] = {-pWB[2], pWB[1], 0};
+ double xW[3] = { -pWB[2], pWB[1], 0 };
// eZ' = eW
- double zW[3] = {pWB[1] / apWB, pWB[2] / apWB, pWB[3] / apWB};
+ double zW[3] = { pWB[1] / apWB, pWB[2] / apWB, pWB[3] / apWB };
double lx = sqrt( xW[0] * xW[0] + xW[1] * xW[1] );
for ( j = 0; j < 2; j++ )
xW[j] /= lx;
// eY' = eZ' x eX'
- double yW[3] = {-pWB[1] * pWB[3], -pWB[2] * pWB[3],
- pWB[1] * pWB[1] + pWB[2] * pWB[2]};
+ double yW[3] = { -pWB[1] * pWB[3], -pWB[2] * pWB[3],
+ pWB[1] * pWB[1] + pWB[2] * pWB[2] };
double ly = sqrt( yW[0] * yW[0] + yW[1] * yW[1] + yW[2] * yW[2] );
for ( j = 0; j < 3; j++ )
yW[j] /= ly;
@@ -421,8 +421,8 @@
if ( ctLL < -1 )
ctLL = -1;
- double pLB[4] = {El, 0, 0, 0};
- double pNB[4] = {pWB[0] - El, 0, 0, 0};
+ double pLB[4] = { El, 0, 0, 0 };
+ double pNB[4] = { pWB[0] - El, 0, 0, 0 };
for ( j = 1; j < 4; j++ ) {
pLB[j] = pLW[j] + ( ctLL * ptmp - ctL * apLW ) / apWB * pWB[j];
@@ -572,8 +572,8 @@
double lowerlim = 0.001 * Pp;
double upperlim = ( 1.0 - 0.001 ) * Pp;
- auto func = EvtItgPtrFunction{&IntJS, lowerlim, upperlim, vars};
- auto integ = EvtItgSimpsonIntegrator{func, precision, maxLoop};
+ auto func = EvtItgPtrFunction{ &IntJS, lowerlim, upperlim, vars };
+ auto integ = EvtItgSimpsonIntegrator{ func, precision, maxLoop };
return integ.evaluate( lowerlim, upperlim );
}
@@ -589,8 +589,8 @@
double lowerlim = 0.001 * Pp;
double upperlim = ( 1.0 - 0.001 ) * Pp;
- auto func = EvtItgPtrFunction{&Int1, lowerlim, upperlim, vars};
- auto integ = EvtItgSimpsonIntegrator{func, precision, maxLoop};
+ auto func = EvtItgPtrFunction{ &Int1, lowerlim, upperlim, vars };
+ auto integ = EvtItgSimpsonIntegrator{ func, precision, maxLoop };
return integ.evaluate( lowerlim, upperlim );
}
@@ -606,8 +606,8 @@
double lowerlim = 0.001 * Pp;
double upperlim = ( 1.0 - 0.001 ) * Pp;
- auto func = EvtItgPtrFunction{&Int2, lowerlim, upperlim, vars};
- auto integ = EvtItgSimpsonIntegrator{func, precision, maxLoop};
+ auto func = EvtItgPtrFunction{ &Int2, lowerlim, upperlim, vars };
+ auto integ = EvtItgSimpsonIntegrator{ func, precision, maxLoop };
return integ.evaluate( lowerlim, upperlim );
}
@@ -623,8 +623,8 @@
double lowerlim = 0.001 * Pp;
double upperlim = ( 1.0 - 0.001 ) * Pp;
- auto func = EvtItgPtrFunction{&Int3, lowerlim, upperlim, vars};
- auto integ = EvtItgSimpsonIntegrator{func, precision, maxLoop};
+ auto func = EvtItgPtrFunction{ &Int3, lowerlim, upperlim, vars };
+ auto integ = EvtItgSimpsonIntegrator{ func, precision, maxLoop };
return integ.evaluate( lowerlim, upperlim );
}
diff --git a/src/EvtGenModels/EvtVubHybrid.cpp b/src/EvtGenModels/EvtVubHybrid.cpp
--- a/src/EvtGenModels/EvtVubHybrid.cpp
+++ b/src/EvtGenModels/EvtVubHybrid.cpp
@@ -275,8 +275,8 @@
sttmp = sqrt( 1 - ctH * ctH );
ptmp = sqrt( Eh * Eh - sh );
- double pHB[4] = {Eh, ptmp * sttmp * cos( phH ), ptmp * sttmp * sin( phH ),
- ptmp * ctH};
+ double pHB[4] = { Eh, ptmp * sttmp * cos( phH ), ptmp * sttmp * sin( phH ),
+ ptmp * ctH };
p4.set( pHB[0], pHB[1], pHB[2], pHB[3] );
xuhad->init( getDaug( 0 ), p4 );
@@ -300,7 +300,7 @@
// calculate the W 4 vector in the B Meson restrframe
double apWB = ptmp;
- double pWB[4] = {mB - Eh, -pHB[1], -pHB[2], -pHB[3]};
+ double pWB[4] = { mB - Eh, -pHB[1], -pHB[2], -pHB[3] };
// first go in the W restframe and calculate the lepton and
// the neutrino in the W frame
@@ -322,17 +322,17 @@
sttmp = sqrt( 1 - ctL * ctL );
// eX' = eZ x eW
- double xW[3] = {-pWB[2], pWB[1], 0};
+ double xW[3] = { -pWB[2], pWB[1], 0 };
// eZ' = eW
- double zW[3] = {pWB[1] / apWB, pWB[2] / apWB, pWB[3] / apWB};
+ double zW[3] = { pWB[1] / apWB, pWB[2] / apWB, pWB[3] / apWB };
double lx = sqrt( xW[0] * xW[0] + xW[1] * xW[1] );
for ( j = 0; j < 2; j++ )
xW[j] /= lx;
// eY' = eZ' x eX'
- double yW[3] = {-pWB[1] * pWB[3], -pWB[2] * pWB[3],
- pWB[1] * pWB[1] + pWB[2] * pWB[2]};
+ double yW[3] = { -pWB[1] * pWB[3], -pWB[2] * pWB[3],
+ pWB[1] * pWB[1] + pWB[2] * pWB[2] };
double ly = sqrt( yW[0] * yW[0] + yW[1] * yW[1] + yW[2] * yW[2] );
for ( j = 0; j < 3; j++ )
yW[j] /= ly;
@@ -360,8 +360,8 @@
if ( ctLL < -1 )
ctLL = -1;
- double pLB[4] = {El, 0, 0, 0};
- double pNB[4] = {pWB[0] - El, 0, 0, 0};
+ double pLB[4] = { El, 0, 0, 0 };
+ double pNB[4] = { pWB[0] - El, 0, 0, 0 };
for ( j = 1; j < 4; j++ ) {
pLB[j] = pLW[j] + ( ctLL * ptmp - ctL * apLW ) / apWB * pWB[j];
diff --git a/src/EvtGenModels/EvtVubNLO.cpp b/src/EvtGenModels/EvtVubNLO.cpp
--- a/src/EvtGenModels/EvtVubNLO.cpp
+++ b/src/EvtGenModels/EvtVubNLO.cpp
@@ -261,15 +261,15 @@
sttmp = sqrt( 1 - ctH * ctH );
ptmp = sqrt( Eh * Eh - sh );
- double pHB[4] = {Eh, ptmp * sttmp * cos( phH ), ptmp * sttmp * sin( phH ),
- ptmp * ctH};
+ double pHB[4] = { Eh, ptmp * sttmp * cos( phH ), ptmp * sttmp * sin( phH ),
+ ptmp * ctH };
p4.set( pHB[0], pHB[1], pHB[2], pHB[3] );
xuhad->init( getDaug( 0 ), p4 );
// calculate the W 4 vector in the B Meson restrframe
double apWB = ptmp;
- double pWB[4] = {_mB - Eh, -pHB[1], -pHB[2], -pHB[3]};
+ double pWB[4] = { _mB - Eh, -pHB[1], -pHB[2], -pHB[3] };
// first go in the W restframe and calculate the lepton and
// the neutrino in the W frame
@@ -294,17 +294,17 @@
sttmp = sqrt( 1 - ctL * ctL );
// eX' = eZ x eW
- double xW[3] = {-pWB[2], pWB[1], 0};
+ double xW[3] = { -pWB[2], pWB[1], 0 };
// eZ' = eW
- double zW[3] = {pWB[1] / apWB, pWB[2] / apWB, pWB[3] / apWB};
+ double zW[3] = { pWB[1] / apWB, pWB[2] / apWB, pWB[3] / apWB };
double lx = sqrt( xW[0] * xW[0] + xW[1] * xW[1] );
for ( int j = 0; j < 2; j++ )
xW[j] /= lx;
// eY' = eZ' x eX'
- double yW[3] = {-pWB[1] * pWB[3], -pWB[2] * pWB[3],
- pWB[1] * pWB[1] + pWB[2] * pWB[2]};
+ double yW[3] = { -pWB[1] * pWB[3], -pWB[2] * pWB[3],
+ pWB[1] * pWB[1] + pWB[2] * pWB[2] };
double ly = sqrt( yW[0] * yW[0] + yW[1] * yW[1] + yW[2] * yW[2] );
for ( int j = 0; j < 3; j++ )
yW[j] /= ly;
@@ -330,8 +330,8 @@
if ( ctLL < -1 )
ctLL = -1;
- double pLB[4] = {El, 0, 0, 0};
- double pNB[8] = {pWB[0] - El, 0, 0, 0};
+ double pLB[4] = { El, 0, 0, 0 };
+ double pNB[8] = { pWB[0] - El, 0, 0, 0 };
for ( int j = 1; j < 4; j++ ) {
pLB[j] = pLW[j] + ( ctLL * ptmp - ctL * apLW ) / apWB * pWB[j];
@@ -370,8 +370,8 @@
double aF3 = F30( sCoeffs );
double td0 = c1 * aF1 + c2 * aF2 + c3 * aF3;
- auto func = EvtItgPtrFunction{&integrand, 0., _mB, sCoeffs};
- auto jetSF = EvtItgSimpsonIntegrator{func, 0.01, 25};
+ auto func = EvtItgPtrFunction{ &integrand, 0., _mB, sCoeffs };
+ auto jetSF = EvtItgSimpsonIntegrator{ func, 0.01, 25 };
double smallfrac =
0.000001; // stop a bit before the end to avoid problems with numerical integration
double tdInt = jetSF.evaluate( 0, pp * ( 1 - smallfrac ) );
@@ -704,7 +704,7 @@
{
std::array<double, 6> gammaCoeffs{
76.18009172947146, -86.50532032941677, 24.01409824083091,
- -1.231739572450155, 0.1208650973866179e-2, -0.5395239384953e-5};
+ -1.231739572450155, 0.1208650973866179e-2, -0.5395239384953e-5 };
//Lifted from Numerical Recipies in C
double y = z;
@@ -726,7 +726,7 @@
{
std::vector<double> c( 1 );
c[0] = z;
- auto func = EvtItgPtrFunction{&dgamma, tmin, 100., c};
- auto jetSF = EvtItgSimpsonIntegrator{func, 0.001};
+ auto func = EvtItgPtrFunction{ &dgamma, tmin, 100., c };
+ auto jetSF = EvtItgSimpsonIntegrator{ func, 0.001 };
return jetSF.evaluate( tmin, 100. );
}
diff --git a/src/EvtGenModels/EvtWilsonCoefficients.cpp b/src/EvtGenModels/EvtWilsonCoefficients.cpp
--- a/src/EvtGenModels/EvtWilsonCoefficients.cpp
+++ b/src/EvtGenModels/EvtWilsonCoefficients.cpp
@@ -31,26 +31,27 @@
EvtWilsonCoefficients::EvtWilsonCoefficients()
{
int i, j;
- double tmpa[8] = {14. / 23., 16. / 23., 6. / 23., -12. / 23.,
- 0.4086, -0.4230, -0.8994, 0.1456};
- double tmph[8] = {2.2996, -1.0880, -3. / 7., -1. / 14.,
- -0.6494, -0.0380, -0.0186, -0.0057};
- double tmpp[8] = {0, 0, -80. / 203., 8. / 33.,
- 0.0433, 0.1384, 0.1648, -0.0073};
- double tmps[8] = {0, 0, -0.2009, -0.3579, 0.0490, -0.3616, -0.3554, 0.0072};
- double tmpq[8] = {0, 0, 0, 0, 0.0318, 0.0918, -0.2700, 0.0059};
- double tmpg[8] = {313063. / 363036., 0, 0, 0,
- -0.9135, 0.0873, -0.0571, -0.0209};
+ double tmpa[8] = { 14. / 23., 16. / 23., 6. / 23., -12. / 23.,
+ 0.4086, -0.4230, -0.8994, 0.1456 };
+ double tmph[8] = { 2.2996, -1.0880, -3. / 7., -1. / 14.,
+ -0.6494, -0.0380, -0.0186, -0.0057 };
+ double tmpp[8] = { 0, 0, -80. / 203., 8. / 33.,
+ 0.0433, 0.1384, 0.1648, -0.0073 };
+ double tmps[8] = { 0, 0, -0.2009, -0.3579,
+ 0.0490, -0.3616, -0.3554, 0.0072 };
+ double tmpq[8] = { 0, 0, 0, 0, 0.0318, 0.0918, -0.2700, 0.0059 };
+ double tmpg[8] = { 313063. / 363036., 0, 0, 0,
+ -0.9135, 0.0873, -0.0571, -0.0209 };
double tmpk[6][8] = {
- {0, 0, 1. / 2., -1. / 2., 0, 0, 0, 0},
- {0, 0, 1. / 2., +1. / 2., 0, 0, 0, 0},
- {0, 0, -1. / 14., +1. / 6., 0.0510, -0.1403, -0.0113, 0.0054},
- {0, 0, -1. / 14., -1. / 6., 0.0984, +0.1214, +0.0156, 0.0026},
- {0, 0, 0, 0, -0.0397, 0.0117, -0.0025, +0.0304},
- {0, 0, 0, 0, +0.0335, 0.0239, -0.0462, -0.0112}};
+ { 0, 0, 1. / 2., -1. / 2., 0, 0, 0, 0 },
+ { 0, 0, 1. / 2., +1. / 2., 0, 0, 0, 0 },
+ { 0, 0, -1. / 14., +1. / 6., 0.0510, -0.1403, -0.0113, 0.0054 },
+ { 0, 0, -1. / 14., -1. / 6., 0.0984, +0.1214, +0.0156, 0.0026 },
+ { 0, 0, 0, 0, -0.0397, 0.0117, -0.0025, +0.0304 },
+ { 0, 0, 0, 0, +0.0335, 0.0239, -0.0462, -0.0112 } };
double tmpr[2][8] = {
- {0, 0, +0.8966, -0.1960, -0.2011, 0.1328, -0.0292, -0.1858},
- {0, 0, -0.1193, +0.1003, -0.0473, 0.2323, -0.0133, -0.1799}};
+ { 0, 0, +0.8966, -0.1960, -0.2011, 0.1328, -0.0292, -0.1858 },
+ { 0, 0, -0.1193, +0.1003, -0.0473, 0.2323, -0.0133, -0.1799 } };
for ( i = 0; i < 8; i++ ) {
a[i] = tmpa[i];
h[i] = tmph[i];
diff --git a/src/EvtGenModels/EvtbTosllAli.cpp b/src/EvtGenModels/EvtbTosllAli.cpp
--- a/src/EvtGenModels/EvtbTosllAli.cpp
+++ b/src/EvtGenModels/EvtbTosllAli.cpp
@@ -65,7 +65,7 @@
//This routine sets the _poleSize.
double mymaxprob = _calcamp->CalcMaxProb( parnum, mesnum, l1num, l2num,
_aliffmodel.get(), _poleSize );
- mymaxprob *= 1.25; // Increase to avoid maxprob errors
+ mymaxprob *= 1.25; // Increase to avoid maxprob errors
setProbMax( mymaxprob );
}
diff --git a/src/EvtGenModels/EvtbTosllMSFF.cpp b/src/EvtGenModels/EvtbTosllMSFF.cpp
--- a/src/EvtGenModels/EvtbTosllMSFF.cpp
+++ b/src/EvtGenModels/EvtbTosllMSFF.cpp
@@ -78,10 +78,10 @@
daught == EvtPDL::getId( std::string( "K_L0" ) ) ) ||
( parent == EvtPDL::getId( std::string( "anti-B0" ) ) &&
daught == EvtPDL::getId( std::string( "K_L0" ) ) ) ) {
- double ff0[] = {0.36, 0.36, 0.35};
- double sigma1[] = {0.43, 0.70, 0.43};
- double sigma2[] = {0.00, 0.27, 0.00};
- int eq_num[] = {9, 10, 9};
+ double ff0[] = { 0.36, 0.36, 0.35 };
+ double sigma1[] = { 0.43, 0.70, 0.43 };
+ double sigma2[] = { 0.00, 0.27, 0.00 };
+ int eq_num[] = { 9, 10, 9 };
double M_P2 = 5.37 * 5.37; // GeV^2 for B^0_s - meson
double M_V2 = 5.42 * 5.42; // GeV^2 for B^*_s - meson
@@ -105,10 +105,10 @@
daught == EvtPDL::getId( std::string( "pi0" ) ) ) ||
( parent == EvtPDL::getId( std::string( "anti-B0" ) ) &&
daught == EvtPDL::getId( std::string( "pi0" ) ) ) ) {
- double ff0[] = {0.29, 0.29, 0.28};
- double sigma1[] = {0.48, 0.76, 0.48};
- double sigma2[] = {0.00, 0.28, 0.00};
- int eq_num[] = {9, 10, 9};
+ double ff0[] = { 0.29, 0.29, 0.28 };
+ double sigma1[] = { 0.48, 0.76, 0.48 };
+ double sigma2[] = { 0.00, 0.28, 0.00 };
+ int eq_num[] = { 9, 10, 9 };
double M_P2 = 5.27 * 5.27; // GeV^2 for B^0 - meson
double M_V2 = 5.32 * 5.32; // GeV^2 for B^* - meson
@@ -128,10 +128,10 @@
daught == EvtPDL::getId( std::string( "eta" ) ) ) ||
( parent == EvtPDL::getId( std::string( "anti-B0" ) ) &&
daught == EvtPDL::getId( std::string( "eta" ) ) ) ) {
- double ff0[] = {0.36, 0.36, 0.36};
- double sigma1[] = {0.60, 0.80, 0.58};
- double sigma2[] = {0.20, 0.40, 0.18};
- int eq_num[] = {9, 10, 9};
+ double ff0[] = { 0.36, 0.36, 0.36 };
+ double sigma1[] = { 0.60, 0.80, 0.58 };
+ double sigma2[] = { 0.20, 0.40, 0.18 };
+ int eq_num[] = { 9, 10, 9 };
double M_P2 = 5.27 * 5.27; // GeV^2 for B_d^0 - meson
double M_V2 = 5.32 * 5.32; // GeV^2 for B_d^* - meson
@@ -154,10 +154,10 @@
daught == EvtPDL::getId( std::string( "eta'" ) ) ) ||
( parent == EvtPDL::getId( std::string( "anti-B0" ) ) &&
daught == EvtPDL::getId( std::string( "eta'" ) ) ) ) {
- double ff0[] = {0.36, 0.36, 0.39};
- double sigma1[] = {0.60, 0.80, 0.58};
- double sigma2[] = {0.20, 0.45, 0.18};
- int eq_num[] = {9, 10, 9};
+ double ff0[] = { 0.36, 0.36, 0.39 };
+ double sigma1[] = { 0.60, 0.80, 0.58 };
+ double sigma2[] = { 0.20, 0.45, 0.18 };
+ int eq_num[] = { 9, 10, 9 };
double M_P2 = 5.27 * 5.27; // GeV^2 for B_d^0 - meson
double M_V2 = 5.32 * 5.32; // GeV^2 for B_d^* - meson
@@ -177,10 +177,10 @@
daught == EvtPDL::getId( std::string( "eta" ) ) ) ||
( parent == EvtPDL::getId( std::string( "anti-B_s0" ) ) &&
daught == EvtPDL::getId( std::string( "eta" ) ) ) ) {
- double ff0[] = {0.36, 0.36, 0.36};
- double sigma1[] = {0.60, 0.80, 0.58};
- double sigma2[] = {0.20, 0.40, 0.18};
- int eq_num[] = {9, 10, 9};
+ double ff0[] = { 0.36, 0.36, 0.36 };
+ double sigma1[] = { 0.60, 0.80, 0.58 };
+ double sigma2[] = { 0.20, 0.40, 0.18 };
+ int eq_num[] = { 9, 10, 9 };
double M_P2 = 5.37 * 5.37; // GeV^2 for B_s^0 - meson
double M_V2 = 5.42 * 5.42; // GeV^2 for B_s^* - meson
@@ -200,10 +200,10 @@
daught == EvtPDL::getId( std::string( "eta'" ) ) ) ||
( parent == EvtPDL::getId( std::string( "anti-B_s0" ) ) &&
daught == EvtPDL::getId( std::string( "eta'" ) ) ) ) {
- double ff0[] = {0.36, 0.36, 0.39};
- double sigma1[] = {0.60, 0.80, 0.58};
- double sigma2[] = {0.20, 0.45, 0.18};
- int eq_num[] = {9, 10, 9};
+ double ff0[] = { 0.36, 0.36, 0.39 };
+ double sigma1[] = { 0.60, 0.80, 0.58 };
+ double sigma2[] = { 0.20, 0.45, 0.18 };
+ int eq_num[] = { 9, 10, 9 };
double M_P2 = 5.37 * 5.37; // GeV^2 for B_s^0 - meson
double M_V2 = 5.42 * 5.42; // GeV^2 for B_s^* - meson
@@ -223,10 +223,10 @@
daught == EvtPDL::getId( std::string( "f_0" ) ) ) ||
( parent == EvtPDL::getId( std::string( "anti-B_s0" ) ) &&
daught == EvtPDL::getId( std::string( "f_0" ) ) ) ) {
- double ff0[] = {0.238, 0.238, 0.308};
- double sigma1[] = {1.50, 0.53, 1.46};
- double sigma2[] = {0.58, -0.36, 0.58};
- int eq_num[] = {10, 10, 10};
+ double ff0[] = { 0.238, 0.238, 0.308 };
+ double sigma1[] = { 1.50, 0.53, 1.46 };
+ double sigma2[] = { 0.58, -0.36, 0.58 };
+ int eq_num[] = { 10, 10, 10 };
double M_P2 = 5.366 * 5.366; // GeV^2 for B_s^0 - meson
fp = 0.0 -
@@ -274,10 +274,10 @@
daught == EvtPDL::getId( std::string( "K*0" ) ) ) ||
( parent == EvtPDL::getId( std::string( "anti-B0" ) ) &&
daught == EvtPDL::getId( std::string( "anti-K*0" ) ) ) ) {
- double ff0[] = {0.44, 0.45, 0.36, 0.32, 0.39, 0.39, 0.27};
- double sigma1[] = {0.45, 0.46, 0.64, 1.23, 0.45, 0.72, 1.31};
- double sigma2[] = {0.00, 0.00, 0.36, 0.38, 0.00, 0.62, 0.41};
- int eq_num[] = {9, 9, 10, 10, 9, 10, 10};
+ double ff0[] = { 0.44, 0.45, 0.36, 0.32, 0.39, 0.39, 0.27 };
+ double sigma1[] = { 0.45, 0.46, 0.64, 1.23, 0.45, 0.72, 1.31 };
+ double sigma2[] = { 0.00, 0.00, 0.36, 0.38, 0.00, 0.62, 0.41 };
+ int eq_num[] = { 9, 9, 10, 10, 9, 10, 10 };
double M_P2 = 5.37 * 5.37; // GeV^2 for B^0_s - meson
double M_V2 = 5.42 * 5.42; // GeV^2 for B^*_s - meson
@@ -306,10 +306,10 @@
daught == EvtPDL::getId( std::string( "rho0" ) ) ) ||
( parent == EvtPDL::getId( std::string( "anti-B0" ) ) &&
daught == EvtPDL::getId( std::string( "rho0" ) ) ) ) {
- double ff0[] = {0.31, 0.30, 0.26, 0.24, 0.27, 0.27, 0.19};
- double sigma1[] = {0.59, 0.54, 0.73, 1.40, 0.60, 0.74, 1.42};
- double sigma2[] = {0.00, 0.00, 0.10, 0.50, 0.00, 0.19, 0.51};
- int eq_num[] = {9, 9, 10, 10, 9, 10, 10};
+ double ff0[] = { 0.31, 0.30, 0.26, 0.24, 0.27, 0.27, 0.19 };
+ double sigma1[] = { 0.59, 0.54, 0.73, 1.40, 0.60, 0.74, 1.42 };
+ double sigma2[] = { 0.00, 0.00, 0.10, 0.50, 0.00, 0.19, 0.51 };
+ int eq_num[] = { 9, 9, 10, 10, 9, 10, 10 };
double M_P2 = 5.27 * 5.27; // GeV^2 for B - meson
double M_V2 = 5.32 * 5.32; // GeV^2 for B^* - meson
@@ -334,10 +334,10 @@
daught == EvtPDL::getId( std::string( "omega" ) ) ) ||
( parent == EvtPDL::getId( std::string( "anti-B0" ) ) &&
daught == EvtPDL::getId( std::string( "omega" ) ) ) ) {
- double ff0[] = {0.31, 0.30, 0.26, 0.24, 0.27, 0.27, 0.19};
- double sigma1[] = {0.59, 0.54, 0.73, 1.40, 0.60, 0.74, 1.42};
- double sigma2[] = {0.00, 0.00, 0.10, 0.50, 0.00, 0.19, 0.51};
- int eq_num[] = {9, 9, 10, 10, 9, 10, 10};
+ double ff0[] = { 0.31, 0.30, 0.26, 0.24, 0.27, 0.27, 0.19 };
+ double sigma1[] = { 0.59, 0.54, 0.73, 1.40, 0.60, 0.74, 1.42 };
+ double sigma2[] = { 0.00, 0.00, 0.10, 0.50, 0.00, 0.19, 0.51 };
+ int eq_num[] = { 9, 9, 10, 10, 9, 10, 10 };
double M_P2 = 5.27 * 5.27; // GeV^2 for B - meson
double M_V2 = 5.32 * 5.32; // GeV^2 for B^* - meson
@@ -362,10 +362,10 @@
daught == EvtPDL::getId( std::string( "phi" ) ) ) ||
( parent == EvtPDL::getId( std::string( "anti-B_s0" ) ) &&
daught == EvtPDL::getId( std::string( "phi" ) ) ) ) {
- double ff0[] = {0.44, 0.42, 0.34, 0.31, 0.38, 0.38, 0.26};
- double sigma1[] = {0.62, 0.55, 0.73, 1.30, 0.62, 0.83, 1.41};
- double sigma2[] = {0.20, 0.12, 0.42, 0.52, 0.20, 0.71, 0.57};
- int eq_num[] = {9, 9, 10, 10, 9, 10, 10};
+ double ff0[] = { 0.44, 0.42, 0.34, 0.31, 0.38, 0.38, 0.26 };
+ double sigma1[] = { 0.62, 0.55, 0.73, 1.30, 0.62, 0.83, 1.41 };
+ double sigma2[] = { 0.20, 0.12, 0.42, 0.52, 0.20, 0.71, 0.57 };
+ int eq_num[] = { 9, 9, 10, 10, 9, 10, 10 };
double M_P2 = 5.37 * 5.37; // GeV^2 for B^0_s - meson
double M_V2 = 5.42 * 5.42; // GeV^2 for B^*_s - meson
@@ -390,10 +390,10 @@
daught == EvtPDL::getId( std::string( "anti-K*0" ) ) ) ||
( parent == EvtPDL::getId( std::string( "anti-B_s0" ) ) &&
daught == EvtPDL::getId( std::string( "K*0" ) ) ) ) {
- double ff0[] = {0.38, 0.37, 0.29, 0.26, 0.32, 0.32, 0.23};
- double sigma1[] = {0.66, 0.60, 0.86, 1.32, 0.66, 0.98, 1.42};
- double sigma2[] = {0.30, 0.16, 0.60, 0.54, 0.31, 0.90, 0.62};
- int eq_num[] = {9, 9, 10, 10, 9, 10, 10};
+ double ff0[] = { 0.38, 0.37, 0.29, 0.26, 0.32, 0.32, 0.23 };
+ double sigma1[] = { 0.66, 0.60, 0.86, 1.32, 0.66, 0.98, 1.42 };
+ double sigma2[] = { 0.30, 0.16, 0.60, 0.54, 0.31, 0.90, 0.62 };
+ int eq_num[] = { 9, 9, 10, 10, 9, 10, 10 };
double M_P2 = 5.27 * 5.27; // GeV^2 for B - meson
double M_V2 = 5.32 * 5.32; // GeV^2 for B^* - meson
@@ -423,13 +423,13 @@
daught == EvtPDL::getId( std::string( "K_10" ) ) ) ||
( parent == EvtPDL::getId( std::string( "anti-B0" ) ) &&
daught == EvtPDL::getId( std::string( "anti-K_10" ) ) ) ) {
- double ff0A[] = {0.450, 0.340, 0.41, 0.22, 0.31, 0.310, 0.28};
- double sigma1A[] = {1.600, 0.635, 1.51, 2.40, 2.01, 0.629, 1.36};
- double sigma2A[] = {0.974, 0.211, 1.18, 1.78, 1.50, 0.387, 0.72};
- double ff0B[] = {-0.37, -0.29, -0.17, -0.45, -0.25, -0.250, -0.11};
- double sigma1B[] = {1.72, 0.729, 0.919, 1.34, 1.59, 0.378, -1.61};
- double sigma2B[] = {0.912, 0.074, 0.855, 0.69, 0.79, -0.755, 10.2};
- int eq_num[] = {10, 10, 10, 10, 10, 10, 10};
+ double ff0A[] = { 0.450, 0.340, 0.41, 0.22, 0.31, 0.310, 0.28 };
+ double sigma1A[] = { 1.600, 0.635, 1.51, 2.40, 2.01, 0.629, 1.36 };
+ double sigma2A[] = { 0.974, 0.211, 1.18, 1.78, 1.50, 0.387, 0.72 };
+ double ff0B[] = { -0.37, -0.29, -0.17, -0.45, -0.25, -0.250, -0.11 };
+ double sigma1B[] = { 1.72, 0.729, 0.919, 1.34, 1.59, 0.378, -1.61 };
+ double sigma2B[] = { 0.912, 0.074, 0.855, 0.69, 0.79, -0.755, 10.2 };
+ int eq_num[] = { 10, 10, 10, 10, 10, 10, 10 };
double MM2 = 5.279 * 5.279; // GeV^2
double MB = 5.279; // GeV
@@ -514,13 +514,13 @@
daught == EvtPDL::getId( std::string( "K'_10" ) ) ) ||
( parent == EvtPDL::getId( std::string( "anti-B0" ) ) &&
daught == EvtPDL::getId( std::string( "anti-K'_10" ) ) ) ) {
- double ff0A[] = {0.450, 0.340, 0.41, 0.22, 0.31, 0.310, 0.28};
- double sigma1A[] = {1.600, 0.635, 1.51, 2.40, 2.01, 0.629, 1.36};
- double sigma2A[] = {0.974, 0.211, 1.18, 1.78, 1.50, 0.387, 0.72};
- double ff0B[] = {-0.37, -0.29, -0.17, -0.45, -0.25, -0.250, -0.11};
- double sigma1B[] = {1.72, 0.729, 0.919, 1.34, 1.59, 0.378, -1.61};
- double sigma2B[] = {0.912, 0.074, 0.855, 0.69, 0.79, -0.755, 10.2};
- int eq_num[] = {10, 10, 10, 10, 10, 10, 10};
+ double ff0A[] = { 0.450, 0.340, 0.41, 0.22, 0.31, 0.310, 0.28 };
+ double sigma1A[] = { 1.600, 0.635, 1.51, 2.40, 2.01, 0.629, 1.36 };
+ double sigma2A[] = { 0.974, 0.211, 1.18, 1.78, 1.50, 0.387, 0.72 };
+ double ff0B[] = { -0.37, -0.29, -0.17, -0.45, -0.25, -0.250, -0.11 };
+ double sigma1B[] = { 1.72, 0.729, 0.919, 1.34, 1.59, 0.378, -1.61 };
+ double sigma2B[] = { 0.912, 0.074, 0.855, 0.69, 0.79, -0.755, 10.2 };
+ int eq_num[] = { 10, 10, 10, 10, 10, 10, 10 };
double MM2 = 5.279 * 5.279; // GeV^2
double MB = 5.279; // GeV
diff --git a/src/EvtGenModels/EvtbTosllWilsCoeffNLO.cpp b/src/EvtGenModels/EvtbTosllWilsCoeffNLO.cpp
--- a/src/EvtGenModels/EvtbTosllWilsCoeffNLO.cpp
+++ b/src/EvtGenModels/EvtbTosllWilsCoeffNLO.cpp
@@ -45,8 +45,8 @@
{
double as, ll;
double b0, b1, b2; /* terms in the series of the beta-function */
- double alpha_strong[] = {0.1156, 0.1176, 0.1196}; /* at M_Z scale */
- double MZ = 91.19; /* in GeV */
+ double alpha_strong[] = { 0.1156, 0.1176, 0.1196 }; /* at M_Z scale */
+ double MZ = 91.19; /* in GeV */
b0 = 11. - 2. * ( (double)Nf ) / 3.;
b1 = 51. - 19. * ( (double)Nf ) / 3.;
@@ -113,9 +113,9 @@
double asmu; /* the strong coupling constant at the scale mu */
int i;
- double a[] = {14.0 / 23.0, 16.0 / 23.0, 6.0 / 23.0, -12.0 / 23.0,
- 0.4086, -0.4230, -0.8994, 0.1456};
- double k1[] = {0.0, 0.0, 0.5, -0.5, 0.0, 0.0, 0.0, 0.0};
+ double a[] = { 14.0 / 23.0, 16.0 / 23.0, 6.0 / 23.0, -12.0 / 23.0,
+ 0.4086, -0.4230, -0.8994, 0.1456 };
+ double k1[] = { 0.0, 0.0, 0.5, -0.5, 0.0, 0.0, 0.0, 0.0 };
asW = As( Mw, Nf, ias );
asmu = As( mu, Nf, ias );
@@ -141,9 +141,9 @@
double asmu; /* the strong coupling constant at the scale mu */
int i;
- double a[] = {14.0 / 23.0, 16.0 / 23.0, 6.0 / 23.0, -12.0 / 23.0,
- 0.4086, -0.4230, -0.8994, 0.1456};
- double k2[] = {0.0, 0.0, 0.5, 0.5, 0.0, 0.0, 0.0, 0.0};
+ double a[] = { 14.0 / 23.0, 16.0 / 23.0, 6.0 / 23.0, -12.0 / 23.0,
+ 0.4086, -0.4230, -0.8994, 0.1456 };
+ double k2[] = { 0.0, 0.0, 0.5, 0.5, 0.0, 0.0, 0.0, 0.0 };
asW = As( Mw, Nf, ias );
asmu = As( mu, Nf, ias );
@@ -169,10 +169,10 @@
double asmu; /* the strong coupling constant at the scale mu */
int i;
- double a[] = {14.0 / 23.0, 16.0 / 23.0, 6.0 / 23.0, -12.0 / 23.0,
- 0.4086, -0.4230, -0.8994, 0.1456};
- double k3[] = {0.0, 0.0, -1.0 / 14.0, 1.0 / 6.0,
- 0.0510, -0.1403, -0.0113, 0.0054};
+ double a[] = { 14.0 / 23.0, 16.0 / 23.0, 6.0 / 23.0, -12.0 / 23.0,
+ 0.4086, -0.4230, -0.8994, 0.1456 };
+ double k3[] = { 0.0, 0.0, -1.0 / 14.0, 1.0 / 6.0,
+ 0.0510, -0.1403, -0.0113, 0.0054 };
asW = As( Mw, Nf, ias );
asmu = As( mu, Nf, ias );
@@ -198,10 +198,10 @@
double asmu; /* the strong coupling constant at the scale mu */
int i;
- double a[] = {14.0 / 23.0, 16.0 / 23.0, 6.0 / 23.0, -12.0 / 23.0,
- 0.4086, -0.4230, -0.8994, 0.1456};
- double k4[] = {0.0, 0.0, -1.0 / 14.0, -1.0 / 6.0,
- 0.0984, 0.1214, 0.0156, 0.0026};
+ double a[] = { 14.0 / 23.0, 16.0 / 23.0, 6.0 / 23.0, -12.0 / 23.0,
+ 0.4086, -0.4230, -0.8994, 0.1456 };
+ double k4[] = { 0.0, 0.0, -1.0 / 14.0, -1.0 / 6.0,
+ 0.0984, 0.1214, 0.0156, 0.0026 };
asW = As( Mw, Nf, ias );
asmu = As( mu, Nf, ias );
@@ -227,9 +227,9 @@
double asmu; /* the strong coupling constant at the scale mu */
int i;
- double a[] = {14.0 / 23.0, 16.0 / 23.0, 6.0 / 23.0, -12.0 / 23.0,
- 0.4086, -0.4230, -0.8994, 0.1456};
- double k5[] = {0.0, 0.0, 0.0, 0.0, -0.0397, 0.0117, -0.0025, 0.0304};
+ double a[] = { 14.0 / 23.0, 16.0 / 23.0, 6.0 / 23.0, -12.0 / 23.0,
+ 0.4086, -0.4230, -0.8994, 0.1456 };
+ double k5[] = { 0.0, 0.0, 0.0, 0.0, -0.0397, 0.0117, -0.0025, 0.0304 };
asW = As( Mw, Nf, ias );
asmu = As( mu, Nf, ias );
@@ -255,9 +255,9 @@
double asmu; /* the strong coupling constant at the scale mu */
int i;
- double a[] = {14.0 / 23.0, 16.0 / 23.0, 6.0 / 23.0, -12.0 / 23.0,
- 0.4086, -0.4230, -0.8994, 0.1456};
- double k6[] = {0.0, 0.0, 0.0, 0.0, 0.0335, 0.0239, -0.0462, -0.0112};
+ double a[] = { 14.0 / 23.0, 16.0 / 23.0, 6.0 / 23.0, -12.0 / 23.0,
+ 0.4086, -0.4230, -0.8994, 0.1456 };
+ double k6[] = { 0.0, 0.0, 0.0, 0.0, 0.0335, 0.0239, -0.0462, -0.0112 };
asW = As( Mw, Nf, ias );
asmu = As( mu, Nf, ias );
@@ -379,10 +379,10 @@
double asW, asmu;
int i;
- double a[] = {14.0 / 23.0, 16.0 / 23.0, 6.0 / 23.0, -12.0 / 23.0,
- 0.4086, -0.4230, -0.8994, 0.1456};
- double h[] = {2.2996, -1.0880, -3.0 / 7.0, -1.0 / 14.0,
- -0.6494, -0.0380, -0.0186, -0.0057};
+ double a[] = { 14.0 / 23.0, 16.0 / 23.0, 6.0 / 23.0, -12.0 / 23.0,
+ 0.4086, -0.4230, -0.8994, 0.1456 };
+ double h[] = { 2.2996, -1.0880, -3.0 / 7.0, -1.0 / 14.0,
+ -0.6494, -0.0380, -0.0186, -0.0057 };
x = pow( mt / Mw, 2.0 );
asW = As( Mw, Nf, ias );
@@ -420,9 +420,9 @@
double Pee;
int i;
- double a[] = {14.0 / 23.0, 16.0 / 23.0, 6.0 / 23.0, -12.0 / 23.0,
- 0.4086, -0.4230, -0.8994, 0.1456};
- double q[] = {0.0, 0.0, 0.0, 0.0, 0.0318, 0.0918, -0.2700, 0.0059};
+ double a[] = { 14.0 / 23.0, 16.0 / 23.0, 6.0 / 23.0, -12.0 / 23.0,
+ 0.4086, -0.4230, -0.8994, 0.1456 };
+ double q[] = { 0.0, 0.0, 0.0, 0.0, 0.0318, 0.0918, -0.2700, 0.0059 };
sum = 0.0;
i = 0;
@@ -444,12 +444,14 @@
double sum;
int i;
- double a[] = {14.0 / 23.0, 16.0 / 23.0, 6.0 / 23.0, -12.0 / 23.0,
- 0.4086, -0.4230, -0.8994, 0.1456};
- double p[] = {0.0, 0.0, -80.0 / 203.0, 8.0 / 33.0,
- 0.0433, 0.1384, 0.1648, -0.0073};
- double r[] = {0.0, 0.0, 0.8966, -0.1960, -0.2011, 0.1328, -0.0292, -0.1858};
- double s[] = {0.0, 0.0, -0.2009, -0.3579, 0.0490, -0.3616, -0.3554, 0.0072};
+ double a[] = { 14.0 / 23.0, 16.0 / 23.0, 6.0 / 23.0, -12.0 / 23.0,
+ 0.4086, -0.4230, -0.8994, 0.1456 };
+ double p[] = { 0.0, 0.0, -80.0 / 203.0, 8.0 / 33.0,
+ 0.0433, 0.1384, 0.1648, -0.0073 };
+ double r[] = { 0.0, 0.0, 0.8966, -0.1960,
+ -0.2011, 0.1328, -0.0292, -0.1858 };
+ double s[] = { 0.0, 0.0, -0.2009, -0.3579,
+ 0.0490, -0.3616, -0.3554, 0.0072 };
sum = 0.0;
i = 0;
diff --git a/src/EvtGenModels/Evtbs2llGammaFFMNT.cpp b/src/EvtGenModels/Evtbs2llGammaFFMNT.cpp
--- a/src/EvtGenModels/Evtbs2llGammaFFMNT.cpp
+++ b/src/EvtGenModels/Evtbs2llGammaFFMNT.cpp
@@ -58,11 +58,11 @@
EvtComplex unit0( 0.0, 0.0 ); // complex zero unit
// characteristics of resonances rho, omega, phi
- double M_res[] = {0.7758, 0.78259, 1.019456}; // particle masses, Gev
- double Gamma[] = {0.1503, 0.00849, 0.00426}; // particle widthes, Gev
+ double M_res[] = { 0.7758, 0.78259, 1.019456 }; // particle masses, Gev
+ double Gamma[] = { 0.1503, 0.00849, 0.00426 }; // particle widthes, Gev
- double f_lept[] = {5.04, 17.1, -13.2}; // decay constants f_i
- double g_plus[] = {0.27, -0.27, -0.38}; // and form-factors g+(0)
+ double f_lept[] = { 5.04, 17.1, -13.2 }; // decay constants f_i
+ double g_plus[] = { 0.27, -0.27, -0.38 }; // and form-factors g+(0)
g_plus[0] = g_plus[0] / sqrt( 2.0 ); // by D.Melikhov, N.Nikitin, K.Toms,
g_plus[1] = g_plus[1] / sqrt( 2.0 ); // Phys.At.Nucl. 68, p.1842 (2005)
@@ -72,8 +72,8 @@
// parametrs for form-factors Fv, Ftv, Fa, Fta
//(by D.Melikhov, N.Nikitin, K.Toms, Yad. Fiz. 62, No 11)
- double beta[] = {0.28, 0.30, 0.26, 0.33}; // beta, Gev^(-1)
- double Delta[] = {0.04, 0.04, 0.30, 0.30}; // Delta, Gev
+ double beta[] = { 0.28, 0.30, 0.26, 0.33 }; // beta, Gev^(-1)
+ double Delta[] = { 0.04, 0.04, 0.30, 0.30 }; // Delta, Gev
// form-factors
EvtComplex Ftvq0, Ftaq0, Ftv00, Fta00;
diff --git a/validation/compareRootFiles.cc b/validation/compareRootFiles.cc
--- a/validation/compareRootFiles.cc
+++ b/validation/compareRootFiles.cc
@@ -124,10 +124,10 @@
gPad->SetLogy();
// Different colours for the particle groups
- int colours[6] = {1, 2, 4, 6, 8, 28};
+ int colours[6] = { 1, 2, 4, 6, 8, 28 };
string histLabels[6] = {
"Leptons,#gamma", "Pions", "Kaons", "D+,D-,D0",
- "Light/strange baryons", "Other"};
+ "Light/strange baryons", "Other" };
TLegend* theLegend = new TLegend( 0.7, 0.7, 0.9, 0.9 );
theLegend->SetFillColor( kWhite );
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Sep 29, 5:51 PM (18 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
6570758
Default Alt Text
D90.1759164699.diff (73 KB)
Attached To
Mode
D90: clang-format applied
Attached
Detach File
Event Timeline
Log In to Comment