Page MenuHomeHEPForge

D99.1759115655.diff
No OneTemporary

Size
62 KB
Referenced Files
None
Subscribers
None

D99.1759115655.diff

diff --git a/EvtGenBase/EvtParticle.hh b/EvtGenBase/EvtParticle.hh
--- a/EvtGenBase/EvtParticle.hh
+++ b/EvtGenBase/EvtParticle.hh
@@ -426,7 +426,7 @@
}
// Retrieve the integer value for the given attribute name
- int getAttribute( std::string attName );
+ int getAttribute( std::string attName ) const;
// Specify if the particle has a double attribute value, e.g. amplitude weight.
// By default, nothing is set, but derived classes can set this to mean something specific
@@ -436,7 +436,7 @@
}
// Retrieve the double value for the given attribute name
- double getAttributeDouble( std::string attName );
+ double getAttributeDouble( std::string attName ) const;
protected:
void setp( double e, double px, double py, double pz )
diff --git a/src/EvtGenBase/EvtParticle.cpp b/src/EvtGenBase/EvtParticle.cpp
--- a/src/EvtGenBase/EvtParticle.cpp
+++ b/src/EvtGenBase/EvtParticle.cpp
@@ -1281,14 +1281,14 @@
return theName;
}
-int EvtParticle::getAttribute( std::string attName )
+int EvtParticle::getAttribute( std::string attName ) const
{
// Retrieve the attribute integer if the name exists.
// Otherwise, simply return 0
int attValue = 0;
- EvtAttIntMap::iterator mapIter;
+ EvtAttIntMap::const_iterator mapIter;
if ( ( mapIter = _intAttributes.find( attName ) ) != _intAttributes.end() ) {
attValue = mapIter->second;
@@ -1297,14 +1297,14 @@
return attValue;
}
-double EvtParticle::getAttributeDouble( std::string attName )
+double EvtParticle::getAttributeDouble( std::string attName ) const
{
// Retrieve the attribute double if the name exists.
// Otherwise, simply return 0.0
double attValue = 0.0;
- EvtAttDblMap::iterator mapIter;
+ EvtAttDblMap::const_iterator mapIter;
if ( ( mapIter = _dblAttributes.find( attName ) ) != _dblAttributes.end() ) {
attValue = mapIter->second;
diff --git a/test/checkJsonFiles.py b/test/checkJsonFiles.py
--- a/test/checkJsonFiles.py
+++ b/test/checkJsonFiles.py
@@ -111,6 +111,7 @@
'nlo',
'pWave',
'sWave',
+ 'yesPhotos'
]
def __init__( self, jsonFileName ) :
diff --git a/test/jsonFiles/BC_BSSTAR_NPI__Bc_Bs0starpipipi.json b/test/jsonFiles/BC_BSSTAR_NPI__Bc_Bs0starpipipi.json
--- a/test/jsonFiles/BC_BSSTAR_NPI__Bc_Bs0starpipipi.json
+++ b/test/jsonFiles/BC_BSSTAR_NPI__Bc_Bs0starpipipi.json
@@ -4,7 +4,7 @@
"models" : ["BC_BSSTAR_NPI", "", "", "", ""],
"parameters" : [[], [], [], [], []],
"do_conjugate_decay" : [true, false, false, false, false],
- "extras" : ["Define dm_incohMix_B_s0 0"],
+ "extras" : ["Define dm_incohMix_B_s0 0", "noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(BC_BSSTAR_NPI)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/BC_BS_NPI__Bc_Bs0pipipi.json b/test/jsonFiles/BC_BS_NPI__Bc_Bs0pipipi.json
--- a/test/jsonFiles/BC_BS_NPI__Bc_Bs0pipipi.json
+++ b/test/jsonFiles/BC_BS_NPI__Bc_Bs0pipipi.json
@@ -4,7 +4,7 @@
"models" : ["BC_BS_NPI", "", "", "", ""],
"parameters" : [[], [], [], [], []],
"do_conjugate_decay" : [true, false, false, false, false],
- "extras" : ["Define dm_incohMix_B_s0 0"],
+ "extras" : ["Define dm_incohMix_B_s0 0", "noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(BC_BS_NPI)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/BC_PSI_NPI=VLL__Bc_Jpsipipipi_ee.json b/test/jsonFiles/BC_PSI_NPI=VLL__Bc_Jpsipipipi_ee.json
--- a/test/jsonFiles/BC_PSI_NPI=VLL__Bc_Jpsipipipi_ee.json
+++ b/test/jsonFiles/BC_PSI_NPI=VLL__Bc_Jpsipipipi_ee.json
@@ -5,7 +5,7 @@
"models" : ["BC_PSI_NPI", "VLL", "", "", ""],
"parameters" : [[], [], [], [], []],
"do_conjugate_decay" : [true, false, false, false, false],
- "extras" : ["Define dm_incohMix_B_s0 0"],
+ "extras" : ["Define dm_incohMix_B_s0 0", "noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(BC_PSI_NPI)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/BHADRONIC__Bd_D0pi0.json b/test/jsonFiles/BHADRONIC__Bd_D0pi0.json
--- a/test/jsonFiles/BHADRONIC__Bd_D0pi0.json
+++ b/test/jsonFiles/BHADRONIC__Bd_D0pi0.json
@@ -4,6 +4,7 @@
"models" : ["BHADRONIC", "", ""],
"parameters" : [["1", "1"], [], []],
"do_conjugate_decay" : [ true, false, false ],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/BHADRONIC__Bd_D0rho0.json b/test/jsonFiles/BHADRONIC__Bd_D0rho0.json
--- a/test/jsonFiles/BHADRONIC__Bd_D0rho0.json
+++ b/test/jsonFiles/BHADRONIC__Bd_D0rho0.json
@@ -4,6 +4,7 @@
"models" : ["BHADRONIC", "", ""],
"parameters" : [["1", "2"], [], []],
"do_conjugate_decay" : [ true, false, false ],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/BHADRONIC__Bd_D2star0pi0.json b/test/jsonFiles/BHADRONIC__Bd_D2star0pi0.json
--- a/test/jsonFiles/BHADRONIC__Bd_D2star0pi0.json
+++ b/test/jsonFiles/BHADRONIC__Bd_D2star0pi0.json
@@ -4,6 +4,7 @@
"models" : ["BHADRONIC", "", ""],
"parameters" : [["4", "1"], [], []],
"do_conjugate_decay" : [ true, false, false ],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/BHADRONIC__Bd_D2star0rho0.json b/test/jsonFiles/BHADRONIC__Bd_D2star0rho0.json
--- a/test/jsonFiles/BHADRONIC__Bd_D2star0rho0.json
+++ b/test/jsonFiles/BHADRONIC__Bd_D2star0rho0.json
@@ -4,6 +4,7 @@
"models" : ["BHADRONIC", "", ""],
"parameters" : [["4", "2"], [], []],
"do_conjugate_decay" : [ true, false, false ],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/BHADRONIC__Bd_Dstar0pi0.json b/test/jsonFiles/BHADRONIC__Bd_Dstar0pi0.json
--- a/test/jsonFiles/BHADRONIC__Bd_Dstar0pi0.json
+++ b/test/jsonFiles/BHADRONIC__Bd_Dstar0pi0.json
@@ -4,6 +4,7 @@
"models" : ["BHADRONIC", "", ""],
"parameters" : [["2", "1"], [], []],
"do_conjugate_decay" : [ true, false, false ],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/BHADRONIC__Bd_Dstar0rho0.json b/test/jsonFiles/BHADRONIC__Bd_Dstar0rho0.json
--- a/test/jsonFiles/BHADRONIC__Bd_Dstar0rho0.json
+++ b/test/jsonFiles/BHADRONIC__Bd_Dstar0rho0.json
@@ -4,6 +4,7 @@
"models" : ["BHADRONIC", "", ""],
"parameters" : [["2", "2"], [], []],
"do_conjugate_decay" : [ true, false, false ],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/BSQUARK__Bu_Dst0enue.json b/test/jsonFiles/BSQUARK__Bu_Dst0enue.json
--- a/test/jsonFiles/BSQUARK__Bu_Dst0enue.json
+++ b/test/jsonFiles/BSQUARK__Bu_Dst0enue.json
@@ -4,6 +4,7 @@
"models" : ["BSQUARK", "", ""],
"parameters" : [["1.14", "2.0", "1000.0", "100.0", "100.0"], [], []],
"do_conjugate_decay" : [ true, false, false ],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/BTODDALITZCPK=D0GAMMADALITZ__Bu_D0K_KsKK.json b/test/jsonFiles/BTODDALITZCPK=D0GAMMADALITZ__Bu_D0K_KsKK.json
--- a/test/jsonFiles/BTODDALITZCPK=D0GAMMADALITZ__Bu_D0K_KsKK.json
+++ b/test/jsonFiles/BTODDALITZCPK=D0GAMMADALITZ__Bu_D0K_KsKK.json
@@ -4,6 +4,7 @@
"grand_daughters" : [["K_S0", "K+", "K-"], []],
"models" : ["BTODDALITZCPK", "D0GAMMADALITZ", ""],
"parameters" : [["1.15", "2.27", "0.10"], [], []],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob_daug1", "title" : "Prob(D0GAMMADALITZ)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/BTOKD3P=PTO3P=PTO3P__Bu_KD0D0bar_K0spipi,K0spipi.json b/test/jsonFiles/BTOKD3P=PTO3P=PTO3P__Bu_KD0D0bar_K0spipi,K0spipi.json
--- a/test/jsonFiles/BTOKD3P=PTO3P=PTO3P__Bu_KD0D0bar_K0spipi,K0spipi.json
+++ b/test/jsonFiles/BTOKD3P=PTO3P=PTO3P__Bu_KD0D0bar_K0spipi,K0spipi.json
@@ -23,6 +23,7 @@
"AMPLITUDE RESONANCE BC omega ANGULAR AB TYPE RBW_ZEMACH COEFFICIENT POLAR_DEG 0.053 126.5",
"AMPLITUDE RESONANCE BC f_2 ANGULAR AB TYPE RBW_ZEMACH COEFFICIENT POLAR_DEG 0.61 157.4",
"AMPLITUDE PHASESPACE COEFFICIENT POLAR_DEG 0.3 0.0"]],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(BTOKD3P)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/BTOPLNUBK__Bu_pi0enu.json b/test/jsonFiles/BTOPLNUBK__Bu_pi0enu.json
--- a/test/jsonFiles/BTOPLNUBK__Bu_pi0enu.json
+++ b/test/jsonFiles/BTOPLNUBK__Bu_pi0enu.json
@@ -3,6 +3,7 @@
"daughters" : ["pi0", "e+", "nu_e"],
"models" : ["BTOPLNUBK"],
"parameters" : [["0.54", "1.4"]],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/BTOXSGAMMA__Bd_Xsdgamma.json b/test/jsonFiles/BTOXSGAMMA__Bd_Xsdgamma.json
--- a/test/jsonFiles/BTOXSGAMMA__Bd_Xsdgamma.json
+++ b/test/jsonFiles/BTOXSGAMMA__Bd_Xsdgamma.json
@@ -4,6 +4,7 @@
"models" : ["BTOXSGAMMA", "", ""],
"parameters" : [["1"], [], []],
"do_conjugate_decay" : [ true, false, false ],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/BToDiBaryonlnupQCD__Bu_Deltappbarmunu.json b/test/jsonFiles/BToDiBaryonlnupQCD__Bu_Deltappbarmunu.json
--- a/test/jsonFiles/BToDiBaryonlnupQCD__Bu_Deltappbarmunu.json
+++ b/test/jsonFiles/BToDiBaryonlnupQCD__Bu_Deltappbarmunu.json
@@ -3,6 +3,7 @@
"daughters" : ["Delta+", "anti-p-", "mu-", "anti-nu_mu"],
"models" : ["BToDiBaryonlnupQCD"],
"parameters" : [["67.7", "-280.0", "-187.3", "-840.1", "-10.1", "-157.0", "7.0e6"]],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/BToDiBaryonlnupQCD__Bu_ppmunu.json b/test/jsonFiles/BToDiBaryonlnupQCD__Bu_ppmunu.json
--- a/test/jsonFiles/BToDiBaryonlnupQCD__Bu_ppmunu.json
+++ b/test/jsonFiles/BToDiBaryonlnupQCD__Bu_ppmunu.json
@@ -3,6 +3,7 @@
"daughters" : ["p+", "anti-p-", "mu-", "anti-nu_mu"],
"models" : ["BToDiBaryonlnupQCD"],
"parameters" : [["67.7", "-280.0", "-187.3", "-840.1", "-10.1", "-157.0", "3.0e6"]],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/BaryonPCR=PHSP__Lambdab0_Lambdacmunu_Lambda0pi.json b/test/jsonFiles/BaryonPCR=PHSP__Lambdab0_Lambdacmunu_Lambda0pi.json
--- a/test/jsonFiles/BaryonPCR=PHSP__Lambdab0_Lambdacmunu_Lambda0pi.json
+++ b/test/jsonFiles/BaryonPCR=PHSP__Lambdab0_Lambdacmunu_Lambda0pi.json
@@ -4,6 +4,7 @@
"grand_daughters" : [["Lambda0", "pi+"], [], []],
"models" : ["BaryonPCR", "PHSP", ""],
"parameters" : [["1", "1", "1", "1"], [], []],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(BaryonPCR)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/CB3PI-MPP__Bu_pipipi.json b/test/jsonFiles/CB3PI-MPP__Bu_pipipi.json
--- a/test/jsonFiles/CB3PI-MPP__Bu_pipipi.json
+++ b/test/jsonFiles/CB3PI-MPP__Bu_pipipi.json
@@ -3,6 +3,7 @@
"daughters" : ["pi+","pi+","pi-"],
"models" : ["CB3PI-MPP"],
"parameters" : [["1.5"]],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/CB3PI-P00__Bu_pipi0pi0.json b/test/jsonFiles/CB3PI-P00__Bu_pipi0pi0.json
--- a/test/jsonFiles/CB3PI-P00__Bu_pipi0pi0.json
+++ b/test/jsonFiles/CB3PI-P00__Bu_pipi0pi0.json
@@ -3,6 +3,7 @@
"daughters" : ["pi+","pi0","pi0"],
"models" : ["CB3PI-P00"],
"parameters" : [["1.5"]],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/D0MIXDALITZ__D0_KsKK.json b/test/jsonFiles/D0MIXDALITZ__D0_KsKK.json
--- a/test/jsonFiles/D0MIXDALITZ__D0_KsKK.json
+++ b/test/jsonFiles/D0MIXDALITZ__D0_KsKK.json
@@ -3,6 +3,7 @@
"daughters" : ["K_S0", "K+", "K-"],
"models" : ["D0MIXDALITZ"],
"parameters" : [["0.01", "0.01", "1.0", "0.0"]],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/D_DALITZ__D+_K+pipi.json b/test/jsonFiles/D_DALITZ__D+_K+pipi.json
--- a/test/jsonFiles/D_DALITZ__D+_K+pipi.json
+++ b/test/jsonFiles/D_DALITZ__D+_K+pipi.json
@@ -4,6 +4,7 @@
"models" : ["D_DALITZ"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/D_DALITZ__D+_K0pipi0.json b/test/jsonFiles/D_DALITZ__D+_K0pipi0.json
--- a/test/jsonFiles/D_DALITZ__D+_K0pipi0.json
+++ b/test/jsonFiles/D_DALITZ__D+_K0pipi0.json
@@ -4,6 +4,7 @@
"models" : ["D_DALITZ"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/D_DALITZ__D+_KKpi+.json b/test/jsonFiles/D_DALITZ__D+_KKpi+.json
--- a/test/jsonFiles/D_DALITZ__D+_KKpi+.json
+++ b/test/jsonFiles/D_DALITZ__D+_KKpi+.json
@@ -4,6 +4,7 @@
"models" : ["D_DALITZ"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/D_DALITZ__D+_Kpipi+.json b/test/jsonFiles/D_DALITZ__D+_Kpipi+.json
--- a/test/jsonFiles/D_DALITZ__D+_Kpipi+.json
+++ b/test/jsonFiles/D_DALITZ__D+_Kpipi+.json
@@ -4,6 +4,7 @@
"models" : ["D_DALITZ"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/D_DALITZ__D+_pipipi+.json b/test/jsonFiles/D_DALITZ__D+_pipipi+.json
--- a/test/jsonFiles/D_DALITZ__D+_pipipi+.json
+++ b/test/jsonFiles/D_DALITZ__D+_pipipi+.json
@@ -4,6 +4,7 @@
"models" : ["D_DALITZ"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/D_DALITZ__D0_KKKS0.json b/test/jsonFiles/D_DALITZ__D0_KKKS0.json
--- a/test/jsonFiles/D_DALITZ__D0_KKKS0.json
+++ b/test/jsonFiles/D_DALITZ__D0_KKKS0.json
@@ -4,6 +4,7 @@
"models" : ["D_DALITZ"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/D_DALITZ__D0_KKanti-K0.json b/test/jsonFiles/D_DALITZ__D0_KKanti-K0.json
--- a/test/jsonFiles/D_DALITZ__D0_KKanti-K0.json
+++ b/test/jsonFiles/D_DALITZ__D0_KKanti-K0.json
@@ -4,6 +4,7 @@
"models" : ["D_DALITZ"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/D_DALITZ__D0_Kpipi0.json b/test/jsonFiles/D_DALITZ__D0_Kpipi0.json
--- a/test/jsonFiles/D_DALITZ__D0_Kpipi0.json
+++ b/test/jsonFiles/D_DALITZ__D0_Kpipi0.json
@@ -4,6 +4,7 @@
"models" : ["D_DALITZ"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/D_DALITZ__D0_anti-K0pipi.json b/test/jsonFiles/D_DALITZ__D0_anti-K0pipi.json
--- a/test/jsonFiles/D_DALITZ__D0_anti-K0pipi.json
+++ b/test/jsonFiles/D_DALITZ__D0_anti-K0pipi.json
@@ -4,6 +4,7 @@
"models" : ["D_DALITZ"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/D_DALITZ__D0_pipiKS0.json b/test/jsonFiles/D_DALITZ__D0_pipiKS0.json
--- a/test/jsonFiles/D_DALITZ__D0_pipiKS0.json
+++ b/test/jsonFiles/D_DALITZ__D0_pipiKS0.json
@@ -4,6 +4,7 @@
"models" : ["D_DALITZ"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/D_DALITZ__D0_pipipi0.json b/test/jsonFiles/D_DALITZ__D0_pipipi0.json
--- a/test/jsonFiles/D_DALITZ__D0_pipipi0.json
+++ b/test/jsonFiles/D_DALITZ__D0_pipipi0.json
@@ -4,6 +4,7 @@
"models" : ["D_DALITZ"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/D_DALITZ__Ds+_KKpi.json b/test/jsonFiles/D_DALITZ__Ds+_KKpi.json
--- a/test/jsonFiles/D_DALITZ__Ds+_KKpi.json
+++ b/test/jsonFiles/D_DALITZ__Ds+_KKpi.json
@@ -4,6 +4,7 @@
"models" : ["D_DALITZ"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/D_DALITZ__Ds+_pipipi.json b/test/jsonFiles/D_DALITZ__Ds+_pipipi.json
--- a/test/jsonFiles/D_DALITZ__Ds+_pipipi.json
+++ b/test/jsonFiles/D_DALITZ__Ds+_pipipi.json
@@ -4,6 +4,7 @@
"models" : ["D_DALITZ"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/D_MULTIBODY__D0_K0sKK.json b/test/jsonFiles/D_MULTIBODY__D0_K0sKK.json
--- a/test/jsonFiles/D_MULTIBODY__D0_K0sKK.json
+++ b/test/jsonFiles/D_MULTIBODY__D0_K0sKK.json
@@ -6,6 +6,7 @@
"RESONANCE", "a_0+(BREITWIGNER,HELAMP,[0.460,3.59],[K_S0,K+])",
"RESONANCE", "f'_0(BREITWIGNER,HELAMP,[0.435,-2.65],[K+,K-])"]],
"do_conjugate_decay" : [false],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/ETA_DALITZ__eta_pipipi0.json b/test/jsonFiles/ETA_DALITZ__eta_pipipi0.json
--- a/test/jsonFiles/ETA_DALITZ__eta_pipipi0.json
+++ b/test/jsonFiles/ETA_DALITZ__eta_pipipi0.json
@@ -3,6 +3,7 @@
"daughters" : ["pi+", "pi-", "pi0"],
"models" : ["ETA_DALITZ"],
"parameters" : [[]],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/ETA_LLPIPI__etap_eepipi.json b/test/jsonFiles/ETA_LLPIPI__etap_eepipi.json
--- a/test/jsonFiles/ETA_LLPIPI__etap_eepipi.json
+++ b/test/jsonFiles/ETA_LLPIPI__etap_eepipi.json
@@ -3,6 +3,7 @@
"daughters" : ["e+", "e-", "pi+", "pi-"],
"models" : ["ETA_LLPIPI"],
"parameters" : [[]],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/ETA_LLPIPI__etap_mumupipi.json b/test/jsonFiles/ETA_LLPIPI__etap_mumupipi.json
--- a/test/jsonFiles/ETA_LLPIPI__etap_mumupipi.json
+++ b/test/jsonFiles/ETA_LLPIPI__etap_mumupipi.json
@@ -3,6 +3,7 @@
"daughters" : ["mu+", "mu-", "pi+", "pi-"],
"models" : ["ETA_LLPIPI"],
"parameters" : [[]],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/EvtBcToNPi=VLL__Bc_Jpsipipipi_ee.json b/test/jsonFiles/EvtBcToNPi=VLL__Bc_Jpsipipipi_ee.json
--- a/test/jsonFiles/EvtBcToNPi=VLL__Bc_Jpsipipipi_ee.json
+++ b/test/jsonFiles/EvtBcToNPi=VLL__Bc_Jpsipipipi_ee.json
@@ -5,7 +5,7 @@
"models" : ["EvtBcToNPi", "VLL", "", "", ""],
"parameters" : [["0.9e5", "5.9", "0.049", "0.0015", "0.0", "0.0", "0.0", "-0.074", "0.049", "0.0015"], [], [], [], []],
"do_conjugate_decay" : [true, false, false, false, false],
- "extras" : ["Define dm_incohMix_B_s0 0"],
+ "extras" : ["Define dm_incohMix_B_s0 0", "noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(EvtBcToNPi)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/FOURBODYPHSP__Bu_mumuKrho0.json b/test/jsonFiles/FOURBODYPHSP__Bu_mumuKrho0.json
--- a/test/jsonFiles/FOURBODYPHSP__Bu_mumuKrho0.json
+++ b/test/jsonFiles/FOURBODYPHSP__Bu_mumuKrho0.json
@@ -4,6 +4,7 @@
"do_conjugate_decay" : [true,false,false,true,false],
"models" : ["FOURBODYPHSP"],
"parameters" : [["1.0", "2.0", "1.0", "2.0"]],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "parMass", "title" : "M(B+)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 5.0, "xmax" : 5.5},
diff --git a/test/jsonFiles/GENERIC_DALITZ__D0_KsKK.json b/test/jsonFiles/GENERIC_DALITZ__D0_KsKK.json
--- a/test/jsonFiles/GENERIC_DALITZ__D0_KsKK.json
+++ b/test/jsonFiles/GENERIC_DALITZ__D0_KsKK.json
@@ -3,6 +3,7 @@
"daughters" : ["K_S0", "K+", "K-"],
"models" : ["GENERIC_DALITZ"],
"parameters" : [["../validation/DalitzFiles/DalitzDecays.xml"]],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/HELAMP=HELAMP=VSS__Bu_psi2SKstar_Jpsigamma,K0pi.json b/test/jsonFiles/HELAMP=HELAMP=VSS__Bu_psi2SKstar_Jpsigamma,K0pi.json
--- a/test/jsonFiles/HELAMP=HELAMP=VSS__Bu_psi2SKstar_Jpsigamma,K0pi.json
+++ b/test/jsonFiles/HELAMP=HELAMP=VSS__Bu_psi2SKstar_Jpsigamma,K0pi.json
@@ -5,6 +5,7 @@
"models" : ["HELAMP", "HELAMP", "VSS"],
"parameters" : [["0.0", "0.0", "0.0", "0.0", "1.0", "0.0"], ["1.0", "0.0", "1.0", "0.0", "0.0", "0.0", "0.0", "0.0"], []],
"do_conjugate_decay" : [true, true, true],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(HELAMP,B)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/KSTARNUNU__Bd_Kstar0nunu.json b/test/jsonFiles/KSTARNUNU__Bd_Kstar0nunu.json
--- a/test/jsonFiles/KSTARNUNU__Bd_Kstar0nunu.json
+++ b/test/jsonFiles/KSTARNUNU__Bd_Kstar0nunu.json
@@ -3,7 +3,7 @@
"daughters" : ["K*0","nu_e","anti-nu_e"],
"models" : ["KSTARNUNU"],
"parameters" : [[]],
- "extras" : ["Define dm_incohMix_B0 0.0"],
+ "extras" : ["Define dm_incohMix_B0 0.0", "noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/KSTARSTARGAMMA__Bd_Kpigamma.json b/test/jsonFiles/KSTARSTARGAMMA__Bd_Kpigamma.json
--- a/test/jsonFiles/KSTARSTARGAMMA__Bd_Kpigamma.json
+++ b/test/jsonFiles/KSTARSTARGAMMA__Bd_Kpigamma.json
@@ -3,7 +3,7 @@
"daughters" : ["K+", "pi-", "gamma"],
"models" : ["KSTARSTARGAMMA"],
"parameters" : [[]],
- "extras" : ["Define dm_incohMix_B0 0.0"],
+ "extras" : ["Define dm_incohMix_B0 0.0", "noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "mass", "title" : "m(K,pi)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.5, "xmax" : 2.5},
diff --git a/test/jsonFiles/KS_PI0MUMU__Ks_pi0mumu.json b/test/jsonFiles/KS_PI0MUMU__Ks_pi0mumu.json
--- a/test/jsonFiles/KS_PI0MUMU__Ks_pi0mumu.json
+++ b/test/jsonFiles/KS_PI0MUMU__Ks_pi0mumu.json
@@ -3,6 +3,7 @@
"daughters" : ["pi0", "mu+", "mu-"],
"models" : ["KS_PI0MUMU"],
"parameters" : [["1.2", "0.49", "-3.9", "0.2", "2.5"]],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.02},
diff --git a/test/jsonFiles/LNUGAMMA__Bu_enugamma.json b/test/jsonFiles/LNUGAMMA__Bu_enugamma.json
--- a/test/jsonFiles/LNUGAMMA__Bu_enugamma.json
+++ b/test/jsonFiles/LNUGAMMA__Bu_enugamma.json
@@ -3,6 +3,7 @@
"daughters" : ["e+", "nu_e", "gamma"],
"models" : ["LNUGAMMA"],
"parameters" : [["0.35", "3.0", "5.0", "0.0"]],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/OMEGA_DALITZ__omega_pipipi0.json b/test/jsonFiles/OMEGA_DALITZ__omega_pipipi0.json
--- a/test/jsonFiles/OMEGA_DALITZ__omega_pipipi0.json
+++ b/test/jsonFiles/OMEGA_DALITZ__omega_pipipi0.json
@@ -3,6 +3,7 @@
"daughters" : ["pi+", "pi-", "pi0"],
"models" : ["OMEGA_DALITZ"],
"parameters" : [[]],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/PARTWAVE=VSS=VSS__Bd_DstarDstar_D0pi,D0pi.json b/test/jsonFiles/PARTWAVE=VSS=VSS__Bd_DstarDstar_D0pi,D0pi.json
--- a/test/jsonFiles/PARTWAVE=VSS=VSS__Bd_DstarDstar_D0pi,D0pi.json
+++ b/test/jsonFiles/PARTWAVE=VSS=VSS__Bd_DstarDstar_D0pi,D0pi.json
@@ -4,7 +4,7 @@
"grand_daughters" : [["D0", "pi+"], ["anti-D0", "pi-"]],
"models" : ["PARTWAVE", "VSS", "VSS"],
"parameters" : [["1.0", "0.0", "0.0", "0.0", "0.0", "0.0"], [], []],
- "extras" : ["Define dm_incohMix_B0 0"],
+ "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(PARTWAVE,B)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/PHI_DALITZ__phi_pipipi0.json b/test/jsonFiles/PHI_DALITZ__phi_pipipi0.json
--- a/test/jsonFiles/PHI_DALITZ__phi_pipipi0.json
+++ b/test/jsonFiles/PHI_DALITZ__phi_pipipi0.json
@@ -3,6 +3,7 @@
"daughters" : ["pi+", "pi-", "pi0"],
"models" : ["PHI_DALITZ"],
"parameters" : [[]],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/PHSPDECAYTIMECUT__Bu_JpsiK+.json b/test/jsonFiles/PHSPDECAYTIMECUT__Bu_JpsiK+.json
--- a/test/jsonFiles/PHSPDECAYTIMECUT__Bu_JpsiK+.json
+++ b/test/jsonFiles/PHSPDECAYTIMECUT__Bu_JpsiK+.json
@@ -4,6 +4,7 @@
"do_conjugate_decay" : [ true, false, true ],
"models" : ["PHSPDECAYTIMECUT"],
"parameters" : [["0.4"]],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "lifetime", "title" : "tau", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 10.0}
diff --git a/test/jsonFiles/PHSPFLATLIFETIME__Bu_JpsiKpi0.json b/test/jsonFiles/PHSPFLATLIFETIME__Bu_JpsiKpi0.json
--- a/test/jsonFiles/PHSPFLATLIFETIME__Bu_JpsiKpi0.json
+++ b/test/jsonFiles/PHSPFLATLIFETIME__Bu_JpsiKpi0.json
@@ -4,6 +4,7 @@
"do_conjugate_decay" : [ true, false, true, false ],
"models" : ["PHSPFLATLIFETIME"],
"parameters" : [["5.0"]],
+ "extras" : ["noPhotos"],
"events" : 20000,
"histograms" : [
{"variable" : "lifetime", "title" : "tau", "d1" : 0, "d2" : 0, "nbins" : 110, "xmin" : 0.0, "xmax" : 5.5},
diff --git a/test/jsonFiles/PI0_DALITZ__pi0_eegamma.json b/test/jsonFiles/PI0_DALITZ__pi0_eegamma.json
--- a/test/jsonFiles/PI0_DALITZ__pi0_eegamma.json
+++ b/test/jsonFiles/PI0_DALITZ__pi0_eegamma.json
@@ -3,6 +3,7 @@
"daughters" : ["e+", "e-", "gamma"],
"models" : ["PI0_DALITZ"],
"parameters" : [[], [], []],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/PSI2JPSIPIPI__X3872_Jpsipipi_nlo.json b/test/jsonFiles/PSI2JPSIPIPI__X3872_Jpsipipi_nlo.json
--- a/test/jsonFiles/PSI2JPSIPIPI__X3872_Jpsipipi_nlo.json
+++ b/test/jsonFiles/PSI2JPSIPIPI__X3872_Jpsipipi_nlo.json
@@ -3,6 +3,7 @@
"daughters" : ["J/psi", "pi+", "pi-"],
"models" : ["PSI2JPSIPIPI"],
"parameters" : [["0.78539816"]],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/PSI2JPSIPIPI__X3872_Jpsipipi_tree.json b/test/jsonFiles/PSI2JPSIPIPI__X3872_Jpsipipi_tree.json
--- a/test/jsonFiles/PSI2JPSIPIPI__X3872_Jpsipipi_tree.json
+++ b/test/jsonFiles/PSI2JPSIPIPI__X3872_Jpsipipi_tree.json
@@ -3,6 +3,7 @@
"daughters" : ["J/psi", "pi+", "pi-"],
"models" : ["PSI2JPSIPIPI"],
"parameters" : [[]],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/PTO3P__D0_K0sKK.json b/test/jsonFiles/PTO3P__D0_K0sKK.json
--- a/test/jsonFiles/PTO3P__D0_K0sKK.json
+++ b/test/jsonFiles/PTO3P__D0_K0sKK.json
@@ -7,6 +7,7 @@
"AMPLITUDE RESONANCE BC phi ANGULAR AC TYPE RBW_ZEMACH COEFFICIENT POLAR_RAD 0.437 1.91",
"AMPLITUDE RESONANCE AB a_0+ ANGULAR CA TYPE NBW COEFFICIENT POLAR_RAD 0.460 3.59",
"AMPLITUDE RESONANCE BC f'_0 ANGULAR AC TYPE RBW_ZEMACH COEFFICIENT POLAR_RAD 0.435 -2.65"]],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/PVV_CPLH=VLL=VSS__B0s_Jpsiphi_ee,KK.json b/test/jsonFiles/PVV_CPLH=VLL=VSS__B0s_Jpsiphi_ee,KK.json
--- a/test/jsonFiles/PVV_CPLH=VLL=VSS__B0s_Jpsiphi_ee,KK.json
+++ b/test/jsonFiles/PVV_CPLH=VLL=VSS__B0s_Jpsiphi_ee,KK.json
@@ -5,7 +5,7 @@
"models" : ["PVV_CPLH", "VLL", "VSS"],
"parameters" : [["-0.035", "1", "0.480", "3.30", "0.722", "0.0", "0.499", "3.07"], [], []],
"do_conjugate_decay" : [true, false, false],
- "extras" : ["Define dm_incohMix_B_s0 0"],
+ "extras" : ["Define dm_incohMix_B_s0 0", "noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(PVV_CPLH)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/SSD_DirectCP=TSS__Bu_f2pi+_pi+pi-.json b/test/jsonFiles/SSD_DirectCP=TSS__Bu_f2pi+_pi+pi-.json
--- a/test/jsonFiles/SSD_DirectCP=TSS__Bu_f2pi+_pi+pi-.json
+++ b/test/jsonFiles/SSD_DirectCP=TSS__Bu_f2pi+_pi+pi-.json
@@ -5,6 +5,7 @@
"models" : ["SSD_DirectCP", "TSS", ""],
"parameters" : [["0.40"], [], []],
"do_conjugate_decay" : [ true, false, false ],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "id", "title" : "StdHep ID", "d1" : 0, "d2" : 0, "nbins" : 2, "xmin" : -600.0, "xmax" : 600.0},
diff --git a/test/jsonFiles/SSD_DirectCP=VSS__Bu_Kst0pi+_K+pi-.json b/test/jsonFiles/SSD_DirectCP=VSS__Bu_Kst0pi+_K+pi-.json
--- a/test/jsonFiles/SSD_DirectCP=VSS__Bu_Kst0pi+_K+pi-.json
+++ b/test/jsonFiles/SSD_DirectCP=VSS__Bu_Kst0pi+_K+pi-.json
@@ -5,6 +5,7 @@
"models" : ["SSD_DirectCP", "VSS", ""],
"parameters" : [["0.032"], [], []],
"do_conjugate_decay" : [ true, true, false ],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "id", "title" : "StdHep ID", "d1" : 0, "d2" : 0, "nbins" : 2, "xmin" : -600.0, "xmax" : 600.0},
diff --git a/test/jsonFiles/SSD_DirectCP__Bd_K+pi-.json b/test/jsonFiles/SSD_DirectCP__Bd_K+pi-.json
--- a/test/jsonFiles/SSD_DirectCP__Bd_K+pi-.json
+++ b/test/jsonFiles/SSD_DirectCP__Bd_K+pi-.json
@@ -4,6 +4,7 @@
"models" : ["SSD_DirectCP"],
"parameters" : [["-0.083"]],
"do_conjugate_decay" : [ true ],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "id", "title" : "StdHep ID", "d1" : 0, "d2" : 0, "nbins" : 2, "xmin" : -600.0, "xmax" : 600.0},
diff --git a/test/jsonFiles/SVV_CPLH=VLL=VSS__Bs0_Jpsiphi_ee,KK.json b/test/jsonFiles/SVV_CPLH=VLL=VSS__Bs0_Jpsiphi_ee,KK.json
--- a/test/jsonFiles/SVV_CPLH=VLL=VSS__Bs0_Jpsiphi_ee,KK.json
+++ b/test/jsonFiles/SVV_CPLH=VLL=VSS__Bs0_Jpsiphi_ee,KK.json
@@ -5,7 +5,7 @@
"models" : ["SVV_CPLH", "VLL", "VSS"],
"parameters" : [["0.2", "2.0e12", "1.0", "1.0", "0.0", "1.0", "0.0", "1.0", "0.0"], [], []],
"do_conjugate_decay" : [true, false, false],
- "extras" : ["Define dm_incohMix_B_s0 0"],
+ "extras" : ["Define dm_incohMix_B_s0 0", "noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(SVV_CPLH)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/THREEBODYPHSP=VLL=PHSP__Bu_JpsiKpi0_mumu,gammagamma.json b/test/jsonFiles/THREEBODYPHSP=VLL=PHSP__Bu_JpsiKpi0_mumu,gammagamma.json
--- a/test/jsonFiles/THREEBODYPHSP=VLL=PHSP__Bu_JpsiKpi0_mumu,gammagamma.json
+++ b/test/jsonFiles/THREEBODYPHSP=VLL=PHSP__Bu_JpsiKpi0_mumu,gammagamma.json
@@ -5,6 +5,7 @@
"models" : ["THREEBODYPHSP", "VLL", "", "PHSP"],
"parameters" : [["15.0", "22.0", "1.5", "4.5"], [], [], []],
"do_conjugate_decay" : [true, false, false, false],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "px", "title" : "px(J/psi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
diff --git a/test/jsonFiles/VECTORISR=VSS__Upsilon4S_psi4160gamma_DD.json b/test/jsonFiles/VECTORISR=VSS__Upsilon4S_psi4160gamma_DD.json
--- a/test/jsonFiles/VECTORISR=VSS__Upsilon4S_psi4160gamma_DD.json
+++ b/test/jsonFiles/VECTORISR=VSS__Upsilon4S_psi4160gamma_DD.json
@@ -4,6 +4,7 @@
"grand_daughters" : [["D+", "D-"], []],
"models" : ["VECTORISR", "VSS", ""],
"parameters" : [["0.9", "0.9"], [], []],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob_daug1", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/VLL__Jpsi_ee.json b/test/jsonFiles/VLL__Jpsi_ee.json
new file mode 100644
--- /dev/null
+++ b/test/jsonFiles/VLL__Jpsi_ee.json
@@ -0,0 +1,28 @@
+{
+ "parent" : "J/psi",
+ "daughters" : ["e+", "e-"],
+ "models" : ["VLL"],
+ "parameters" : [[]],
+ "extras" : ["noPhotos"],
+ "events" : 100000,
+ "histograms" : [
+ {"variable" : "prob", "title" : "probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.5 },
+ {"variable" : "nFSRPhotons", "title" : "nFSRPhotons(J/#psi)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 10.0 },
+ {"variable" : "totalFSREnergy", "title" : "totalFSREnergy(J/#psi)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.0 },
+ {"variable" : "nFSRPhotons_daug1", "title" : "nFSRPhotons(e+)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 10.0 },
+ {"variable" : "nFSRPhotons_daug2", "title" : "nFSRPhotons(e-)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 10.0 },
+ {"variable" : "parMass", "title" : "m(J/#psi)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 3.0967, "xmax" : 3.09695},
+ {"variable" : "mass", "title" : "m(e^{+}e^{-})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 3.0967, "xmax" : 3.09695},
+ {"variable" : "cosHel", "title" : "cosHel12", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
+ {"variable" : "E", "title" : "E(e+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
+ {"variable" : "E", "title" : "E(e-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
+ {"variable" : "pz", "title" : "p_{z}(e+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.6, "xmax" : 1.6},
+ {"variable" : "pz", "title" : "p_{z}(e-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.6, "xmax" : 1.6},
+ {"variable" : "pLab", "title" : "pLab(e+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
+ {"variable" : "pLab", "title" : "pLab(e-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
+ {"variable" : "cosTheta", "title" : "cosTheta(e+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
+ {"variable" : "cosTheta", "title" : "cosTheta(e-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
+ ],
+ "outfile" : "VLL__Jpsi_ee.root",
+ "reference" : "RefVLL__Jpsi_ee.root"
+}
diff --git a/test/jsonFiles/VLL__Jpsi_ee_yesPhotos.json b/test/jsonFiles/VLL__Jpsi_ee_yesPhotos.json
new file mode 100644
--- /dev/null
+++ b/test/jsonFiles/VLL__Jpsi_ee_yesPhotos.json
@@ -0,0 +1,28 @@
+{
+ "parent" : "J/psi",
+ "daughters" : ["e+", "e-"],
+ "models" : ["VLL"],
+ "parameters" : [[]],
+ "extras" : ["yesPhotos"],
+ "events" : 100000,
+ "histograms" : [
+ {"variable" : "prob", "title" : "probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.5 },
+ {"variable" : "nFSRPhotons", "title" : "nFSRPhotons(J/#psi)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 10.0 },
+ {"variable" : "totalFSREnergy", "title" : "totalFSREnergy(J/#psi)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.0 },
+ {"variable" : "nFSRPhotons_daug1", "title" : "nFSRPhotons(e+)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 10.0 },
+ {"variable" : "nFSRPhotons_daug2", "title" : "nFSRPhotons(e-)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 10.0 },
+ {"variable" : "parMass", "title" : "m(J/#psi)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 3.0967, "xmax" : 3.09695},
+ {"variable" : "mass", "title" : "m(e^{+}e^{-})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 3.0967, "xmax" : 3.09695},
+ {"variable" : "cosHel", "title" : "cosHel12", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
+ {"variable" : "E", "title" : "E(e+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
+ {"variable" : "E", "title" : "E(e-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
+ {"variable" : "pz", "title" : "p_{z}(e+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.6, "xmax" : 1.6},
+ {"variable" : "pz", "title" : "p_{z}(e-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.6, "xmax" : 1.6},
+ {"variable" : "pLab", "title" : "pLab(e+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
+ {"variable" : "pLab", "title" : "pLab(e-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
+ {"variable" : "cosTheta", "title" : "cosTheta(e+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
+ {"variable" : "cosTheta", "title" : "cosTheta(e-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
+ ],
+ "outfile" : "VLL__Jpsi_ee_yesPhotos.root",
+ "reference" : "RefVLL__Jpsi_ee_yesPhotos.root"
+}
diff --git a/test/jsonFiles/VLL__Jpsi_mumu.json b/test/jsonFiles/VLL__Jpsi_mumu.json
new file mode 100644
--- /dev/null
+++ b/test/jsonFiles/VLL__Jpsi_mumu.json
@@ -0,0 +1,28 @@
+{
+ "parent" : "J/psi",
+ "daughters" : ["mu+", "mu-"],
+ "models" : ["VLL"],
+ "parameters" : [[]],
+ "extras" : ["noPhotos"],
+ "events" : 100000,
+ "histograms" : [
+ {"variable" : "prob", "title" : "probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.5 },
+ {"variable" : "nFSRPhotons", "title" : "nFSRPhotons(J/#psi)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 10.0 },
+ {"variable" : "totalFSREnergy", "title" : "totalFSREnergy(J/#psi)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.0 },
+ {"variable" : "nFSRPhotons_daug1", "title" : "nFSRPhotons(mu+)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 10.0 },
+ {"variable" : "nFSRPhotons_daug2", "title" : "nFSRPhotons(mu-)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 10.0 },
+ {"variable" : "parMass", "title" : "m(J/#psi)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 3.0967, "xmax" : 3.09695},
+ {"variable" : "mass", "title" : "m(#mu^{+}#mu^{-})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 3.0967, "xmax" : 3.09695},
+ {"variable" : "cosHel", "title" : "cosHel12", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
+ {"variable" : "E", "title" : "E(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
+ {"variable" : "E", "title" : "E(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
+ {"variable" : "pz", "title" : "p_{z}(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.6, "xmax" : 1.6},
+ {"variable" : "pz", "title" : "p_{z}(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.6, "xmax" : 1.6},
+ {"variable" : "pLab", "title" : "pLab(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
+ {"variable" : "pLab", "title" : "pLab(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
+ {"variable" : "cosTheta", "title" : "cosTheta(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
+ {"variable" : "cosTheta", "title" : "cosTheta(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
+ ],
+ "outfile" : "VLL__Jpsi_mumu.root",
+ "reference" : "RefVLL__Jpsi_mumu.root"
+}
diff --git a/test/jsonFiles/VLL__Jpsi_mumu_yesPhotos.json b/test/jsonFiles/VLL__Jpsi_mumu_yesPhotos.json
new file mode 100644
--- /dev/null
+++ b/test/jsonFiles/VLL__Jpsi_mumu_yesPhotos.json
@@ -0,0 +1,28 @@
+{
+ "parent" : "J/psi",
+ "daughters" : ["mu+", "mu-"],
+ "models" : ["VLL"],
+ "parameters" : [[]],
+ "extras" : ["yesPhotos"],
+ "events" : 100000,
+ "histograms" : [
+ {"variable" : "prob", "title" : "probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.5 },
+ {"variable" : "nFSRPhotons", "title" : "nFSRPhotons(J/#psi)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 10.0 },
+ {"variable" : "totalFSREnergy", "title" : "totalFSREnergy(J/#psi)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.0 },
+ {"variable" : "nFSRPhotons_daug1", "title" : "nFSRPhotons(mu+)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 10.0 },
+ {"variable" : "nFSRPhotons_daug2", "title" : "nFSRPhotons(mu-)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 10.0 },
+ {"variable" : "parMass", "title" : "m(J/#psi)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 3.0967, "xmax" : 3.09695},
+ {"variable" : "mass", "title" : "m(#mu^{+}#mu^{-})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 3.0967, "xmax" : 3.09695},
+ {"variable" : "cosHel", "title" : "cosHel12", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
+ {"variable" : "E", "title" : "E(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
+ {"variable" : "E", "title" : "E(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
+ {"variable" : "pz", "title" : "p_{z}(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.6, "xmax" : 1.6},
+ {"variable" : "pz", "title" : "p_{z}(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.6, "xmax" : 1.6},
+ {"variable" : "pLab", "title" : "pLab(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
+ {"variable" : "pLab", "title" : "pLab(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
+ {"variable" : "cosTheta", "title" : "cosTheta(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
+ {"variable" : "cosTheta", "title" : "cosTheta(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
+ ],
+ "outfile" : "VLL__Jpsi_mumu_yesPhotos.root",
+ "reference" : "RefVLL__Jpsi_mumu_yesPhotos.root"
+}
diff --git a/test/jsonFiles/VSP_PWAVE=PHSP__Dst0_D0gamma_Kpi.json b/test/jsonFiles/VSP_PWAVE=PHSP__Dst0_D0gamma_Kpi.json
--- a/test/jsonFiles/VSP_PWAVE=PHSP__Dst0_D0gamma_Kpi.json
+++ b/test/jsonFiles/VSP_PWAVE=PHSP__Dst0_D0gamma_Kpi.json
@@ -4,6 +4,7 @@
"grand_daughters" : [["K-", "pi+"],[]],
"models" : ["VSP_PWAVE", "PHSP", ""],
"parameters" : [[], [], []],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/VSS=BTO2PI_CP_ISO=ISGW2__Upsilon4S_BdBdbar_pipi,Denue.json b/test/jsonFiles/VSS=BTO2PI_CP_ISO=ISGW2__Upsilon4S_BdBdbar_pipi,Denue.json
--- a/test/jsonFiles/VSS=BTO2PI_CP_ISO=ISGW2__Upsilon4S_BdBdbar_pipi,Denue.json
+++ b/test/jsonFiles/VSS=BTO2PI_CP_ISO=ISGW2__Upsilon4S_BdBdbar_pipi,Denue.json
@@ -4,7 +4,7 @@
"grand_daughters" : [["pi+", "pi-"], ["D+","e-","anti-nu_e"]],
"models" : ["VSS", "BTO2PI_CP_ISO", "ISGW2"],
"parameters" : [[], ["0.4", "0.51e12", "0.8", "1.15", "0.8", "-1.15", "1.0", "1.15", "1.0", "-1.15"], []],
- "extras" : ["Define dm_incohMix_B0 0"],
+ "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
"do_conjugate_decay" : [false, true, true],
"events" : 10000,
"histograms" : [
diff --git a/test/jsonFiles/VSS=BTO3PI_CP=ISGW2__Upsilon4S_BdBdbar_pipipi0,Deanti-nue.json b/test/jsonFiles/VSS=BTO3PI_CP=ISGW2__Upsilon4S_BdBdbar_pipipi0,Deanti-nue.json
--- a/test/jsonFiles/VSS=BTO3PI_CP=ISGW2__Upsilon4S_BdBdbar_pipipi0,Deanti-nue.json
+++ b/test/jsonFiles/VSS=BTO3PI_CP=ISGW2__Upsilon4S_BdBdbar_pipipi0,Deanti-nue.json
@@ -5,6 +5,7 @@
"models" : ["VSS", "BTO3PI_CP", "ISGW2"],
"parameters" : [[], ["0.51e12", "0.4"], []],
"do_conjugate_decay" : [false, true, true],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob_daug1", "title" : "Prob(BTO3PI_CP)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/VSS=BTO4PI_CP=ISGW2__Upsilon4S_BdBdbar_pipipipi,D+enu.json b/test/jsonFiles/VSS=BTO4PI_CP=ISGW2__Upsilon4S_BdBdbar_pipipipi,D+enu.json
--- a/test/jsonFiles/VSS=BTO4PI_CP=ISGW2__Upsilon4S_BdBdbar_pipipipi,D+enu.json
+++ b/test/jsonFiles/VSS=BTO4PI_CP=ISGW2__Upsilon4S_BdBdbar_pipipipi,D+enu.json
@@ -5,6 +5,7 @@
"models" : ["VSS", "BTO4PI_CP", "ISGW2"],
"parameters" : [[], ["0.4", "0.51e12", "1.0", "0.0", "1.0", "0.0", "1.0", "0.0", "1.0", "0.0", "1.0", "0.0", "1.0", "0.0", "1.0", "0.0", "1.0", "0.0"], []],
"do_conjugate_decay" : [false, true, true],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob_daug1", "title" : "Prob(BTO4PI_CP)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/VSS=BTOKPIPI_CP=ISGW2__Upsilon4S_BdBdbar_Kpipi0,Deanti-nue.json b/test/jsonFiles/VSS=BTOKPIPI_CP=ISGW2__Upsilon4S_BdBdbar_Kpipi0,Deanti-nue.json
--- a/test/jsonFiles/VSS=BTOKPIPI_CP=ISGW2__Upsilon4S_BdBdbar_Kpipi0,Deanti-nue.json
+++ b/test/jsonFiles/VSS=BTOKPIPI_CP=ISGW2__Upsilon4S_BdBdbar_Kpipi0,Deanti-nue.json
@@ -5,6 +5,7 @@
"models" : ["VSS", "BTOKPIPI_CP", "ISGW2"],
"parameters" : [[], ["0.51e12", "1.5", "0.4"], []],
"do_conjugate_decay" : [false, true, true],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob_daug1", "title" : "Prob(BTOKPIPI_CP)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/VSS=BTOKPI_CP_ISO=ISGW2__Upsilon4S_BdBdbar_Kpi,Denue.json b/test/jsonFiles/VSS=BTOKPI_CP_ISO=ISGW2__Upsilon4S_BdBdbar_Kpi,Denue.json
--- a/test/jsonFiles/VSS=BTOKPI_CP_ISO=ISGW2__Upsilon4S_BdBdbar_Kpi,Denue.json
+++ b/test/jsonFiles/VSS=BTOKPI_CP_ISO=ISGW2__Upsilon4S_BdBdbar_Kpi,Denue.json
@@ -4,7 +4,7 @@
"grand_daughters" : [["K+", "pi-"], ["D+","e-","anti-nu_e"]],
"models" : ["VSS", "BTOKPI_CP_ISO", "ISGW2"],
"parameters" : [[], ["0.4", "0.51e12", "0.8", "1.48", "0.8", "-1.48", "0.8", "1.48", "0.8", "-1.48", "1.0", "1.48", "1.0", "-1.48"], []],
- "extras" : ["Define dm_incohMix_B0 0"],
+ "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
"do_conjugate_decay" : [false, true, true],
"events" : 10000,
"histograms" : [
diff --git a/test/jsonFiles/VSS=SSD_CP=HQET__Upsilon4S_BdBdbar_Dpi,Dstenue.json b/test/jsonFiles/VSS=SSD_CP=HQET__Upsilon4S_BdBdbar_Dpi,Dstenue.json
--- a/test/jsonFiles/VSS=SSD_CP=HQET__Upsilon4S_BdBdbar_Dpi,Dstenue.json
+++ b/test/jsonFiles/VSS=SSD_CP=HQET__Upsilon4S_BdBdbar_Dpi,Dstenue.json
@@ -5,6 +5,7 @@
"models" : ["VSS", "SSD_CP", "HQET"],
"parameters" : [[], ["0.472e12", "0.0", "1.0", "-0.85", "1.0", "0.0", "0.6", "-0.5", "0.6", "1.5", "1.0", "0.0"], ["0.91", "1.18", "0.72"]],
"do_conjugate_decay" : [false, true, true],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/VSS=SSS_CP=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.json b/test/jsonFiles/VSS=SSS_CP=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.json
--- a/test/jsonFiles/VSS=SSS_CP=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.json
+++ b/test/jsonFiles/VSS=SSS_CP=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.json
@@ -5,6 +5,7 @@
"models" : ["VSS", "SSS_CP", "ISGW2"],
"parameters" : [[], ["0.4", "0.51e12", "1.0", "1.0", "0.0", "1.0", "0.0"], []],
"do_conjugate_decay" : [false, true, true],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/VSS=SSS_CPT=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.json b/test/jsonFiles/VSS=SSS_CPT=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.json
--- a/test/jsonFiles/VSS=SSS_CPT=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.json
+++ b/test/jsonFiles/VSS=SSS_CPT=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.json
@@ -5,6 +5,7 @@
"models" : ["VSS", "SSS_CPT", "ISGW2"],
"parameters" : [[], ["0.0", "0.51e12", "1.0", "0.0", "1.0", "0.0", "0.1", "-0.4"], []],
"do_conjugate_decay" : [false, true, true],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/VSS=SSS_CP_PNG=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.json b/test/jsonFiles/VSS=SSS_CP_PNG=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.json
--- a/test/jsonFiles/VSS=SSS_CP_PNG=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.json
+++ b/test/jsonFiles/VSS=SSS_CP_PNG=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.json
@@ -5,6 +5,7 @@
"models" : ["VSS", "SSS_CP_PNG", "ISGW2"],
"parameters" : [[], ["0.4", "1.2", "0.1", "0.51e12", "1.0", "1.0", "0.2"], []],
"do_conjugate_decay" : [false, true, true],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/VSS=SVS_CP=ISGW2__Upsilon4S_BdBdbar_JpsiK0,Dstenue.json b/test/jsonFiles/VSS=SVS_CP=ISGW2__Upsilon4S_BdBdbar_JpsiK0,Dstenue.json
--- a/test/jsonFiles/VSS=SVS_CP=ISGW2__Upsilon4S_BdBdbar_JpsiK0,Dstenue.json
+++ b/test/jsonFiles/VSS=SVS_CP=ISGW2__Upsilon4S_BdBdbar_JpsiK0,Dstenue.json
@@ -5,6 +5,7 @@
"models" : ["VSS", "SVS_CP", "ISGW2"],
"parameters" : [[], ["0.4", "0.51e12", "1.0", "1.0", "0.0", "1.0", "0.0"], []],
"do_conjugate_decay" : [false, true, true],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/VSS=SVS_CPLH=ISGW2__Upsilon4S_BdBdbar_JpsiK0s,Denue.json b/test/jsonFiles/VSS=SVS_CPLH=ISGW2__Upsilon4S_BdBdbar_JpsiK0s,Denue.json
--- a/test/jsonFiles/VSS=SVS_CPLH=ISGW2__Upsilon4S_BdBdbar_JpsiK0s,Denue.json
+++ b/test/jsonFiles/VSS=SVS_CPLH=ISGW2__Upsilon4S_BdBdbar_JpsiK0s,Denue.json
@@ -5,6 +5,7 @@
"models" : ["VSS", "SVS_CPLH", "ISGW2"],
"parameters" : [[], ["0.472e12", "0.2", "1.0", "-0.77", "1.0", "0.0", "1.0", "0.0"], []],
"do_conjugate_decay" : [false, true, true],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/VSS=SVS_CP_ISO=ISGW2__Upsilon4S_BdBdbar_a1pi,Dstenue.json b/test/jsonFiles/VSS=SVS_CP_ISO=ISGW2__Upsilon4S_BdBdbar_a1pi,Dstenue.json
--- a/test/jsonFiles/VSS=SVS_CP_ISO=ISGW2__Upsilon4S_BdBdbar_a1pi,Dstenue.json
+++ b/test/jsonFiles/VSS=SVS_CP_ISO=ISGW2__Upsilon4S_BdBdbar_a1pi,Dstenue.json
@@ -5,6 +5,7 @@
"models" : ["VSS", "SVS_CP_ISO", "ISGW2"],
"parameters" : [[], ["0.4", "0.51e12", "0.0", "1.0", "0.0", "1.0", "0.0", "1.0", "0.0", "1.0", "0.0", "1.0", "0.0", "1.0", "0.0", "1.0", "0.0", "1.0", "0.0", "1.0", "1.2", "3.0", "-1.2", "3.0", "1.2", "1.0", "-1.2"], []],
"do_conjugate_decay" : [false, true, true],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/VSS=SVS_NONCPEIGEN=ISGW2__Upsilon4S_BdBdbar_a1pi,Dstenue.json b/test/jsonFiles/VSS=SVS_NONCPEIGEN=ISGW2__Upsilon4S_BdBdbar_a1pi,Dstenue.json
--- a/test/jsonFiles/VSS=SVS_NONCPEIGEN=ISGW2__Upsilon4S_BdBdbar_a1pi,Dstenue.json
+++ b/test/jsonFiles/VSS=SVS_NONCPEIGEN=ISGW2__Upsilon4S_BdBdbar_a1pi,Dstenue.json
@@ -5,6 +5,7 @@
"models" : ["VSS", "SVS_NONCPEIGEN", "ISGW2"],
"parameters" : [[], ["0.35", "0.51e12", "1.0", "1.0", "0.0", "3.0", "0.0", "3.0", "0.0", "1.0", "0.0"], []],
"do_conjugate_decay" : [false, true, true],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/VSS=SVV_CP=ISGW2__Upsilon4S_BdBdbar_JpsiKst,Denue.json b/test/jsonFiles/VSS=SVV_CP=ISGW2__Upsilon4S_BdBdbar_JpsiKst,Denue.json
--- a/test/jsonFiles/VSS=SVV_CP=ISGW2__Upsilon4S_BdBdbar_JpsiKst,Denue.json
+++ b/test/jsonFiles/VSS=SVV_CP=ISGW2__Upsilon4S_BdBdbar_JpsiKst,Denue.json
@@ -5,6 +5,7 @@
"models" : ["VSS", "SVV_CP", "ISGW2"],
"parameters" : [[], ["0.4", "0.51e12", "1.0", "1.0", "0.0", "1.0", "0.0", "1.0", "0.0"], []],
"do_conjugate_decay" : [false, true, true],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/VSS=SVV_NONCPEIGEN=ISGW2__Upsilon4S_BdBdbar_Dstrho,Denue.json b/test/jsonFiles/VSS=SVV_NONCPEIGEN=ISGW2__Upsilon4S_BdBdbar_Dstrho,Denue.json
--- a/test/jsonFiles/VSS=SVV_NONCPEIGEN=ISGW2__Upsilon4S_BdBdbar_Dstrho,Denue.json
+++ b/test/jsonFiles/VSS=SVV_NONCPEIGEN=ISGW2__Upsilon4S_BdBdbar_Dstrho,Denue.json
@@ -4,7 +4,7 @@
"grand_daughters" : [["D*-", "rho+"], ["D+","e-","anti-nu_e"]],
"models" : ["VSS", "SVV_NONCPEIGEN", "ISGW2"],
"parameters" : [[], ["0.51e12", "0.4", "1.15", "0.152", "1.48", "0.936", "0.0", "0.317", "0.19", "0.00152", "1.48", "0.00936", "0.0", "0.00317", "0.19"], []],
- "extras" : ["Define dm_incohMix_B0 0"],
+ "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
"do_conjugate_decay" : [false, true, true],
"events" : 10000,
"histograms" : [
diff --git a/test/jsonFiles/VSS_BMIX__Upsilon4S_BdBdbar.json b/test/jsonFiles/VSS_BMIX__Upsilon4S_BdBdbar.json
--- a/test/jsonFiles/VSS_BMIX__Upsilon4S_BdBdbar.json
+++ b/test/jsonFiles/VSS_BMIX__Upsilon4S_BdBdbar.json
@@ -3,6 +3,7 @@
"daughters" : ["B0", "anti-B0"],
"models" : ["VSS_BMIX"],
"parameters" : [["0.474e12", "0.5", "0.8", "0.0"]],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "id", "title" : "StdHep ID1", "d1" : 1, "d2" : 0, "nbins" : 2, "xmin" : -600.0, "xmax" : 600.0},
diff --git a/test/jsonFiles/VSS_MIX__Upsilon4S_BdBdbar.json b/test/jsonFiles/VSS_MIX__Upsilon4S_BdBdbar.json
--- a/test/jsonFiles/VSS_MIX__Upsilon4S_BdBdbar.json
+++ b/test/jsonFiles/VSS_MIX__Upsilon4S_BdBdbar.json
@@ -3,6 +3,7 @@
"daughters" : ["B0", "anti-B0"],
"models" : ["VSS_MIX"],
"parameters" : [["0.474e12"]],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "id", "title" : "StdHep ID1", "d1" : 1, "d2" : 0, "nbins" : 2, "xmin" : -600.0, "xmax" : 600.0},
diff --git a/test/jsonFiles/X38722-+_PSI_GAMMA=VLL__X3872_gammaJpsi_mumu.json b/test/jsonFiles/X38722-+_PSI_GAMMA=VLL__X3872_gammaJpsi_mumu.json
--- a/test/jsonFiles/X38722-+_PSI_GAMMA=VLL__X3872_gammaJpsi_mumu.json
+++ b/test/jsonFiles/X38722-+_PSI_GAMMA=VLL__X3872_gammaJpsi_mumu.json
@@ -4,6 +4,7 @@
"grand_daughters" : [[], ["mu+", "mu-"]],
"models" : ["X38722-+_PSI_GAMMA", "", "VLL"],
"parameters" : [[], [], []],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.5 },
diff --git a/test/jsonFiles/X38722-+_PSI_GAMMA=VSS=VLL__X3872_omegaJpsi_pipi,mumu.json b/test/jsonFiles/X38722-+_PSI_GAMMA=VSS=VLL__X3872_omegaJpsi_pipi,mumu.json
--- a/test/jsonFiles/X38722-+_PSI_GAMMA=VSS=VLL__X3872_omegaJpsi_pipi,mumu.json
+++ b/test/jsonFiles/X38722-+_PSI_GAMMA=VSS=VLL__X3872_omegaJpsi_pipi,mumu.json
@@ -4,6 +4,7 @@
"grand_daughters" : [["pi+", "pi-"], ["mu+", "mu-"]],
"models" : ["X38722-+_PSI_GAMMA", "VSS", "VLL"],
"parameters" : [[], [], []],
+ "extras" : ["noPhotos"],
"events" : 5000,
"histograms" : [
{"variable" : "prob", "title" : "probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 20 },
diff --git a/test/jsonFiles/X38722-+_PSI_GAMMA=VSS=VLL__X3872_rho0Jpsi_pipi,mumu.json b/test/jsonFiles/X38722-+_PSI_GAMMA=VSS=VLL__X3872_rho0Jpsi_pipi,mumu.json
--- a/test/jsonFiles/X38722-+_PSI_GAMMA=VSS=VLL__X3872_rho0Jpsi_pipi,mumu.json
+++ b/test/jsonFiles/X38722-+_PSI_GAMMA=VSS=VLL__X3872_rho0Jpsi_pipi,mumu.json
@@ -4,6 +4,7 @@
"grand_daughters" : [["pi+", "pi-"], ["mu+", "mu-"]],
"models" : ["X38722-+_PSI_GAMMA", "VSS", "VLL"],
"parameters" : [[], [], []],
+ "extras" : ["noPhotos"],
"events" : 5000,
"histograms" : [
{"variable" : "prob", "title" : "probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 80 },
diff --git a/test/jsonFiles/Y3STOY1SPIPIMOXHAY__Upsilon3S_Upsilonpipi.json b/test/jsonFiles/Y3STOY1SPIPIMOXHAY__Upsilon3S_Upsilonpipi.json
--- a/test/jsonFiles/Y3STOY1SPIPIMOXHAY__Upsilon3S_Upsilonpipi.json
+++ b/test/jsonFiles/Y3STOY1SPIPIMOXHAY__Upsilon3S_Upsilonpipi.json
@@ -3,6 +3,7 @@
"daughters" : ["Upsilon", "pi+", "pi-"],
"models" : ["Y3STOY1SPIPIMOXHAY"],
"parameters" : [["0.2196", "0.2983"]],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 1.0},
diff --git a/test/jsonFiles/YMSTOYNSPIPICLEO__Upsilon3S_Upsilonpipi.json b/test/jsonFiles/YMSTOYNSPIPICLEO__Upsilon3S_Upsilonpipi.json
--- a/test/jsonFiles/YMSTOYNSPIPICLEO__Upsilon3S_Upsilonpipi.json
+++ b/test/jsonFiles/YMSTOYNSPIPICLEO__Upsilon3S_Upsilonpipi.json
@@ -3,6 +3,7 @@
"daughters" : ["Upsilon", "pi+", "pi-"],
"models" : ["YMSTOYNSPIPICLEO"],
"parameters" : [["2.523", "1.189"]],
+ "extras" : ["noPhotos"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 1.0},
diff --git a/test/testDecayModel.cc b/test/testDecayModel.cc
--- a/test/testDecayModel.cc
+++ b/test/testDecayModel.cc
@@ -1034,6 +1034,35 @@
value = p > 0.0
? 1e12 * vtxPos.d3mag() * p1_lab.mass() / ( p * EvtConst::c )
: 0.0;
+ } else if ( !selectedVarName.compare( "nFSRPhotons" ) ) {
+ // Loop over all daughters and get number of FSR photons
+
+ double nFSRPhotons{ 0 };
+
+ for ( size_t iDaughter{ 0 }; iDaughter < selectedParent->getNDaug();
+ iDaughter++ ) {
+ const EvtParticle* iDaug = selectedParent->getDaug( iDaughter );
+
+ if ( iDaug->getAttribute( "FSR" ) == 1 )
+ nFSRPhotons += 1.0;
+ }
+
+ value = nFSRPhotons;
+
+ } else if ( !selectedVarName.compare( "totalFSREnergy" ) ) {
+ // Loop over all daughters and get number of FSR photons
+
+ double totalFSREnergy{ 0 };
+
+ for ( size_t iDaughter{ 0 }; iDaughter < selectedParent->getNDaug();
+ iDaughter++ ) {
+ const EvtParticle* iDaug = selectedParent->getDaug( iDaughter );
+
+ if ( iDaug->getAttribute( "FSR" ) == 1 )
+ totalFSREnergy += iDaug->getP4Lab().get( 0 );
+ }
+
+ value = totalFSREnergy;
} else {
std::cerr << "Warning: Did not recognise variable name "
<< selectedVarName << std::endl;

File Metadata

Mime Type
text/plain
Expires
Mon, Sep 29, 4:14 AM (15 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
6562174
Default Alt Text
D99.1759115655.diff (62 KB)

Event Timeline