diff --git a/EvtGenBase/EvtDecayBase.hh b/EvtGenBase/EvtDecayBase.hh
index 41698ae..8129fab 100644
--- a/EvtGenBase/EvtDecayBase.hh
+++ b/EvtGenBase/EvtDecayBase.hh
@@ -1,142 +1,145 @@
/***********************************************************************
* Copyright 1998-2020 CERN for the benefit of the EvtGen authors *
* *
* This file is part of EvtGen. *
* *
* EvtGen is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* EvtGen is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with EvtGen. If not, see <https://www.gnu.org/licenses/>. *
***********************************************************************/
#ifndef EVTDECAYBASE_HH
#define EVTDECAYBASE_HH
#include "EvtGenBase/EvtId.hh"
#include "EvtGenBase/EvtPatches.hh"
#include "EvtGenBase/EvtSpinType.hh"
#include <stdlib.h>
#include <string>
#include <vector>
class EvtParticle;
class EvtSpinType;
class EvtDecayBase {
public:
//These pure virtual methods has to be implemented
//by any derived class
virtual std::string getName() = 0;
virtual void decay( EvtParticle* p ) = 0;
virtual void makeDecay( EvtParticle* p, bool recursive = true ) = 0;
virtual EvtDecayBase* clone() = 0;
//These virtual methods can be implemented by the
//derived class to implement nontrivial functionality.
virtual void init();
virtual void initProbMax();
virtual std::string commandName();
virtual void command( std::string cmd );
virtual std::string getParamName( int i );
virtual std::string getParamDefault( int i );
double getProbMax( double prob );
double resetProbMax( double prob );
- EvtDecayBase();
+ EvtDecayBase() = default;
virtual ~EvtDecayBase() = default;
virtual bool matchingDecay( const EvtDecayBase& other ) const;
EvtId getParentId() const { return _parent; }
double getBranchingFraction() const { return _brfr; }
- void disableCheckQ() { _chkCharge = 0; };
+ void disableCheckQ() { _chkCharge = false; };
void checkQ();
int getNDaug() const { return _ndaug; }
EvtId* getDaugs() { return _daug.data(); }
EvtId getDaug( int i ) const { return _daug[i]; }
int getNArg() const { return _narg; }
- int getPHOTOS() const { return _photos; }
- void setPHOTOS() { _photos = 1; }
- void setVerbose() { _verbose = 1; }
- void setSummary() { _summary = 1; }
+ bool getFSR() const { return _fsr; }
+ void setFSR() { _fsr = true; }
+ void setVerbose() { _verbose = true; }
+ void setSummary() { _summary = true; }
double* getArgs();
std::string* getArgsStr() { return _args.data(); }
double getArg( unsigned int j );
double getStoredArg( int j ) const { return _storedArgs.at( j ); }
double getNStoredArg() const { return _storedArgs.size(); }
std::string getArgStr( int j ) const { return _args[j]; }
std::string getModelName() const { return _modelname; }
int getDSum() const { return _dsum; }
- int summary() const { return _summary; }
- int verbose() const { return _verbose; }
+ bool summary() const { return _summary; }
+ bool verbose() const { return _verbose; }
void saveDecayInfo( EvtId ipar, int ndaug, EvtId* daug, int narg,
std::vector<std::string>& args, std::string name,
double brfr );
void printSummary() const;
void printInfo() const;
//Does not really belong here but I don't have a better place.
static void findMasses( EvtParticle* p, int ndaugs, EvtId daugs[10],
double masses[10] );
static void findMass( EvtParticle* p );
static double findMaxMass( EvtParticle* p );
//Methods to set the maximum probability.
void setProbMax( double prbmx );
void noProbMax();
void checkNArg( int a1, int a2 = -1, int a3 = -1, int a4 = -1 );
void checkNDaug( int d1, int d2 = -1 );
void checkSpinParent( EvtSpinType::spintype sp );
void checkSpinDaughter( int d1, EvtSpinType::spintype sp );
// lange - some models can take more daughters
// than they really have to fool aliases (VSSBMIX for example)
virtual int nRealDaughters() { return _ndaug; }
protected:
bool _daugsDecayedByParentModel;
bool daugsDecayedByParentModel() { return _daugsDecayedByParentModel; }
private:
- int _photos;
- int _ndaug;
- EvtId _parent;
- int _narg;
std::vector<double> _storedArgs;
std::vector<EvtId> _daug;
std::vector<double> _argsD;
std::vector<std::string> _args;
- std::string _modelname;
- double _brfr;
- int _dsum;
- int _summary;
- int _verbose;
- int defaultprobmax;
- double probmax;
- int ntimes_prob;
+ std::string _modelname = "**********";
- //Should charge conservation be checked when model is
- //created? 1=yes 0 no.
- int _chkCharge;
+ EvtId _parent = EvtId( -1, -1 );
+ int _ndaug = 0;
+ int _narg = 0;
+ double _brfr = 0;
+ int _dsum = 0;
+
+ bool _fsr = false;
+ bool _summary = false;
+ bool _verbose = false;
+
+ // The default is that the user module does _not_ set any probmax.
+ bool defaultprobmax = true;
+ int ntimes_prob = 0;
+ double probmax = 0.0;
+
+ //Default is to check that charge is conserved
+ bool _chkCharge = true;
//These are used for gathering statistics.
- double sum_prob;
- double max_prob;
+ double sum_prob = 0.0;
+ double max_prob = 0.0;
};
#endif
diff --git a/History.md b/History.md
index bf06225..1c88e53 100644
--- a/History.md
+++ b/History.md
@@ -1,898 +1,902 @@
# History file for EvtGen
From version 2.0.0,
Tabc labels refer to [Maniphest tasks](https://phab.hepforge.org/maniphest/query/nkBRd9OhPCBN/), while
Dxyz labels refer to [Differential code reviews](https://phab.hepforge.org/differential/query/YDY8EgjNGd.e/) on HepForge:
https://phab.hepforge.org/Tabc
https://phab.hepforge.org/Dxyz
===
## R02-0X-00
12 Apr 2024 Fernando Abudinen
+* D113: Introduced new FSR flag and deprecated PHOTOS flag.
+ Implemented proper use of neverRadCorr.
+
+12 Apr 2024 Fernando Abudinen
* D112: Removed EvtPhotosEngine and moved its functionality EvtPHOTOS class.
Moved initialisation of fsrEngine to setRadCorrEngine.
11 Apr 2024 Thomas Latham
* D109: Remove broken or obsolete models
- Models removed:
* BHADRONIC
* BQTOLLLLHYPERCP
* BQTOLLLL
* D\_MULTIBODY
* KSTARSTARGAMMA
* LAMBDAB2LAMBDAV and subsidiary models LAMBDA2PPIFORLAMBDAB2LAMBDAV and V2VPVMFORLAMBDAB2LAMBDAV
* Lb2Lhh
* PROPSLPOLE
* VPHOTOV
* VPHOTOVISR
* VUB\_AC
- Classes in EvtGenBase already unused or used only by the above models also removed
* Evt3Rank3C
* EvtAbsBinning
* EvtAmpAmpPdf
* EvtAmpIndex
* EvtAmpSubIndex
* EvtBreitWignerPdf
* EvtDecayParm
* EvtIntegPdf1D
* EvtMBreitWigner
* EvtMHelAmp
* EvtMNode
* EvtMParticle
* EvtMLineShape
* EvtMRes
* EvtMTree
* EvtMTrivialLS
* EvtPointPred
* EvtPto3PAmpSmpResolution
* EvtSpinAmp
9 Apr 2024 Fernando Abudinen
* D111: Added tests for decays with FSR and implemented const correctness for getP4LabBeforeFSR() function.
19 Feb 2024 Fernando Abudinen
* D108: Bugfix protect polarisation vector for vector and tensor particles against wrong indices
19 Feb 2024 Fernando Abudinen
* D107: Implement const correctness for epsPhoton and epsParentPhoton
3 Feb 2024 John Back
* T230: Add EvtBcVPPHad model for Bc to Jpsi p pbar pi decays and generalised particle ordering
for EvtBcVHad decay files, courtesy of Aleksei Luchinsky, Dmitrii Pereima & Vanya Belyaev (LHCb).
Updated EvtPhiDalitz model to use helicity amplitudes and fixed the indices used in
EvtVector3R::dot(), courtesy of Arnau Brossa Gonzalo & Antonio Romero Vidal (LHCb).
31 Oct 2023 Fernando Abudinen
* D102: Bugfix probmax issue for X38722-+\_PSI\_GAMMA model
- Calculation of amplitude moved to dedicated calcAmp function and fixed initialisation.
- Introduced weighting to compensate for phase-space changes due to resonance width.
- Fixed bugs in rho couplings and loops over photon and vector states.
16 Oct 2023 Fernando Abudinen
* D99: Add tests for PHOTOS
- EvtParticle::getAttribute function made const
- Added variables for testing of FSR to testing framework
- Added dedicated tests for FSR with Photos
- Turned off Photos for all other tests
16 Oct 2023 Thomas Latham
* D98: Modernise EvtIdSet and other improvements
- Modernise and greatly simplify EvtIdSet implementation
- Fixes in EvtPropSLPole to avoid unnecessary dynamic allocations
- Other minor fixes and tidy-ups
* Credit to Heather Ratcliffe and Chris Brady for providing
and/or inspiring several of these improvements
22 Aug 2023 Fernando Abudinen
* D97: Bugfix probmax issue and introduced pole compensation for VTOSLL model
- Calculation of amplitude moved to dedicated calcAmp function and fixed initialisation.
22 Aug 2023 Tom Latham
* CMake updates
- Update default C++ standard to 17
- Suppress 'up-to-date' messages during install
- Add 'EvtGen' prefix to file names of custom CMake modules
- Remove unused CMake module
* Update CI config
- Update default LCG version to 103
- Add builds for el9 OS using LCG 104
- Allow switching on/off building against each external
- Test stage: attempt to improve selection of commits to diff in different cases
- Update CVMFS tags as per https://cern.service-now.com/service-portal?id=outage&n=OTG0079356
* Fix script for generating src dependencies
- Adapted to behaviour of newer CMake version in LCG 103
* Apply clang-format
- Few small changes after update of CI clang version to 12
- Document version of clang-format to be used
* Updates to install script
- Update to latest Pythia8 and HepMC3 versions
- Fix to ensure dependencies are picked up from the local install
22 Aug 2023 Andrii Verbytskyi
* Patch for finding Pythia8 xmldoc path
21 Aug 2023 Tom Latham
* D96: Work around change of interface for setRndmEnginePtr in Pythia8 310
22 Jun 2023 Ludovico Massaccesi
* T219: Fixed amplitudes for D_DALITZ model of D0 -> pi+ pi- pi0.
1 March 2023 Fernando Abudinen
* D92: Bugfix probmax issue for TENSOR daughter in EvtSSD_DirectCP model.
Calculation of amplitude in EvtSSD_DirectCP model moved to dedicated calcAmp function.
Got rid of a few static variables along the way.
8 Feb 2023 Alexei Sibidanov and Tom Latham
* D90: Apply clang format and enable checking of formatting in gitlab CI
3 Feb 2023 John Back
* D91: Check for non-zero momentum for EvtSLBaryonAmp parent spin density matrix.
Print out integrals of JSON test histograms.
16 Dec 2022 John Back
* D89: Added probabilities for B_c -> V pi+ and V pi+ pi0 EvtBcVHad modes.
16 Dec 2022 Alexei Sibidanov
* D88: Applied clang-tidy modernize-use-nullptr
13 Dec 2022 Fernando Abudinen and Tom Latham
* Various improvements to testing framework
16 Nov 2022 Tom Latham
* T123: Provide documention of how to contribute bug reports, feature requests, new/modified code
8 Sep 2022 Fernando Abudinen, John Back, Michal Kreps, Tom Latham, Alex Ward
* T108: Implement JSON test framework for all decay models
9 June 2022 Michal Kreps
* D84: Improve efficiency of RareLbToLll decay model for final states with e+e- pair.
===
## R02-02-00
12 May 2022 Michal Kreps
* D83: Fix double counting of charmonia with K0 decays for B0.
11 May 2022 Tom Latham
* D80: Add CMake options for enabling clang-tidy static analysis checks during build
14 Apr 2022 John Back
* D82: EvtDecayProb: initialise data members and remove empty destructor
14 Apr 2022 Michal Kreps
* D81: Derive EvtFlatSqDalitz from EvtDecayIncoherent since we directly provide
final kinematics
2nd Mar 2022 John Back
* D78: Add Bc -> J/psi K+ pi- pi+ pi- pi+, Bc -> J/psi K+ K- pi+ pi- pi+ &
Bc -> J/psi 4pi+ 3pi- decay modes to the BC_VHAD model, courtesy of
Aleksei Luchinsky, Anna Danilina, Dmitrii Pereima & Vanya Belyaev (LHCb)
===
## R02-01-01
8th Sep 2021 Michal Kreps
* Update location of web page for Pythia8 download in setup script.
8th Sep 2021 Markus Prim, Lu Cao, Chaoyi Lyu and Michel De Cian (Michal Kreps)
* D73: Add new model for semileptonic B decays with BCL and BGL form-factors
8th June 2021 Michal Kreps
* T110, D71: Fix B+ --> eta' l nu BF which was order of magnitude too high.
Balance the decrease by increasing B+ --> D0 l nu, which is after change
still bit smaller than PDG 2021.
8th Jun 2021 Michal Kreps
* D71: Fix B+ --> eta' l nu BF.
20th Apr 2021 Tom Lathem
* D68: Fix compilation with Pythia 8.304
17th Mar 2021 Michal Kreps
* D62: Improve PI0DALITZ model to dynamically work out maximum probability to
make it usuable also for eta --> llgamma decays.
Remove ETA2MUMUGAMMA since it is a pure one-to-one copy of PI0DALITZ.
15th Jan 2021 Michal Kreps
* D47: Model to generate 4-body phase-space decays in restricted part of the m12-m34 space
12th Jan 2021 Michal Kreps
* D48: Fix bug in calculation of the daughter momentum in decay model EvtBsMuMuKK
7th Jan 2021 Michal Kreps
* D43: Allow to pass particle properties table in form of stringstream to constructor
of EvtGen for use case where these are created on fly.
10th Dec 2020 Michal Kreps
* D36: EvtFlatSqDalitz model to be more efficient and to avoid cut-off around the edges
21st Aug 2020 John Back
* T109: Add EvtEtaLLPiPi model for eta' -> l l pi pi decays (l = e or mu),
- courtesy of Aleksei Luchinsky (LHCb).
29th Jun 2020 Michal Kreps
* T103: Add missing include in EvtGenBase/EvtMatrix.hh.
15th May 2020 Michal Kreps
* D28: Add EvtThreeBodyPhsp (rectangular Dalitz plot selection) and
EvtPhspDecaytimeCut (minimum decay time requirement) models.
* D27: Fix initialisation of constants in EvtBTo3hCP model.
===
## R02-00-00
24th Apr 2020 Michal Kreps
* Update particle properties file evt.pdl to 2019 version of RPP by PDG.
23rd Apr 2020 Tom Latham
* Apply copyright and licence notices to all relevant files.
17th Apr 2020 Tom Latham
* Add text of GNU GPLv3 in COPYING, add (preliminary) list of authors in
AUTHORS, and clean-up all source files, prior to applying copyright and
licence notices.
9th Apr 2020 Tom Latham
* Improve, and document use of, standalone installation script.
* Apply clang-format formatting to all C++ source files.
8th Apr 2020 Tom Latham
* One small modernisation change to EvtPhotosEngine to match that already
applied in EvtTauolaEngine.
8th Apr 2020 John Back
* Fixed NonReson amplitude and the 4-momentum boosts used for angles in
EvtLambdacPHH,
- courtesy of Elisabeth Niel (LHCb).
7th Apr 2020 Gerhard Raven, Tom Latham, Michal Kreps and John Back
* Incorporate C++ modernization changes from Gerhard Raven (LHCb).
- Merged modernize branch into master.
9th Mar 2020 John Back
* Add EvtAbsExternalGen::getDecayProb() to allow external generators to
return a probability that can be used in EvtDecayProb (default = 1).
6th Mar 2020 Andrii Verbytskyi and Tom Latham
* Implement HepMC3 support: EvtHepMCEvent, external engines & cmake files.
15th Nov 2019 John Back
* Added EvtPsi2JpsiPiPi model for psi2S -> J/psi pi+ pi- decays based on hep-ph/1507.07985,
- courtesy of Aleksei Luchinsky (LHCb).
21st August 2019 Michal Kreps
* Added the EvtDToKpienu decay model for D -> K pi e nu decays from BESIII,
- courtesy of Liaoyuan Dong.
16th July 2019 John Back
* Correct imaginary sign for EvtComplex /= (EvtComplex c) operator.
3rd July 2019 John Back
* Added the EvtLambdacPHH decay model for Lc -> p K pi decays with K*(890),
Delta++(1232) and Lambda(1520) resonances, based on the Fermilab E791
analysis hep-ex/9912003v1,
- courtesy of Elisabeth Niel and Patrick Robbe (LHCb).
* Modified EvtResonance2 to accept other barrier factor radii.
3rd July 2019 Michal Kreps
* Make sure minimum mass for resonances with non-zero widths is larger than
1e-4 GeV in EvtRelBreitWignerBarrierFact.
3rd May 2019 John Back
* Corrected EvtSLDiBaryonAmp bugs/issues in the BToDiBaryonlnupQCD model:
- parity, amplitude terms and B momentum reference frame variables.
* Corrected treament of spinor indices in EvtRareLb2Lll,
- courtesy of Tom Blake and Michal Kreps (LHCb).
* Updated the EvtBcVHad model to also handle Bc -> psi Ks K decays,
- courtesy of Aleksei Luchinsky (LHCb).
* Add new decay model EvtBsMuMuKK (BS_MUMUKK) for Bs to J/psi (mu+mu-) K+K-,
- courtesy of Veronika Chobanova, Jeremy Dalseno, Diego Martinez Santos and
Marcos Romero Lamas (LHCb).
* Fix infinite loop during initialisation of the EvtBTo3hCP model via
EvtCBTo3piP00 and EvtCBTo3piMPP,
- courtesy of Peter Richardson (Durham).
15th March 2019 Tom Latham
* Implement cmake build system, replacing the old config method.
30th Jan 2019 John Back
* Fix modernization compiler errors and warnings.
29th Jan 2019 Michal Kreps
* Allow reading decay files which are missing end-of-line before end-of-file.
21st December 2018 John Back
* Imported C++ modernization changes from Gerhard Raven (LHCb).
7th December 2018 John Back
* Added the EvtBLLNuL (BLLNUL) model that generates rare B -> ell ell nu ell
decays, where ell = e or mu,
- courtesy of Anna Danilina and Nikolai Nikitin (LHCb).
* Removed the EvtB2MuMuMuNu (BUTOMMMN) model, since its now replaced
by the more general BLLNuL one.
5th November 2018 John Back
* Added the BToDiBaryonlnupQCD model for generating B to p N* l nu decays,
where N can be any (exited) charged baryon (spin 1/2 or 3/2),
- courtesy of Mark Smith and Ryan Newcombe (LHCb), with added code optimisations.
17th October 2018 John Back
* Added various decay models from LHCb EvtGenExtras package:
- EvtBcVHad ("BC_VHAD"),
- Evtbs2llGammaMNT ("BSTOGLLMNT"),
- Evtbs2llGammaISRFSR ("BSTOGLLISRFSR"),
- EvtbTosllMS ("BTOSLLMS"),
- EvtbTosllMSExt ("BTOSLLMSEXT"),
- EvtLb2Baryonlnu ("Lb2Baryonlnu"),
- EvtLb2plnuLCSR ("Lb2plnuLCSR"),
- EvtLb2plnuLQCD ("Lb2plnuLQCD"),
- EvtFlatSqDalitz ("FLATSQDALITZ"),
- EvtPhspFlatLifetime ("PHSPFLATLIFETIME").
5th October 2018 John Back
* Updated setupEvtGen.sh to work with the new HepForge Phabricator site.
13th March 2018 John Back
* Updated EvtPythiaEngine to correctly handle updates of various particle
properties so that Pythia uses the same information as EvtGen (evt.pdl)
for the generic and alias PYTHIA decay model.
12th March 2018 John Back
* Updated EvtBcXMuNu models (X = Scalar, Vector, Tensor) to generate
Bc to D0(star) mu nu decays, with associated form factors in EvtBCXFF,
- courtesy of Aleksei Luchinsky (LHCb).
* Also generalised the calculation
of their maximum probabilities by reusing the CalcMaxProb method in
EvtSemiLeptonicAmp, which now allows for different Q^2 binning
(default remains at 25 bins).
===
## R01-07-00
13th December 2017 John Back
* New tag incorporating all changes below.
* Recommended external packages are
(as used in the setupEvtGen.sh script):
- HepMC 2.06.09,
- pythia 8.230,
- Photos++ 3.61
- Tauola++ 1.1.6c.
12th December 2017 John Back
* Changed Pythia validation example decay files to use Pythia8 codes.
6th December 2017 John Back
* Modified the examples to use DECAY.DEC (see 25th April 2016) instead of
DECAY_2010.DEC. Changed EvtExternalGenList to assume Pythia8 codes are
used in decay files by default, which is the case for DECAY.DEC. Also
updated the setupEvtGen.sh script to work with Pythia 8.2x versions.
29th November 2017 John Back
* Modified EvtSVP, EvtVVP and EvtTVP models to handle both radiative and
two-lepton decays,
- courtesy of Aleksei Luchinsky (LHCb).
14th July 2017 John Back
* Only create external generator objects if they don't already exist in
EvtExternalGenFactory.
* Modified configure script to work with Pythia 8.2x
5th July 2017 Michal Kreps
* Register the VTOSLL model.
14th June 2017 John Back
* Add isNeutralKaon() boolean function and corrected comments in EvtDDalitz.
8th May 2017 Michal Kreps
* Fix bug in EvtbTosllVectorAmp to recognise Bs --> K*bar mu mu decay as
b --> d ll transition.
8th May 2017 Michal Kreps
* Significantly simplify way how we decide on decay mode and daughters
ordering in DDalitz model.
- With new code by definition all orderings of
daughters in the decay file will yield same output.
4th May 2017 John Back
* Further fixes to DDalitz particle ordering (including charge-conjugates):
- Mode 5: D0 -> K- K0bar K+ and K+ K- K0bar
- Mode 12: D0 -> pi0 pi- pi+ and pi+ pi0 pi-
- Removed unneeded index ordering checks for mode 10 (D+ -> pi- pi+ pi+)
and mode 11 (Ds+ -> pi- pi+ pi+)
27th April 2017 John Back
* Fixed DDalitz particle ordering for mode 7: D+ -> pi+ K- K+ and K+ pi+ K-
and their charge-conjugates
7th April 2017 John Back
* Modified EvtGenExternal/EvtPythiaEngine to ensure that the EvtGen-based
instances of Pythia8 (for generic and alias decays) use the same
particle properties as defined by EvtGen,
- courtesy Patrick Robbe (LHCb).
5th April 2017 Michal Kreps
* Fixed indexing in copy constructor of Evt3Rank3C, which would otherwise
produce an infinite loop;
- bug report from David Grellscheid.
3rd November 2016 John Back
* Modified EvtFlatQ2 model to work for all B -> X lepton lepton modes, as
well as adding an extra phase space factor to correct for the dip at low
q^2, which is enabled by using "FLATQ2 1" instead of just "FLATQ2" in the decay file,
- courtesy of Marcin Chrzaszcz & Thomas Blake (LHCb).
13th October 2016 John Back
* Added the TauolaCurrentOption decfile keyword to select the hadronic
current in Tauola; default is the BaBar-tuned current option (int = 1).
* EvtParticles can store double attributes using the functions
setAttributeDouble(name, double) and getAttributeDouble(name), which can
be useful for storing and retrieving amplitude weights, for example.
- The analogous EvtParticle integer attribute interface remains unchanged:
setAttribute(name, int) and getAttribute(name).
13th September 2016 John Back
* Modified EvtTauolaEngine to use internal Tauola spin matrices for
tau pair events by temporarily setting the PDG id of the mother as a
boson, keeping the same 4-momentum.
* The BaBar hadronic currents are now used by default.
* Also added the ability to change some Tauola parameters
using the "Define" keyword in decay files.
* Added an example decay file
illustrating the new features: validation/TauolaFiles/Btautau.dec
9th September 2016 Michal Kreps
* Reimplement code in EvtBTo3pi.F, EvtBTo3piMPP.F, EvtBTo3piP00.F and
EvtBToKpipi.F in C++ in order to remove dependence on Fortran compiler.
- With this, there is no internal Fortran code in EvtGen.
===
## R01-06-00
1st June 2016 John Back
* New tag incorporating all changes below.
* Recommended external packages are
- HepMC 2.06.09
- pythia 8.186
- Photos++ 3.61
- Tauola++ 1.1.5
28th April 2016 Michal Kreps
* For Ds+ --> 2pi+ pi- there was double counting of branching fraction
resulting in total branching fraction being 1.5 times larger than measured
one.
- Fix by revisiting submodes, which now fill total Ds --> 3pi.
25th April 2016 Michal Kreps
* Added DECAY.DEC/XML, which contain updated semileptonic charm and beauty
branching fractions using the 2014 PDG, tuned to minimize disagreements
between measurements and EvtGen for both inclusive and exclusive decays.
* Updated the evt.pdl particle properties file to the PDG 2014 edition.
* Implemented new LQCD form factors for Lb --> L mu mu from arXiv paper
1602.01399 (EvtRareLbToLllFFlQCD); old LQCD form factors are removed.
18th March 2016 John Back
* Fixed incorrect spinor algebra used in S1 -> 1/2 S2, 1/2 -> S3 S4 decays
in EvtDiracParticle::rotateToHelicityBasis() functions,
- courtesy of Luis Miguel Garcia Martin and the IFIC Valencia LHCb group.
19th Feburary 2016 John Back
* Fixed bug in the definition of the initial spinor term Sinit in
EvtRareLbToLll::HadronicAmpRS(),
- from Tom Blake (LHCb).
12th February 2016 John Back
* From LHCb, added extensions to the EvtHQET2(FF) model for semitauonic
decays from Brian Hamilton, which needs a patch to EvtSemiLeptonicAmp
from Jack Wimberley to ensure that the q^2 range is physical when
finding the maximum amplitude probability.
2nd December 2015 John Back
* From LHCb, added EvtKStopizmumu model for KS -> pi0 mu mu decays based on
JHEP08(1998)004,
- courtesy of Veronika Chobanova, Diego Martinez Santos and Jeremy Dalseno.
* Added EvtConst::Fermi for Fermi coupling constant.
===
## R01-05-00
21st October 2015 John Back
* New tag incorporating all changes below.
* Recommended external packages are
- HepMC 2.06.09
- pythia 8.186
- Photos++ 3.61
- Tauola++ 1.1.5
* Added the EvtB2MuMuMuNu model for simulating the very rare four-leptonic
decays B- -> mu+ mu- anti-nu_mu mu-,
- courtesy Nikolai Nikitin.
16th October 2015 John Back
* Updated the configure script to automatically select the library names
for PHOTOS++; version 3.56 and below uses Fortran, version 3.61 and above
uses C++ only (default). Avoid using v3.60, since it does not work.
This needs the PHOTOS libraries built before EvtGen is configured.
Modified setupEvtGen.sh to use Photos++ v3.61.
7th October 2015 John Back
* Updated EvtGenExternal/EvtPhotosEngine to check that additional particles
from the outgoing vertex are indeed (FSR) photons, since later versions of
PHOTOS introduce pair emission, where particles may not always be photons.
* Added the genRootDecayChain.cc validation program to create ROOT files
containing information about the complete decay tree. Two example test
decay files BKstarGamma.dec and BuDst0rhop.dec can be used with this; the
first tests PHOTOS, the second looks at sequential decay chain storage.
The plotBKstarGamma.C ROOT macro can be used for B -> K* gamma plots.
2nd October 2015 John Back
* Modified EvtSVPHelAmp and added a new EvtSVPHelCPMix model, implementing
the complete mixing phenomenology of Bs to vector gamma decays,
- courtesy of Clara Remon (LHCb).
* EvtD0mixDalitz code: cleanup, inverted q/p for decays of D0bar (simplifies
user decay files) and fixed y parameter bug,
- courtesy of Jordi Tico (LHCb).
* Changed the initialisation order of the infrared cut-off in EvtPhotosEngine.
This actually has no effect, since the exponentiation function sets it to the
same 1e-7 value, but it is now in the correct order if we need to update it.
* Removed all remaining obsolete pragma (Win32) warnings from some classes.
23rd September 2015 Michal Kreps
* Reimplement the real Spence function in C++ and removed its fortran
implementation.
15th September 2015 Michal Kreps
* Fixed accessed uninitialised memory in EvtPDL.cpp, line 213.
* Modified the configure and setupEvtGen.sh scripts to work on Mac; needed
Mac compilation patch files added to the new "platform" subdirectory.
10th September 2015 John Back
* Updated setupEvtGen.sh to use the recommended external packages:
- HepMC 2.06.09, pythia 8.186, Photos++ 3.56 and Tauola++ 1.1.5.
* Fixed form-factor calculations for the BTOSLLBALL model 6 used to generate
b -> sll decays,
- courtesy of Christoph Langenbruch and David Loh (LHCb).
- Affects B->K*ll, B->rholl and B->omegall, particularly the electron modes.
* In the validation directory, added runPhotosTest.sh for testing FSR in
Upsilon(4S) -> e+ e- decays, and changed the plot comparison scripts to
use the 2nd directory "oldRootFiles" (which could be a soft-link) for
including ROOT histograms made from a previous version of EvtGen.
27th August 2015 John Back
* Added Mersenne-Twister random number generator (RNG) EvtMTRandomEngine.
- It requires c++11 compiler features (>= gcc 4.7), which should
automatically be enabled by the configure script.
- Introduced the preprocessor environment variable EVTGEN_CPP11 for c++11
features.
- EvtMTRandomEngine is the default RNG for the validation and test examples
if c++11 features are enabled.
* Added a phase-space test validation/genPHSP.sh and PhaseSpacePlots.C to
visually check the flatness of Dalitz plots in order to ensure that the
RNG is not producing biased results that depend on particle ordering.
* Added the models EvtbsToLLLLAmp and EvtbsToLLLLHyperCP for
B0_q -> l+ l- l+ l- decays (SM and one supersymmetric scenario),
- courtesy of Nikolai Nikitin and Konstantin Toms.
- Documentation provided in doc/evt_BQTOLLLL_model.pdf and
doc/evt_BQTOLLLLHYPERCP_model.pdf.
* Changed the installation and set-up script name to be just setupEvtGen.sh;
it uses the VERSION variable to specify the required tag. List of tags
are available using either "svn ls -v http://svn.cern.ch/guest/evtgen/tags"
or by going to http://svn.cern.ch/guest/evtgen/tags in a web browser.
12th June 2015 John Back
* Changed the width of chi_b1 in evt.pdl from 9.8928 GeV (!) to zero.
1st May 2015 John Back
* Added Bc -> scalar ell nu (EvtBcSMuNu) and Bc -> tensor ell nu
(EvtBcTMuNu) decays,
- courtesy of Jack Wimberley, LHCb.
- Also included the chi_c1 mode for EvtBcVMuNu.
===
## R01-04-00
2nd April 2015 John Back
* Removed the EvtStdlibRandomEngine class since this can produce biases
to kinematic distributions when one or more of the daughters is a
resonance, such as B0 -> K pi psi
- (thanks to Antonio Augusto Alves Jr who discovered this issue).
- EvtSimpleRandomEngine is now the default random number generator in the
validation and test examples.
* Incorporated several additions and modifications from LHCb:
a) From Michal Kreps, Tom Blake & Christoph Langenbruch,
added rare Lb --> Lambda^(*) ell ell models described in
arXiv:1108.6129, with various form factors from Gutsche et al.
(arXiv:1301.3737) and lattice QCD (arXiv:1212.4827)
b) From Andrew Crocombe, implemented Bs --> K* form factors
from Ball-Zwicky and z-parametrization form factors from
arXiv:1006.4945 for EvtbTosllBallFF
c) Christoph Langenbruch fixed the Bs -> phi ll form factors in
EvtbTosllBallFF; T3 showed a non-physical pole at very low
q2 which significantly affected the electron mode
d) From Michal Kreps, removed semicolons from wrong places to
clear warnings when compiled with the "-pedantic" option.
9th October 2014 John Back
* Change svnweb.cern.ch to svn.cern.ch in the setup script.
1st April 2014 John Back
* In EvtReport, modified the logging output severity status flags
to have the "EVTGEN_" prefix, e.g. INFO becomes EVTGEN_INFO.
* The global report() function has been renamed to EvtGenReport().
31st March 2014 John Back
* Added the ability to store named attributes for EvtParticles in the
form of a map<string, int>. The setAttribute(name, value) stores the
required value, while getAttribute(name) retrieves the integer value.
This is used in EvtPhotosEngine to specify the final-state radiation
"FSR" attribute to 1 for any additional photons (EvtPhotonParticles)
created by Photos++. It also stores the "ISR" attribute, but this
is always set to zero, since only FSR photons are created.
If the named attribute does not exist, then getAttribute() returns zero.
29th January 2014 Daniel Craik
* Removed mass assertion on GS shape in EvtDalitzReso to allow it to also
be used for charged rho resonances.
27th January 2014 John Back
* Minor corrections to Vub models to remove further gcc 4.8 warnings.
* Updated configure script to work for MacOS clang (from Genser team).
===
## R01-03-00
9th January 2014 John Back
* New tag version "1.3.0", incorporating all changes below.
* Replaced auto-install script to work with this version as well as
the latest versions of all external generator packages.
* Updated README to mention the new CERN-based web pages for Photos++
and Tauola++.
8th January 2014 John Back
* Fix gcc 4.6 and 4.8 compilation warnings,
- courtesy of Patrick Robbe (LHCb);
- main changes are removal of unused variables.
* Changed the EvtPythiaEngine class and configure script to use new
Pythia 8 header locations; Pythia 8.180 or above is now required.
7th January 2014 John Back
* Modified EvtBCVFF to correct the Kiselev form factors
- from Jack Wimberley (LHCb).
9th October 2013 Daniel Craik
* Added Gounaris-Sakurai and Gaussian shapes to EvtGenericDalitz
and set sensible defaults for LASS parameters.
19th September 2013 John Back
* Modified EvtGenExternal/EvtPythiaEngine to keep track of any new
particles that are added to the default Pythia database to avoid
duplicating particle/anti-particle entries that could override
previously defined Pythia decay chains.
18th September 2013 John Back
* Added Mac OS flags for the configure script and src/Makefile.
15th July 2013 Daniel Craik
* Added flag to turn on scaling of LASS amplitude by M/q in EvtDalitzReso
15th July 2013 Daniel Craik
* EvtParserXML now accepts file names containing environment variables,
exponential non-resonant shape in EvtDalitzReso now defined as exp(-alpha*m^2),
LASS shape in EvtDalitzReso now takes a cutoff parameter
4th July 2013 Daniel Craik
* Added LASS, exponential non-resonant and linear non-resonant shapes to EvtGenericDalitz.
3rd July 2013 Daniel Craik
* Fixed auto-install script for R01-02-00.
1st July 2013 Daniel Craik
* Added auto-install script for R01-02-00.
===
## R01-02-00
15th May 2013 John Back
* New tag, version "1.2.0", incorporating all changes below.
14th May 2013 Michal Kreps
* Added Blatt-Weisskopf barrier factors up to L=5 in
EvtGenBase/EvtBlattWeisskopf::compute().
14th May 2013 John Back
* Added additional entries (appended at the end) to the evt.pdl particle
data file
- courtesy of Romulus Godang and Belle II colleagues.
14th March 2013 John Back
* Added the method EvtParticle::getPDGId() to get the PDG integer for a
particle directly (which just calls EvtPDL::getStdHep()).
* Added a check in EvtPhotosEngine::doDecay to skip Photos if a given
particle has too many daughters (>= 10) to avoid a problem with a
hard coded upper limit in the Photos PHOENE subroutine.
2nd February 2013 Daniel Craik
* Updated EvtDalitzTable to estimate probMax when it is missing from a
Dalitz model.
1st February 2013 John Back
* Added the ability to read in Pythia 6 commands in ascii decay files in
EvtDecayTable::readDecayFile (this was already possible in xml files).
* Modified the Photos++ engine default settings to be more suited to B
decays (from LHCb defaults).
31st January 2013 John Back
* Added the ability to read in Pythia 8 commands in ascii decay files
in EvtDecayTable::readDecayFile. They can be set using the syntax:
"PythiaTypeParam module:variable=value", where Type = Generic, Alias or
Both for specifying whether the parameter is for the generic or alias
Pythia decay engines (or both). The 2nd argument must not contain any
spaces. Fixed the list of commands strings being used in the
EvtPythiaEngine class (i.e. Pythia parameters that can be set via decay
files).
31st January 2013 Daniel Craik
* Added named parameters to various decay models.
30th January 2013 John Back
* Fixed some of the parameter arguments used in the EvtSVSCPiso model.
24th January 2013 John Back
* Set the Photos++ and Tauola++ models to use the EvtGen random number
engine when useEvtGenRandom is set to true in the EvtExternalGenList
constructor.
23rd January 2013 John Back
* Added EvtGenExternal/EvtPythiaRandom to allow the use of the EvtGen
random number engine to also be used for the random engine for Pythia 8.
* Added a boolean (useEvtGenRandom, default = true) within the
EvtExternalGenList constructor to use this feature.
18th December 2012 John Back
* Corrected some wrong daughter ordering assignments for decay modes 5 and
12 in EvtDDalitz. Updated validation/DalitzDecays.xml to also contain
D decay mode 12, as well as various modes that may use K_S0 and K_L0.
* Added validation/genDDalitzModes.sh and updated validation/compareDalitz.C to
do a complete comparison of the D Dalitz modes with the xml versions.
11th December 2012 Daniel Craik
* Updated the Xml parser to support named model parameters.
* Updated the generic Dalitz model to use named model parameters as an example.
15th October 2012 John Back
* Make EvtSimpleRandomEngine inherit from EvtRandomEngine to avoid
crash in EvtGen.cpp when no random engine is defined
- (from Bjoern Spruck).
===
## R01-01-00
4th October 2012 John Back
* New tag, version "1.1.0", incorporating all changes below.
* Provide proper default constructors for EvtVector4R and
EvtPhotonParticle. Modified the validation and test code to also
compile/link in the case of no external generators being included.
3rd October 2012 John Back
* Corrected the t3 vector form factor values for the Ball-Zwicky 2005
model (modelId = 6) in EvtbTosllBallFF::getVectorFF(), which
were set to t3tilde instead.
18th September 2012 John Back
* Moved the external generator engines to a new sub-directory
EvtGenExternal. Building the code now creates 2 libraries:
libEvtGen.so (Base+Models) and libEvtGenExternal.so.
- This allows anyone to ignore using the new external generators
if required (by not creating/loading the 2nd library).
* Added prefix option to the configure script/Makefile to allow the user
to specify an installation directory for the include files, libraries,
DECAY.DEC and evt.pdl files (for Genser).
14th September 2012 Michal Kreps
* Fixed the calculation of the angle between decay planes in the function
EvtKine::EvtDecayAngleChi. Fixed typo in EvtLb2Lll decay model. Only
some NP scenarious could be affected, SM one is definitely unaffected.
13th September 2012 John Back
* Added the use of the environment variables EVTGEN_PHOTOS, EVTGEN_PYTHIA
and EVTGEN_TAUOLA to specify if the Photos, Pythia and/or Tauola engine
classes are used or not. These variables are set by the configure script,
depending if the library paths are specified for these generators.
===
## R01-00-01
12th September 2012 John Back
* New tag incorporating all changes below, since R01-00-00.
11th September 2012 John Back
* Modified the Photos and Tauola engine classes to use the new
Photospp and Tauolapp namespaces that are present in the latest
versions of Photos++(3.5) and Tauola++(1.0.7).
* Updated the configure file to get the correct location of the Tauola++
include files.
* Added the D0->pi+pi-pi0 decay mode in EvtDDalitz
- from Marco Gersabeck and Frederic Dreyer (LHCb).
* Added new decay models/classes from Alexey Luchinsky (LHCb):
EvtBcVMuNu, EvtTVP, EvtWnPi, EvtSVP, EvtXPsiGamma, EvtBcVNpi
29th June 2012 John Back
* Corrected mass(squared) variables filled in the Dalitz TTree in
validation/genExampleRootFiles.
15th May 2012 Daniel Craik
* Updated EvtD0gammaDalitz to deal with D mesons from neutral B->DK
* Added save function to validation/compareDalitz.C.
11th May 2012 Daniel Craik
* Replaced BaBar specific configuration for BlattWeisskopf birth factors.
* Updated XML conversion script to handle new configuration.
* Fixed some bugs in the XML conversion script related to particle
modifications.
9th May 2012 Daniel Craik
* Added latex documentation for xml decay files.
2nd May 2012 Daniel Craik
* Added resDaughters attribute to the Dalitz resonance xml tag to
simplify defining symmetric resonances. Updated validation xml files to
use the new functionality.
27th April 2012 Daniel Craik
* Upgraded EvtGenericDalitz to use EvtDalitzReso for resonances.
* Added validation to compare EvtGenericDalitz to all 11 EvtDDalitz modes.
* Added a root macro to quickly compare two Dalitz decays for validation.
24th April 2012 John Back
* Solved two bugs in the EvtD0gammaDalitz model (from Jordi Tico, LHCb):
configuration of the conjugated model, and using only the B charge
to determine the model used, not the D flavour.
17th April 2012 Daniel Craik
* Updated the GenericDalitz validation code to use the same probMax
values as DDalitz.
* Added XML decay file parsing to EvtGen::readUDecay.
- Dec files are still the default.
30th March 2012 John Back
* Update maximum probability values in EvtDDalitz::initProbMax()
for all DDalitz modes.
23rd March 2012 John Back
* Added the EvtEta2MuMuGamma decay model from LHCb.
21st March 2012 John Back
* Added EvtD0gammaDalitz decay model from LHCb.
20th March 2012 Daniel Craik
* Added backwards compatibility for Pythia 6 commands in the XML configuration.
* Updated decay file conversion tool to convert JetSetPar lines to pythia6Param
tags.
19th March 2012 Daniel Craik
* Added infrastructure to pass commands to external generators.
* XML config now takes Pythia8 configuration commands.
16th March 2012 Daniel Craik
* Added the ability to define particles from the PDL for Dalitz decay
resonances instead of defining mass, width and spin seperately.
* Renamed the lifetime attribute of Dalitz decay resonaces to width to avoid
confusion.
* Added further validation code for the generic Dalitz model.
15th March 2012 Daniel Craik
* Added validation code for xml decay files and the generic Dalitz model.
===
## R01-00-00
6th March 2012 John Back
* First official version for Genser (evtgen 1.0.0) that includes
support for external generators: Pythia8, Photos++ and Tauola++.
* This also includes a preliminary version of creating Dalitz plot
decay models using EvtGenericDalitz.
diff --git a/src/EvtGenBase/EvtDecayAmp.cpp b/src/EvtGenBase/EvtDecayAmp.cpp
index de4af16..ca2f4da 100644
--- a/src/EvtGenBase/EvtDecayAmp.cpp
+++ b/src/EvtGenBase/EvtDecayAmp.cpp
@@ -1,259 +1,260 @@
/***********************************************************************
* Copyright 1998-2020 CERN for the benefit of the EvtGen authors *
* *
* This file is part of EvtGen. *
* *
* EvtGen is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* EvtGen is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with EvtGen. If not, see <https://www.gnu.org/licenses/>. *
***********************************************************************/
#include "EvtGenBase/EvtDecayAmp.hh"
#include "EvtGenBase/EvtAmp.hh"
#include "EvtGenBase/EvtDecayBase.hh"
#include "EvtGenBase/EvtPDL.hh"
#include "EvtGenBase/EvtParticle.hh"
#include "EvtGenBase/EvtPatches.hh"
#include "EvtGenBase/EvtRadCorr.hh"
#include "EvtGenBase/EvtRandom.hh"
#include "EvtGenBase/EvtReport.hh"
using std::endl;
void EvtDecayAmp::makeDecay( EvtParticle* p, bool recursive )
{
//original default value
int ntimes = 10000;
int more;
EvtSpinDensity rho;
double prob, prob_max;
_amp2.init( p->getId(), getNDaug(), getDaugs() );
do {
_daugsDecayedByParentModel = false;
_weight = 1.0;
decay( p );
rho = _amp2.getSpinDensity();
prob = p->getSpinDensityForward().normalizedProb( rho );
if ( prob < 0.0 ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Negative prob:" << p->getId().getId() << " "
<< p->getChannel() << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" ) << "rho_forward:" << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" ) << p->getSpinDensityForward();
EvtGenReport( EVTGEN_ERROR, "EvtGen" ) << "rho decay:" << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" ) << rho << endl;
}
if ( prob != prob ) {
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Forward density matrix:" << endl;
EvtGenReport( EVTGEN_DEBUG, "EvtGen" ) << p->getSpinDensityForward();
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Decay density matrix:" << endl;
EvtGenReport( EVTGEN_DEBUG, "EvtGen" ) << rho;
EvtGenReport( EVTGEN_DEBUG, "EvtGen" ) << "prob:" << prob << endl;
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Particle:" << EvtPDL::name( p->getId() ).c_str() << endl;
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "channel :" << p->getChannel() << endl;
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Momentum:" << p->getP4() << " " << p->mass() << endl;
if ( p->getParent() != nullptr ) {
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "parent:"
<< EvtPDL::name( p->getParent()->getId() ).c_str() << endl;
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "parent channel :" << p->getParent()->getChannel()
<< endl;
size_t i;
EvtGenReport( EVTGEN_DEBUG, "EvtGen" ) << "parent daughters :";
for ( i = 0; i < p->getParent()->getNDaug(); i++ ) {
EvtGenReport( EVTGEN_DEBUG, "" )
<< EvtPDL::name( p->getParent()->getDaug( i )->getId() )
.c_str()
<< " ";
}
EvtGenReport( EVTGEN_DEBUG, "" ) << endl;
EvtGenReport( EVTGEN_DEBUG, "EvtGen" ) << "daughters :";
for ( size_t i = 0; i < p->getNDaug(); i++ ) {
EvtGenReport( EVTGEN_DEBUG, "" )
<< EvtPDL::name( p->getDaug( i )->getId() ).c_str()
<< " ";
}
EvtGenReport( EVTGEN_DEBUG, "" ) << endl;
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "daughter momenta :" << endl;
;
for ( size_t i = 0; i < p->getNDaug(); i++ ) {
EvtGenReport( EVTGEN_DEBUG, "" )
<< p->getDaug( i )->getP4() << " "
<< p->getDaug( i )->mass();
EvtGenReport( EVTGEN_DEBUG, "" ) << endl;
}
}
}
prob /= _weight;
prob_max = getProbMax( prob );
p->setDecayProb( prob / prob_max );
more = prob < EvtRandom::Flat( prob_max );
ntimes--;
} while ( ntimes && more );
if ( ntimes == 0 ) {
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Tried accept/reject: 10000"
<< " times, and rejected all the times!" << endl;
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< p->getSpinDensityForward() << endl;
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Is therefore accepting the last event!" << endl;
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Decay of particle:" << EvtPDL::name( p->getId() ).c_str()
<< "(channel:" << p->getChannel() << ") with mass " << p->mass()
<< endl;
for ( size_t ii = 0; ii < p->getNDaug(); ii++ ) {
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Daughter " << ii << ":"
<< EvtPDL::name( p->getDaug( ii )->getId() ).c_str()
<< " with mass " << p->getDaug( ii )->mass() << endl;
}
}
EvtSpinDensity rho_list[10];
rho_list[0] = p->getSpinDensityForward();
EvtAmp ampcont;
if ( _amp2._pstates != 1 ) {
ampcont = _amp2.contract( 0, p->getSpinDensityForward() );
} else {
ampcont = _amp2;
}
// it may be that the parent decay model has already
// done the decay - this should be rare and the
// model better know what it is doing..
if ( !daugsDecayedByParentModel() ) {
if ( recursive ) {
for ( size_t i = 0; i < p->getNDaug(); i++ ) {
rho.setDim( _amp2.dstates[i] );
if ( _amp2.dstates[i] == 1 ) {
rho.set( 0, 0, EvtComplex( 1.0, 0.0 ) );
} else {
rho = ampcont.contract( _amp2._dnontrivial[i], _amp2 );
}
if ( !rho.check() ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "-------start error-------" << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "forward rho failed Check:"
<< EvtPDL::name( p->getId() ).c_str() << " "
<< p->getChannel() << " " << i << endl;
p->printTree();
for ( size_t idaug = 0; idaug < p->getNDaug(); idaug++ ) {
EvtParticle* daughter = p->getDaug( idaug );
if ( daughter != nullptr ) {
daughter->printTree();
}
}
EvtParticle* pParent = p->getParent();
if ( pParent != nullptr ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Parent:"
<< EvtPDL::name( pParent->getId() ).c_str() << endl;
EvtParticle* grandParent = pParent->getParent();
if ( grandParent != nullptr ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "GrandParent:"
<< EvtPDL::name( grandParent->getId() ).c_str()
<< endl;
}
}
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< " EvtSpinDensity rho: " << rho;
_amp2.dump();
for ( size_t ii = 0; ii < i + 1; ii++ ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "rho_list[" << ii << "] = " << rho_list[ii];
}
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "-------Done with error-------" << endl;
}
p->getDaug( i )->setSpinDensityForward( rho );
p->getDaug( i )->decay();
rho_list[i + 1] = p->getDaug( i )->getSpinDensityBackward();
if ( _amp2.dstates[i] != 1 ) {
ampcont = ampcont.contract( _amp2._dnontrivial[i],
rho_list[i + 1] );
}
}
p->setSpinDensityBackward( _amp2.getBackwardSpinDensity( rho_list ) );
if ( !p->getSpinDensityBackward().check() ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "rho_backward failed Check" << p->getId().getId() << " "
<< p->getChannel() << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< p->getSpinDensityBackward();
}
}
}
- if ( getPHOTOS() || EvtRadCorr::alwaysRadCorr() ) {
+ if ( ( getFSR() || EvtRadCorr::alwaysRadCorr() ) &&
+ !EvtRadCorr::neverRadCorr() ) {
int n_daug_orig = p->getNDaug();
EvtRadCorr::doRadCorr( p );
int n_daug_new = p->getNDaug();
for ( int i = n_daug_orig; i < n_daug_new; i++ ) {
p->getDaug( i )->decay();
}
}
}
diff --git a/src/EvtGenBase/EvtDecayBase.cpp b/src/EvtGenBase/EvtDecayBase.cpp
index e09dd81..03dea6e 100644
--- a/src/EvtGenBase/EvtDecayBase.cpp
+++ b/src/EvtGenBase/EvtDecayBase.cpp
@@ -1,665 +1,640 @@
/***********************************************************************
* Copyright 1998-2020 CERN for the benefit of the EvtGen authors *
* *
* This file is part of EvtGen. *
* *
* EvtGen is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* EvtGen is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with EvtGen. If not, see <https://www.gnu.org/licenses/>. *
***********************************************************************/
#include "EvtGenBase/EvtDecayBase.hh"
#include "EvtGenBase/EvtPDL.hh"
#include "EvtGenBase/EvtParticle.hh"
#include "EvtGenBase/EvtPatches.hh"
#include "EvtGenBase/EvtReport.hh"
#include "EvtGenBase/EvtSpinType.hh"
#include "EvtGenBase/EvtStatus.hh"
#include <ctype.h>
#include <fstream>
#include <iostream>
#include <stdlib.h>
#include <vector>
using std::endl;
using std::fstream;
void EvtDecayBase::checkQ()
{
int i;
int q = 0;
int qpar;
//If there are no daughters (jetset etc) then we do not
//want to do this test. Why? Because sometimes the parent
//will have a nonzero charge.
if ( _ndaug != 0 ) {
for ( i = 0; i < _ndaug; i++ ) {
q += EvtPDL::chg3( _daug[i] );
}
qpar = EvtPDL::chg3( _parent );
if ( q != qpar ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< _modelname.c_str() << " generator expected "
<< " charge to be conserved, found:" << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Parent charge of " << ( qpar / 3 ) << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Sum of daughter charge of " << ( q / 3 ) << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "The parent is " << EvtPDL::name( _parent ).c_str() << endl;
for ( i = 0; i < _ndaug; i++ ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Daughter " << EvtPDL::name( _daug[i] ).c_str() << endl;
}
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Will terminate execution!" << endl;
::abort();
}
}
}
double EvtDecayBase::getProbMax( double prob )
{
int i;
//diagnostics
sum_prob += prob;
if ( prob > max_prob )
max_prob = prob;
if ( defaultprobmax && ntimes_prob <= 500 ) {
//We are building up probmax with this iteration
ntimes_prob += 1;
if ( prob > probmax ) {
probmax = prob;
}
if ( ntimes_prob == 500 ) {
probmax *= 1.2;
}
return 1000000.0 * prob;
}
if ( prob > probmax * 1.0001 ) {
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< "prob > probmax:(" << prob << ">" << probmax << ")";
EvtGenReport( EVTGEN_INFO, "" ) << "(" << _modelname.c_str() << ") ";
EvtGenReport( EVTGEN_INFO, "" )
<< EvtPDL::name( _parent ).c_str() << " -> ";
for ( i = 0; i < _ndaug; i++ ) {
EvtGenReport( EVTGEN_INFO, "" )
<< EvtPDL::name( _daug[i] ).c_str() << " ";
}
EvtGenReport( EVTGEN_INFO, "" ) << endl;
if ( defaultprobmax )
probmax = prob;
}
ntimes_prob += 1;
return probmax;
} //getProbMax
double EvtDecayBase::resetProbMax( double prob )
{
EvtGenReport( EVTGEN_INFO, "EvtGen" ) << "Reseting prob max\n";
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< "prob > probmax:(" << prob << ">" << probmax << ")";
EvtGenReport( EVTGEN_INFO, "" ) << "(" << _modelname.c_str() << ")";
EvtGenReport( EVTGEN_INFO, "" ) << EvtPDL::getStdHep( _parent ) << "->";
for ( int i = 0; i < _ndaug; i++ ) {
EvtGenReport( EVTGEN_INFO, "" ) << EvtPDL::getStdHep( _daug[i] ) << " ";
}
EvtGenReport( EVTGEN_INFO, "" ) << endl;
probmax = 0.0;
- defaultprobmax = 0;
+ defaultprobmax = false;
ntimes_prob = 0;
return prob;
}
std::string EvtDecayBase::commandName()
{
return std::string( "" );
}
void EvtDecayBase::command( std::string )
{
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Should never call EvtDecayBase::command" << endl;
::abort();
}
std::string EvtDecayBase::getParamName( int i )
{
switch ( i ) {
case 0:
return "param00";
case 1:
return "param01";
case 2:
return "param02";
case 3:
return "param03";
case 4:
return "param04";
case 5:
return "param05";
case 6:
return "param06";
case 7:
return "param07";
case 8:
return "param08";
case 9:
return "param09";
default:
return "";
}
}
std::string EvtDecayBase::getParamDefault( int /*i*/ )
{
return "";
}
void EvtDecayBase::init()
{
//This default version of init does nothing;
//A specialized version of this function can be
//supplied for each decay model to do initialization.
return;
}
void EvtDecayBase::initProbMax()
{
//This function is called if the decay does not have a
//specialized initialization.
//The default is to set the maximum
//probability to 0 and the number of times called to 0
- //and defaultprobmax to 1 such that the decay will be
+ //and defaultprobmax to 'true' such that the decay will be
//generated many many times
//in order to generate a reasonable maximum probability
//for the decay.
- defaultprobmax = 1;
+ defaultprobmax = true;
ntimes_prob = 0;
probmax = 0.0;
} //initProbMax
void EvtDecayBase::saveDecayInfo( EvtId ipar, int ndaug, EvtId* daug, int narg,
std::vector<std::string>& args,
std::string name, double brfr )
{
int i;
_brfr = brfr;
_ndaug = ndaug;
_narg = narg;
_parent = ipar;
_dsum = 0;
if ( _ndaug > 0 ) {
_daug.resize( _ndaug );
for ( i = 0; i < _ndaug; i++ ) {
_daug[i] = daug[i];
_dsum += daug[i].getAlias();
}
} else {
_daug.clear();
}
if ( _narg > 0 ) {
_args.resize( _narg + 1 );
for ( i = 0; i < _narg; i++ ) {
_args[i] = args[i];
}
} else {
_args.clear();
}
_modelname = name;
this->init();
this->initProbMax();
if ( _chkCharge ) {
this->checkQ();
}
if ( defaultprobmax ) {
EvtGenReport( EVTGEN_INFO, "EvtGen" ) << "No default probmax for ";
EvtGenReport( EVTGEN_INFO, "" ) << "(" << _modelname.c_str() << ") ";
EvtGenReport( EVTGEN_INFO, "" )
<< EvtPDL::name( _parent ).c_str() << " -> ";
for ( i = 0; i < _ndaug; i++ ) {
EvtGenReport( EVTGEN_INFO, "" )
<< EvtPDL::name( _daug[i] ).c_str() << " ";
}
EvtGenReport( EVTGEN_INFO, "" ) << endl;
EvtGenReport( EVTGEN_INFO, "" )
<< "This is fine for development, but must be provided for production."
<< endl;
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< "Never fear though - the decay will use the \n";
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< "500 iterations to build up a good probmax \n";
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< "before accepting a decay. " << endl;
}
}
-EvtDecayBase::EvtDecayBase()
-{
- //the default is that the user module does _not_ set
- // any probmax.
- defaultprobmax = 1;
- ntimes_prob = 0;
- probmax = 0.0;
-
- _photos = 0;
- _verbose = 0;
- _summary = 0;
- _parent = EvtId( -1, -1 );
- _ndaug = 0;
- _narg = 0;
- _modelname = "**********";
-
- //Default is to check that charge is conserved
- _chkCharge = 1;
-
- //statistics collection!
-
- max_prob = 0.0;
- sum_prob = 0.0;
-}
-
void EvtDecayBase::printSummary() const
{
if ( ntimes_prob > 0 ) {
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< "Calls = " << ntimes_prob
<< " eff: " << sum_prob / ( probmax * ntimes_prob )
<< " frac. max:" << max_prob / probmax;
EvtGenReport( EVTGEN_INFO, "" )
<< " probmax:" << probmax << " max:" << max_prob << " : ";
}
printInfo();
}
void EvtDecayBase::printInfo() const
{
EvtGenReport( EVTGEN_INFO, "" ) << EvtPDL::name( _parent ).c_str() << " -> ";
for ( int i = 0; i < _ndaug; i++ ) {
EvtGenReport( EVTGEN_INFO, "" )
<< EvtPDL::name( _daug[i] ).c_str() << " ";
}
EvtGenReport( EVTGEN_INFO, "" ) << " (" << _modelname.c_str() << ")" << endl;
}
void EvtDecayBase::setProbMax( double prbmx )
{
- defaultprobmax = 0;
+ defaultprobmax = false;
probmax = prbmx;
}
void EvtDecayBase::noProbMax()
{
- defaultprobmax = 0;
+ defaultprobmax = false;
}
double EvtDecayBase::findMaxMass( EvtParticle* p )
{
double maxOkMass = EvtPDL::getMaxMass( p->getId() );
//protect against vphotons
if ( maxOkMass < 0.0000000001 )
return 10000000.;
//and against already determined masses
if ( p->hasValidP4() )
maxOkMass = p->mass();
EvtParticle* par = p->getParent();
if ( par ) {
double maxParMass = findMaxMass( par );
size_t i;
double minDaugMass = 0.;
for ( i = 0; i < par->getNDaug(); i++ ) {
EvtParticle* dau = par->getDaug( i );
if ( dau != p ) {
// it might already have a mass
if ( dau->isInitialized() || dau->hasValidP4() )
minDaugMass += dau->mass();
else
//give it a bit of phase space
minDaugMass += 1.000001 * EvtPDL::getMinMass( dau->getId() );
}
}
if ( maxOkMass > ( maxParMass - minDaugMass ) )
maxOkMass = maxParMass - minDaugMass;
}
return maxOkMass;
}
// given list of daughters ( by number ) returns a
// list of viable masses.
void EvtDecayBase::findMass( EvtParticle* p )
{
//Need to also check that this mass does not screw
//up the parent
//This code assumes that for the ith daughter, 0..i-1
//already have a mass
double maxOkMass = findMaxMass( p );
int count = 0;
double mass;
bool massOk = false;
size_t i;
while ( !massOk ) {
count++;
if ( count > 10000 ) {
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< "Can not find a valid mass for: "
<< EvtPDL::name( p->getId() ).c_str() << endl;
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< "Now printing parent and/or grandparent tree\n";
if ( p->getParent() ) {
if ( p->getParent()->getParent() ) {
p->getParent()->getParent()->printTree();
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< p->getParent()->getParent()->mass() << endl;
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< p->getParent()->mass() << endl;
} else {
p->getParent()->printTree();
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< p->getParent()->mass() << endl;
}
} else
p->printTree();
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< "maxokmass=" << maxOkMass << " "
<< EvtPDL::getMinMass( p->getId() ) << " "
<< EvtPDL::getMaxMass( p->getId() ) << endl;
if ( p->getNDaug() ) {
for ( i = 0; i < p->getNDaug(); i++ ) {
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< p->getDaug( i )->mass() << " ";
}
EvtGenReport( EVTGEN_INFO, "EvtGen" ) << endl;
}
if ( maxOkMass >= EvtPDL::getMinMass( p->getId() ) ) {
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< "taking a default value\n";
p->setMass( maxOkMass );
return;
}
assert( 0 );
}
mass = EvtPDL::getMass( p->getId() );
//Just need to check that this mass is > than
//the mass of all daughters
double massSum = 0.;
if ( p->getNDaug() ) {
for ( i = 0; i < p->getNDaug(); i++ ) {
massSum += p->getDaug( i )->mass();
}
}
//some special cases are handled with 0 (stable) or 1 (k0->ks/kl) daughters
if ( p->getNDaug() < 2 )
massOk = true;
if ( p->getParent() ) {
if ( p->getParent()->getNDaug() == 1 )
massOk = true;
}
if ( !massOk ) {
if ( massSum < mass )
massOk = true;
if ( mass > maxOkMass )
massOk = false;
}
}
p->setMass( mass );
}
void EvtDecayBase::findMasses( EvtParticle* p, int ndaugs, EvtId daugs[10],
double masses[10] )
{
int i;
double mass_sum;
int count = 0;
if ( !( p->firstornot() ) ) {
for ( i = 0; i < ndaugs; i++ ) {
masses[i] = p->getDaug( i )->mass();
} //for
} //if
else {
p->setFirstOrNot();
// if only one daughter do it
if ( ndaugs == 1 ) {
masses[0] = p->mass();
return;
}
//until we get a combo whose masses are less than _parent mass.
do {
mass_sum = 0.0;
for ( i = 0; i < ndaugs; i++ ) {
masses[i] = EvtPDL::getMass( daugs[i] );
mass_sum = mass_sum + masses[i];
}
count++;
if ( count == 10000 ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Decaying particle:" << EvtPDL::name( p->getId() ).c_str()
<< " (m=" << p->mass() << ")" << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "To the following daugthers" << endl;
for ( i = 0; i < ndaugs; i++ ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< EvtPDL::name( daugs[i] ).c_str() << endl;
}
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Has been rejected " << count
<< " times, will now take minimal masses "
<< " of daugthers" << endl;
mass_sum = 0.;
for ( i = 0; i < ndaugs; i++ ) {
masses[i] = EvtPDL::getMinMass( daugs[i] );
mass_sum = mass_sum + masses[i];
}
if ( mass_sum > p->mass() ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Parent mass=" << p->mass()
<< "to light for daugthers." << endl
<< "Will throw the event away." << endl;
//dont terminate - start over on the event.
EvtStatus::setRejectFlag();
mass_sum = 0.;
// ::abort();
}
}
} while ( mass_sum > p->mass() );
} //else
return;
}
void EvtDecayBase::checkNArg( int a1, int a2, int a3, int a4 )
{
if ( _narg != a1 && _narg != a2 && _narg != a3 && _narg != a4 ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< _modelname.c_str() << " generator expected " << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" ) << a1 << endl;
;
if ( a2 > -1 ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" ) << " or " << a2 << endl;
}
if ( a3 > -1 ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" ) << " or " << a3 << endl;
}
if ( a4 > -1 ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" ) << " or " << a4 << endl;
}
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< " arguments but found:" << _narg << endl;
printSummary();
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Will terminate execution!" << endl;
::abort();
}
}
void EvtDecayBase::checkNDaug( int d1, int d2 )
{
if ( _ndaug != d1 && _ndaug != d2 ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< _modelname.c_str() << " generator expected ";
EvtGenReport( EVTGEN_ERROR, "EvtGen" ) << d1;
if ( d2 > -1 ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" ) << " or " << d2;
}
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< " daughters but found:" << _ndaug << endl;
printSummary();
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Will terminate execution!" << endl;
::abort();
}
}
void EvtDecayBase::checkSpinParent( EvtSpinType::spintype sp )
{
EvtSpinType::spintype parenttype = EvtPDL::getSpinType( getParentId() );
if ( parenttype != sp ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< _modelname.c_str() << " did not get the correct parent spin\n";
printSummary();
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Will terminate execution!" << endl;
::abort();
}
}
void EvtDecayBase::checkSpinDaughter( int d1, EvtSpinType::spintype sp )
{
EvtSpinType::spintype parenttype = EvtPDL::getSpinType( getDaug( d1 ) );
if ( parenttype != sp ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< _modelname.c_str()
<< " did not get the correct daughter spin d=" << d1 << endl;
printSummary();
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Will terminate execution!" << endl;
::abort();
}
}
double* EvtDecayBase::getArgs()
{
if ( !_argsD.empty() )
return _argsD.data();
//The user has asked for a list of doubles - the arguments
//better all be doubles...
if ( _narg == 0 )
return _argsD.data();
_argsD.resize( _narg );
for ( int i = 0; i < _narg; i++ ) {
char* tc;
_argsD[i] = strtod( _args[i].c_str(), &tc );
}
return _argsD.data();
}
double EvtDecayBase::getArg( unsigned int j )
{
// Verify string
if ( getParentId().getId() == 25 ) {
int i = 0;
++i;
}
const char* str = _args[j].c_str();
int i = 0;
while ( str[i] != 0 ) {
if ( isalpha( str[i] ) && str[i] != 'e' ) {
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< "String " << str << " is not a number" << endl;
assert( 0 );
}
i++;
}
char** tc = nullptr;
double result = strtod( _args[j].c_str(), tc );
if ( _storedArgs.size() < j + 1 ) { // then store the argument's value
_storedArgs.push_back( result );
}
return result;
}
bool EvtDecayBase::matchingDecay( const EvtDecayBase& other ) const
{
if ( _ndaug != other._ndaug )
return false;
if ( _parent != other._parent )
return false;
std::vector<int> useDs;
for ( int i = 0; i < _ndaug; i++ )
useDs.push_back( 0 );
for ( int i = 0; i < _ndaug; i++ ) {
bool foundIt = false;
for ( int j = 0; j < _ndaug; j++ ) {
if ( useDs[j] == 1 )
continue;
if ( _daug[i] == other._daug[j] &&
_daug[i].getAlias() == other._daug[j].getAlias() ) {
foundIt = true;
useDs[j] = 1;
break;
}
}
if ( foundIt == false )
return false;
}
for ( int i = 0; i < _ndaug; i++ )
if ( useDs[i] == 0 )
return false;
return true;
}
diff --git a/src/EvtGenBase/EvtDecayIncoherent.cpp b/src/EvtGenBase/EvtDecayIncoherent.cpp
index 5534f56..6023a3c 100644
--- a/src/EvtGenBase/EvtDecayIncoherent.cpp
+++ b/src/EvtGenBase/EvtDecayIncoherent.cpp
@@ -1,78 +1,79 @@
/***********************************************************************
* Copyright 1998-2020 CERN for the benefit of the EvtGen authors *
* *
* This file is part of EvtGen. *
* *
* EvtGen is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* EvtGen is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with EvtGen. If not, see <https://www.gnu.org/licenses/>. *
***********************************************************************/
#include "EvtGenBase/EvtDecayIncoherent.hh"
#include "EvtGenBase/EvtDecayBase.hh"
#include "EvtGenBase/EvtPDL.hh"
#include "EvtGenBase/EvtParticle.hh"
#include "EvtGenBase/EvtPatches.hh"
#include "EvtGenBase/EvtRadCorr.hh"
#include "EvtGenBase/EvtReport.hh"
void EvtDecayIncoherent::makeDecay( EvtParticle* p, bool recursive )
{
//initialize this the hard way..
//Lange June 26, 2000
for ( size_t i = 0; i < static_cast<unsigned int>( MAX_DAUG ); i++ ) {
spinDensitySet[i] = 0;
}
_daugsDecayedByParentModel = false;
decay( p );
p->setDecayProb( 1.0 );
EvtSpinDensity rho;
rho.setDiag( p->getSpinStates() );
p->setSpinDensityBackward( rho );
- if ( getPHOTOS() || EvtRadCorr::alwaysRadCorr() ) {
+ if ( ( getFSR() || EvtRadCorr::alwaysRadCorr() ) &&
+ !EvtRadCorr::neverRadCorr() ) {
EvtRadCorr::doRadCorr( p );
}
if ( !recursive )
return;
//Now decay the daughters.
if ( !daugsDecayedByParentModel() ) {
for ( size_t i = 0; i < p->getNDaug(); i++ ) {
//Need to set the spin density of the daughters to be
//diagonal.
rho.setDiag( p->getDaug( i )->getSpinStates() );
//if (p->getDaug(i)->getNDaug()==0){
//only do this if the user has not already set the
//spin density matrix herself.
//Lange June 26, 2000
if ( isDaughterSpinDensitySet( i ) == 0 ) {
p->getDaug( i )->setSpinDensityForward( rho );
} else {
//EvtGenReport(EVTGEN_INFO,"EvtGen") << "spinDensitymatrix already set!!!\n";
EvtSpinDensity temp = p->getDaug( i )->getSpinDensityForward();
// EvtGenReport(EVTGEN_INFO,"EvtGen") <<temp<<endl;
}
//Now decay the daughter. Really!
p->getDaug( i )->decay();
}
}
}
diff --git a/src/EvtGenBase/EvtDecayProb.cpp b/src/EvtGenBase/EvtDecayProb.cpp
index 8bb6261..898b883 100644
--- a/src/EvtGenBase/EvtDecayProb.cpp
+++ b/src/EvtGenBase/EvtDecayProb.cpp
@@ -1,94 +1,96 @@
/***********************************************************************
* Copyright 1998-2020 CERN for the benefit of the EvtGen authors *
* *
* This file is part of EvtGen. *
* *
* EvtGen is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* EvtGen is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with EvtGen. If not, see <https://www.gnu.org/licenses/>. *
***********************************************************************/
#include "EvtGenBase/EvtDecayProb.hh"
#include "EvtGenBase/EvtDecayBase.hh"
#include "EvtGenBase/EvtPDL.hh"
#include "EvtGenBase/EvtParticle.hh"
#include "EvtGenBase/EvtPatches.hh"
#include "EvtGenBase/EvtRadCorr.hh"
#include "EvtGenBase/EvtRandom.hh"
#include "EvtGenBase/EvtReport.hh"
using std::endl;
void EvtDecayProb::makeDecay( EvtParticle* p, bool recursive )
{
int ntimes = 10000;
double dummy;
do {
_weight = 1.0;
_daugsDecayedByParentModel = false;
decay( p );
ntimes--;
_prob = _prob / _weight;
dummy = getProbMax( _prob ) * EvtRandom::Flat();
p->setDecayProb( _prob / getProbMax( _prob ) );
} while ( ntimes && ( _prob < dummy ) );
if ( ntimes == 0 ) {
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Tried accept/reject:10000"
<< " times, and rejected all the times!" << endl;
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Is therefore accepting the last event!" << endl;
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Decay of particle:" << EvtPDL::name( p->getId() ).c_str()
<< "(channel:" << p->getChannel() << ") with mass " << p->mass()
<< endl;
for ( size_t ii = 0; ii < p->getNDaug(); ii++ ) {
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Daughter " << ii << ":"
<< EvtPDL::name( p->getDaug( ii )->getId() ).c_str()
<< " with mass " << p->getDaug( ii )->mass() << endl;
}
}
EvtSpinDensity rho;
rho.setDiag( p->getSpinStates() );
p->setSpinDensityBackward( rho );
- if ( getPHOTOS() || EvtRadCorr::alwaysRadCorr() ) {
+
+ if ( ( getFSR() || EvtRadCorr::alwaysRadCorr() ) &&
+ !EvtRadCorr::neverRadCorr() ) {
EvtRadCorr::doRadCorr( p );
}
if ( !recursive )
return;
//Now decay the daughters.
if ( !daugsDecayedByParentModel() ) {
for ( size_t i = 0; i < p->getNDaug(); i++ ) {
//Need to set the spin density of the daughters to be
//diagonal.
rho.setDiag( p->getDaug( i )->getSpinStates() );
p->getDaug( i )->setSpinDensityForward( rho );
//Now decay the daughter. Really!
p->getDaug( i )->decay();
}
}
}
diff --git a/src/EvtGenBase/EvtDecayTable.cpp b/src/EvtGenBase/EvtDecayTable.cpp
index 4740be8..8b32926 100644
--- a/src/EvtGenBase/EvtDecayTable.cpp
+++ b/src/EvtGenBase/EvtDecayTable.cpp
@@ -1,1634 +1,1694 @@
/***********************************************************************
* Copyright 1998-2020 CERN for the benefit of the EvtGen authors *
* *
* This file is part of EvtGen. *
* *
* EvtGen is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* EvtGen is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with EvtGen. If not, see <https://www.gnu.org/licenses/>. *
***********************************************************************/
#include "EvtGenBase/EvtDecayTable.hh"
#include "EvtGenBase/EvtDecayBase.hh"
#include "EvtGenBase/EvtExtGeneratorCommandsTable.hh"
#include "EvtGenBase/EvtModel.hh"
#include "EvtGenBase/EvtModelAlias.hh"
#include "EvtGenBase/EvtPDL.hh"
#include "EvtGenBase/EvtParser.hh"
#include "EvtGenBase/EvtParserXml.hh"
#include "EvtGenBase/EvtParticle.hh"
#include "EvtGenBase/EvtPatches.hh"
#include "EvtGenBase/EvtRadCorr.hh"
#include "EvtGenBase/EvtRandom.hh"
#include "EvtGenBase/EvtReport.hh"
#include "EvtGenBase/EvtSymTable.hh"
#include <ctype.h>
#include <fstream>
#include <iomanip>
#include <iostream>
#include <sstream>
#include <stdlib.h>
#include <string.h>
using std::endl;
using std::fstream;
using std::ifstream;
EvtDecayTable::EvtDecayTable()
{
_decaytable.clear();
}
EvtDecayTable::~EvtDecayTable()
{
_decaytable.clear();
}
EvtDecayTable* EvtDecayTable::getInstance()
{
static EvtDecayTable* theDecayTable = nullptr;
if ( !theDecayTable ) {
theDecayTable = new EvtDecayTable();
}
return theDecayTable;
}
int EvtDecayTable::getNMode( int ipar )
{
return _decaytable[ipar].getNMode();
}
EvtDecayBase* EvtDecayTable::getDecay( int ipar, int imode )
{
return _decaytable[ipar].getDecayModel( imode );
}
void EvtDecayTable::printSummary()
{
for ( size_t i = 0; i < EvtPDL::entries(); i++ ) {
_decaytable[i].printSummary();
}
}
EvtDecayBase* EvtDecayTable::getDecayFunc( EvtParticle* p )
{
int partnum;
partnum = p->getId().getAlias();
if ( _decaytable[partnum].getNMode() == 0 )
return nullptr;
return _decaytable[partnum].getDecayModel( p );
}
void EvtDecayTable::readDecayFile( const std::string dec_name, bool verbose )
{
if ( _decaytable.size() < EvtPDL::entries() )
_decaytable.resize( EvtPDL::entries() );
EvtModel& modelist = EvtModel::instance();
EvtExtGeneratorCommandsTable* extGenCommands =
EvtExtGeneratorCommandsTable::getInstance();
std::string colon( ":" ), equals( "=" );
int i;
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< "In readDecayFile, reading:" << dec_name.c_str() << endl;
ifstream fin;
fin.open( dec_name.c_str() );
if ( !fin ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Could not open " << dec_name.c_str() << endl;
}
fin.close();
EvtParser parser;
parser.read( dec_name );
int itok;
int hasend = 0;
std::string token;
for ( itok = 0; itok < parser.getNToken(); itok++ ) {
token = parser.getToken( itok );
if ( token == "End" )
hasend = 1;
}
if ( !hasend ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Could not find an 'End' in " << dec_name.c_str() << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Will terminate execution." << endl;
::abort();
}
std::string model, parent, sdaug;
EvtId ipar;
int n_daugh;
EvtId daught[MAX_DAUG];
double brfr;
int itoken = 0;
std::vector<EvtModelAlias> modelAliasList;
do {
token = parser.getToken( itoken++ );
- //Easy way to turn off photos... Lange September 5, 2000
- if ( token == "noPhotos" ) {
+ //Easy way to turn off final-state radiation.
+ if ( token == "noFSR" ) {
EvtRadCorr::setNeverRadCorr();
- if ( verbose )
+
+ if ( verbose ) {
+ EvtGenReport( EVTGEN_INFO, "EvtGen" )
+ << "As requested, final-state radiation will be turned off."
+ << endl;
+ }
+ } else if ( token == "yesFSR" ) {
+ EvtRadCorr::setAlwaysRadCorr();
+
+ if ( verbose ) {
+ EvtGenReport( EVTGEN_INFO, "EvtGen" )
+ << "As requested, final-state radiation will be turned on for all decays."
+ << endl;
+ }
+ } else if ( token == "normalFSR" ) {
+ EvtRadCorr::setNormalRadCorr();
+
+ if ( verbose ) {
+ EvtGenReport( EVTGEN_INFO, "EvtGen" )
+ << "As requested, final-state radiation will be turned on only when requested."
+ << endl;
+ }
+ } else if ( token == "noPhotos" ) {
+ EvtGenReport( EVTGEN_WARNING, "EvtGen" )
+ << "'noPhotos' is deprecated. Use 'noFSR' instead. " << endl;
+ EvtRadCorr::setNeverRadCorr();
+
+ if ( verbose ) {
EvtGenReport( EVTGEN_INFO, "EvtGen" )
- << "As requested, PHOTOS will be turned off." << endl;
+ << "As requested, final-state radiation will be turned off."
+ << endl;
+ }
} else if ( token == "yesPhotos" ) {
+ EvtGenReport( EVTGEN_WARNING, "EvtGen" )
+ << "'yesPhotos' is deprecated. Use 'yesFSR' instead." << endl;
EvtRadCorr::setAlwaysRadCorr();
- if ( verbose )
+
+ if ( verbose ) {
EvtGenReport( EVTGEN_INFO, "EvtGen" )
- << "As requested, PHOTOS will be turned on for all decays."
+ << " As requested, final-state radiation will be turned on for all decays."
<< endl;
+ }
} else if ( token == "normalPhotos" ) {
+ EvtGenReport( EVTGEN_WARNING, "EvtGen" )
+ << "'normalPhotos' is deprecated. Use 'normalFSR' instead. "
+ << endl;
EvtRadCorr::setNormalRadCorr();
- if ( verbose )
+
+ if ( verbose ) {
EvtGenReport( EVTGEN_INFO, "EvtGen" )
- << "As requested, PHOTOS will be turned on only when requested."
+ << "As requested, final-state radiation will be turned on only when requested."
<< endl;
+ }
} else if ( token == "Alias" ) {
std::string newname;
std::string oldname;
newname = parser.getToken( itoken++ );
oldname = parser.getToken( itoken++ );
EvtId id = EvtPDL::getId( oldname );
if ( id == EvtId( -1, -1 ) ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Unknown particle name:" << oldname.c_str()
<< " on line " << parser.getLineofToken( itoken ) << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Will terminate execution!" << endl;
::abort();
}
EvtPDL::alias( id, newname );
if ( _decaytable.size() < EvtPDL::entries() )
_decaytable.resize( EvtPDL::entries() );
} else if ( token == "ModelAlias" ) {
std::vector<std::string> modelArgList;
std::string aliasName = parser.getToken( itoken++ );
std::string modelName = parser.getToken( itoken++ );
std::string nameTemp;
do {
nameTemp = parser.getToken( itoken++ );
if ( nameTemp != ";" ) {
modelArgList.push_back( nameTemp );
}
} while ( nameTemp != ";" );
EvtModelAlias newAlias( aliasName, modelName, modelArgList );
modelAliasList.push_back( newAlias );
} else if ( token == "ChargeConj" ) {
std::string aname;
std::string abarname;
aname = parser.getToken( itoken++ );
abarname = parser.getToken( itoken++ );
EvtId a = EvtPDL::getId( aname );
EvtId abar = EvtPDL::getId( abarname );
if ( a == EvtId( -1, -1 ) ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Unknown particle name:" << aname.c_str() << " on line "
<< parser.getLineofToken( itoken ) << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Will terminate execution!" << endl;
::abort();
}
if ( abar == EvtId( -1, -1 ) ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Unknown particle name:" << abarname.c_str()
<< " on line " << parser.getLineofToken( itoken ) << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Will terminate execution!" << endl;
::abort();
}
EvtPDL::aliasChgConj( a, abar );
} else if ( token == "JetSetPar" ) {
// Check if any old Pythia 6 commands are present
std::string pythiaCommand = parser.getToken( itoken++ );
Command command;
// The old command format is NAME(INT)=VALUE
int i1 = pythiaCommand.find_first_of( "(" );
int i2 = pythiaCommand.find_first_of( ")" );
int i3 = pythiaCommand.find_first_of( "=" );
std::string pythiaModule = pythiaCommand.substr( 0, i1 );
std::string pythiaParam = pythiaCommand.substr( i1 + 1, i2 - i1 - 1 );
std::string pythiaValue = pythiaCommand.substr( i3 + 1 );
command["MODULE"] = pythiaModule;
command["PARAM"] = pythiaParam;
command["VALUE"] = pythiaValue;
command["GENERATOR"] = "Both";
command["VERSION"] = "PYTHIA6";
extGenCommands->addCommand( "PYTHIA", command );
} else if ( modelist.isCommand( token ) ) {
std::string cnfgstr;
cnfgstr = parser.getToken( itoken++ );
modelist.storeCommand( token, cnfgstr );
} else if ( token == "PythiaGenericParam" ||
token == "PythiaAliasParam" || token == "PythiaBothParam" ) {
// Read in any Pythia 8 commands, which will be of the form
// pythia<type>Param module:param=value, with no spaces in the parameter
// string! Here, <type> specifies whether the command is for generic
// decays, alias decays, or both.
// Pythia 6 commands will be defined by the old JetSetPar command
// name, which is handled by the modelist.isCommand() statement above.
std::string pythiaCommand = parser.getToken( itoken++ );
std::string pythiaModule( "" ), pythiaParam( "" ), pythiaValue( "" );
// Separate out the string into the 3 sections using the delimiters
// ":" and "=".
std::vector<std::string> pComVect1 =
this->splitString( pythiaCommand, colon );
if ( pComVect1.size() == 2 ) {
pythiaModule = pComVect1[0];
std::string pCom2 = pComVect1[1];
std::vector<std::string> pComVect2 = this->splitString( pCom2,
equals );
if ( pComVect2.size() == 2 ) {
pythiaParam = pComVect2[0];
pythiaValue = pComVect2[1];
}
}
// Define the Pythia 8 command and pass it to the external generator
// command list.
Command command;
if ( token == "PythiaGenericParam" ) {
command["GENERATOR"] = "Generic";
} else if ( token == "PythiaAliasParam" ) {
command["GENERATOR"] = "Alias";
} else {
command["GENERATOR"] = "Both";
}
command["MODULE"] = pythiaModule;
command["PARAM"] = pythiaParam;
command["VALUE"] = pythiaValue;
command["VERSION"] = "PYTHIA8";
extGenCommands->addCommand( "PYTHIA", command );
} else if ( token == "CDecay" ) {
std::string name;
name = parser.getToken( itoken++ );
ipar = EvtPDL::getId( name );
if ( ipar == EvtId( -1, -1 ) ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Unknown particle name:" << name.c_str() << " on line "
<< parser.getLineofToken( itoken - 1 ) << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Will terminate execution!" << endl;
::abort();
}
EvtId cipar = EvtPDL::chargeConj( ipar );
if ( _decaytable[ipar.getAlias()].getNMode() != 0 ) {
if ( verbose )
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Redefined decay of " << name.c_str() << " in CDecay"
<< endl;
_decaytable[ipar.getAlias()].removeDecay();
}
//take contents of cipar and conjugate and store in ipar
_decaytable[ipar.getAlias()].makeChargeConj(
&_decaytable[cipar.getAlias()] );
} else if ( token == "Define" ) {
std::string name;
name = parser.getToken( itoken++ );
// value=atof(parser.getToken(itoken++).c_str());
EvtSymTable::define( name, parser.getToken( itoken++ ) );
//New code Lange April 10, 2001 - allow the user
//to change particle definitions of EXISTING
//particles on the fly
} else if ( token == "Particle" ) {
std::string pname;
pname = parser.getToken( itoken++ );
if ( verbose )
EvtGenReport( EVTGEN_INFO, "EvtGen" ) << pname.c_str() << endl;
//There should be at least the mass
double newMass = atof( parser.getToken( itoken++ ).c_str() );
EvtId thisPart = EvtPDL::getId( pname );
double newWidth = EvtPDL::getMeanMass( thisPart );
if ( parser.getNToken() > 3 )
newWidth = atof( parser.getToken( itoken++ ).c_str() );
//Now make the change!
EvtPDL::reSetMass( thisPart, newMass );
EvtPDL::reSetWidth( thisPart, newWidth );
if ( verbose )
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< "Changing particle properties of " << pname.c_str()
<< " Mass=" << newMass << " Width=" << newWidth << endl;
} else if ( token == "ChangeMassMin" ) {
std::string pname;
pname = parser.getToken( itoken++ );
double tmass = atof( parser.getToken( itoken++ ).c_str() );
EvtId thisPart = EvtPDL::getId( pname );
EvtPDL::reSetMassMin( thisPart, tmass );
if ( verbose )
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Refined minimum mass for "
<< EvtPDL::name( thisPart ).c_str() << " to be " << tmass
<< endl;
} else if ( token == "ChangeMassMax" ) {
std::string pname;
pname = parser.getToken( itoken++ );
double tmass = atof( parser.getToken( itoken++ ).c_str() );
EvtId thisPart = EvtPDL::getId( pname );
EvtPDL::reSetMassMax( thisPart, tmass );
if ( verbose )
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Refined maximum mass for "
<< EvtPDL::name( thisPart ).c_str() << " to be " << tmass
<< endl;
} else if ( token == "IncludeBirthFactor" ) {
std::string pname;
pname = parser.getToken( itoken++ );
bool yesno = false;
if ( parser.getToken( itoken++ ) == "yes" )
yesno = true;
EvtId thisPart = EvtPDL::getId( pname );
EvtPDL::includeBirthFactor( thisPart, yesno );
if ( verbose ) {
if ( yesno )
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Include birth factor for "
<< EvtPDL::name( thisPart ).c_str() << endl;
if ( !yesno )
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "No longer include birth factor for "
<< EvtPDL::name( thisPart ).c_str() << endl;
}
} else if ( token == "IncludeDecayFactor" ) {
std::string pname;
pname = parser.getToken( itoken++ );
bool yesno = false;
if ( parser.getToken( itoken++ ) == "yes" )
yesno = true;
EvtId thisPart = EvtPDL::getId( pname );
EvtPDL::includeDecayFactor( thisPart, yesno );
if ( verbose ) {
if ( yesno )
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Include decay factor for "
<< EvtPDL::name( thisPart ).c_str() << endl;
if ( !yesno )
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "No longer include decay factor for "
<< EvtPDL::name( thisPart ).c_str() << endl;
}
} else if ( token == "LSNONRELBW" ) {
std::string pname;
pname = parser.getToken( itoken++ );
EvtId thisPart = EvtPDL::getId( pname );
std::string tstr = "NONRELBW";
EvtPDL::changeLS( thisPart, tstr );
if ( verbose )
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Change lineshape to non-rel BW for "
<< EvtPDL::name( thisPart ).c_str() << endl;
} else if ( token == "LSFLAT" ) {
std::string pname;
pname = parser.getToken( itoken++ );
EvtId thisPart = EvtPDL::getId( pname );
std::string tstr = "FLAT";
EvtPDL::changeLS( thisPart, tstr );
if ( verbose )
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Change lineshape to flat for "
<< EvtPDL::name( thisPart ).c_str() << endl;
} else if ( token == "LSMANYDELTAFUNC" ) {
std::string pname;
pname = parser.getToken( itoken++ );
EvtId thisPart = EvtPDL::getId( pname );
std::string tstr = "MANYDELTAFUNC";
EvtPDL::changeLS( thisPart, tstr );
if ( verbose )
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Change lineshape to spikes for "
<< EvtPDL::name( thisPart ).c_str() << endl;
} else if ( token == "BlattWeisskopf" ) {
std::string pname;
pname = parser.getToken( itoken++ );
double tnum = atof( parser.getToken( itoken++ ).c_str() );
EvtId thisPart = EvtPDL::getId( pname );
EvtPDL::reSetBlatt( thisPart, tnum );
if ( verbose )
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Redefined Blatt-Weisskopf factor "
<< EvtPDL::name( thisPart ).c_str() << " to be " << tnum
<< endl;
} else if ( token == "BlattWeisskopfBirth" ) {
std::string pname;
pname = parser.getToken( itoken++ );
double tnum = atof( parser.getToken( itoken++ ).c_str() );
EvtId thisPart = EvtPDL::getId( pname );
EvtPDL::reSetBlattBirth( thisPart, tnum );
if ( verbose )
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Redefined Blatt-Weisskopf birth factor "
<< EvtPDL::name( thisPart ).c_str() << " to be " << tnum
<< endl;
} else if ( token == "SetLineshapePW" ) {
std::string pname;
pname = parser.getToken( itoken++ );
EvtId thisPart = EvtPDL::getId( pname );
std::string pnameD1 = parser.getToken( itoken++ );
EvtId thisD1 = EvtPDL::getId( pnameD1 );
std::string pnameD2 = parser.getToken( itoken++ );
EvtId thisD2 = EvtPDL::getId( pnameD2 );
int pw = atoi( parser.getToken( itoken++ ).c_str() );
if ( verbose )
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Redefined Partial wave for " << pname.c_str() << " to "
<< pnameD1.c_str() << " " << pnameD2.c_str() << " (" << pw
<< ")" << endl;
EvtPDL::setPWForDecay( thisPart, pw, thisD1, thisD2 );
EvtPDL::setPWForBirthL( thisD1, pw, thisPart, thisD2 );
EvtPDL::setPWForBirthL( thisD2, pw, thisPart, thisD1 );
} else if ( token == "Decay" ) {
std::string temp_fcn_new_model;
EvtDecayBase* temp_fcn_new;
double brfrsum = 0.0;
parent = parser.getToken( itoken++ );
ipar = EvtPDL::getId( parent );
if ( ipar == EvtId( -1, -1 ) ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Unknown particle name:" << parent.c_str() << " on line "
<< parser.getLineofToken( itoken - 1 ) << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Will terminate execution!" << endl;
::abort();
}
if ( _decaytable[ipar.getAlias()].getNMode() != 0 ) {
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Redefined decay of " << parent.c_str() << endl;
_decaytable[ipar.getAlias()].removeDecay();
}
do {
token = parser.getToken( itoken++ );
if ( token != "Enddecay" ) {
i = 0;
while ( token.c_str()[i++] != 0 ) {
if ( isalpha( token.c_str()[i] ) ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Expected to find a branching fraction or Enddecay "
<< "but found:" << token.c_str() << " on line "
<< parser.getLineofToken( itoken - 1 ) << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Possibly to few arguments to model "
<< "on previous line!" << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Will terminate execution!" << endl;
::abort();
}
}
brfr = atof( token.c_str() );
int isname =
EvtPDL::getId( parser.getToken( itoken ) ).getId() >= 0;
int ismodel = modelist.isModel( parser.getToken( itoken ) );
if ( !( isname || ismodel ) ) {
//see if this is an aliased model
for ( size_t iAlias = 0; iAlias < modelAliasList.size();
iAlias++ ) {
if ( modelAliasList[iAlias].matchAlias(
parser.getToken( itoken ) ) ) {
ismodel = 2;
break;
}
}
}
if ( !( isname || ismodel ) ) {
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< parser.getToken( itoken ).c_str()
<< " is neither a particle name nor "
<< "the name of a model. " << endl;
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< "It was encountered on line "
<< parser.getLineofToken( itoken )
<< " of the decay file." << endl;
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< "Please fix it. Thank you." << endl;
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< "Be sure to check that the "
<< "correct case has been used. \n";
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< "Terminating execution. \n";
::abort();
itoken++;
}
n_daugh = 0;
while ( EvtPDL::getId( parser.getToken( itoken ) ).getId() >=
0 ) {
sdaug = parser.getToken( itoken++ );
daught[n_daugh++] = EvtPDL::getId( sdaug );
if ( daught[n_daugh - 1] == EvtId( -1, -1 ) ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Unknown particle name:" << sdaug.c_str()
<< " on line "
<< parser.getLineofToken( itoken ) << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Will terminate execution!" << endl;
::abort();
}
}
model = parser.getToken( itoken++ );
- int photos = 0;
- int verbose = 0;
- int summary = 0;
+ bool fsr = false;
+ bool verbose = false;
+ bool summary = false;
do {
- if ( model == "PHOTOS" ) {
- photos = 1;
+ if ( model == "PHOTOS" || model == "FSR" ) {
+ fsr = true;
+ if ( model == "PHOTOS" ) {
+ EvtGenReport( EVTGEN_WARNING, "EvtGen" )
+ << "'PHOTOS' is deprecated. Use 'FSR' instead. "
+ << endl;
+ }
model = parser.getToken( itoken++ );
}
if ( model == "VERBOSE" ) {
- verbose = 1;
+ verbose = true;
model = parser.getToken( itoken++ );
}
if ( model == "SUMMARY" ) {
- summary = 1;
+ summary = true;
model = parser.getToken( itoken++ );
}
- } while ( model == "PHOTOS" || model == "VERBOSE" ||
- model == "SUMMARY" );
+ } while ( model == "PHOTOS" || model == "FSR" ||
+ model == "VERBOSE" || model == "SUMMARY" );
//see if this is an aliased model
int foundAnAlias = -1;
for ( size_t iAlias = 0; iAlias < modelAliasList.size();
iAlias++ ) {
if ( modelAliasList[iAlias].matchAlias( model ) ) {
foundAnAlias = iAlias;
break;
}
}
if ( foundAnAlias == -1 ) {
if ( !modelist.isModel( model ) ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Expected to find a model name,"
<< "found:" << model.c_str() << " on line "
<< parser.getLineofToken( itoken ) << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Will terminate execution!" << endl;
::abort();
}
} else {
model = modelAliasList[foundAnAlias].getName();
}
temp_fcn_new_model = model;
temp_fcn_new = modelist.getFcn( model );
- if ( photos ) {
- temp_fcn_new->setPHOTOS();
+ if ( fsr ) {
+ temp_fcn_new->setFSR();
}
+
if ( verbose ) {
temp_fcn_new->setVerbose();
}
if ( summary ) {
temp_fcn_new->setSummary();
}
std::vector<std::string> temp_fcn_new_args;
std::string name;
int ierr;
if ( foundAnAlias == -1 ) {
do {
name = parser.getToken( itoken++ );
if ( name != ";" ) {
temp_fcn_new_args.push_back(
EvtSymTable::get( name, ierr ) );
if ( ierr ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Reading arguments and found:"
<< name.c_str() << " on line:"
<< parser.getLineofToken( itoken - 1 )
<< endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Will terminate execution!" << endl;
::abort();
}
}
//int isname=EvtPDL::getId(name).getId()>=0;
int ismodel = modelist.isModel( name );
if ( ismodel ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Expected ';' but found:" << name.c_str()
<< " on line:"
<< parser.getLineofToken( itoken - 1 )
<< endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Most probable error is omitted ';'."
<< endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Will terminate execution!" << endl;
::abort();
}
} while ( name != ";" );
} else {
std::vector<std::string> copyMe =
modelAliasList[foundAnAlias].getArgList();
temp_fcn_new_args = copyMe;
itoken++;
}
//Found one decay.
brfrsum += brfr;
temp_fcn_new->saveDecayInfo( ipar, n_daugh, daught,
temp_fcn_new_args.size(),
temp_fcn_new_args,
temp_fcn_new_model, brfr );
double massmin = 0.0;
// for (i=0;i<n_daugh;i++){
for ( i = 0; i < temp_fcn_new->nRealDaughters(); i++ ) {
if ( EvtPDL::getMinMass( daught[i] ) > 0.0001 ) {
massmin += EvtPDL::getMinMass( daught[i] );
} else {
massmin += EvtPDL::getMeanMass( daught[i] );
}
}
_decaytable[ipar.getAlias()].addMode( temp_fcn_new, brfrsum,
massmin );
}
} while ( token != "Enddecay" );
_decaytable[ipar.getAlias()].finalize();
}
// Allow copying of decays from one particle to another; useful
// in combination with RemoveDecay
else if ( token == "CopyDecay" ) {
std::string newname;
std::string oldname;
newname = parser.getToken( itoken++ );
oldname = parser.getToken( itoken++ );
EvtId newipar = EvtPDL::getId( newname );
EvtId oldipar = EvtPDL::getId( oldname );
if ( oldipar == EvtId( -1, -1 ) ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Unknown particle name:" << oldname.c_str()
<< " on line " << parser.getLineofToken( itoken ) << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Will terminate execution!" << endl;
::abort();
}
if ( newipar == EvtId( -1, -1 ) ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Unknown particle name:" << newname.c_str()
<< " on line " << parser.getLineofToken( itoken ) << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Will terminate execution!" << endl;
::abort();
}
if ( _decaytable[newipar.getAlias()].getNMode() != 0 ) {
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Redefining decay of " << newname << endl;
_decaytable[newipar.getAlias()].removeDecay();
}
_decaytable[newipar.getAlias()] = _decaytable[oldipar.getAlias()];
}
// Enable decay deletion; intended primarily for aliases
// Peter Onyisi, March 2008
else if ( token == "RemoveDecay" ) {
parent = parser.getToken( itoken++ );
ipar = EvtPDL::getId( parent );
if ( ipar == EvtId( -1, -1 ) ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Unknown particle name:" << parent.c_str() << " on line "
<< parser.getLineofToken( itoken - 1 ) << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Will terminate execution!" << endl;
::abort();
}
if ( _decaytable[ipar.getAlias()].getNMode() == 0 ) {
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "No decays to delete for " << parent.c_str() << endl;
} else {
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Deleting selected decays of " << parent.c_str() << endl;
}
do {
token = parser.getToken( itoken );
if ( token != "Enddecay" ) {
n_daugh = 0;
while ( EvtPDL::getId( parser.getToken( itoken ) ).getId() >=
0 ) {
sdaug = parser.getToken( itoken++ );
daught[n_daugh++] = EvtPDL::getId( sdaug );
if ( daught[n_daugh - 1] == EvtId( -1, -1 ) ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Unknown particle name:" << sdaug.c_str()
<< " on line "
<< parser.getLineofToken( itoken ) << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Will terminate execution!" << endl;
::abort();
}
}
token = parser.getToken( itoken );
if ( token != ";" ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Expected ';' but found:" << token << " on line:"
<< parser.getLineofToken( itoken - 1 ) << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Most probable error is omitted ';'." << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Will terminate execution!" << endl;
::abort();
}
token = parser.getToken( itoken++ );
EvtDecayBase* temp_fcn_new = modelist.getFcn( "PHSP" );
std::vector<std::string> temp_fcn_new_args;
std::string temp_fcn_new_model( "PHSP" );
temp_fcn_new->saveDecayInfo( ipar, n_daugh, daught, 0,
temp_fcn_new_args,
temp_fcn_new_model, 0. );
_decaytable[ipar.getAlias()].removeMode( temp_fcn_new );
}
} while ( token != "Enddecay" );
itoken++;
} else if ( token != "End" ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Found unknown command:'" << token.c_str() << "' on line "
<< parser.getLineofToken( itoken ) << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Will terminate execution!" << endl;
::abort();
}
} while ( ( token != "End" ) && itoken != parser.getNToken() );
//Now we may need to reset the minimum mass for some particles????
for ( size_t ii = 0; ii < EvtPDL::entries(); ii++ ) {
EvtId temp( ii, ii );
int nModTot = getNMode( ii );
//no decay modes
if ( nModTot == 0 )
continue;
//0 width?
if ( EvtPDL::getWidth( temp ) < 0.0000001 )
continue;
int jj;
double minMass = EvtPDL::getMaxMass( temp );
for ( jj = 0; jj < nModTot; jj++ ) {
double tmass = _decaytable[ii].getDecay( jj ).getMassMin();
if ( tmass < minMass )
minMass = tmass;
}
if ( minMass > EvtPDL::getMinMass( temp ) ) {
if ( verbose )
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< "Given allowed decays, resetting minMass "
<< EvtPDL::name( temp ).c_str() << " "
<< EvtPDL::getMinMass( temp ) << " to " << minMass << endl;
EvtPDL::reSetMassMin( temp, minMass );
}
}
}
void EvtDecayTable::readXMLDecayFile( const std::string dec_name, bool verbose )
{
if ( _decaytable.size() < EvtPDL::entries() )
_decaytable.resize( EvtPDL::entries() );
EvtModel& modelist = EvtModel::instance();
EvtExtGeneratorCommandsTable* extGenCommands =
EvtExtGeneratorCommandsTable::getInstance();
EvtParserXml parser;
parser.open( dec_name );
EvtId ipar;
std::string decayParent = "";
double brfrSum = 0.;
std::vector<EvtModelAlias> modelAliasList;
bool endReached = false;
while ( parser.readNextTag() ) {
//TAGS FOUND UNDER DATA
if ( parser.getParentTagTitle() == "data" ) {
- if ( parser.getTagTitle() == "photos" ) {
+ if ( parser.getTagTitle() == "photos" ||
+ parser.getTagTitle() == "fsr" ) {
+ if ( parser.getTagTitle() == "photos" ) {
+ EvtGenReport( EVTGEN_WARNING, "EvtGen" )
+ << "'photos' is deprecated. Use 'fsr' instead. " << endl;
+ }
+
std::string usage = parser.readAttribute( "usage" );
+
if ( usage == "always" ) {
EvtRadCorr::setAlwaysRadCorr();
if ( verbose )
EvtGenReport( EVTGEN_INFO, "EvtGen" )
- << "As requested, PHOTOS will be turned on for all decays."
+ << "As requested, final-state radiation will be turned on for all decays."
<< endl;
} else if ( usage == "never" ) {
EvtRadCorr::setNeverRadCorr();
if ( verbose )
EvtGenReport( EVTGEN_INFO, "EvtGen" )
- << "As requested, PHOTOS will be turned off."
+ << "As requested, final-state radiation will be turned off."
<< endl;
} else {
EvtRadCorr::setNormalRadCorr();
if ( verbose )
EvtGenReport( EVTGEN_INFO, "EvtGen" )
- << "As requested, PHOTOS will be turned on only when requested."
+ << "As requested, final-state radiation will be turned on only when requested."
<< endl;
}
} else if ( parser.getTagTitle() == "alias" ) {
std::string alias = parser.readAttribute( "name" );
std::string particle = parser.readAttribute( "particle" );
checkParticle( particle );
EvtId id = EvtPDL::getId( particle );
EvtPDL::alias( id, alias );
if ( _decaytable.size() < EvtPDL::entries() )
_decaytable.resize( EvtPDL::entries() );
} else if ( parser.getTagTitle() == "modelAlias" ) {
std::vector<std::string> modelArgList;
std::string alias = parser.readAttribute( "name" );
std::string model = parser.readAttribute( "model" );
std::string paramStr = parser.readAttribute( "params" );
std::istringstream paramStream( paramStr );
std::string param;
if ( paramStr == "" ) {
EvtDecayBase* fcn = modelist.getFcn( model );
int i( 0 );
std::string paramName = fcn->getParamName( 0 );
while ( paramName != "" ) {
param = parser.readAttribute( paramName,
fcn->getParamDefault( i ) );
if ( param == "" )
break;
modelArgList.push_back( param );
++i;
paramName = fcn->getParamName( i );
}
} else {
while ( std::getline( paramStream, param, ' ' ) ) {
modelArgList.push_back( param );
}
}
EvtModelAlias newAlias( alias, model, modelArgList );
modelAliasList.push_back( newAlias );
} else if ( parser.getTagTitle() == "chargeConj" ) {
std::string particle = parser.readAttribute( "particle" );
std::string conjugate = parser.readAttribute( "conjugate" );
EvtId a = EvtPDL::getId( particle );
EvtId abar = EvtPDL::getId( conjugate );
checkParticle( particle );
checkParticle( conjugate );
EvtPDL::aliasChgConj( a, abar );
} else if ( parser.getTagTitle() == "conjDecay" ) {
std::string particle = parser.readAttribute( "particle" );
EvtId a = EvtPDL::getId( particle );
EvtId abar = EvtPDL::chargeConj( a );
checkParticle( particle );
checkParticle( abar.getName() );
if ( _decaytable[a.getAlias()].getNMode() != 0 ) {
if ( verbose )
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Redefined decay of " << particle.c_str()
<< " in ConjDecay" << endl;
_decaytable[a.getAlias()].removeDecay();
}
//take contents of abar and conjugate and store in a
_decaytable[a.getAlias()].makeChargeConj(
&_decaytable[abar.getAlias()] );
} else if ( parser.getTagTitle() == "define" ) {
std::string name = parser.readAttribute( "name" );
std::string value = parser.readAttribute( "value" );
EvtSymTable::define( name, value );
} else if ( parser.getTagTitle() == "particle" ) {
std::string name = parser.readAttribute( "name" );
double mass = parser.readAttributeDouble( "mass" );
double width = parser.readAttributeDouble( "width" );
double minMass = parser.readAttributeDouble( "massMin" );
double maxMass = parser.readAttributeDouble( "massMax" );
std::string birthFactor = parser.readAttribute(
"includeBirthFactor" );
std::string decayFactor = parser.readAttribute(
"includeDecayFactor" );
std::string lineShape = parser.readAttribute( "lineShape" );
double blattWeisskopfD = parser.readAttributeDouble(
"blattWeisskopfFactor" );
double blattWeisskopfB = parser.readAttributeDouble(
"blattWeisskopfBirth" );
EvtId thisPart = EvtPDL::getId( name );
checkParticle( name );
if ( mass != -1 ) {
EvtPDL::reSetMass( thisPart, mass );
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Refined mass for "
<< EvtPDL::name( thisPart ).c_str() << " to be " << mass
<< endl;
}
if ( width != -1 ) {
EvtPDL::reSetWidth( thisPart, width );
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Refined width for "
<< EvtPDL::name( thisPart ).c_str() << " to be "
<< width << endl;
}
if ( minMass != -1 ) {
EvtPDL::reSetMassMin( thisPart, minMass );
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Refined minimum mass for "
<< EvtPDL::name( thisPart ).c_str() << " to be "
<< minMass << endl;
}
if ( maxMass != -1 ) {
EvtPDL::reSetMassMax( thisPart, maxMass );
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Refined maximum mass for "
<< EvtPDL::name( thisPart ).c_str() << " to be "
<< maxMass << endl;
}
if ( !birthFactor.empty() ) {
EvtPDL::includeBirthFactor( thisPart,
stringToBoolean( birthFactor ) );
if ( verbose ) {
if ( stringToBoolean( birthFactor ) ) {
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Include birth factor for "
<< EvtPDL::name( thisPart ).c_str() << endl;
} else {
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "No longer include birth factor for "
<< EvtPDL::name( thisPart ).c_str() << endl;
}
}
}
if ( !decayFactor.empty() ) {
EvtPDL::includeDecayFactor( thisPart,
stringToBoolean( decayFactor ) );
if ( verbose ) {
if ( stringToBoolean( decayFactor ) ) {
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Include decay factor for "
<< EvtPDL::name( thisPart ).c_str() << endl;
} else {
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "No longer include decay factor for "
<< EvtPDL::name( thisPart ).c_str() << endl;
}
}
}
if ( !lineShape.empty() ) {
EvtPDL::changeLS( thisPart, lineShape );
if ( verbose )
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Change lineshape to " << lineShape << " for "
<< EvtPDL::name( thisPart ).c_str() << endl;
}
if ( blattWeisskopfD != -1 ) {
EvtPDL::reSetBlatt( thisPart, blattWeisskopfD );
if ( verbose )
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Redefined Blatt-Weisskopf factor "
<< EvtPDL::name( thisPart ).c_str() << " to be "
<< blattWeisskopfD << endl;
}
if ( blattWeisskopfB != -1 ) {
EvtPDL::reSetBlattBirth( thisPart, blattWeisskopfB );
if ( verbose )
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Redefined Blatt-Weisskopf birth factor "
<< EvtPDL::name( thisPart ).c_str() << " to be "
<< blattWeisskopfB << endl;
}
} else if ( parser.getTagTitle() == "lineShapePW" ) {
std::string parent = parser.readAttribute( "parent" );
std::string daug1 = parser.readAttribute( "daug1" );
std::string daug2 = parser.readAttribute( "daug2" );
int pw = parser.readAttributeInt( "pw" );
checkParticle( parent );
checkParticle( daug1 );
checkParticle( daug2 );
EvtId thisPart = EvtPDL::getId( parent );
EvtId thisD1 = EvtPDL::getId( daug1 );
EvtId thisD2 = EvtPDL::getId( daug2 );
EvtPDL::setPWForDecay( thisPart, pw, thisD1, thisD2 );
EvtPDL::setPWForBirthL( thisD1, pw, thisPart, thisD2 );
EvtPDL::setPWForBirthL( thisD2, pw, thisPart, thisD1 );
if ( verbose )
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Redefined Partial wave for " << parent.c_str()
<< " to " << daug1.c_str() << " " << daug2.c_str()
<< " (" << pw << ")" << endl;
} else if ( parser.getTagTitle() == "decay" ) { //start of a particle
brfrSum = 0.;
decayParent = parser.readAttribute( "name" );
checkParticle( decayParent );
ipar = EvtPDL::getId( decayParent );
if ( _decaytable[ipar.getAlias()].getNMode() != 0 ) {
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Redefined decay of " << decayParent.c_str() << endl;
_decaytable[ipar.getAlias()].removeDecay();
}
} else if ( parser.getTagTitle() == "copyDecay" ) {
std::string particle = parser.readAttribute( "particle" );
std::string copy = parser.readAttribute( "copy" );
EvtId newipar = EvtPDL::getId( particle );
EvtId oldipar = EvtPDL::getId( copy );
checkParticle( particle );
checkParticle( copy );
if ( _decaytable[newipar.getAlias()].getNMode() != 0 ) {
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Redefining decay of " << particle << endl;
_decaytable[newipar.getAlias()].removeDecay();
}
_decaytable[newipar.getAlias()] = _decaytable[oldipar.getAlias()];
} else if ( parser.getTagTitle() == "removeDecay" ) {
decayParent = parser.readAttribute( "particle" );
checkParticle( decayParent );
ipar = EvtPDL::getId( decayParent );
if ( _decaytable[ipar.getAlias()].getNMode() == 0 ) {
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "No decays to delete for " << decayParent.c_str()
<< endl;
} else {
EvtGenReport( EVTGEN_DEBUG, "EvtGen" )
<< "Deleting selected decays of " << decayParent.c_str()
<< endl;
}
} else if ( parser.getTagTitle() == "pythiaParam" ) {
Command command;
command["GENERATOR"] = parser.readAttribute( "generator" );
command["MODULE"] = parser.readAttribute( "module" );
command["PARAM"] = parser.readAttribute( "param" );
command["VALUE"] = parser.readAttribute( "value" );
command["VERSION"] = "PYTHIA8";
extGenCommands->addCommand( "PYTHIA", command );
} else if ( parser.getTagTitle() == "pythia6Param" ) {
Command command;
command["GENERATOR"] = parser.readAttribute( "generator" );
command["MODULE"] = parser.readAttribute( "module" );
command["PARAM"] = parser.readAttribute( "param" );
command["VALUE"] = parser.readAttribute( "value" );
command["VERSION"] = "PYTHIA6";
extGenCommands->addCommand( "PYTHIA", command );
} else if ( parser.getTagTitle() == "/data" ) { //end of data
endReached = true;
parser.close();
break;
} else if ( parser.getTagTitle() == "Title" ||
parser.getTagTitle() == "Details" ||
parser.getTagTitle() == "Author" ||
parser.getTagTitle() == "Version"
//the above tags are expected to be in the XML decay file but are not used by EvtGen
|| parser.getTagTitle() == "dalitzDecay" ||
parser.getTagTitle() == "copyDalitz" ) {
//the above tags are only used by EvtGenModels/EvtDalitzTable
} else {
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< "Unknown tag " << parser.getTagTitle()
<< " found in XML decay file near line "
<< parser.getLineNumber() << ". Tag will be ignored."
<< endl;
}
//TAGS FOUND UNDER DECAY
} else if ( parser.getParentTagTitle() == "decay" ) {
if ( parser.getTagTitle() == "channel" ) { //start of a channel
int nDaughters = 0;
EvtId daughter[MAX_DAUG];
EvtDecayBase* temp_fcn_new;
std::string temp_fcn_new_model;
std::vector<std::string> temp_fcn_new_args;
double brfr = parser.readAttributeDouble( "br" );
std::string daugStr = parser.readAttribute( "daughters" );
std::istringstream daugStream( daugStr );
std::string model = parser.readAttribute( "model" );
std::string paramStr = parser.readAttribute( "params" );
std::istringstream paramStream( paramStr );
bool decVerbose = parser.readAttributeBool( "verbose" );
- bool decPhotos = parser.readAttributeBool( "photos" );
+
+ bool decFSR = parser.readAttributeBool( "fsr" );
+
+ if ( parser.readAttribute( "photos" ) != "" ) {
+ EvtGenReport( EVTGEN_WARNING, "EvtGen" )
+ << "'photos' is deprecated. Use 'fsr' instead. " << endl;
+
+ decFSR = parser.readAttributeBool( "photos" );
+ }
+
bool decSummary = parser.readAttributeBool( "summary" );
std::string daugh;
while ( std::getline( daugStream, daugh, ' ' ) ) {
checkParticle( daugh );
daughter[nDaughters++] = EvtPDL::getId( daugh );
}
int modelAlias = -1;
for ( size_t iAlias = 0; iAlias < modelAliasList.size();
iAlias++ ) {
if ( modelAliasList[iAlias].matchAlias( model ) ) {
modelAlias = iAlias;
break;
}
}
if ( modelAlias == -1 ) {
if ( !modelist.isModel( model ) ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Expected to find a model name near line "
<< parser.getLineNumber() << ","
<< "found:" << model.c_str() << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Will terminate execution!" << endl;
::abort();
}
} else {
model = modelAliasList[modelAlias].getName();
}
temp_fcn_new_model = model;
temp_fcn_new = modelist.getFcn( model );
- if ( decPhotos )
- temp_fcn_new->setPHOTOS();
+ if ( decFSR )
+ temp_fcn_new->setFSR();
if ( decVerbose )
temp_fcn_new->setVerbose();
if ( decSummary )
temp_fcn_new->setSummary();
int ierr;
if ( modelAlias == -1 ) {
std::string param;
if ( paramStr == "" ) {
int i( 0 );
std::string paramName = temp_fcn_new->getParamName( 0 );
while ( paramName != "" ) {
param = parser.readAttribute(
paramName, temp_fcn_new->getParamDefault( i ) );
if ( param == "" )
break; //params must be added in order so we can't just skip the missing ones
temp_fcn_new_args.push_back(
EvtSymTable::get( param, ierr ) );
if ( ierr ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Reading arguments near line "
<< parser.getLineNumber()
<< " and found:" << param.c_str() << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Will terminate execution!" << endl;
::abort();
}
++i;
paramName = temp_fcn_new->getParamName( i );
}
} else { //if the params are not set seperately
while ( std::getline( paramStream, param, ' ' ) ) {
temp_fcn_new_args.push_back(
EvtSymTable::get( param, ierr ) );
if ( ierr ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Reading arguments near line "
<< parser.getLineNumber()
<< " and found:" << param.c_str() << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Will terminate execution!" << endl;
::abort();
}
}
}
} else {
std::vector<std::string> copyMe =
modelAliasList[modelAlias].getArgList();
temp_fcn_new_args = copyMe;
}
brfrSum += brfr;
temp_fcn_new->saveDecayInfo( ipar, nDaughters, daughter,
temp_fcn_new_args.size(),
temp_fcn_new_args,
temp_fcn_new_model, brfr );
double massMin = 0.0;
for ( int i = 0; i < temp_fcn_new->nRealDaughters(); i++ ) {
if ( EvtPDL::getMinMass( daughter[i] ) > 0.0001 ) {
massMin += EvtPDL::getMinMass( daughter[i] );
} else {
massMin += EvtPDL::getMeanMass( daughter[i] );
}
}
_decaytable[ipar.getAlias()].addMode( temp_fcn_new, brfrSum,
massMin );
} else if ( parser.getTagTitle() == "/decay" ) { //end of a particle
_decaytable[ipar.getAlias()].finalize();
} else
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< "Unexpected tag " << parser.getTagTitle()
<< " found in XML decay file near line "
<< parser.getLineNumber() << ". Tag will be ignored."
<< endl;
//TAGS FOUND UNDER REMOVEDECAY
} else if ( parser.getParentTagTitle() == "removeDecay" ) {
if ( parser.getTagTitle() == "channel" ) { //start of a channel
int nDaughters = 0;
EvtId daughter[MAX_DAUG];
std::string daugStr = parser.readAttribute( "daughters" );
std::istringstream daugStream( daugStr );
std::string daugh;
while ( std::getline( daugStream, daugh, ' ' ) ) {
checkParticle( daugh );
daughter[nDaughters++] = EvtPDL::getId( daugh );
}
EvtDecayBase* temp_fcn_new = modelist.getFcn( "PHSP" );
std::vector<std::string> temp_fcn_new_args;
std::string temp_fcn_new_model( "PHSP" );
temp_fcn_new->saveDecayInfo( ipar, nDaughters, daughter, 0,
temp_fcn_new_args,
temp_fcn_new_model, 0. );
_decaytable[ipar.getAlias()].removeMode( temp_fcn_new );
} else if ( parser.getTagTitle() != "/removeDecay" ) {
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< "Unexpected tag " << parser.getTagTitle()
<< " found in XML decay file near line "
<< parser.getLineNumber() << ". Tag will be ignored."
<< endl;
}
}
} //while lines in file
if ( !endReached ) {
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< "Either the decay file ended prematurely or the file is badly formed.\n"
<< "Error occured near line" << parser.getLineNumber() << endl;
::abort();
}
//Now we may need to reset the minimum mass for some particles????
for ( size_t ii = 0; ii < EvtPDL::entries(); ii++ ) {
EvtId temp( ii, ii );
int nModTot = getNMode( ii );
//no decay modes
if ( nModTot == 0 )
continue;
//0 width?
if ( EvtPDL::getWidth( temp ) < 0.0000001 )
continue;
int jj;
double minMass = EvtPDL::getMaxMass( temp );
for ( jj = 0; jj < nModTot; jj++ ) {
double tmass = _decaytable[ii].getDecay( jj ).getMassMin();
if ( tmass < minMass )
minMass = tmass;
}
if ( minMass > EvtPDL::getMinMass( temp ) ) {
if ( verbose )
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< "Given allowed decays, resetting minMass "
<< EvtPDL::name( temp ).c_str() << " "
<< EvtPDL::getMinMass( temp ) << " to " << minMass << endl;
EvtPDL::reSetMassMin( temp, minMass );
}
}
}
bool EvtDecayTable::stringToBoolean( std::string valStr )
{
return ( valStr == "true" || valStr == "1" || valStr == "on" ||
valStr == "yes" );
}
void EvtDecayTable::checkParticle( std::string particle )
{
if ( EvtPDL::getId( particle ) == EvtId( -1, -1 ) ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Unknown particle name:" << particle.c_str() << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Will terminate execution!" << endl;
::abort();
}
}
EvtDecayBase* EvtDecayTable::findDecayModel( EvtId id, int modeInt )
{
int aliasInt = id.getAlias();
EvtDecayBase* theModel = this->findDecayModel( aliasInt, modeInt );
return theModel;
}
EvtDecayBase* EvtDecayTable::findDecayModel( int aliasInt, int modeInt )
{
EvtDecayBase* theModel( nullptr );
if ( aliasInt >= 0 && aliasInt < (int)EvtPDL::entries() ) {
theModel = _decaytable[aliasInt].getDecayModel( modeInt );
}
return theModel;
}
bool EvtDecayTable::hasPythia( EvtId id )
{
bool hasPythia = this->hasPythia( id.getAlias() );
return hasPythia;
}
bool EvtDecayTable::hasPythia( int aliasInt )
{
bool hasPythia( false );
if ( aliasInt >= 0 && aliasInt < (int)EvtPDL::entries() ) {
hasPythia = _decaytable[aliasInt].isJetSet();
}
return hasPythia;
}
int EvtDecayTable::getNModes( EvtId id )
{
int nModes = this->getNModes( id.getAlias() );
return nModes;
}
int EvtDecayTable::getNModes( int aliasInt )
{
int nModes( 0 );
if ( aliasInt >= 0 && aliasInt < (int)EvtPDL::entries() ) {
nModes = _decaytable[aliasInt].getNMode();
}
return nModes;
}
int EvtDecayTable::findChannel( EvtId parent, std::string model, int ndaug,
EvtId* daugs, int narg, std::string* args )
{
int i, j, right;
EvtId daugs_scratch[50];
int nmatch, k;
for ( i = 0; i < _decaytable[parent.getAlias()].getNMode(); i++ ) {
right = 1;
right = right && model == _decaytable[parent.getAlias()]
.getDecay( i )
.getDecayModel()
->getModelName();
right = right && ( ndaug == _decaytable[parent.getAlias()]
.getDecay( i )
.getDecayModel()
->getNDaug() );
right = right && ( narg == _decaytable[parent.getAlias()]
.getDecay( i )
.getDecayModel()
->getNArg() );
if ( right ) {
for ( j = 0; j < ndaug; j++ ) {
daugs_scratch[j] = daugs[j];
}
nmatch = 0;
for ( j = 0; j < _decaytable[parent.getAlias()]
.getDecay( i )
.getDecayModel()
->getNDaug();
j++ ) {
for ( k = 0; k < ndaug; k++ ) {
if ( daugs_scratch[k] == _decaytable[parent.getAlias()]
.getDecay( i )
.getDecayModel()
->getDaug( j ) ) {
daugs_scratch[k] = EvtId( -1, -1 );
nmatch++;
break;
}
}
}
right = right && ( nmatch == ndaug );
for ( j = 0; j < _decaytable[parent.getAlias()]
.getDecay( i )
.getDecayModel()
->getNArg();
j++ ) {
right = right && ( args[j] == _decaytable[parent.getAlias()]
.getDecay( i )
.getDecayModel()
->getArgStr( j ) );
}
}
if ( right )
return i;
}
return -1;
}
int EvtDecayTable::inChannelList( EvtId parent, int ndaug, EvtId* daugs )
{
int i, j, k;
EvtId daugs_scratch[MAX_DAUG];
int dsum = 0;
for ( i = 0; i < ndaug; i++ ) {
dsum += daugs[i].getAlias();
}
int nmatch;
int ipar = parent.getAlias();
int nmode = _decaytable[ipar].getNMode();
for ( i = 0; i < nmode; i++ ) {
EvtDecayBase* thedecaymodel =
_decaytable[ipar].getDecay( i ).getDecayModel();
if ( thedecaymodel->getDSum() == dsum ) {
int nd = thedecaymodel->getNDaug();
if ( ndaug == nd ) {
for ( j = 0; j < ndaug; j++ ) {
daugs_scratch[j] = daugs[j];
}
nmatch = 0;
for ( j = 0; j < nd; j++ ) {
for ( k = 0; k < ndaug; k++ ) {
if ( EvtId( daugs_scratch[k] ) ==
thedecaymodel->getDaug( j ) ) {
daugs_scratch[k] = EvtId( -1, -1 );
nmatch++;
break;
}
}
}
if ( ( nmatch == ndaug ) &&
( !( ( thedecaymodel->getModelName() == "JETSET" ) ||
( thedecaymodel->getModelName() == "PYTHIA" ) ) ) ) {
return i;
}
}
}
}
return -1;
}
std::vector<std::string> EvtDecayTable::splitString( std::string& theString,
std::string& splitter )
{
// Code from STLplus
std::vector<std::string> result;
if ( !theString.empty() && !splitter.empty() ) {
for ( std::string::size_type offset = 0;; ) {
std::string::size_type found = theString.find( splitter, offset );
if ( found != std::string::npos ) {
std::string tmpString = theString.substr( offset, found - offset );
if ( tmpString.size() > 0 ) {
result.push_back( tmpString );
}
offset = found + splitter.size();
} else {
std::string tmpString =
theString.substr( offset, theString.size() - offset );
if ( tmpString.size() > 0 ) {
result.push_back( tmpString );
}
break;
}
}
}
return result;
}
diff --git a/src/EvtGenBase/EvtParticleDecay.cpp b/src/EvtGenBase/EvtParticleDecay.cpp
index 8ce5080..ad9864d 100644
--- a/src/EvtGenBase/EvtParticleDecay.cpp
+++ b/src/EvtGenBase/EvtParticleDecay.cpp
@@ -1,72 +1,72 @@
/***********************************************************************
* Copyright 1998-2020 CERN for the benefit of the EvtGen authors *
* *
* This file is part of EvtGen. *
* *
* EvtGen is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* EvtGen is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with EvtGen. If not, see <https://www.gnu.org/licenses/>. *
***********************************************************************/
#include "EvtGenBase/EvtParticleDecay.hh"
#include "EvtGenBase/EvtId.hh"
#include "EvtGenBase/EvtPDL.hh"
#include "EvtGenBase/EvtParticle.hh"
#include "EvtGenBase/EvtPatches.hh"
#include "EvtGenBase/EvtRandom.hh"
#include "EvtGenBase/EvtReport.hh"
#include <ctype.h>
#include <fstream>
#include <iostream>
#include <stdlib.h>
#include <string>
#include <vector>
using std::fstream;
void EvtParticleDecay::printSummary()
{
if ( _decay != nullptr )
_decay->printSummary();
}
void EvtParticleDecay::chargeConj( EvtParticleDecay* decay )
{
_brfrsum = decay->_brfrsum;
_massmin = decay->_massmin;
_decay = decay->_decay->clone();
int ndaug = decay->_decay->getNDaug();
int narg = decay->_decay->getNArg();
double brfr = decay->_decay->getBranchingFraction();
std::string name = decay->_decay->getName();
EvtId ipar = EvtPDL::chargeConj( decay->_decay->getParentId() );
int i;
EvtId* daug = new EvtId[ndaug];
for ( i = 0; i < ndaug; i++ ) {
daug[i] = EvtPDL::chargeConj( decay->_decay->getDaug( i ) );
}
//Had to add 1 to make sure the vector is not empty!
std::vector<std::string> args;
for ( i = 0; i < narg; i++ ) {
args.push_back( decay->_decay->getArgStr( i ) );
}
_decay->saveDecayInfo( ipar, ndaug, daug, narg, args, name, brfr );
- if ( decay->_decay->getPHOTOS() )
- _decay->setPHOTOS();
+ if ( decay->_decay->getFSR() )
+ _decay->setFSR();
delete[] daug;
}
diff --git a/src/EvtGenBase/EvtParticleDecayList.cpp b/src/EvtGenBase/EvtParticleDecayList.cpp
index ea8b3a3..030a59e 100644
--- a/src/EvtGenBase/EvtParticleDecayList.cpp
+++ b/src/EvtGenBase/EvtParticleDecayList.cpp
@@ -1,463 +1,463 @@
/***********************************************************************
* Copyright 1998-2020 CERN for the benefit of the EvtGen authors *
* *
* This file is part of EvtGen. *
* *
* EvtGen is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* EvtGen is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with EvtGen. If not, see <https://www.gnu.org/licenses/>. *
***********************************************************************/
#include "EvtGenBase/EvtParticleDecayList.hh"
#include "EvtGenBase/EvtPDL.hh"
#include "EvtGenBase/EvtParticle.hh"
#include "EvtGenBase/EvtPatches.hh"
#include "EvtGenBase/EvtRandom.hh"
#include "EvtGenBase/EvtReport.hh"
#include "EvtGenBase/EvtStatus.hh"
#include <ctype.h>
#include <fstream>
#include <iostream>
#include <stdlib.h>
using std::endl;
using std::fstream;
EvtParticleDecayList::EvtParticleDecayList( const EvtParticleDecayList& o )
{
_nmode = o._nmode;
_rawbrfrsum = o._rawbrfrsum;
_decaylist = new EvtParticleDecayPtr[_nmode];
int i;
for ( i = 0; i < _nmode; i++ ) {
_decaylist[i] = new EvtParticleDecay;
EvtDecayBase* tModel = o._decaylist[i]->getDecayModel();
EvtDecayBase* tModelNew = tModel->clone();
- if ( tModel->getPHOTOS() ) {
- tModelNew->setPHOTOS();
+ if ( tModel->getFSR() ) {
+ tModelNew->setFSR();
}
if ( tModel->verbose() ) {
tModelNew->setVerbose();
}
if ( tModel->summary() ) {
tModelNew->setSummary();
}
std::vector<std::string> args;
int j;
for ( j = 0; j < tModel->getNArg(); j++ ) {
args.push_back( tModel->getArgStr( j ) );
}
tModelNew->saveDecayInfo( tModel->getParentId(), tModel->getNDaug(),
tModel->getDaugs(), tModel->getNArg(), args,
tModel->getModelName(),
tModel->getBranchingFraction() );
_decaylist[i]->setDecayModel( tModelNew );
_decaylist[i]->setBrfrSum( o._decaylist[i]->getBrfrSum() );
_decaylist[i]->setMassMin( o._decaylist[i]->getMassMin() );
}
}
EvtParticleDecayList::~EvtParticleDecayList()
{
int i;
for ( i = 0; i < _nmode; i++ ) {
delete _decaylist[i];
}
if ( _decaylist != nullptr )
delete[] _decaylist;
}
void EvtParticleDecayList::printSummary()
{
int i;
for ( i = 0; i < _nmode; i++ ) {
_decaylist[i]->printSummary();
}
}
void EvtParticleDecayList::removeDecay()
{
int i;
for ( i = 0; i < _nmode; i++ ) {
delete _decaylist[i];
}
delete[] _decaylist;
_decaylist = nullptr;
_nmode = 0;
_rawbrfrsum = 0.0;
}
EvtDecayBase* EvtParticleDecayList::getDecayModel( int imode )
{
EvtDecayBase* theModel( nullptr );
if ( imode >= 0 && imode < _nmode ) {
EvtParticleDecay* theDecay = _decaylist[imode];
if ( theDecay != nullptr ) {
theModel = theDecay->getDecayModel();
}
}
return theModel;
}
EvtDecayBase* EvtParticleDecayList::getDecayModel( EvtParticle* p )
{
if ( p->getNDaug() != 0 ) {
assert( p->getChannel() >= 0 );
return getDecay( p->getChannel() ).getDecayModel();
}
if ( p->getChannel() > ( -1 ) ) {
return getDecay( p->getChannel() ).getDecayModel();
}
if ( getNMode() == 0 ) {
return nullptr;
}
if ( getRawBrfrSum() < 0.00000001 ) {
return nullptr;
}
if ( getNMode() == 1 ) {
p->setChannel( 0 );
return getDecay( 0 ).getDecayModel();
}
if ( p->getChannel() > ( -1 ) ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" ) << "Internal error!!!" << endl;
::abort();
}
int j;
for ( j = 0; j < 10000000; j++ ) {
double u = EvtRandom::Flat();
int i;
bool breakL = false;
for ( i = 0; i < getNMode(); i++ ) {
if ( breakL )
continue;
if ( u < getDecay( i ).getBrfrSum() ) {
breakL = true;
//special case for decay of on particel to another
// e.g. K0->K0S
if ( getDecay( i ).getDecayModel()->getNDaug() == 1 ) {
p->setChannel( i );
return getDecay( i ).getDecayModel();
}
if ( p->hasValidP4() ) {
if ( getDecay( i ).getMassMin() < p->mass() ) {
p->setChannel( i );
return getDecay( i ).getDecayModel();
}
} else {
//Lange apr29-2002 - dont know the mass yet
p->setChannel( i );
return getDecay( i ).getDecayModel();
}
}
}
}
//Ok, we tried 10000000 times above to pick a decay channel that is
//kinematically allowed! Now we give up and search all channels!
//if that fails, the particle will not be decayed!
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Tried 10000000 times to generate decay of "
<< EvtPDL::name( p->getId() ) << " with mass=" << p->mass() << endl;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Will take first kinematically allowed decay in the decay table"
<< endl;
int i;
//Need to check that we don't use modes with 0 branching fractions.
double previousBrSum = 0.0;
for ( i = 0; i < getNMode(); i++ ) {
if ( getDecay( i ).getBrfrSum() != previousBrSum ) {
if ( getDecay( i ).getMassMin() < p->mass() ) {
p->setChannel( i );
return getDecay( i ).getDecayModel();
}
}
previousBrSum = getDecay( i ).getBrfrSum();
}
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Could not decay:" << EvtPDL::name( p->getId() ).c_str()
<< " with mass:" << p->mass() << " will throw event away! " << endl;
EvtStatus::setRejectFlag();
return nullptr;
}
void EvtParticleDecayList::setNMode( int nmode )
{
EvtParticleDecayPtr* _decaylist_new = new EvtParticleDecayPtr[nmode];
if ( _nmode != 0 ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Error _nmode not equal to zero!!!" << endl;
::abort();
}
if ( _decaylist != nullptr ) {
delete[] _decaylist;
}
_decaylist = _decaylist_new;
_nmode = nmode;
}
EvtParticleDecay& EvtParticleDecayList::getDecay( int nchannel ) const
{
if ( nchannel >= _nmode ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Error getting channel:" << nchannel << " with only " << _nmode
<< " stored!" << endl;
::abort();
}
return *( _decaylist[nchannel] );
}
void EvtParticleDecayList::makeChargeConj( EvtParticleDecayList* conjDecayList )
{
_rawbrfrsum = conjDecayList->_rawbrfrsum;
setNMode( conjDecayList->_nmode );
int i;
for ( i = 0; i < _nmode; i++ ) {
_decaylist[i] = new EvtParticleDecay;
_decaylist[i]->chargeConj( conjDecayList->_decaylist[i] );
}
}
void EvtParticleDecayList::addMode( EvtDecayBase* decay, double brfrsum,
double massmin )
{
EvtParticleDecayPtr* newlist = new EvtParticleDecayPtr[_nmode + 1];
int i;
for ( i = 0; i < _nmode; i++ ) {
newlist[i] = _decaylist[i];
}
_rawbrfrsum = brfrsum;
newlist[_nmode] = new EvtParticleDecay;
newlist[_nmode]->setDecayModel( decay );
newlist[_nmode]->setBrfrSum( brfrsum );
newlist[_nmode]->setMassMin( massmin );
EvtDecayBase* newDec = newlist[_nmode]->getDecayModel();
for ( i = 0; i < _nmode; i++ ) {
if ( newDec->matchingDecay( *( newlist[i]->getDecayModel() ) ) ) {
//sometimes its ok..
if ( newDec->getModelName() == "JETSET" ||
newDec->getModelName() == "PYTHIA" )
continue;
if ( newDec->getModelName() == "JSCONT" ||
newDec->getModelName() == "PYCONT" )
continue;
if ( newDec->getModelName() == "PYGAGA" )
continue;
if ( newDec->getModelName() == "LUNDAREALAW" )
continue;
if ( newDec->getModelName() == "TAUOLA" )
continue;
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Two matching decays with same parent in decay table\n";
EvtGenReport( EVTGEN_ERROR, "EvtGen" ) << "Please fix that\n";
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Parent " << EvtPDL::name( newDec->getParentId() ).c_str()
<< endl;
for ( int j = 0; j < newDec->getNDaug(); j++ )
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Daughter "
<< EvtPDL::name( newDec->getDaug( j ) ).c_str() << endl;
assert( 0 );
}
}
if ( _nmode != 0 ) {
delete[] _decaylist;
}
if ( ( _nmode == 0 ) && ( _decaylist != nullptr ) )
delete[] _decaylist;
_nmode++;
_decaylist = newlist;
}
void EvtParticleDecayList::finalize()
{
if ( _nmode > 0 ) {
if ( _rawbrfrsum < 0.000001 ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Please give me a "
<< "branching fraction sum greater than 0\n";
assert( 0 );
}
if ( fabs( _rawbrfrsum - 1.0 ) > 0.0001 ) {
EvtGenReport( EVTGEN_INFO, "EvtGen" )
<< "Warning, sum of branching fractions for "
<< EvtPDL::name( _decaylist[0]->getDecayModel()->getParentId() )
.c_str()
<< " is " << _rawbrfrsum << endl;
EvtGenReport( EVTGEN_INFO, "EvtGen" ) << "rescaled to one! " << endl;
}
int i;
for ( i = 0; i < _nmode; i++ ) {
double brfrsum = _decaylist[i]->getBrfrSum() / _rawbrfrsum;
_decaylist[i]->setBrfrSum( brfrsum );
}
}
}
EvtParticleDecayList& EvtParticleDecayList::operator=( const EvtParticleDecayList& o )
{
if ( this != &o ) {
removeDecay();
_nmode = o._nmode;
_rawbrfrsum = o._rawbrfrsum;
_decaylist = new EvtParticleDecayPtr[_nmode];
int i;
for ( i = 0; i < _nmode; i++ ) {
_decaylist[i] = new EvtParticleDecay;
EvtDecayBase* tModel = o._decaylist[i]->getDecayModel();
EvtDecayBase* tModelNew = tModel->clone();
- if ( tModel->getPHOTOS() ) {
- tModelNew->setPHOTOS();
+ if ( tModel->getFSR() ) {
+ tModelNew->setFSR();
}
if ( tModel->verbose() ) {
tModelNew->setVerbose();
}
if ( tModel->summary() ) {
tModelNew->setSummary();
}
std::vector<std::string> args;
int j;
for ( j = 0; j < tModel->getNArg(); j++ ) {
args.push_back( tModel->getArgStr( j ) );
}
tModelNew->saveDecayInfo( tModel->getParentId(), tModel->getNDaug(),
tModel->getDaugs(), tModel->getNArg(),
args, tModel->getModelName(),
tModel->getBranchingFraction() );
_decaylist[i]->setDecayModel( tModelNew );
//_decaylist[i]->setDecayModel(tModel);
_decaylist[i]->setBrfrSum( o._decaylist[i]->getBrfrSum() );
_decaylist[i]->setMassMin( o._decaylist[i]->getMassMin() );
}
}
return *this;
}
void EvtParticleDecayList::removeMode( EvtDecayBase* decay )
{
// here we will delete a decay with the same final state particles
// and recalculate the branching fractions for the remaining modes
int match = -1;
int i;
double match_bf;
for ( i = 0; i < _nmode; i++ ) {
if ( decay->matchingDecay( *( _decaylist[i]->getDecayModel() ) ) ) {
match = i;
}
}
if ( match < 0 ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< " Attempt to remove undefined mode for" << endl
<< "Parent " << EvtPDL::name( decay->getParentId() ).c_str() << endl
<< "Daughters: ";
for ( int j = 0; j < decay->getNDaug(); j++ )
EvtGenReport( EVTGEN_ERROR, "" )
<< EvtPDL::name( decay->getDaug( j ) ).c_str() << " ";
EvtGenReport( EVTGEN_ERROR, "" ) << endl;
::abort();
}
if ( match == 0 ) {
match_bf = _decaylist[match]->getBrfrSum();
} else {
match_bf = ( _decaylist[match]->getBrfrSum() -
_decaylist[match - 1]->getBrfrSum() );
}
double divisor = 1 - match_bf;
if ( divisor < 0.000001 && _nmode > 1 ) {
EvtGenReport( EVTGEN_ERROR, "EvtGen" )
<< "Removing requested mode leaves "
<< EvtPDL::name( decay->getParentId() ).c_str()
<< " with zero sum branching fraction," << endl
<< "but more than one decay mode remains. Aborting." << endl;
::abort();
}
EvtParticleDecayPtr* newlist = new EvtParticleDecayPtr[_nmode - 1];
for ( i = 0; i < match; i++ ) {
newlist[i] = _decaylist[i];
newlist[i]->setBrfrSum( newlist[i]->getBrfrSum() / divisor );
}
for ( i = match + 1; i < _nmode; i++ ) {
newlist[i - 1] = _decaylist[i];
newlist[i - 1]->setBrfrSum(
( newlist[i - 1]->getBrfrSum() - match_bf ) / divisor );
}
delete[] _decaylist;
_nmode--;
_decaylist = newlist;
if ( _nmode == 0 ) {
delete[] _decaylist;
}
}
bool EvtParticleDecayList::isJetSet() const
{
int i;
EvtDecayBase* decayer;
for ( i = 0; i < getNMode(); i++ ) {
decayer = getDecay( i ).getDecayModel();
if ( decayer->getModelName() == "PYTHIA" )
return true;
}
return false;
}
diff --git a/test/checkJsonFiles.py b/test/checkJsonFiles.py
index cc9bf1d..2b26d91 100644
--- a/test/checkJsonFiles.py
+++ b/test/checkJsonFiles.py
@@ -1,286 +1,286 @@
#!/usr/bin/env python
import json
import itertools
class JsonFileChecker :
particleNames = {
'B0' : [ 'Bd', 'B0' ],
'anti-B0' : [ 'Bd', 'Bdbar', 'B0', 'B0bar' ],
'B_s0' : [ 'Bs', 'Bs0', 'B0s' ],
'anti-B_s0' : [ 'Bs', 'Bsbar', 'Bs0', 'Bs0bar', 'B0s', 'B0sbar' ],
'B+' : [ 'Bu', 'Bp', 'B+' ],
'B-' : [ 'Bu', 'Bm', 'B-' ],
'B_c+' : [ 'Bc', 'Bcp', 'Bc+' ],
'B_c-' : [ 'Bc', 'Bcm', 'Bc-' ],
'B*0' : [ 'Bstd', 'Bst0' ],
'anti-B*0' : [ 'Bstd', 'Bst0' ],
'B_s*0' : [ 'Bsst', 'Bs0st', 'Bs0star' ],
'anti-B_s*0' : [ 'Bsst', 'Bs0st', 'Bs0star' ],
'D+' : [ 'D+', 'Dp', 'D' ],
'D-' : [ 'D-', 'Dm', 'D' ],
'D0' : [ 'D0', 'Dz' ],
'anti-D0' : [ 'D0', 'D0bar', 'anti-D0', 'Dz', 'Dzbar', 'anti-Dz' ],
'D_s+' : [ 'Ds+', 'Dsp', 'Ds' ],
'D_s-' : [ 'Ds-', 'Dsm', 'Ds' ],
'D*+' : [ 'Dst+', 'Dstp', 'Dst', 'Dstar+', 'Dstarp', 'Dstar' ],
'D*-' : [ 'Dst-', 'Dstm', 'Dst', 'Dstar-', 'Dstarm', 'Dstar' ],
'D*0' : [ 'Dst0', 'Dstz', 'Dstar0', 'Dstarz' ],
'anti-D*0' : [ 'Dst0', 'Dstz', 'Dstar0', 'Dstarz' ],
'D_2*0' : [ 'D2st0', 'D2stz', 'D2star0', 'D2starz' ],
'anti-D_2*0' : [ 'D2st0', 'D2stz', 'D2star0', 'D2starz' ],
'D*(2S)+' : [ 'Dst2S+', 'Dst2Sp', 'Dst2S', 'Dstar2S+', 'Dstar2Sp', 'Dstar2S' ],
'D*(2S)-' : [ 'Dst2S-', 'Dst2Sm', 'Dst2S', 'Dstar2S-', 'Dstar2Sm', 'Dstar2S' ],
'K+' : [ 'K+', 'Kp', 'K' ],
'K-' : [ 'K-', 'Km', 'K' ],
'K0' : [ 'K0', 'Kz' ],
'anti-K0' : [ 'K0', 'Kz', 'anti-K0' ],
'K_S0' : [ 'KS', 'KS0', 'K0S', 'Ks', 'Ks0', 'K0s' ],
'K_L0' : [ 'KL', 'KL0', 'K0L', 'Kl', 'Kl0', 'K0l' ],
'K*+' : [ 'Kst+', 'Kstp', 'Kst', 'Kstar' ],
'K*-' : [ 'Kst-', 'Kstm', 'Kst', 'Kstar' ],
'K*0' : [ 'Kst0', 'Kstz', 'Kst', 'Kstar0' ],
'anti-K*0' : [ 'Kst0', 'Kstz', 'Kst', 'Kstar0' ],
'K_1+' : [ 'K1+', 'K1p', 'K1' ],
'K_1-' : [ 'K1-', 'K1m', 'K1' ],
'K\'_1+' : [ 'Kprime1+', 'Kprime1p', 'Kprime1' ],
'K\'_1-' : [ 'Kprime1-', 'Kprime1m', 'Kprime1' ],
'pi+' : [ 'pi+', 'pip', 'pi' ],
'pi-' : [ 'pi-', 'pim', 'pi' ],
'pi0' : [ 'pi0', 'piz' ],
'rho+' : [ 'rho+', 'rhop', 'rho' ],
'rho-' : [ 'rho-', 'rhom', 'rho' ],
'rho0' : [ 'rho0', 'rhoz' ],
'a_1+' : [ 'a1+', 'a1p', 'a1' ],
'a_1-' : [ 'a1-', 'a1m', 'a1' ],
'a_2+' : [ 'a2+', 'a2p', 'a2' ],
'a_2-' : [ 'a2-', 'a2m', 'a2' ],
'f_2' : [ 'f2' ],
'p+' : [ 'p+', 'p' ],
'anti-p-' : [ 'p-', 'p', 'pbar' ],
'Lambda_b0' : [ 'Lambdab', 'Lambdab0', 'Lb', 'Lbz', 'Lb0' ],
'Lambda_c+' : [ 'Lambdac', 'Lambdac+', 'Lambdacp', 'Lc', 'Lc+', 'Lcp' ],
'Lambda_c(2593)+' : [ 'Lambdac2593', 'Lambdac2593+', 'Lambdac2593p', 'Lc2593', 'Lc2593+', 'Lc2593p' ],
'Lambda_c(2625)+' : [ 'Lambdac2625', 'Lambdac2625+', 'Lambdac2625p', 'Lc2625', 'Lc2625+', 'Lc2625p' ],
'Lambda0' : [ 'Lambda', 'Lambda0', 'Lz', 'L0' ],
'Delta+' : [ 'Delta+', 'Deltap' ],
'J/psi' : [ 'Jpsi' ],
'psi(2S)' : [ 'psi2S' ],
'psi(3770)' : [ 'psi3770' ],
'psi(4160)' : [ 'psi4160' ],
'psi(4415)' : [ 'psi4415' ],
'X_2(3872)' : [ 'X3872' ],
'chi_c0' : [ 'chic0' ],
'chi_c1' : [ 'chic1' ],
'chi_c2' : [ 'chic2' ],
'Upsilon' : [ 'Upsilon1S', 'Y1S', 'Upsilon' ],
'Upsilon(2S)' : [ 'Upsilon2S', 'Y2S' ],
'Upsilon(3S)' : [ 'Upsilon3S', 'Y3S' ],
'Upsilon(4S)' : [ 'Upsilon4S', 'Y4S' ],
'Upsilon(5S)' : [ 'Upsilon5S', 'Y5S' ],
'omega' : [ 'omega' ],
'phi' : [ 'phi' ],
'eta' : [ 'eta' ],
'eta\'' : [ 'etap', 'etapr', 'etaprime' ],
'e+' : [ 'e', 'ep', 'e+' ],
'e-' : [ 'e', 'em', 'e-' ],
'mu+' : [ 'mu', 'mup', 'mu+' ],
'mu-' : [ 'mu', 'mum', 'mu-' ],
'tau+' : [ 'tau', 'taup', 'tau+' ],
'tau-' : [ 'tau', 'taum', 'tau-' ],
'nu_e' : [ 'nue', 'nu-e', 'nu' ],
'anti-nu_e' : [ 'anti-nue', 'nue', 'nu-e', 'nu' ],
'nu_mu' : [ 'numu', 'nu-mu', 'nu' ],
'anti-nu_mu' : [ 'anti-numu', 'numu', 'nu-mu', 'nu' ],
'nu_tau' : [ 'nutau', 'nu-tau', 'nu' ],
'anti-nu_tau' : [ 'anti-nutau', 'nutau', 'nu-tau', 'nu' ],
'gamma' : [ 'gamma' ],
'Xsd' : [ 'Xsd' ],
'Xsu' : [ 'Xsu' ],
'Xu-' : [ 'Xu' ],
}
allowedSuffixes = [
'cuts',
'CLEO',
'BaBar',
'Longitudinal',
'Transverse',
'tree',
'nlo',
'pWave',
'sWave',
- 'yesPhotos',
+ 'yesFSR',
'Pars1',
- 'Pars2'
+ 'Pars2',
]
def __init__( self, jsonFileName ) :
self.j = None
with open( 'jsonFiles/'+jsonFileName ) as jsonFile :
self.j = json.load( jsonFile )
self.jsonFileName = jsonFileName
self.modelString = jsonFileName[ : jsonFileName.index('__') ]
self.particleString = jsonFileName[ jsonFileName.index('__') + 2 : jsonFileName.index('.json') ]
self.jsonFileNameBase = jsonFileName[ : jsonFileName.index('.json') ]
def checkModels( self ) :
modelsFromString = self.modelString.split('=')
jsonModelsList = [ i for i in itertools.filterfalse( lambda x : x == "", self.j['models'] ) ]
if len(modelsFromString) != len(jsonModelsList) :
print(f'ERROR : different numbers of models: {len(modelsFromString)} in filename, {len(jsonModelsList)} in JSON')
return False
allOK = True
for model1, model2 in zip( modelsFromString, jsonModelsList ) :
if model1 != model2 :
print(f'ERROR : different model name : {model1} in filename, {model2} in JSON')
allOK = False
return allOK
def checkParticles( self ) :
allOK = True
models = self.j['models']
generations = self.particleString.split('_')
if generations[-1] in self.allowedSuffixes :
generations = generations[:-1]
parent = self.j['parent']
daughters = self.j['daughters']
if 'VSS_BMIX' == models[0] and len(daughters) == 4 and daughters[0] == daughters[2] and daughters[1] == daughters[3] :
daughters = daughters[:2]
grandDaughters = None
if 'grand_daughters' in self.j :
grandDaughters = self.j['grand_daughters']
if ( grandDaughters and len(generations) != 3 ) or ( not grandDaughters and len(generations) != 2 ) :
print(f'ERROR : incorrect number of generations in particle string: {generations}')
return False
if generations[0] not in self.particleNames[ parent ] :
print(f'ERROR : parent name mis-match : {generations[0]} in filename, {parent} in JSON')
allOK = False
tauolaIndex = -1
tauolaDecay = -1
if 'TAUOLA' in models :
tauolaIndex = models.index('TAUOLA')
tauolaDecay = self.j['parameters'][tauolaIndex][0]
if tauolaIndex == 0 :
print(f'WARNING : cannot check accuracy of daughter string for TAUOLA decay {tauolaDecay}')
else :
daugList = [ self.particleNames[d] for d in daughters ]
combinations = itertools.product( *daugList )
string_combinations = []
for comb in combinations :
string = ''
for name in comb :
string += name
string_combinations.append( string )
if generations[1] not in string_combinations :
print(f'ERROR : daughter name mis-match : {generations[1]} in filename, {daughters} in JSON')
print(string_combinations)
allOK = False
if grandDaughters :
gdStrings = generations[2].split(',')
gdLists = [ i for i in itertools.filterfalse( lambda x : len(x) == 0, grandDaughters ) ]
if len(gdStrings) != len(gdLists) :
print(f'ERROR : mis-match in number of grand-daughter sets: {gdStrings} in filename, {gdLists} in JSON')
return False
for index, gdList in enumerate(gdLists) :
if 'VSS_BMIX' == models[index+1] and len(gdList) == 4 and gdList[0] == gdList[2] and gdList[1] == gdList[3] :
gdList = gdList[:2]
if tauolaIndex > 0 :
gdStrings.pop(tauolaIndex-1)
gdLists.pop(tauolaIndex-1)
print(f'WARNING : cannot check accuracy of grand-daughter string for TAUOLA decay {tauolaDecay}')
for gdString, gdList in zip( gdStrings, gdLists ) :
grandDaugList = [ self.particleNames[gd] for gd in gdList ]
combinations = itertools.product( *grandDaugList )
string_combinations = []
for comb in combinations :
string = ''
for name in comb :
string += name
string_combinations.append( string )
if gdString not in string_combinations :
print(f'ERROR : grand-daughter name mis-match : {gdString} in filename, {gdList} in JSON')
print(string_combinations)
allOK = False
return allOK
def checkFileNames( self ) :
rootFileName = self.j['outfile']
if rootFileName != self.jsonFileNameBase+'.root' :
print(f'ERROR : ROOT file name mis-match : {self.jsonFileNameBase}.root from JSON filename, {rootFileName} in JSON field')
return False
refFileName = self.j['reference']
if refFileName != 'Ref'+self.jsonFileNameBase+'.root' :
print(f'ERROR : reference file name mis-match : Ref{self.jsonFileNameBase}.root from JSON filename, {refFileName} in JSON field')
return False
return True
def runChecks( self ) :
modelsOK = checker.checkModels()
particlesOK = checker.checkParticles()
namesOK = checker.checkFileNames()
return modelsOK and particlesOK and namesOK
if __name__ == '__main__' :
import os, sys
jsonFiles = os.listdir('jsonFiles')
allOK = True
for jsonFileName in jsonFiles :
print(f'Checking file: {jsonFileName}')
checker = JsonFileChecker( jsonFileName )
if not checker.runChecks() :
allOK = False
if not allOK :
sys.exit(1)
diff --git a/test/jsonFiles/BC_BSSTAR_NPI__Bc_Bs0starpipipi.json b/test/jsonFiles/BC_BSSTAR_NPI__Bc_Bs0starpipipi.json
index 5056fad..ac59568 100644
--- a/test/jsonFiles/BC_BSSTAR_NPI__Bc_Bs0starpipipi.json
+++ b/test/jsonFiles/BC_BSSTAR_NPI__Bc_Bs0starpipipi.json
@@ -1,17 +1,17 @@
{
"parent" : "B_c+",
"daughters" : ["B_s*0", "pi+", "pi-", "pi+"],
"models" : ["BC_BSSTAR_NPI", "", "", "", ""],
"parameters" : [[], [], [], [], []],
"do_conjugate_decay" : [true, false, false, false, false],
- "extras" : ["Define dm_incohMix_B_s0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B_s0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(BC_BSSTAR_NPI)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "parMass", "title" : "m(B_{c}^{+})", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 6.2, "xmax" : 6.3},
{"variable" : "mass", "title" : "m(B_{s}^{*0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 5.4, "xmax" : 5.5},
{"variable" : "mass3", "title" : "m(#pi^{+}#pi^{-}#pi^{+})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0}
],
"outfile" : "BC_BSSTAR_NPI__Bc_Bs0starpipipi.root",
"reference" : "RefBC_BSSTAR_NPI__Bc_Bs0starpipipi.root"
}
diff --git a/test/jsonFiles/BC_BS_NPI__Bc_Bs0pipipi.json b/test/jsonFiles/BC_BS_NPI__Bc_Bs0pipipi.json
index 53e61ea..02e463d 100644
--- a/test/jsonFiles/BC_BS_NPI__Bc_Bs0pipipi.json
+++ b/test/jsonFiles/BC_BS_NPI__Bc_Bs0pipipi.json
@@ -1,17 +1,17 @@
{
"parent" : "B_c+",
"daughters" : ["B_s0", "pi+", "pi-", "pi+"],
"models" : ["BC_BS_NPI", "", "", "", ""],
"parameters" : [[], [], [], [], []],
"do_conjugate_decay" : [true, false, false, false, false],
- "extras" : ["Define dm_incohMix_B_s0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B_s0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(BC_BS_NPI)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "parMass", "title" : "m(B_{c}^{+})", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 6.2, "xmax" : 6.3},
{"variable" : "mass", "title" : "m(B_{s}^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 5.3, "xmax" : 5.4},
{"variable" : "mass3", "title" : "m(#pi^{+}#pi^{-}#pi^{+})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0}
],
"outfile" : "BC_BS_NPI__Bc_Bs0pipipi.root",
"reference" : "RefBC_BS_NPI__Bc_Bs0pipipi.root"
}
diff --git a/test/jsonFiles/BC_PSI_NPI=VLL__Bc_Jpsipipipi_ee.json b/test/jsonFiles/BC_PSI_NPI=VLL__Bc_Jpsipipipi_ee.json
index b33c957..3a7b4de 100644
--- a/test/jsonFiles/BC_PSI_NPI=VLL__Bc_Jpsipipipi_ee.json
+++ b/test/jsonFiles/BC_PSI_NPI=VLL__Bc_Jpsipipipi_ee.json
@@ -1,20 +1,20 @@
{
"parent" : "B_c+",
"daughters" : ["J/psi", "pi+", "pi-", "pi+"],
"grand_daughters" : [["e+", "e-"], [], [], []],
"models" : ["BC_PSI_NPI", "VLL", "", "", ""],
"parameters" : [[], [], [], [], []],
"do_conjugate_decay" : [true, false, false, false, false],
- "extras" : ["Define dm_incohMix_B_s0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B_s0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(BC_PSI_NPI)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(VLL)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "parMass", "title" : "m(B_{c}^{+})", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 6.2, "xmax" : 6.3},
{"variable" : "mass", "title" : "m(J/#psi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 3.0, "xmax" : 3.2},
{"variable" : "mass3", "title" : "m(#pi^{+}#pi^{-}#pi^{+})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.5},
{"variable" : "cosHel", "title" : "cosHel(e^{+}, J/#psi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "BC_PSI_NPI=VLL__Bc_Jpsipipipi_ee.root",
"reference" : "RefBC_PSI_NPI=VLL__Bc_Jpsipipipi_ee.root"
}
diff --git a/test/jsonFiles/BC_SMN=SVP__Bc_D0munu_gammaKst0.json b/test/jsonFiles/BC_SMN=SVP__Bc_D0munu_gammaKst0.json
index 93753a0..d197475 100644
--- a/test/jsonFiles/BC_SMN=SVP__Bc_D0munu_gammaKst0.json
+++ b/test/jsonFiles/BC_SMN=SVP__Bc_D0munu_gammaKst0.json
@@ -1,35 +1,35 @@
{
"parent" : "B_c+",
"daughters" : ["D0", "mu+", "nu_mu"],
"grand_daughters" : [["gamma", "K*0"], [], []],
"models" : ["BC_SMN", "SVP", ""],
"parameters" : [["1"], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(D0)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 1.8, "xmax" : 1.9},
{"variable" : "mass", "title" : "m(D0 mu)", "d1" : 1, "d2" : 2, "nbins": 100, "xmin" : 3.0, "xmax" : 7.0},
{"variable" : "mass", "title" : "m(mu nu)", "d1" : 2, "d2" : 3, "nbins": 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "pSumSq", "title" : "qSq(mu nu)", "d1" : 2, "d2" : 3, "nbins": 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "p", "title" : "p(D0)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 3.5},
{"variable" : "pSq", "title" : "pSq(D0)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 10.0},
{"variable" : "pz", "title" : "pz(D0)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(D0,mu)", "d1" : 1, "d2" : 2, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug1", "title" : "cosHel(gamma)", "d1" : 1, "d2" : 2, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug1", "title" : "cosHel(K*0)", "d1" : 2, "d2" : 1, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(D0)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0},
{"variable" : "E", "title" : "E(D0)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 1.5, "xmax" : 4.0},
{"variable" : "phi", "title" : "phi(D0)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "E_daug1", "title" : "E(gamma)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pLab_daug1", "title" : "pLab(K*0)", "d1" : 2, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 4.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(gamma)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(gamma)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(K*0)", "d1" : 2, "d2" : 0, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(K*0)", "d1" : 2, "d2" : 0, "nbins": 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "BC_SMN=SVP__Bc_D0munu_gammaKst0.root",
"reference" : "RefBC_SMN=SVP__Bc_D0munu_gammaKst0.root"
}
diff --git a/test/jsonFiles/BC_TMN=TVP__Bc_chic2munu_gammaJpsi.json b/test/jsonFiles/BC_TMN=TVP__Bc_chic2munu_gammaJpsi.json
index 4b9a3d7..725e533 100644
--- a/test/jsonFiles/BC_TMN=TVP__Bc_chic2munu_gammaJpsi.json
+++ b/test/jsonFiles/BC_TMN=TVP__Bc_chic2munu_gammaJpsi.json
@@ -1,36 +1,36 @@
{
"parent" : "B_c+",
"daughters" : ["chi_c2", "mu+", "nu_mu"],
"grand_daughters" : [["gamma", "J/psi"], [], []],
"models" : ["BC_TMN", "TVP", ""],
"parameters" : [["3"], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(chi_c2)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 3.52, "xmax" : 3.6},
{"variable" : "mass", "title" : "m(chi_c2 mu)", "d1" : 1, "d2" : 2, "nbins": 100, "xmin" : 3.0, "xmax" : 7.0},
{"variable" : "mass", "title" : "m(mu nu)", "d1" : 2, "d2" : 3, "nbins": 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pSumSq", "title" : "qSq(mu nu)", "d1" : 2, "d2" : 3, "nbins": 100, "xmin" : 0.0, "xmax" : 9.0},
{"variable" : "p", "title" : "p(chi_c2)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "pSq", "title" : "pSq(chi_c2)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "pz", "title" : "pz(chi_c2)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosHel", "title" : "cosHel(chi_c2,mu)", "d1" : 1, "d2" : 2, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(mu,chi_c2)", "d1" : 2, "d2" : 1, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug1", "title" : "cosHel(gamma)", "d1" : 1, "d2" : 2, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug1", "title" : "cosHel(J/psi)", "d1" : 2, "d2" : 1, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(chi_c2)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0},
{"variable" : "E", "title" : "E(chi_c2)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 3.5, "xmax" : 4.3},
{"variable" : "phi", "title" : "phi(chi_c2)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "E_daug1", "title" : "E(gamma)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pLab_daug1", "title" : "pLab(J/psi)", "d1" : 2, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(gamma)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(gamma)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(J/psi)", "d1" : 2, "d2" : 0, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(J/psi)", "d1" : 2, "d2" : 0, "nbins": 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "BC_TMN=TVP__Bc_chic2munu_gammaJpsi.root",
"reference" : "RefBC_TMN=TVP__Bc_chic2munu_gammaJpsi.root"
}
diff --git a/test/jsonFiles/BC_VHAD=VLL__Bc_Jpsipipi0_mumu.json b/test/jsonFiles/BC_VHAD=VLL__Bc_Jpsipipi0_mumu.json
index 79b6f10..b5bb48e 100644
--- a/test/jsonFiles/BC_VHAD=VLL__Bc_Jpsipipi0_mumu.json
+++ b/test/jsonFiles/BC_VHAD=VLL__Bc_Jpsipipi0_mumu.json
@@ -1,38 +1,38 @@
{
"parent" : "B_c+",
"daughters" : ["J/psi", "pi+", "pi0"],
"grand_daughters" : [["mu+", "mu-"], [], []],
"models" : ["BC_VHAD", "VLL", "", ""],
"parameters" : [["1"], [], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(BC_VHAD)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(VLL)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(Jpsi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 3.0, "xmax" : 3.2},
{"variable" : "mass", "title" : "m(Jpsi pi+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 3.0, "xmax" : 6.5},
{"variable" : "mass", "title" : "m(Jpsi pi0)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 3.0, "xmax" : 6.5},
{"variable" : "mass", "title" : "m(pi+ pi0)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pSumSq", "title" : "qSq(pi+ pi0)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 4.0},
{"variable" : "p", "title" : "p(Jpsi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.5, "xmax" : 2.5},
{"variable" : "pz", "title" : "pz(Jpsi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(Jpsi,pi+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(pi+,pi0)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(Jpsi,pi0)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug1", "title" : "cosHel(mu+,Jpsi)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug1", "title" : "cosHel(mu-,Jpsi)", "d1" : 2, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(Jpsi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "E", "title" : "E(Jpsi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 3.5, "xmax" : 4.2},
{"variable" : "phi", "title" : "phi(Jpsi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.5},
{"variable" : "pLab_daug1", "title" : "pLab(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.5},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "BC_VHAD=VLL__Bc_Jpsipipi0_mumu.root",
"reference" : "RefBC_VHAD=VLL__Bc_Jpsipipi0_mumu.root"
}
diff --git a/test/jsonFiles/BC_VHAD=VLL__Bc_psi2SKKpi_mumu.json b/test/jsonFiles/BC_VHAD=VLL__Bc_psi2SKKpi_mumu.json
index 4fad46a..12f7fbe 100644
--- a/test/jsonFiles/BC_VHAD=VLL__Bc_psi2SKKpi_mumu.json
+++ b/test/jsonFiles/BC_VHAD=VLL__Bc_psi2SKKpi_mumu.json
@@ -1,41 +1,41 @@
{
"parent" : "B_c+",
"daughters" : ["psi(2S)", "K+", "K-", "pi+"],
"grand_daughters" : [["mu+", "mu-"], [], [], []],
"models" : ["BC_VHAD", "VLL", "", "", ""],
"parameters" : [["1"], [], [], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 3.68, "xmax" : 3.695},
{"variable" : "mass", "title" : "m(psi2S K+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 4.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(psi2S K-)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 4.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(K+K-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.0},
{"variable" : "mass", "title" : "m(K-pi+)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.5, "xmax" : 1.6},
{"variable" : "mass", "title" : "m(psi2S pi+)", "d1" : 1, "d2" : 4, "nbins" : 100, "xmin" : 3.5, "xmax" : 5.5},
{"variable" : "pSumSq", "title" : "qSq(K+ K-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 7.0},
{"variable" : "p", "title" : "p(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "pSq", "title" : "pSq(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.5},
{"variable" : "pz", "title" : "pz(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.0, "xmax" : 2.0},
{"variable" : "cosHel", "title" : "cosHel(psi2S,K+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(K-,pi+)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(K+,K-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(psi2S,K-)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug1", "title" : "cosHel(mu+,psi2S)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug1", "title" : "cosHel(mu-,psi2S)", "d1" : 2, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "E", "title" : "E(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 3.5, "xmax" : 4.2},
{"variable" : "phi", "title" : "phi(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.5},
{"variable" : "pLab_daug1", "title" : "pLab(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.5},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "BC_VHAD=VLL__Bc_psi2SKKpi_mumu.root",
"reference" : "RefBC_VHAD=VLL__Bc_psi2SKKpi_mumu.root"
}
diff --git a/test/jsonFiles/BC_VHAD=VLL__Bc_psi2Spi_mumu.json b/test/jsonFiles/BC_VHAD=VLL__Bc_psi2Spi_mumu.json
index 22012f9..d8abfac 100644
--- a/test/jsonFiles/BC_VHAD=VLL__Bc_psi2Spi_mumu.json
+++ b/test/jsonFiles/BC_VHAD=VLL__Bc_psi2Spi_mumu.json
@@ -1,29 +1,29 @@
{
"parent" : "B_c+",
"daughters" : ["psi(2S)", "pi+"],
"grand_daughters" : [["mu+", "mu-"], []],
"models" : ["BC_VHAD", "VLL", ""],
"parameters" : [["2"], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(BC_VHAD)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(VLL)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 3.68, "xmax" : 3.695},
{"variable" : "mass", "title" : "m(psi2S pi+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 6.0, "xmax" : 6.5},
{"variable" : "p", "title" : "p(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.0, "xmax" : 2.1},
{"variable" : "pz", "title" : "pz(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosHel", "title" : "cosHel(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "E", "title" : "E(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 4.0, "xmax" : 4.5},
{"variable" : "phi", "title" : "phi(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.5},
{"variable" : "pLab_daug1", "title" : "pLab(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.5},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "BC_VHAD=VLL__Bc_psi2Spi_mumu.root",
"reference" : "RefBC_VHAD=VLL__Bc_psi2Spi_mumu.root"
}
diff --git a/test/jsonFiles/BC_VMN=VVPIPI_WEIGHTED__Bc_psi2Smunu_Jpsipipi.json b/test/jsonFiles/BC_VMN=VVPIPI_WEIGHTED__Bc_psi2Smunu_Jpsipipi.json
index 4d65f7f..872a596 100644
--- a/test/jsonFiles/BC_VMN=VVPIPI_WEIGHTED__Bc_psi2Smunu_Jpsipipi.json
+++ b/test/jsonFiles/BC_VMN=VVPIPI_WEIGHTED__Bc_psi2Smunu_Jpsipipi.json
@@ -1,40 +1,40 @@
{
"parent" : "B_c+",
"daughters" : ["psi(2S)", "mu+", "nu_mu"],
"grand_daughters" : [["J/psi", "pi+", "pi-"], [], []],
"models" : ["BC_VMN", "VVPIPI_WEIGHTED", ""],
"parameters" : [["1"], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(psi2S)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 3.68, "xmax" : 3.695},
{"variable" : "mass", "title" : "m(psi2S mu)", "d1" : 1, "d2" : 2, "nbins": 100, "xmin" : 3.0, "xmax" : 7.0},
{"variable" : "mass", "title" : "m(mu nu)", "d1" : 2, "d2" : 3, "nbins": 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pSumSq", "title" : "qSq(mu nu)", "d1" : 2, "d2" : 3, "nbins": 100, "xmin" : 0.0, "xmax" : 8.0},
{"variable" : "p", "title" : "p(psi2S)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "pSq", "title" : "pSq(psi2S)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "pz", "title" : "pz(psi2S)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosHel", "title" : "cosHel(psi2S,mu)", "d1" : 1, "d2" : 2, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(mu,psi2S)", "d1" : 2, "d2" : 1, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug1", "title" : "cosHel(J/psi)", "d1" : 1, "d2" : 2, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug1", "title" : "cosHel(pi+)", "d1" : 2, "d2" : 1, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(psi2S)", "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},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0},
{"variable" : "E", "title" : "E(psi2S)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 3.6, "xmax" : 4.4},
{"variable" : "phi", "title" : "phi(psi2S)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(J/psi)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "pLab_daug1", "title" : "pLab(pi+)", "d1" : 2, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 0.7},
{"variable" : "pLab_daug1", "title" : "pLab(pi-)", "d1" : 3, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 0.7},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(J/psi)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(J/psi)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi+)", "d1" : 2, "d2" : 0, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(pi+)", "d1" : 2, "d2" : 0, "nbins": 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi-)", "d1" : 3, "d2" : 0, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(pi-)", "d1" : 3, "d2" : 0, "nbins": 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "BC_VMN=VVPIPI_WEIGHTED__Bc_psi2Smunu_Jpsipipi.root",
"reference" : "RefBC_VMN=VVPIPI_WEIGHTED__Bc_psi2Smunu_Jpsipipi.root"
}
diff --git a/test/jsonFiles/BC_VMN=VVPIPI__Bc_psi2Smunu_Jpsipipi.json b/test/jsonFiles/BC_VMN=VVPIPI__Bc_psi2Smunu_Jpsipipi.json
index 4e23250..1bbd923 100644
--- a/test/jsonFiles/BC_VMN=VVPIPI__Bc_psi2Smunu_Jpsipipi.json
+++ b/test/jsonFiles/BC_VMN=VVPIPI__Bc_psi2Smunu_Jpsipipi.json
@@ -1,40 +1,40 @@
{
"parent" : "B_c+",
"daughters" : ["psi(2S)", "mu+", "nu_mu"],
"grand_daughters" : [["J/psi", "pi+", "pi-"], [], []],
"models" : ["BC_VMN", "VVPIPI", ""],
"parameters" : [["1"], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(psi2S)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 3.68, "xmax" : 3.695},
{"variable" : "mass", "title" : "m(psi2S mu)", "d1" : 1, "d2" : 2, "nbins": 100, "xmin" : 3.0, "xmax" : 7.0},
{"variable" : "mass", "title" : "m(mu nu)", "d1" : 2, "d2" : 3, "nbins": 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pSumSq", "title" : "qSq(mu nu)", "d1" : 2, "d2" : 3, "nbins": 100, "xmin" : 0.0, "xmax" : 8.0},
{"variable" : "p", "title" : "p(psi2S)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "pSq", "title" : "pSq(psi2S)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "pz", "title" : "pz(psi2S)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosHel", "title" : "cosHel(psi2S,mu)", "d1" : 1, "d2" : 2, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(mu,psi2S)", "d1" : 2, "d2" : 1, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug1", "title" : "cosHel(J/psi)", "d1" : 1, "d2" : 2, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug1", "title" : "cosHel(pi+)", "d1" : 2, "d2" : 1, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(psi2S)", "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},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0},
{"variable" : "E", "title" : "E(psi2S)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 3.6, "xmax" : 4.4},
{"variable" : "phi", "title" : "phi(psi2S)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(J/psi)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "pLab_daug1", "title" : "pLab(pi+)", "d1" : 2, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 0.7},
{"variable" : "pLab_daug1", "title" : "pLab(pi-)", "d1" : 3, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 0.7},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(J/psi)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(J/psi)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi+)", "d1" : 2, "d2" : 0, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(pi+)", "d1" : 2, "d2" : 0, "nbins": 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi-)", "d1" : 3, "d2" : 0, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(pi-)", "d1" : 3, "d2" : 0, "nbins": 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "BC_VMN=VVPIPI__Bc_psi2Smunu_Jpsipipi.root",
"reference" : "RefBC_VMN=VVPIPI__Bc_psi2Smunu_Jpsipipi.root"
}
diff --git a/test/jsonFiles/BC_VMN=VVP__Bc_psi2Smunu_chic1gamma.json b/test/jsonFiles/BC_VMN=VVP__Bc_psi2Smunu_chic1gamma.json
index 316a521..f1daec5 100644
--- a/test/jsonFiles/BC_VMN=VVP__Bc_psi2Smunu_chic1gamma.json
+++ b/test/jsonFiles/BC_VMN=VVP__Bc_psi2Smunu_chic1gamma.json
@@ -1,36 +1,36 @@
{
"parent" : "B_c+",
"daughters" : ["psi(2S)", "mu+", "nu_mu"],
"grand_daughters" : [["chi_c1", "gamma"], [], []],
"models" : ["BC_VMN", "VVP", ""],
"parameters" : [["1"], ["1.0", "0.0", "0.0", "0.0", "0.0", "0.0", "0.0", "0.0"], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(psi2S)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 3.68, "xmax" : 3.695},
{"variable" : "mass", "title" : "m(psi2S mu)", "d1" : 1, "d2" : 2, "nbins": 100, "xmin" : 3.0, "xmax" : 7.0},
{"variable" : "mass", "title" : "m(mu nu)", "d1" : 2, "d2" : 3, "nbins": 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pSumSq", "title" : "qSq(mu nu)", "d1" : 2, "d2" : 3, "nbins": 100, "xmin" : 0.0, "xmax" : 8.0},
{"variable" : "p", "title" : "p(psi2S)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "pSq", "title" : "pSq(psi2S)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "pz", "title" : "pz(psi2S)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosHel", "title" : "cosHel(psi2S,mu)", "d1" : 1, "d2" : 2, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(mu,psi2S)", "d1" : 2, "d2" : 1, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug1", "title" : "cosHel(chi_c1)", "d1" : 1, "d2" : 2, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug1", "title" : "cosHel(gamma)", "d1" : 2, "d2" : 1, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(psi2S)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0},
{"variable" : "E", "title" : "E(psi2S)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 3.6, "xmax" : 4.4},
{"variable" : "phi", "title" : "phi(psi2S)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(chi_c1)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "E_daug1", "title" : "E(gamma)", "d1" : 2, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 0.4},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(chi_c1)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(chi_c1)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(gamma)", "d1" : 2, "d2" : 0, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(gamma)", "d1" : 2, "d2" : 0, "nbins": 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "BC_VMN=VVP__Bc_psi2Smunu_chic1gamma.root",
"reference" : "RefBC_VMN=VVP__Bc_psi2Smunu_chic1gamma.root"
}
diff --git a/test/jsonFiles/BC_VNPI=VLL__Bc_psi2Spipipi_mumu.json b/test/jsonFiles/BC_VNPI=VLL__Bc_psi2Spipipi_mumu.json
index 9dc0589..ef707c9 100644
--- a/test/jsonFiles/BC_VNPI=VLL__Bc_psi2Spipipi_mumu.json
+++ b/test/jsonFiles/BC_VNPI=VLL__Bc_psi2Spipipi_mumu.json
@@ -1,41 +1,41 @@
{
"parent" : "B_c+",
"daughters" : ["psi(2S)", "pi+", "pi-", "pi+"],
"grand_daughters" : [["mu+", "mu-"], [], [], []],
"models" : ["BC_VNPI", "VLL", "", "", ""],
"parameters" : [["1"], [], [], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 3.684, "xmax" : 3.69},
{"variable" : "mass", "title" : "m(psi2S pi+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 3.5, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(psi2S pi-)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 3.5, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(pi+pi-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0, "xmax" : 3.0},
{"variable" : "mass", "title" : "m(pi-pi+)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0, "xmax" : 3.0},
{"variable" : "mass", "title" : "m(psi2S pi+)", "d1" : 1, "d2" : 4, "nbins" : 100, "xmin" : 3.5, "xmax" : 6.5},
{"variable" : "pSumSq", "title" : "qSq(pi+ pi-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "p", "title" : "p(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "pSq", "title" : "pSq(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 4.0},
{"variable" : "pz", "title" : "pz(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.0, "xmax" : 2.0},
{"variable" : "cosHel", "title" : "cosHel(psi2S,K+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(pi-,pi+)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(pi+,K-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(psi2S,K-)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug1", "title" : "cosHel(mu+,psi2S)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug1", "title" : "cosHel(mu-,psi2S)", "d1" : 2, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "E", "title" : "E(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 3.5, "xmax" : 4.2},
{"variable" : "phi", "title" : "phi(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.5},
{"variable" : "pLab_daug1", "title" : "pLab(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.5},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "BC_VNPI=VLL__Bc_psi2Spipipi_mumu.root",
"reference" : "RefBC_VNPI=VLL__Bc_psi2Spipipi_mumu.root"
}
diff --git a/test/jsonFiles/BC_VPPHAD=VLL__Bc_Jpsippbarpi_mumu_Pars1.json b/test/jsonFiles/BC_VPPHAD=VLL__Bc_Jpsippbarpi_mumu_Pars1.json
index 9a84bd4..f91c5a6 100644
--- a/test/jsonFiles/BC_VPPHAD=VLL__Bc_Jpsippbarpi_mumu_Pars1.json
+++ b/test/jsonFiles/BC_VPPHAD=VLL__Bc_Jpsippbarpi_mumu_Pars1.json
@@ -1,38 +1,38 @@
{
"parent" : "B_c+",
"daughters" : ["J/psi", "p+", "anti-p-", "pi+"],
"grand_daughters" : [["mu+", "mu-"], [], [], []],
"models" : ["BC_VPPHAD", "VLL", "", "", ""],
"parameters" : [["1"], [], [], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(BC_VPPHAD)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(VLL)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(Jpsi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 3.0, "xmax" : 3.2},
{"variable" : "mass", "title" : "m(Jpsi p)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 3.8, "xmax" : 5.4},
{"variable" : "mass", "title" : "m(Jpsi pbar)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 3.8, "xmax" : 5.4},
{"variable" : "mass", "title" : "m(Jpsi pi)", "d1" : 1, "d2" : 4, "nbins" : 100, "xmin" : 3.0, "xmax" : 4.5},
{"variable" : "mass", "title" : "m(p pbar)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 1.8, "xmax" : 3.2},
{"variable" : "mass", "title" : "m(p pi)", "d1" : 2, "d2" : 4, "nbins" : 100, "xmin" : 1.0, "xmax" : 2.4},
{"variable" : "mass", "title" : "m(pbar pi)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 1.0, "xmax" : 2.4},
{"variable" : "cosHel", "title" : "cosHel(Jpsi, p)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(Jpsi, pbar)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(Jpsi, pi)", "d1" : 1, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(p, pbar)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(p, pi)", "d1" : 2, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(pbar, pi)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug1", "title" : "cosHel(mu+,Jpsi)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug1", "title" : "cosHel(mu-,Jpsi)", "d1" : 2, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(Jpsi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(Jpsi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.5},
{"variable" : "pLab_daug1", "title" : "pLab(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.5},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "BC_VPPHAD=VLL__Bc_Jpsippbarpi_mumu_Pars1.root",
"reference" : "RefBC_VPPHAD=VLL__Bc_Jpsippbarpi_mumu_Pars1.root"
}
diff --git a/test/jsonFiles/BC_VPPHAD=VLL__Bc_Jpsippbarpi_mumu_Pars2.json b/test/jsonFiles/BC_VPPHAD=VLL__Bc_Jpsippbarpi_mumu_Pars2.json
index 1460898..745e142 100644
--- a/test/jsonFiles/BC_VPPHAD=VLL__Bc_Jpsippbarpi_mumu_Pars2.json
+++ b/test/jsonFiles/BC_VPPHAD=VLL__Bc_Jpsippbarpi_mumu_Pars2.json
@@ -1,38 +1,38 @@
{
"parent" : "B_c+",
"daughters" : ["J/psi", "p+", "anti-p-", "pi+"],
"grand_daughters" : [["mu+", "mu-"], [], [], []],
"models" : ["BC_VPPHAD", "VLL", "", "", ""],
"parameters" : [["2"], [], [], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(BC_VPPHAD)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(VLL)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(Jpsi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 3.0, "xmax" : 3.2},
{"variable" : "mass", "title" : "m(Jpsi p)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 3.8, "xmax" : 5.4},
{"variable" : "mass", "title" : "m(Jpsi pbar)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 3.8, "xmax" : 5.4},
{"variable" : "mass", "title" : "m(Jpsi pi)", "d1" : 1, "d2" : 4, "nbins" : 100, "xmin" : 3.0, "xmax" : 4.5},
{"variable" : "mass", "title" : "m(p pbar)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 1.8, "xmax" : 3.2},
{"variable" : "mass", "title" : "m(p pi)", "d1" : 2, "d2" : 4, "nbins" : 100, "xmin" : 1.0, "xmax" : 2.4},
{"variable" : "mass", "title" : "m(pbar pi)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 1.0, "xmax" : 2.4},
{"variable" : "cosHel", "title" : "cosHel(Jpsi, p)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(Jpsi, pbar)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(Jpsi, pi)", "d1" : 1, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(p, pbar)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(p, pi)", "d1" : 2, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(pbar, pi)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug1", "title" : "cosHel(mu+,Jpsi)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug1", "title" : "cosHel(mu-,Jpsi)", "d1" : 2, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(Jpsi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(Jpsi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.5},
{"variable" : "pLab_daug1", "title" : "pLab(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.5},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "BC_VPPHAD=VLL__Bc_Jpsippbarpi_mumu_Pars2.root",
"reference" : "RefBC_VPPHAD=VLL__Bc_Jpsippbarpi_mumu_Pars2.root"
}
diff --git a/test/jsonFiles/BC_VPPHAD=VLL__Bc_psi2Sppbarpi_mumu_Pars1.json b/test/jsonFiles/BC_VPPHAD=VLL__Bc_psi2Sppbarpi_mumu_Pars1.json
index e328089..5bd76ca 100644
--- a/test/jsonFiles/BC_VPPHAD=VLL__Bc_psi2Sppbarpi_mumu_Pars1.json
+++ b/test/jsonFiles/BC_VPPHAD=VLL__Bc_psi2Sppbarpi_mumu_Pars1.json
@@ -1,38 +1,38 @@
{
"parent" : "B_c+",
"daughters" : ["psi(2S)", "p+", "anti-p-", "pi+"],
"grand_daughters" : [["mu+", "mu-"], [], [], []],
"models" : ["BC_VPPHAD", "VLL", "", "", ""],
"parameters" : [["1"], [], [], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(BC_VPPHAD)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(VLL)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 3.684, "xmax" : 3.69},
{"variable" : "mass", "title" : "m(psi2S p)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 4.5, "xmax" : 5.3},
{"variable" : "mass", "title" : "m(psi2S pbar)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 4.5, "xmax" : 5.3},
{"variable" : "mass", "title" : "m(psi2S pi)", "d1" : 1, "d2" : 4, "nbins" : 100, "xmin" : 3.7, "xmax" : 4.5},
{"variable" : "mass", "title" : "m(p pbar)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 1.8, "xmax" : 2.5},
{"variable" : "mass", "title" : "m(p pi)", "d1" : 2, "d2" : 4, "nbins" : 100, "xmin" : 1.0, "xmax" : 1.7},
{"variable" : "mass", "title" : "m(pbar pi)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 1.0, "xmax" : 1.7},
{"variable" : "cosHel", "title" : "cosHel(psi2S, p)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(psi2S, pbar)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(psi2S, pi)", "d1" : 1, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(p, pbar)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(p, pi)", "d1" : 2, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(pbar, pi)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug1", "title" : "cosHel(mu+,psi2S)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug1", "title" : "cosHel(mu-,psi2S)", "d1" : 2, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.5},
{"variable" : "pLab_daug1", "title" : "pLab(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.5},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "BC_VPPHAD=VLL__Bc_psi2Sppbarpi_mumu_Pars1.root",
"reference" : "RefBC_VPPHAD=VLL__Bc_psi2Sppbarpi_mumu_Pars1.root"
}
diff --git a/test/jsonFiles/BC_VPPHAD=VLL__Bc_psi2Sppbarpi_mumu_Pars2.json b/test/jsonFiles/BC_VPPHAD=VLL__Bc_psi2Sppbarpi_mumu_Pars2.json
index ec15a02..f25f582 100644
--- a/test/jsonFiles/BC_VPPHAD=VLL__Bc_psi2Sppbarpi_mumu_Pars2.json
+++ b/test/jsonFiles/BC_VPPHAD=VLL__Bc_psi2Sppbarpi_mumu_Pars2.json
@@ -1,38 +1,38 @@
{
"parent" : "B_c+",
"daughters" : ["psi(2S)", "p+", "anti-p-", "pi+"],
"grand_daughters" : [["mu+", "mu-"], [], [], []],
"models" : ["BC_VPPHAD", "VLL", "", "", ""],
"parameters" : [["2"], [], [], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(BC_VPPHAD)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(VLL)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 3.684, "xmax" : 3.69},
{"variable" : "mass", "title" : "m(psi2S p)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 4.5, "xmax" : 5.3},
{"variable" : "mass", "title" : "m(psi2S pbar)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 4.5, "xmax" : 5.3},
{"variable" : "mass", "title" : "m(psi2S pi)", "d1" : 1, "d2" : 4, "nbins" : 100, "xmin" : 3.7, "xmax" : 4.5},
{"variable" : "mass", "title" : "m(p pbar)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 1.8, "xmax" : 2.5},
{"variable" : "mass", "title" : "m(p pi)", "d1" : 2, "d2" : 4, "nbins" : 100, "xmin" : 1.0, "xmax" : 1.7},
{"variable" : "mass", "title" : "m(pbar pi)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 1.0, "xmax" : 1.7},
{"variable" : "cosHel", "title" : "cosHel(psi2S, p)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(psi2S, pbar)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(psi2S, pi)", "d1" : 1, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(p, pbar)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(p, pi)", "d1" : 2, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(pbar, pi)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug1", "title" : "cosHel(mu+,psi2S)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug1", "title" : "cosHel(mu-,psi2S)", "d1" : 2, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.5},
{"variable" : "pLab_daug1", "title" : "pLab(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.5},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "BC_VPPHAD=VLL__Bc_psi2Sppbarpi_mumu_Pars2.root",
"reference" : "RefBC_VPPHAD=VLL__Bc_psi2Sppbarpi_mumu_Pars2.root"
}
diff --git a/test/jsonFiles/BLLNUL__Bu_eenumu.json b/test/jsonFiles/BLLNUL__Bu_eenumu.json
index e9b1106..2a25bac 100644
--- a/test/jsonFiles/BLLNUL__Bu_eenumu.json
+++ b/test/jsonFiles/BLLNUL__Bu_eenumu.json
@@ -1,39 +1,39 @@
{
"parent" : "B+",
"daughters" : ["e-", "e+", "nu_mu", "mu+"],
"models" : ["BLLNUL"],
"parameters" : [[]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(e-e+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.1, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(e- nu_mu)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "mass", "title" : "m(e+ nu_mu)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "mass", "title" : "m(nu_mu mu+)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "pSumSq", "title" : "qSq(e-e+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pSumSq", "title" : "qSq(nu_mu mu+)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.0, "xmax" : 25.0},
{"variable" : "p", "title" : "p(e-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(e-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(e+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(e+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(nu_mu)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(nu_mu)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(mu+)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(mu+)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(e-,e+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(nu_mu,mu+)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(e+,nu_mu)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(e-,nu_mu)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"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},
{"variable" : "cosTheta", "title" : "cosTheta(nu_mu)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(mu+)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(e-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "phi", "title" : "phi(e+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "phi", "title" : "phi(nu_mu)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "phi", "title" : "phi(mu+)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180}
],
"outfile" : "BLLNUL__Bu_eenumu.root",
"reference" : "RefBLLNUL__Bu_eenumu.root"
}
diff --git a/test/jsonFiles/BSQUARK__Bu_Dst0enue.json b/test/jsonFiles/BSQUARK__Bu_Dst0enue.json
index f07241d..1844b36 100644
--- a/test/jsonFiles/BSQUARK__Bu_Dst0enue.json
+++ b/test/jsonFiles/BSQUARK__Bu_Dst0enue.json
@@ -1,27 +1,27 @@
{
"parent" : "B-",
"daughters" : ["D*0", "e-", "anti-nu_e"],
"models" : ["BSQUARK", "", ""],
"parameters" : [["1.14", "2.0", "1000.0", "100.0", "100.0"], [], []],
"do_conjugate_decay" : [ true, false, false ],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "parMass", "title" : "m(B-)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 5.25, "xmax" : 5.3},
{"variable" : "mass", "title" : "m(D*0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.9, "xmax" : 2.1},
{"variable" : "pSumSq", "title" : "qSq(e,nue)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "p", "title" : "p(D*0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "phi", "title" : "phi(D*0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(D*0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "p", "title" : "p(e-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "phi", "title" : "phi(e-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(e-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "p", "title" : "p(nue)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "phi", "title" : "phi(nue)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(nue)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "E", "title" : "Dalitz qSq(e,nue) vs E(e)", "d1" : 2, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 2.5, "variableY" : "pSumSq", "d1Y" : 2, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 12.0}
],
"outfile" : "BSQUARK__Bu_Dst0enue.root",
"reference" : "RefBSQUARK__Bu_Dst0enue.root"
}
diff --git a/test/jsonFiles/BSTOGLLISRFSR__Bs_gammamumu.json b/test/jsonFiles/BSTOGLLISRFSR__Bs_gammamumu.json
index 3649520..ed1f157 100644
--- a/test/jsonFiles/BSTOGLLISRFSR__Bs_gammamumu.json
+++ b/test/jsonFiles/BSTOGLLISRFSR__Bs_gammamumu.json
@@ -1,34 +1,34 @@
{
"parent" : "B_s0",
"daughters" : ["gamma", "mu+", "mu-"],
"models" : ["BSTOGLLISRFSR"],
"parameters" : [["5.0", "5", "1", "1", "1", "0.02", "0.814", "0.2254", "0.117", "0.353"]],
"do_conjugate_decay" : [true],
- "extras" : ["Define dm_incohMix_B_s0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B_s0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.02},
{"variable" : "mass", "title" : "m(gamma mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(gamma mu-)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(mu+ mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "pSumSq", "title" : "qSq(gamma mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 40.0},
{"variable" : "pSumSq", "title" : "qSq(mu+mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 40.0},
{"variable" : "p", "title" : "p(gamma)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(gamma)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(mu+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(mu+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(mu-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(mu-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(gamma,mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(gamma,mu-)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(mu+,mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(gamma)", "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},
{"variable" : "cosTheta", "title" : "cosTheta(mu-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(gamma)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "phi", "title" : "phi(mu+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "phi", "title" : "phi(mu-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180}
],
"outfile" : "BSTOGLLISRFSR__Bs_gammamumu.root",
"reference" : "RefBSTOGLLISRFSR__Bs_gammamumu.root"
}
diff --git a/test/jsonFiles/BSTOGLLMNT__Bs_gammamumu.json b/test/jsonFiles/BSTOGLLMNT__Bs_gammamumu.json
index 46ebc6d..6fe8dc6 100644
--- a/test/jsonFiles/BSTOGLLMNT__Bs_gammamumu.json
+++ b/test/jsonFiles/BSTOGLLMNT__Bs_gammamumu.json
@@ -1,34 +1,34 @@
{
"parent" : "B_s0",
"daughters" : ["gamma", "mu+", "mu-"],
"models" : ["BSTOGLLMNT"],
"parameters" : [["5.0", "5", "1", "1", "0.02", "0.88", "0.227", "0.22", "0.34"]],
"do_conjugate_decay" : [true],
- "extras" : ["Define dm_incohMix_B_s0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B_s0 0", "noFSR"],
"events" : 2000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.5},
{"variable" : "mass", "title" : "m(gamma mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.1, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(gamma mu-)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(mu+ mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "pSumSq", "title" : "qSq(gamma mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 30.0},
{"variable" : "pSumSq", "title" : "qSq(mu+ mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "E", "title" : "E(gamma)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 4.0},
{"variable" : "pz", "title" : "pz(gamma)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(mu+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(mu+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(mu-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(mu-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(gamma,mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(gamma,mu-)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(mu+,mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(gamma)", "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},
{"variable" : "cosTheta", "title" : "cosTheta(mu-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(gamma)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "phi", "title" : "phi(mu+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "phi", "title" : "phi(mu-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180}
],
"outfile" : "BSTOGLLMNT__Bs_gammamumu.root",
"reference" : "RefBSTOGLLMNT__Bs_gammamumu.root"
}
diff --git a/test/jsonFiles/BS_MUMUKK__Bs_mumuKK.json b/test/jsonFiles/BS_MUMUKK__Bs_mumuKK.json
index 11b963c..fbdd2ad 100644
--- a/test/jsonFiles/BS_MUMUKK__Bs_mumuKK.json
+++ b/test/jsonFiles/BS_MUMUKK__Bs_mumuKK.json
@@ -1,40 +1,40 @@
{
"parent" : "B_s0",
"daughters" : ["mu+", "mu-", "K+", "K-"],
"models" : ["BS_MUMUKK"],
"parameters" : [["0.0", "0.0", "-0.03", "1.0", "0.07", "3.315", "-0.03", "1.0", "0.93", "0.5242", "0.0", "-0.03", "1.0", "0.25", "3.08", "-0.03", "1.0", "3.26", "-0.03", "1.0", "0.0", "0.0", "-0.03", "1.0", "0.0", "0.0", "-0.03", "1.0", "0.0", "-0.03", "1.0", "0.6614", "0.08543", "17.8", "0.9499", "0.988", "1.2"]],
"do_conjugate_decay" : [true],
- "extras" : ["Define dm_incohMix_B_s0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B_s0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.3},
{"variable" : "mass", "title" : "m(mu+mu-)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 3.0, "xmax" : 3.2},
{"variable" : "mass", "title" : "m(mu+K+)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 4.0},
{"variable" : "mass", "title" : "m(mu- K+)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 4.0},
{"variable" : "mass", "title" : "m(K+ K-)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.9, "xmax" : 1.3},
{"variable" : "pSumSq", "title" : "qSq(mu+mu-)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 9.5, "xmax" : 9.7},
{"variable" : "pSumSq", "title" : "qSq(K+K-)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.9, "xmax" : 1.5},
{"variable" : "p", "title" : "p(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(K+)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.5},
{"variable" : "pz", "title" : "pz(K+)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.5, "xmax" : 1.5},
{"variable" : "p", "title" : "p(K-)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.5},
{"variable" : "pz", "title" : "pz(K-)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : -1.5, "xmax" : 1.5},
{"variable" : "cosHel", "title" : "cosHel(mu+,mu-)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(K+,K-)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(mu-,K+)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(mu+,K+)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"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},
{"variable" : "cosTheta", "title" : "cosTheta(K+)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(K-)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "phi", "title" : "phi(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "phi", "title" : "phi(K+)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "phi", "title" : "phi(K-)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180}
],
"outfile" : "BS_MUMUKK__Bs_mumuKK.root",
"reference" : "RefBS_MUMUKK__Bs_mumuKK.root"
}
diff --git a/test/jsonFiles/BTODDALITZCPK=D0GAMMADALITZ__Bu_D0K_KsKK.json b/test/jsonFiles/BTODDALITZCPK=D0GAMMADALITZ__Bu_D0K_KsKK.json
index db06eab..5fe46a0 100644
--- a/test/jsonFiles/BTODDALITZCPK=D0GAMMADALITZ__Bu_D0K_KsKK.json
+++ b/test/jsonFiles/BTODDALITZCPK=D0GAMMADALITZ__Bu_D0K_KsKK.json
@@ -1,27 +1,27 @@
{
"parent" : "B-",
"daughters" : ["D0", "K-"],
"grand_daughters" : [["K_S0", "K+", "K-"], []],
"models" : ["BTODDALITZCPK", "D0GAMMADALITZ", ""],
"parameters" : [["1.15", "2.27", "0.10"], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob_daug1", "title" : "Prob(D0GAMMADALITZ)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "parMass", "title" : "m(B^{0})", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 5.25, "xmax" : 5.3},
{"variable" : "cosTheta", "title" : "cosTheta(D^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(K)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "mass_daug1", "title" : "m(K^{0}_{S} K^{+})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.95, "xmax" : 1.4},
{"variable" : "mass_daug1", "title" : "m(K^{0}_{S} K^{-})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.95, "xmax" : 1.4},
{"variable" : "mass_daug1", "title" : "m(K^{+} K^{-})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.95, "xmax" : 1.4},
{"variable" : "massSq_daug1", "title" : "Dalitz m^{2}(K^{0}_{S} K^{+}) vs m^{2}(K^{0}_{S} K^{-})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.8, "xmax" : 2.0, "variableY" : "massSq_daug1", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.8, "ymax" : 2.0},
{"variable" : "massSq_daug1", "title" : "Dalitz m^{2}(K^{+} K^{-}) vs m^{2}(K^{0}_{S} K^{+})", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : 0.8, "xmax" : 2.0, "variableY" : "massSq_daug1", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 50, "ymin" : 0.8, "ymax" : 2.0},
{"variable" : "mPrime_daug1", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime_daug1", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(K^{0}_{S},D^{0})", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug1", "title" : "cosHel12", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug1", "title" : "cosHel23", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug1", "title" : "cosHel13", "d1" : 1, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "BTODDALITZCPK=D0GAMMADALITZ__Bu_D0K_KsKK.root",
"reference" : "RefBTODDALITZCPK=D0GAMMADALITZ__Bu_D0K_KsKK.root"
}
diff --git a/test/jsonFiles/BTOKD3P=PTO3P=PTO3P__Bu_KD0D0bar_K0spipi,K0spipi.json b/test/jsonFiles/BTOKD3P=PTO3P=PTO3P__Bu_KD0D0bar_K0spipi,K0spipi.json
index b61407f..fb03ebc 100644
--- a/test/jsonFiles/BTOKD3P=PTO3P=PTO3P__Bu_KD0D0bar_K0spipi,K0spipi.json
+++ b/test/jsonFiles/BTOKD3P=PTO3P=PTO3P__Bu_KD0D0bar_K0spipi,K0spipi.json
@@ -1,46 +1,46 @@
{
"parent" : "B-",
"daughters" : ["K-", "D0", "anti-D0"],
"grand_daughters" : [[], ["K_S0", "pi+", "pi-"], ["K_S0", "pi+", "pi-"]],
"models" : ["BTOKD3P", "", "PTO3P", "PTO3P"],
"do_conjugate_decay" : [false, false, false],
"parameters" : [["0.10", "3.04"], [],
["MAXPDF 2.4",
"AMPLITUDE RESONANCE AC K*- ANGULAR BC TYPE RBW_ZEMACH COEFFICIENT POLAR_DEG 1.74 139.0",
"AMPLITUDE RESONANCE AC K_0*- ANGULAR BC TYPE RBW_ZEMACH COEFFICIENT POLAR_DEG 0.8 153.0",
"AMPLITUDE RESONANCE AC K_2*- ANGULAR BC TYPE RBW_ZEMACH COEFFICIENT POLAR_DEG 1.41 138.4",
"AMPLITUDE RESONANCE AB K*+ ANGULAR CA TYPE RBW_ZEMACH COEFFICIENT POLAR_DEG 0.16 -42.7",
"AMPLITUDE RESONANCE BC rho0 ANGULAR AB TYPE RBW_ZEMACH COEFFICIENT POLAR_DEG 1.0 0.0",
"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"],
["MAXPDF 2.4",
"AMPLITUDE RESONANCE AC K*- ANGULAR BC TYPE RBW_ZEMACH COEFFICIENT POLAR_DEG 1.74 139.0",
"AMPLITUDE RESONANCE AC K_0*- ANGULAR BC TYPE RBW_ZEMACH COEFFICIENT POLAR_DEG 0.8 153.0",
"AMPLITUDE RESONANCE AC K_2*- ANGULAR BC TYPE RBW_ZEMACH COEFFICIENT POLAR_DEG 1.41 138.4",
"AMPLITUDE RESONANCE AB K*+ ANGULAR CA TYPE RBW_ZEMACH COEFFICIENT POLAR_DEG 0.16 -42.7",
"AMPLITUDE RESONANCE BC rho0 ANGULAR AB TYPE RBW_ZEMACH COEFFICIENT POLAR_DEG 1.0 0.0",
"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"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(BTOKD3P)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(K^{-} D^{0})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 5.27, "xmax" : 5.29},
{"variable" : "mass_daug2", "title" : "m(K^{0}_{S} #pi^{+})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.5, "xmax" : 1.8},
{"variable" : "mass_daug2", "title" : "m(K^{0}_{S} #pi^{-})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.5, "xmax" : 1.8},
{"variable" : "mass_daug2", "title" : "m(#pi^{-} #pi^{+})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.2, "xmax" : 1.5},
{"variable" : "massSq_daug2", "title" : "m^{2}(K^{0}_{S} #pi^{+})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.5},
{"variable" : "massSq_daug2", "title" : "m^{2}(K^{0}_{S} #pi^{-})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.5},
{"variable" : "massSq_daug2", "title" : "m^{2}(#pi^{-} #pi^{+})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "massSq_daug2", "title" : "Dalitz m^{2}(K^{0}_{S} #pi^{-}) vs m^{2}(K^{0}_{S} #pi^{+})", "d1" : 1, "d2" : 3, "nbins" : 50, "xmin" : 0.0, "xmax" : 3.5, "variableY" : "massSq_daug2", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 3.5},
{"variable" : "massSq_daug2", "title" : "Dalitz m^{2}(#pi^{+} #pi^{-}) vs m^{2}(K^{0}_{S} #pi^{+})", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : 0.0, "xmax" : 2.1, "variableY" : "massSq_daug2", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 3.5},
{"variable" : "mPrime_daug2", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime_daug2", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0},
{"variable" : "cosHel_daug2", "title" : "cosHel12", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug2", "title" : "cosHel23", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug2", "title" : "cosHel13", "d1" : 1, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "BTOKD3P=PTO3P=PTO3P__Bu_KD0D0bar_K0spipi,K0spipi.root",
"reference" : "RefBTOKD3P=PTO3P=PTO3P__Bu_KD0D0bar_K0spipi,K0spipi.root"
}
diff --git a/test/jsonFiles/BTOPLNUBK__Bu_pi0enu.json b/test/jsonFiles/BTOPLNUBK__Bu_pi0enu.json
index c187ee0..fcc6a5f 100644
--- a/test/jsonFiles/BTOPLNUBK__Bu_pi0enu.json
+++ b/test/jsonFiles/BTOPLNUBK__Bu_pi0enu.json
@@ -1,27 +1,27 @@
{
"parent" : "B+",
"daughters" : ["pi0", "e+", "nu_e"],
"models" : ["BTOPLNUBK"],
"parameters" : [["0.54", "1.4"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pSumSq", "title" : "q^{2}(e #nu)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 28.0},
{"variable" : "mass", "title" : "m(#pi^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.12, "xmax" : 0.15},
{"variable" : "mass", "title" : "m(#pi^{0} e)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.5},
{"variable" : "mass", "title" : "m(e #nu)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.5},
{"variable" : "mass", "title" : "m(#pi^{0} #nu)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.5},
{"variable" : "p", "title" : "p(#pi^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(e)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(#nu)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(#pi^{0},e)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(e,#nu)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(#pi^{0},#nu)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#pi^{0})", "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},
{"variable" : "cosTheta", "title" : "cosTheta(#nu)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "BTOPLNUBK__Bu_pi0enu.root",
"reference" : "RefBTOPLNUBK__Bu_pi0enu.root"
}
diff --git a/test/jsonFiles/BTOSLLALI=VSS__Bs_phimumu_KK.json b/test/jsonFiles/BTOSLLALI=VSS__Bs_phimumu_KK.json
index ec7ab9e..331365b 100644
--- a/test/jsonFiles/BTOSLLALI=VSS__Bs_phimumu_KK.json
+++ b/test/jsonFiles/BTOSLLALI=VSS__Bs_phimumu_KK.json
@@ -1,32 +1,32 @@
{
"parent" : "B_s0",
"daughters" : ["phi", "mu+", "mu-"],
"grand_daughters" : [["K+", "K-"], [], []],
"models" : ["BTOSLLALI", "VSS", ""],
"parameters" : [[], [], []],
"do_conjugate_decay" : [true, false, false],
- "extras" : ["Define dm_incohMix_B_s0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B_s0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(BTOSLLALI)", "d1" : 0, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(phi)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 0.95, "xmax" : 1.1},
{"variable" : "mass", "title" : "m(phi mu+)", "d1" : 1, "d2" : 2, "nbins": 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(mu+ mu-)", "d1" : 2, "d2" : 3, "nbins": 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "pSumSq", "title" : "qSq(mu+ mu-)", "d1" : 2, "d2" : 3, "nbins": 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "p", "title" : "p(phi)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pSq", "title" : "pSq(phi)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 8.0},
{"variable" : "pz", "title" : "pz(phi)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(mu+,phi)", "d1" : 2, "d2" : 1, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(K+)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(phi)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "pLab_daug1", "title" : "pLab(K+)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(K+)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(K+)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(K-)", "d1" : 2, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(K-)", "d1" : 2, "d2" : 0, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(K-)", "d1" : 2, "d2" : 0, "nbins": 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "BTOSLLALI=VSS__Bs_phimumu_KK.root",
"reference" : "RefBTOSLLALI=VSS__Bs_phimumu_KK.root"
}
diff --git a/test/jsonFiles/BTOSLLBALL=PHSP__Bd_Ksmumu_pipi.json b/test/jsonFiles/BTOSLLBALL=PHSP__Bd_Ksmumu_pipi.json
index e0d8060..da1d6f0 100644
--- a/test/jsonFiles/BTOSLLBALL=PHSP__Bd_Ksmumu_pipi.json
+++ b/test/jsonFiles/BTOSLLBALL=PHSP__Bd_Ksmumu_pipi.json
@@ -1,37 +1,37 @@
{
"parent" : "B0",
"daughters" : ["K_S0", "mu+", "mu-"],
"grand_daughters" : [["pi+", "pi-"], [], []],
"models" : ["BTOSLLBALL", "PHSP", ""],
"parameters" : [[], [], []],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(Ks)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.4, "xmax" : 0.6},
{"variable" : "mass", "title" : "m(Ks mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(Ks mu-)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(mu+mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "pSumSq", "title" : "qSq(mu+ mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 25.0},
{"variable" : "p", "title" : "p(Ks)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pSq", "title" : "pSq(Ks)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 8.0},
{"variable" : "pz", "title" : "pz(Ks)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(Ks,mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(mu+,mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(Ks)", "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},
{"variable" : "cosTheta", "title" : "cosTheta(mu-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(Ks)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.0},
{"variable" : "pLab_daug1", "title" : "pLab(pi-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(pi-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "BTOSLLBALL=PHSP__Bd_Ksmumu_pipi.root",
"reference" : "RefBTOSLLBALL=PHSP__Bd_Ksmumu_pipi.root"
}
diff --git a/test/jsonFiles/BTOSLLBALL=VSS__Bd_Kst0mumu_Kpi.json b/test/jsonFiles/BTOSLLBALL=VSS__Bd_Kst0mumu_Kpi.json
index f280fad..8395f9c 100644
--- a/test/jsonFiles/BTOSLLBALL=VSS__Bd_Kst0mumu_Kpi.json
+++ b/test/jsonFiles/BTOSLLBALL=VSS__Bd_Kst0mumu_Kpi.json
@@ -1,37 +1,37 @@
{
"parent" : "B0",
"daughters" : ["K*0", "mu+", "mu-"],
"grand_daughters" : [["K+", "pi-"], [], []],
"models" : ["BTOSLLBALL", "VSS", ""],
"parameters" : [["6"], [], []],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(Kst)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "mass", "title" : "m(Kst mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(Kst mu-)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(mu+mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "pSumSq", "title" : "qSq(mu+ mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 25.0},
{"variable" : "p", "title" : "p(Kst)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pSq", "title" : "pSq(Kst)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 8.0},
{"variable" : "pz", "title" : "pz(Kst)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(Kst,mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(mu+,mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(K+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(Kst)", "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},
{"variable" : "cosTheta", "title" : "cosTheta(mu-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(Kst)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(K+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.0},
{"variable" : "pLab_daug1", "title" : "pLab(pi-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(K+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(K+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(pi-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "BTOSLLBALL=VSS__Bd_Kst0mumu_Kpi.root",
"reference" : "RefBTOSLLBALL=VSS__Bd_Kst0mumu_Kpi.root"
}
diff --git a/test/jsonFiles/BTOSLLBALL=VSS__Bs_phimumu_KK.json b/test/jsonFiles/BTOSLLBALL=VSS__Bs_phimumu_KK.json
index 5561f76..a5aeb1f 100644
--- a/test/jsonFiles/BTOSLLBALL=VSS__Bs_phimumu_KK.json
+++ b/test/jsonFiles/BTOSLLBALL=VSS__Bs_phimumu_KK.json
@@ -1,38 +1,38 @@
{
"parent" : "B_s0",
"daughters" : ["phi", "mu+", "mu-"],
"grand_daughters" : [["K+", "K-"], [], []],
"models" : ["BTOSLLBALL", "VSS", ""],
"parameters" : [["6"], [], []],
"do_conjugate_decay" : [true, false, false, false],
- "extras" : ["Define dm_incohMix_B_s0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B_s0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(phi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.95, "xmax" : 1.1},
{"variable" : "mass", "title" : "m(phi mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(phi mu-)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(mu+mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "pSumSq", "title" : "qSq(mu+ mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "p", "title" : "p(phi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pSq", "title" : "pSq(phi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 8.0},
{"variable" : "pz", "title" : "pz(phi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(phi,mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(mu+,mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(K+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(phi)", "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},
{"variable" : "cosTheta", "title" : "cosTheta(mu-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(phi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(K+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 2.0},
{"variable" : "pLab_daug1", "title" : "pLab(K-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 2.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(K+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(K+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(K-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(K-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "BTOSLLBALL=VSS__Bs_phimumu_KK.root",
"reference" : "RefBTOSLLBALL=VSS__Bs_phimumu_KK.root"
}
diff --git a/test/jsonFiles/BTOSLLBALL=VSS__Bu_rhomumu_pipi0.json b/test/jsonFiles/BTOSLLBALL=VSS__Bu_rhomumu_pipi0.json
index 6e8f540..ad620e2 100644
--- a/test/jsonFiles/BTOSLLBALL=VSS__Bu_rhomumu_pipi0.json
+++ b/test/jsonFiles/BTOSLLBALL=VSS__Bu_rhomumu_pipi0.json
@@ -1,37 +1,37 @@
{
"parent" : "B+",
"daughters" : ["rho+", "mu+", "mu-"],
"grand_daughters" : [["pi+", "pi0"], [], []],
"models" : ["BTOSLLBALL", "VSS", ""],
"parameters" : [["6"], [], []],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(rho)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "mass", "title" : "m(rho mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(rho mu-)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(mu+mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "pSumSq", "title" : "qSq(mu+ mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 25.0},
{"variable" : "p", "title" : "p(rho)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pSq", "title" : "pSq(rho)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 8.0},
{"variable" : "pz", "title" : "pz(rho)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(rho,mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(mu+,mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(rho)", "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},
{"variable" : "cosTheta", "title" : "cosTheta(mu-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(rho)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.0},
{"variable" : "pLab_daug1", "title" : "pLab(pi0)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi0)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(pi0)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "BTOSLLBALL=VSS__Bu_rhomumu_pipi0.root",
"reference" : "RefBTOSLLBALL=VSS__Bu_rhomumu_pipi0.root"
}
diff --git a/test/jsonFiles/BTOSLLBALL__Bu_Kmumu.json b/test/jsonFiles/BTOSLLBALL__Bu_Kmumu.json
index 9b4b3d0..c12ebc9 100644
--- a/test/jsonFiles/BTOSLLBALL__Bu_Kmumu.json
+++ b/test/jsonFiles/BTOSLLBALL__Bu_Kmumu.json
@@ -1,33 +1,33 @@
{
"parent" : "B+",
"daughters" : ["K+", "mu+", "mu-"],
"models" : ["BTOSLLBALL"],
"parameters" : [["6"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(K+ mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.1, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(K+ mu-)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(mu+ mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "pSumSq", "title" : "qSq(K+ mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 30.0},
{"variable" : "pSumSq", "title" : "qSq(mu+ mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 30.0},
{"variable" : "p", "title" : "p(K+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(K+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(mu+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(mu+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(mu-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(mu-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(K+,mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(K+,mu-)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(mu+,mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(K+)", "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},
{"variable" : "cosTheta", "title" : "cosTheta(mu-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(K+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "phi", "title" : "phi(mu+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "phi", "title" : "phi(mu-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180}
],
"outfile" : "BTOSLLBALL__Bu_Kmumu.root",
"reference" : "RefBTOSLLBALL__Bu_Kmumu.root"
}
diff --git a/test/jsonFiles/BTOSLLBALL__Bu_pimumu.json b/test/jsonFiles/BTOSLLBALL__Bu_pimumu.json
index e32780b..f0cfb76 100644
--- a/test/jsonFiles/BTOSLLBALL__Bu_pimumu.json
+++ b/test/jsonFiles/BTOSLLBALL__Bu_pimumu.json
@@ -1,33 +1,33 @@
{
"parent" : "B+",
"daughters" : ["pi+", "mu+", "mu-"],
"models" : ["BTOSLLBALL"],
"parameters" : [["6"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(pi+ mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.1, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(pi+ mu-)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(mu+ mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "pSumSq", "title" : "qSq(pi+ mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 30.0},
{"variable" : "pSumSq", "title" : "qSq(mu+ mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 30.0},
{"variable" : "p", "title" : "p(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(mu+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(mu+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(mu-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(mu-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(pi+,mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(pi+,mu-)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(mu+,mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(pi+)", "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},
{"variable" : "cosTheta", "title" : "cosTheta(mu-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "phi", "title" : "phi(mu+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "phi", "title" : "phi(mu-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180}
],
"outfile" : "BTOSLLBALL__Bu_pimumu.root",
"reference" : "RefBTOSLLBALL__Bu_pimumu.root"
}
diff --git a/test/jsonFiles/BTOSLLMS=VSS__Bu_rhomumu_pipi0.json b/test/jsonFiles/BTOSLLMS=VSS__Bu_rhomumu_pipi0.json
index 0e20851..b926aa9 100644
--- a/test/jsonFiles/BTOSLLMS=VSS__Bu_rhomumu_pipi0.json
+++ b/test/jsonFiles/BTOSLLMS=VSS__Bu_rhomumu_pipi0.json
@@ -1,37 +1,37 @@
{
"parent" : "B+",
"daughters" : ["rho+", "mu+", "mu-"],
"grand_daughters" : [["pi+", "pi0"], [], []],
"models" : ["BTOSLLMS", "VSS", ""],
"parameters" : [["5.0", "5", "0", "1", "0.88", "0.227", "0.22", "0.34"], [], []],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(rho)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "mass", "title" : "m(rho mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(rho mu-)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(mu+mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "pSumSq", "title" : "qSq(mu+ mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 25.0},
{"variable" : "p", "title" : "p(rho)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pSq", "title" : "pSq(rho)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 8.0},
{"variable" : "pz", "title" : "pz(rho)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(rho,mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(mu+,mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(rho)", "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},
{"variable" : "cosTheta", "title" : "cosTheta(mu-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(rho)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.0},
{"variable" : "pLab_daug1", "title" : "pLab(pi0)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi0)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(pi0)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "BTOSLLMS=VSS__Bu_rhomumu_pipi0.root",
"reference" : "RefBTOSLLMS=VSS__Bu_rhomumu_pipi0.root"
}
diff --git a/test/jsonFiles/BTOSLLMSEXT=VVS_PWAVE__Bu_K1mumu_rho0K.json b/test/jsonFiles/BTOSLLMSEXT=VVS_PWAVE__Bu_K1mumu_rho0K.json
index f6bc069..889d75c 100644
--- a/test/jsonFiles/BTOSLLMSEXT=VVS_PWAVE__Bu_K1mumu_rho0K.json
+++ b/test/jsonFiles/BTOSLLMSEXT=VVS_PWAVE__Bu_K1mumu_rho0K.json
@@ -1,38 +1,38 @@
{
"parent" : "B+",
"daughters" : ["K_1+", "mu+", "mu-"],
"grand_daughters" : [["rho0", "K+"], [], []],
"models" : ["BTOSLLMSEXT", "VVS_PWAVE", ""],
"parameters" : [["5.0", "5", "0", "1", "0.88", "0.227", "0.22", "0.34", "1.0", "0.0", "-1.0", "0.0"],
["1.0", "0.0", "0.0", "0.0", "0.0", "0.0"], []],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(K_1)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "mass", "title" : "m(K_1 mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(K_1 mu-)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(mu+mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "pSumSq", "title" : "qSq(mu+ mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "p", "title" : "p(K_1)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pSq", "title" : "pSq(K_1)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 8.0},
{"variable" : "pz", "title" : "pz(K_1)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(K_1,mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(mu+,mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(rho0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(K_1)", "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},
{"variable" : "cosTheta", "title" : "cosTheta(mu-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(K_1)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(rho0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.0},
{"variable" : "pLab_daug1", "title" : "pLab(K+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(rho0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(rho0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(K+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(K+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "BTOSLLMSEXT=VVS_PWAVE__Bu_K1mumu_rho0K.root",
"reference" : "RefBTOSLLMSEXT=VVS_PWAVE__Bu_K1mumu_rho0K.root"
}
diff --git a/test/jsonFiles/BTOVLNUBALL__Bd_Kstarenu.json b/test/jsonFiles/BTOVLNUBALL__Bd_Kstarenu.json
index 3c2d3ac..9be4410 100644
--- a/test/jsonFiles/BTOVLNUBALL__Bd_Kstarenu.json
+++ b/test/jsonFiles/BTOVLNUBALL__Bd_Kstarenu.json
@@ -1,26 +1,26 @@
{
"parent" : "B0",
"daughters" : ["K*+", "e-", "anti-nu_e"],
"models" : ["BTOVLNUBALL"],
"parameters" : [["0.290", "40.38", "-0.084", "0.342", "52.0", "0.923", "-0.511", "49.40"]],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(K^{*+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 1.8},
{"variable" : "mass", "title" : "m(K^{*+} e)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.5, "xmax" : 5.5},
{"variable" : "mass", "title" : "m(e #nu)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "mass", "title" : "m(K^{*+} #nu)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.5, "xmax" : 5.5},
{"variable" : "pSumSq", "title" : "q^{2}(e #nu)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 21.0},
{"variable" : "p", "title" : "p(K^{*+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(e)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(#nu)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(K^{*+},e)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(e,#nu)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(K^{*+})", "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},
{"variable" : "cosTheta", "title" : "cosTheta(#nu)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "BTOVLNUBALL__Bd_Kstarenu.root",
"reference" : "RefBTOVLNUBALL__Bd_Kstarenu.root"
}
diff --git a/test/jsonFiles/BTOXELNU=VSS__Bu_rho0munu_pipi.json b/test/jsonFiles/BTOXELNU=VSS__Bu_rho0munu_pipi.json
index 24f9bcf..b6c7644 100644
--- a/test/jsonFiles/BTOXELNU=VSS__Bu_rho0munu_pipi.json
+++ b/test/jsonFiles/BTOXELNU=VSS__Bu_rho0munu_pipi.json
@@ -1,38 +1,38 @@
{
"parent" : "B+",
"daughters" : ["rho0", "mu+", "nu_mu"],
"grand_daughters" : [["pi+", "pi-"], [], []],
"models" : ["BTOXELNU", "VSS", ""],
"parameters" : [["BCL", "-0.861", "1.444", "0.266", "0.378", "0.165", "0.291",
"0.718", "0.384", "0.331", "-0.876", "1.907"], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(BTOXELNU)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(#rho^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.2, "xmax" : 2.0},
{"variable" : "mass", "title" : "m(#rho^{0} #mu)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(#rho^{0} #nu)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(#mu #nu)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "pSumSq", "title" : "q^{2}(#mu #nu)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 25.0},
{"variable" : "p", "title" : "p(#rho^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(#rho^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(#pi^{+},#rho^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(#rho^{0})", "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},
{"variable" : "cosTheta", "title" : "cosTheta(#nu)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(#rho^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi(#mu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi(#nu)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "p_daug1", "title" : "p(#pi^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.5},
{"variable" : "p_daug1", "title" : "p(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.5},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#pi^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#pi^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi_daug1", "title" : "phi(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "BTOXELNU=VSS__Bu_rho0munu_pipi.root",
"reference" : "RefBTOXELNU=VSS__Bu_rho0munu_pipi.root"
}
diff --git a/test/jsonFiles/BTOXSETAP=SVP_HELAMP__Bu_Xsuetap_rho0gamma.json b/test/jsonFiles/BTOXSETAP=SVP_HELAMP__Bu_Xsuetap_rho0gamma.json
index 10fde57..290d93c 100644
--- a/test/jsonFiles/BTOXSETAP=SVP_HELAMP__Bu_Xsuetap_rho0gamma.json
+++ b/test/jsonFiles/BTOXSETAP=SVP_HELAMP__Bu_Xsuetap_rho0gamma.json
@@ -1,31 +1,31 @@
{
"parent" : "B+",
"daughters" : ["Xsu", "eta'"],
"grand_daughters" : [[], ["rho0", "gamma"], []],
"models" : ["BTOXSETAP", "", "SVP_HELAMP"],
"parameters" : [[], [], ["1.0", "0.0", "1.0", "0.0"]],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "mass", "title" : "m(Xsu)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "mass", "title" : "m(eta')", "d1" : 2, "d2" : 0, "nbins": 100, "xmin" : 0.8, "xmax" : 1.1},
{"variable" : "p", "title" : "p(Xsu)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pSq", "title" : "pSq(Xsu)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 8.0},
{"variable" : "pz", "title" : "pz(Xsu)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "cosHel_daug2", "title" : "cosHel(rho0)", "d1" : 1, "d2" : 2, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug2", "title" : "cosHel(gamma)", "d1" : 2, "d2" : 1, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(Xsu)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi(Xsu)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug2", "title" : "pLab(rho0)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(rho0)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(rho0)", "d1" : 1, "d2" : 0, "nbins": 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "E_daug2", "title" : "E(gamma)", "d1" : 2, "d2" : 0, "nbins": 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(gamma)", "d1" : 2, "d2" : 0, "nbins": 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(gamma)", "d1" : 2, "d2" : 0, "nbins": 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" :"BTOXSETAP=SVP_HELAMP__Bu_Xsuetap_rho0gamma.root",
"reference" : "RefBTOXSETAP=SVP_HELAMP__Bu_Xsuetap_rho0gamma.root"
}
diff --git a/test/jsonFiles/BTOXSGAMMA__Bd_Xsdgamma.json b/test/jsonFiles/BTOXSGAMMA__Bd_Xsdgamma.json
index 6c30ac0..3cc19ca 100644
--- a/test/jsonFiles/BTOXSGAMMA__Bd_Xsdgamma.json
+++ b/test/jsonFiles/BTOXSGAMMA__Bd_Xsdgamma.json
@@ -1,22 +1,22 @@
{
"parent" : "B0",
"daughters" : ["Xsd", "gamma"],
"models" : ["BTOXSGAMMA", "", ""],
"parameters" : [["1"], [], []],
"do_conjugate_decay" : [ true, false, false ],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "parMass", "title" : "m(B0)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 5.25, "xmax" : 5.3},
{"variable" : "mass", "title" : "m(Xsd)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "p", "title" : "p(Xsd)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "phi", "title" : "phi(Xsd)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(Xsd)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "p", "title" : "p(gamma)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.0, "xmax" : 3.0},
{"variable" : "phi", "title" : "phi(gamma)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(gamma)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "BTOXSGAMMA__Bd_Xsdgamma.root",
"reference" : "RefBTOXSGAMMA__Bd_Xsdgamma.root"
}
diff --git a/test/jsonFiles/BTOXSLL__Bu_Xsumumu.json b/test/jsonFiles/BTOXSLL__Bu_Xsumumu.json
index ebc20b4..f873bd4 100644
--- a/test/jsonFiles/BTOXSLL__Bu_Xsumumu.json
+++ b/test/jsonFiles/BTOXSLL__Bu_Xsumumu.json
@@ -1,33 +1,33 @@
{
"parent" : "B+",
"daughters" : ["Xsu", "mu+", "mu-"],
"models" : ["BTOXSLL"],
"parameters" : [["4.8", "0.2", "0.0", "0.41"]],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "mass", "title" : "m(Xsu mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.1, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(Xsu mu-)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(mu+ mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "pSumSq", "title" : "qSq(Xsu mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 30.0},
{"variable" : "pSumSq", "title" : "qSq(mu+ mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "p", "title" : "p(Xsu)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(Xsu)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(mu+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(mu+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(mu-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(mu-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(Xsu,mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(Xsu,mu-)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(mu+,mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(Xsu)", "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},
{"variable" : "cosTheta", "title" : "cosTheta(mu-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(Xsu)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "phi", "title" : "phi(mu+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "phi", "title" : "phi(mu-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180}
],
"outfile" :"BTOXSLL__Bu_Xsumumu.root",
"reference" : "RefBTOXSLL__Bu_Xsumumu.root"
}
diff --git a/test/jsonFiles/BToDiBaryonlnupQCD__Bu_Deltappbarmunu.json b/test/jsonFiles/BToDiBaryonlnupQCD__Bu_Deltappbarmunu.json
index fa304bb..f81f566 100644
--- a/test/jsonFiles/BToDiBaryonlnupQCD__Bu_Deltappbarmunu.json
+++ b/test/jsonFiles/BToDiBaryonlnupQCD__Bu_Deltappbarmunu.json
@@ -1,18 +1,18 @@
{
"parent" : "B-",
"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"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "mPP", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 1.5, "xmax" : 3.5},
{"variable" : "mass", "title" : "mMuNu", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.5},
{"variable" : "pSumSq", "title" : "qSqMuNu", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "cosHel", "title" : "cosThetaB", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosThetaL", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "BToDiBaryonlnupQCD__Bu_Deltappbarmunu.root",
"reference" : "RefBToDiBaryonlnupQCD__Bu_Deltappbarmunu.root"
}
diff --git a/test/jsonFiles/BToDiBaryonlnupQCD__Bu_ppmunu.json b/test/jsonFiles/BToDiBaryonlnupQCD__Bu_ppmunu.json
index 51949d1..03437b0 100644
--- a/test/jsonFiles/BToDiBaryonlnupQCD__Bu_ppmunu.json
+++ b/test/jsonFiles/BToDiBaryonlnupQCD__Bu_ppmunu.json
@@ -1,18 +1,18 @@
{
"parent" : "B-",
"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"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "mPP", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 1.5, "xmax" : 3.5},
{"variable" : "mass", "title" : "mMuNu", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.5},
{"variable" : "pSumSq", "title" : "qSqMuNu", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "cosHel", "title" : "cosThetaB", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosThetaL", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "BToDiBaryonlnupQCD__Bu_ppmunu.root",
"reference" : "RefBToDiBaryonlnupQCD__Bu_ppmunu.root"
}
diff --git a/test/jsonFiles/B_TO_2BARYON_SCALAR__Bu_Lambda0pbarpi0.json b/test/jsonFiles/B_TO_2BARYON_SCALAR__Bu_Lambda0pbarpi0.json
index 4e88412..baba902 100644
--- a/test/jsonFiles/B_TO_2BARYON_SCALAR__Bu_Lambda0pbarpi0.json
+++ b/test/jsonFiles/B_TO_2BARYON_SCALAR__Bu_Lambda0pbarpi0.json
@@ -1,19 +1,19 @@
{
"parent" : "B-",
"daughters" : ["Lambda0", "anti-p-", "pi0"],
"models" : ["B_TO_2BARYON_SCALAR"],
"parameters" : [[]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "M(#it{#Lambda}#bar{#it{p}})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 1.5, "xmax" : 5.5},
{"variable" : "mass", "title" : "M(#bar{#it{p}}#it{#pi}^{0})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 1.0, "xmax" : 5.0},
{"variable" : "mass", "title" : "M(#it{#Lambda}#it{#pi}^{0})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 1.0, "xmax" : 5.0},
{"variable" : "cosHel", "title" : "cosHel(#it{#Lambda},#bar{#it{p}})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(#bar{#it{p}},#it{#pi}^{0})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(#it{#Lambda},#it{#pi}^{0})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "B_TO_2BARYON_SCALAR__Bu_Lambda0pbarpi0.root",
"reference" : "RefB_TO_2BARYON_SCALAR__Bu_Lambda0pbarpi0.root"
}
diff --git a/test/jsonFiles/B_TO_LAMBDA_PBAR_GAMMA__Bu_Lambda0pbargamma.json b/test/jsonFiles/B_TO_LAMBDA_PBAR_GAMMA__Bu_Lambda0pbargamma.json
index 81001b2..ca176f2 100644
--- a/test/jsonFiles/B_TO_LAMBDA_PBAR_GAMMA__Bu_Lambda0pbargamma.json
+++ b/test/jsonFiles/B_TO_LAMBDA_PBAR_GAMMA__Bu_Lambda0pbargamma.json
@@ -1,20 +1,20 @@
{
"parent" : "B-",
"daughters" : ["Lambda0", "anti-p-", "gamma"],
"models" : ["B_TO_LAMBDA_PBAR_GAMMA"],
"parameters" : [[]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pSumSq", "title" : "qSq(pbar,gamma)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "mass", "title" : "m(Lambda,pbar)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 1.5, "xmax" : 5.5},
{"variable" : "mass", "title" : "m(pbar,gamma)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 1.0, "xmax" : 5.0},
{"variable" : "mass", "title" : "m(Lambda,gamma)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 1.0, "xmax" : 5.0},
{"variable" : "cosHel", "title" : "cosHel(Lambda0,pbar)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(pbar,gamma)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(Lambda0,gamma)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "B_TO_LAMBDA_PBAR_GAMMA__Bu_Lambda0pbargamma.root",
"reference" : "RefB_TO_LAMBDA_PBAR_GAMMA__Bu_Lambda0pbargamma.root"
}
diff --git a/test/jsonFiles/BaryonPCR=PHSP__Lambdab0_Lambdacmunu_Lambda0pi.json b/test/jsonFiles/BaryonPCR=PHSP__Lambdab0_Lambdacmunu_Lambda0pi.json
index 5f5ad2d..4d6821c 100644
--- a/test/jsonFiles/BaryonPCR=PHSP__Lambdab0_Lambdacmunu_Lambda0pi.json
+++ b/test/jsonFiles/BaryonPCR=PHSP__Lambdab0_Lambdacmunu_Lambda0pi.json
@@ -1,21 +1,21 @@
{
"parent" : "Lambda_b0",
"daughters" : ["Lambda_c+", "mu-", "anti-nu_mu"],
"grand_daughters" : [["Lambda0", "pi+"], [], []],
"models" : ["BaryonPCR", "PHSP", ""],
"parameters" : [["1", "1", "1", "1"], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(BaryonPCR)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "parMass", "title" : "m(#Lambda^{0}_{b})", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 5.5, "xmax" : 5.7},
{"variable" : "mass", "title" : "m(#Lambda^{+}_{c})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.0, "xmax" : 2.5},
{"variable" : "mass", "title" : "m(#Lambda^{+}_{c},#mu^{-})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 2.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(#mu^{-},anti-#nu_{#mu})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 4.0},
{"variable" : "mass", "title" : "m(#Lambda^{+}_{c},anti-#nu_{#mu})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 2.0, "xmax" : 6.0},
{"variable" : "pSumSq", "title" : "qSq(#mu^{-},anti-#nu_{#mu})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "cosHel", "title" : "cosHel(#Lambda^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "BaryonPCR=PHSP__Lambdab0_Lambdacmunu_Lambda0pi.root",
"reference" : "RefBaryonPCR=PHSP__Lambdab0_Lambdacmunu_Lambda0pi.root"
}
diff --git a/test/jsonFiles/CB3PI-MPP__Bu_pipipi.json b/test/jsonFiles/CB3PI-MPP__Bu_pipipi.json
index bed6002..a041676 100644
--- a/test/jsonFiles/CB3PI-MPP__Bu_pipipi.json
+++ b/test/jsonFiles/CB3PI-MPP__Bu_pipipi.json
@@ -1,18 +1,18 @@
{
"parent" : "B+",
"daughters" : ["pi+","pi+","pi-"],
"models" : ["CB3PI-MPP"],
"parameters" : [["1.5"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(#pi^{+} #pi^{+})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(#pi^{+} #pi^{-})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(#pi^{+} #pi^{-})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "massSq", "title" : "Dalitz m^{2}(#pi^{+} #pi^{-}) vs m^{2}(#pi^{+} #pi^{-})", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : 0.0, "xmax" : 30.0, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 30.0},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0}
],
"outfile" :"CB3PI-MPP__Bu_pipipi.root",
"reference" : "RefCB3PI-MPP__Bu_pipipi.root"
}
diff --git a/test/jsonFiles/CB3PI-P00__Bu_pipi0pi0.json b/test/jsonFiles/CB3PI-P00__Bu_pipi0pi0.json
index b53c6d8..ff15df9 100644
--- a/test/jsonFiles/CB3PI-P00__Bu_pipi0pi0.json
+++ b/test/jsonFiles/CB3PI-P00__Bu_pipi0pi0.json
@@ -1,18 +1,18 @@
{
"parent" : "B+",
"daughters" : ["pi+","pi0","pi0"],
"models" : ["CB3PI-P00"],
"parameters" : [["1.5"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(#pi^{+} #pi^{0})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(#pi^{+} #pi^{0})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(#pi^{0} #pi^{0})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "massSq", "title" : "Dalitz m^{2}(#pi^{+} #pi^{0}) vs m^{2}(#pi^{+} #pi^{0})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 30.0, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 30.0},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0}
],
"outfile" :"CB3PI-P00__Bu_pipi0pi0.root",
"reference" : "RefCB3PI-P00__Bu_pipi0pi0.root"
}
diff --git a/test/jsonFiles/D0MIXDALITZ__D0_KsKK.json b/test/jsonFiles/D0MIXDALITZ__D0_KsKK.json
index d8398e7..c2f92f5 100644
--- a/test/jsonFiles/D0MIXDALITZ__D0_KsKK.json
+++ b/test/jsonFiles/D0MIXDALITZ__D0_KsKK.json
@@ -1,22 +1,22 @@
{
"parent" : "D0",
"daughters" : ["K_S0", "K+", "K-"],
"models" : ["D0MIXDALITZ"],
"parameters" : [["0.01", "0.01", "1.0", "0.0"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(K^{0}_{S} K^{+})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.95, "xmax" : 1.4},
{"variable" : "mass", "title" : "m(K^{0}_{S} K^{-})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.95, "xmax" : 1.4},
{"variable" : "mass", "title" : "m(K^{+} K^{-})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.95, "xmax" : 1.4},
{"variable" : "massSq", "title" : "Dalitz m^{2}(K^{0}_{S} K^{+}) vs m^{2}(K^{0}_{S} K^{-})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.8, "xmax" : 2.0, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.8, "ymax" : 2.0},
{"variable" : "massSq", "title" : "Dalitz m^{2}(K^{+} K^{-}) vs m^{2}(K^{0}_{S} K^{+})", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : 0.8, "xmax" : 2.0, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 50, "ymin" : 0.8, "ymax" : 2.0},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel12", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel23", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel13", "d1" : 1, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "D0MIXDALITZ__D0_KsKK.root",
"reference" : "RefD0MIXDALITZ__D0_KsKK.root"
}
diff --git a/test/jsonFiles/DToKpienu__D+_Kpimunu.json b/test/jsonFiles/DToKpienu__D+_Kpimunu.json
index fcb70ea..81c08c3 100644
--- a/test/jsonFiles/DToKpienu__D+_Kpimunu.json
+++ b/test/jsonFiles/DToKpienu__D+_Kpimunu.json
@@ -1,39 +1,39 @@
{
"parent" : "D+",
"daughters" : ["K-", "pi+", "mu+", "nu_mu"],
"models" : ["DToKpienu"],
"parameters" : [[]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(K pi)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.5, "xmax" : 1.5},
{"variable" : "mass", "title" : "m(K mu)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "mass", "title" : "m(pi mu)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.5},
{"variable" : "mass", "title" : "m(mu mu)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.5},
{"variable" : "pSumSq", "title" : "qSq(K pi)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "pSumSq", "title" : "qSq(mu mu)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "p", "title" : "p(K)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pz", "title" : "pz(K)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "p", "title" : "p(pi)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pz", "title" : "pz(pi)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "p", "title" : "p(mu)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pz", "title" : "pz(mu)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "p", "title" : "p(nu)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pz", "title" : "pz(nu)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(K,pi)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(mu,nu)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(pi,mu)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(K,mu)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(K)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(pi)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(mu)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(nu)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(K)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "phi", "title" : "phi(pi)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "phi", "title" : "phi(mu)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "phi", "title" : "phi(nu)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180}
],
"outfile" : "DToKpienu__D+_Kpimunu.root",
"reference" : "RefDToKpienu__D+_Kpimunu.root"
}
diff --git a/test/jsonFiles/D_DALITZ__D+_K+pipi.json b/test/jsonFiles/D_DALITZ__D+_K+pipi.json
index a26e35a..ecf6859 100644
--- a/test/jsonFiles/D_DALITZ__D+_K+pipi.json
+++ b/test/jsonFiles/D_DALITZ__D+_K+pipi.json
@@ -1,23 +1,23 @@
{
"parent" : "D+",
"daughters" : ["K+", "pi-", "pi+"],
"models" : ["D_DALITZ"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(K^{+} #pi^{-})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.5, "xmax" : 1.8},
{"variable" : "mass", "title" : "m(K^{+} #pi^{+})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.5, "xmax" : 1.8},
{"variable" : "mass", "title" : "m(#pi^{-} #pi^{+})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.2, "xmax" : 1.5},
{"variable" : "massSq", "title" : "Dalitz m^{2}(K^{+} #pi^{-}) vs m^{2}(K^{+} #pi^{+})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.05, "xmax" : 3.5, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 3.5},
{"variable" : "massSq", "title" : "Dalitz m^{2}(#pi^{-} #pi^{+}) vs m^{2}(K^{+} #pi^{-})", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : 0.05, "xmax" : 2.0, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 50, "ymin" : 0.05, "ymax" : 3.5},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel12", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel23", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel13", "d1" : 1, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "D_DALITZ__D+_K+pipi.root",
"reference" : "RefD_DALITZ__D+_K+pipi.root"
}
diff --git a/test/jsonFiles/D_DALITZ__D+_K0pipi0.json b/test/jsonFiles/D_DALITZ__D+_K0pipi0.json
index 47c5537..7edbba0 100644
--- a/test/jsonFiles/D_DALITZ__D+_K0pipi0.json
+++ b/test/jsonFiles/D_DALITZ__D+_K0pipi0.json
@@ -1,23 +1,23 @@
{
"parent" : "D+",
"daughters" : ["K0", "pi+", "pi0"],
"models" : ["D_DALITZ"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(K^{0} #pi^{+})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.5, "xmax" : 1.8},
{"variable" : "mass", "title" : "m(K^{0} #pi^{0})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.5, "xmax" : 1.8},
{"variable" : "mass", "title" : "m(#pi^{+} #pi^{0})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.2, "xmax" : 1.5},
{"variable" : "massSq", "title" : "Dalitz m^{2}(K^{0} #pi^{+}) vs m^{2}(K^{0} #pi^{0})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.3, "xmax" : 3.2, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.3, "ymax" : 3.2},
{"variable" : "massSq", "title" : "Dalitz m^{2}(#pi^{+} #pi^{0}) vs m^{2}(K^{0} #pi^{+})", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : 0.0, "xmax" : 2.0, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 50, "ymin" : 0.3, "ymax" : 3.2},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel12", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel23", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel13", "d1" : 1, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "D_DALITZ__D+_K0pipi0.root",
"reference" : "RefD_DALITZ__D+_K0pipi0.root"
}
diff --git a/test/jsonFiles/D_DALITZ__D+_KKpi+.json b/test/jsonFiles/D_DALITZ__D+_KKpi+.json
index aec3502..5f64ce9 100644
--- a/test/jsonFiles/D_DALITZ__D+_KKpi+.json
+++ b/test/jsonFiles/D_DALITZ__D+_KKpi+.json
@@ -1,23 +1,23 @@
{
"parent" : "D+",
"daughters" : ["K-", "K+", "pi+"],
"models" : ["D_DALITZ"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(K^{-} K^{+})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.9, "xmax" : 1.8},
{"variable" : "mass", "title" : "m(K^{-} #pi^{+})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.5, "xmax" : 1.5},
{"variable" : "mass", "title" : "m(K^{+} #pi^{+})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.5, "xmax" : 1.5},
{"variable" : "massSq", "title" : "Dalitz m^{2}(K^{-} K^{+}) vs m^{2}(K^{-} #pi^{+})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.8, "xmax" : 3.2, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.3, "ymax" : 2.0},
{"variable" : "massSq", "title" : "Dalitz m^{2}(K^{+} #pi^{+}) vs m^{2}(K^{-} K^{+})", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : 0.3, "xmax" : 2.0, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 50, "ymin" : 0.7, "ymax" : 3.2},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel12", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel23", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel13", "d1" : 1, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "D_DALITZ__D+_KKpi+.root",
"reference" : "RefD_DALITZ__D+_KKpi+.root"
}
diff --git a/test/jsonFiles/D_DALITZ__D+_Kpipi+.json b/test/jsonFiles/D_DALITZ__D+_Kpipi+.json
index c0b00d2..3cf220c 100644
--- a/test/jsonFiles/D_DALITZ__D+_Kpipi+.json
+++ b/test/jsonFiles/D_DALITZ__D+_Kpipi+.json
@@ -1,23 +1,23 @@
{
"parent" : "D+",
"daughters" : ["K-", "pi+", "pi+"],
"models" : ["D_DALITZ"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(K^{-} #pi^{+})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.5, "xmax" : 1.8},
{"variable" : "mass", "title" : "m(K^{-} #pi^{+})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.5, "xmax" : 1.8},
{"variable" : "mass", "title" : "m(#pi^{+} #pi^{+})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.2, "xmax" : 1.5},
{"variable" : "massSq", "title" : "Dalitz m^{2}(K^{-} #pi^{+}) vs m^{2}(K^{-} #pi^{+})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.3, "xmax" : 3.2, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.3, "ymax" : 3.2},
{"variable" : "massSq", "title" : "Dalitz m^{2}(#pi^{+} #pi^{+}) vs m^{2}(K^{-} #pi^{+})", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : 0.0, "xmax" : 2.0, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 50, "ymin" : 0.3, "ymax" : 3.2},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel12", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel23", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel13", "d1" : 1, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "D_DALITZ__D+_Kpipi+.root",
"reference" : "RefD_DALITZ__D+_Kpipi+.root"
}
diff --git a/test/jsonFiles/D_DALITZ__D+_Kpipi+_yesPhotos.json b/test/jsonFiles/D_DALITZ__D+_Kpipi+_yesFSR.json
similarity index 95%
rename from test/jsonFiles/D_DALITZ__D+_Kpipi+_yesPhotos.json
rename to test/jsonFiles/D_DALITZ__D+_Kpipi+_yesFSR.json
index 2f7ccf6..1e431ac 100644
--- a/test/jsonFiles/D_DALITZ__D+_Kpipi+_yesPhotos.json
+++ b/test/jsonFiles/D_DALITZ__D+_Kpipi+_yesFSR.json
@@ -1,31 +1,31 @@
{
"parent" : "D+",
"daughters" : ["K-", "pi+", "pi+"],
"models" : ["D_DALITZ"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
- "extras" : ["yesPhotos"],
+ "extras" : ["yesFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "nFSRPhotons", "title" : "nFSRPhotons", "d1" : 0, "d2" : 0, "nbins" : 10, "xmin" : 0, "xmax" : 10.0 },
{"variable" : "totalFSREnergy", "title" : "totalFSREnergy", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 0.8 },
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.8},
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma) cut off", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 0.5e-6},
{"variable" : "cosTheta_FSRPhotons", "title" : "FSR cosTheta/#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"variable" : "cosTheta_EnergyWeight_FSRPhotons", "title" : "FSR cosTheta(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_EnergyWeight_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"variable" : "mass", "title" : "m(K^{-} #pi^{+})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.5, "xmax" : 1.8},
{"variable" : "mass", "title" : "m(K^{-} #pi^{+})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.5, "xmax" : 1.8},
{"variable" : "mass", "title" : "m(#pi^{+} #pi^{+})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.2, "xmax" : 1.5},
{"variable" : "massSq", "title" : "Dalitz m^{2}(K^{-} #pi^{+}) vs m^{2}(K^{-} #pi^{+})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.3, "xmax" : 3.2, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.3, "ymax" : 3.2},
{"variable" : "massSq", "title" : "Dalitz m^{2}(#pi^{+} #pi^{+}) vs m^{2}(K^{-} #pi^{+})", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : 0.0, "xmax" : 2.0, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 50, "ymin" : 0.3, "ymax" : 3.2},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel12", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel23", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel13", "d1" : 1, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0}
],
- "outfile" : "D_DALITZ__D+_Kpipi+_yesPhotos.root",
- "reference" : "RefD_DALITZ__D+_Kpipi+_yesPhotos.root"
+ "outfile" : "D_DALITZ__D+_Kpipi+_yesFSR.root",
+ "reference" : "RefD_DALITZ__D+_Kpipi+_yesFSR.root"
}
diff --git a/test/jsonFiles/D_DALITZ__D+_pipipi+.json b/test/jsonFiles/D_DALITZ__D+_pipipi+.json
index c70a099..50c9581 100644
--- a/test/jsonFiles/D_DALITZ__D+_pipipi+.json
+++ b/test/jsonFiles/D_DALITZ__D+_pipipi+.json
@@ -1,23 +1,23 @@
{
"parent" : "D+",
"daughters" : ["pi-", "pi+", "pi+"],
"models" : ["D_DALITZ"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(#pi^{-} #pi^{+})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.2, "xmax" : 1.8},
{"variable" : "mass", "title" : "m(#pi^{-} #pi^{+})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.2, "xmax" : 1.8},
{"variable" : "mass", "title" : "m(#pi^{+} #pi^{+})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.2, "xmax" : 1.8},
{"variable" : "massSq", "title" : "Dalitz m^{2}(#pi^{-} #pi^{+}) vs m^{2}(#pi^{-} #pi^{+})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 3.2, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 3.2},
{"variable" : "massSq", "title" : "Dalitz m^{2}(#pi^{+} #pi^{+}) vs m^{2}(#pi^{-} #pi^{+})", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : 0.0, "xmax" : 3.2, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 3.2},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel12", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel23", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel13", "d1" : 1, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "D_DALITZ__D+_pipipi+.root",
"reference" : "RefD_DALITZ__D+_pipipi+.root"
}
diff --git a/test/jsonFiles/D_DALITZ__D0_KKKS0.json b/test/jsonFiles/D_DALITZ__D0_KKKS0.json
index 7c5e69a..afea2ba 100644
--- a/test/jsonFiles/D_DALITZ__D0_KKKS0.json
+++ b/test/jsonFiles/D_DALITZ__D0_KKKS0.json
@@ -1,23 +1,23 @@
{
"parent" : "D0",
"daughters" : ["K-", "K+", "K_S0"],
"models" : ["D_DALITZ"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(K^{-} K^{+})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.95, "xmax" : 1.4},
{"variable" : "mass", "title" : "m(K^{-} K^{0}_{S})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.95, "xmax" : 1.4},
{"variable" : "mass", "title" : "m(K^{+} K^{0}_{S})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.95, "xmax" : 1.4},
{"variable" : "massSq", "title" : "Dalitz m^{2}(K^{-} K^{+}) vs m^{2}(K^{-} K^{0}_{S})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.8, "xmax" : 2.0, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.8, "ymax" : 2.0},
{"variable" : "massSq", "title" : "Dalitz m^{2}(K^{+} K^{0}_{S}) vs m^{2}(K^{-} K^{+})", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : 0.8, "xmax" : 2.0, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 50, "ymin" : 0.8, "ymax" : 2.0},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel12", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel23", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel13", "d1" : 1, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "D_DALITZ__D0_KKKS0.root",
"reference" : "RefD_DALITZ__D0_KKKS0.root"
}
diff --git a/test/jsonFiles/D_DALITZ__D0_KKanti-K0.json b/test/jsonFiles/D_DALITZ__D0_KKanti-K0.json
index c55fdc1..1ec1f9e 100644
--- a/test/jsonFiles/D_DALITZ__D0_KKanti-K0.json
+++ b/test/jsonFiles/D_DALITZ__D0_KKanti-K0.json
@@ -1,23 +1,23 @@
{
"parent" : "D0",
"daughters" : ["K-", "K+", "anti-K0"],
"models" : ["D_DALITZ"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(K^{-} K^{+})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.95, "xmax" : 1.4},
{"variable" : "mass", "title" : "m(K^{-} anti-K^{0})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.95, "xmax" : 1.4},
{"variable" : "mass", "title" : "m(K^{+} anti-K^{0})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.95, "xmax" : 1.4},
{"variable" : "massSq", "title" : "Dalitz m^{2}(K^{-} K^{+}) vs m^{2}(K^{-} anti-K^{0})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.8, "xmax" : 2.0, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.8, "ymax" : 2.0},
{"variable" : "massSq", "title" : "Dalitz m^{2}(K^{+} anti-K^{0}) vs m^{2}(K^{-} K^{+})", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : 0.8, "xmax" : 2.0, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 50, "ymin" : 0.8, "ymax" : 2.0},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel12", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel23", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel13", "d1" : 1, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "D_DALITZ__D0_KKanti-K0.root",
"reference" : "RefD_DALITZ__D0_KKanti-K0.root"
}
diff --git a/test/jsonFiles/D_DALITZ__D0_Kpipi0.json b/test/jsonFiles/D_DALITZ__D0_Kpipi0.json
index 2338ae1..369ccf0 100644
--- a/test/jsonFiles/D_DALITZ__D0_Kpipi0.json
+++ b/test/jsonFiles/D_DALITZ__D0_Kpipi0.json
@@ -1,23 +1,23 @@
{
"parent" : "D0",
"daughters" : ["K-", "pi+", "pi0"],
"models" : ["D_DALITZ"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(K^{-} #pi^{+})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.5, "xmax" : 1.8},
{"variable" : "mass", "title" : "m(K^{-} #pi^{0})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.5, "xmax" : 1.8},
{"variable" : "mass", "title" : "m(#pi^{+} #pi^{0})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.2, "xmax" : 1.5},
{"variable" : "massSq", "title" : "Dalitz m^{2}(K^{-} #pi^{+}) vs m^{2}(K^{-} #pi^{0})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.3, "xmax" : 3.2, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.3, "ymax" : 3.2},
{"variable" : "massSq", "title" : "Dalitz m^{2}(#pi^{+} #pi^{0}) vs m^{2}(K^{-} #pi^{+})", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : 0.0, "xmax" : 2.0, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 3.2},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel12", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel23", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel13", "d1" : 1, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "D_DALITZ__D0_Kpipi0.root",
"reference" : "RefD_DALITZ__D0_Kpipi0.root"
}
diff --git a/test/jsonFiles/D_DALITZ__D0_anti-K0pipi.json b/test/jsonFiles/D_DALITZ__D0_anti-K0pipi.json
index 06c3f27..2d79e76 100644
--- a/test/jsonFiles/D_DALITZ__D0_anti-K0pipi.json
+++ b/test/jsonFiles/D_DALITZ__D0_anti-K0pipi.json
@@ -1,23 +1,23 @@
{
"parent" : "D0",
"daughters" : ["anti-K0", "pi+", "pi-"],
"models" : ["D_DALITZ"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(anti-K^{0} #pi^{+})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.6, "xmax" : 1.8},
{"variable" : "mass", "title" : "m(anti-K^{0} #pi^{-})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.6, "xmax" : 1.8},
{"variable" : "mass", "title" : "m(#pi^{+} #pi^{-})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.2, "xmax" : 1.5},
{"variable" : "massSq", "title" : "Dalitz m^{2}(anti-K^{0} #pi^{+}) vs m^{2}(anti-K^{0} #pi^{-})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.05, "xmax" : 3.5, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 3.5},
{"variable" : "massSq", "title" : "Dalitz m^{2}(#pi^{+} #pi^{-}) vs m^{2}(anti-K^{0} #pi^{+})", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : 0.05, "xmax" : 2.0, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 50, "ymin" : 0.05, "ymax" : 3.5},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel12", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel23", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel13", "d1" : 1, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "D_DALITZ__D0_anti-K0pipi.root",
"reference" : "RefD_DALITZ__D0_anti-K0pipi.root"
}
diff --git a/test/jsonFiles/D_DALITZ__D0_pipiKS0.json b/test/jsonFiles/D_DALITZ__D0_pipiKS0.json
index 30e69f4..1b2f2c2 100644
--- a/test/jsonFiles/D_DALITZ__D0_pipiKS0.json
+++ b/test/jsonFiles/D_DALITZ__D0_pipiKS0.json
@@ -1,23 +1,23 @@
{
"parent" : "D0",
"daughters" : ["pi-", "pi+", "K_S0"],
"models" : ["D_DALITZ"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(#pi^{-} #pi^{+})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.2, "xmax" : 1.5},
{"variable" : "mass", "title" : "m(#pi^{-} K^{0}_{S})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.6, "xmax" : 1.8},
{"variable" : "mass", "title" : "m(#pi^{+} K^{0}_{S})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.6, "xmax" : 1.8},
{"variable" : "massSq", "title" : "Dalitz m^{2}(#pi^{-} #pi^{+}) vs m^{2}(#pi^{-} K^{0}_{S})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 2.0, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 3.2},
{"variable" : "massSq", "title" : "Dalitz m^{2}(#pi^{+} K^{0}_{S}) vs m^{2}(#pi^{-} #pi^{+})", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : 0.3, "xmax" : 3.2, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 2.0},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel12", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel23", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel13", "d1" : 1, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "D_DALITZ__D0_pipiKS0.root",
"reference" : "RefD_DALITZ__D0_pipiKS0.root"
}
diff --git a/test/jsonFiles/D_DALITZ__D0_pipipi0.json b/test/jsonFiles/D_DALITZ__D0_pipipi0.json
index 848b14a..bf39cea 100644
--- a/test/jsonFiles/D_DALITZ__D0_pipipi0.json
+++ b/test/jsonFiles/D_DALITZ__D0_pipipi0.json
@@ -1,23 +1,23 @@
{
"parent" : "D0",
"daughters" : ["pi-", "pi+", "pi0"],
"models" : ["D_DALITZ"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(#pi^{-} #pi^{+})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.2, "xmax" : 1.8},
{"variable" : "mass", "title" : "m(#pi^{-} #pi^{0})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.2, "xmax" : 1.8},
{"variable" : "mass", "title" : "m(#pi^{+} #pi^{0})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.2, "xmax" : 1.8},
{"variable" : "massSq", "title" : "Dalitz m^{2}(#pi^{-} #pi^{+}) vs m^{2}(#pi^{-} #pi^{0})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 3.2, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 3.2},
{"variable" : "massSq", "title" : "Dalitz m^{2}(#pi^{+} #pi^{0}) vs m^{2}(#pi^{-} #pi^{+})", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : 0.0, "xmax" : 3.2, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 3.2},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel12", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel23", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel13", "d1" : 1, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "D_DALITZ__D0_pipipi0.root",
"reference" : "RefD_DALITZ__D0_pipipi0.root"
}
diff --git a/test/jsonFiles/D_DALITZ__Ds+_KKpi.json b/test/jsonFiles/D_DALITZ__Ds+_KKpi.json
index 66a1df2..09991ca 100644
--- a/test/jsonFiles/D_DALITZ__Ds+_KKpi.json
+++ b/test/jsonFiles/D_DALITZ__Ds+_KKpi.json
@@ -1,23 +1,23 @@
{
"parent" : "D_s+",
"daughters" : ["K-", "K+", "pi+"],
"models" : ["D_DALITZ"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(K^{-} K^{+})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.9, "xmax" : 1.9},
{"variable" : "mass", "title" : "m(K^{-} #pi^{+})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.5, "xmax" : 1.6},
{"variable" : "mass", "title" : "m(K^{+} #pi^{+})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.5, "xmax" : 1.6},
{"variable" : "massSq", "title" : "Dalitz m^{2}(K^{-} K^{+}) vs m^{2}(K^{-} #pi^{+})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.8, "xmax" : 3.5, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.2, "ymax" : 2.5},
{"variable" : "massSq", "title" : "Dalitz m^{2}(K^{+} #pi^{+}) vs m^{2}(K^{-} K^{+})", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : 0.2, "xmax" : 2.5, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 50, "ymin" : 0.7, "ymax" : 3.5},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel12", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel23", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel13", "d1" : 1, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "D_DALITZ__Ds+_KKpi.root",
"reference" : "RefD_DALITZ__Ds+_KKpi.root"
}
diff --git a/test/jsonFiles/D_DALITZ__Ds+_pipipi.json b/test/jsonFiles/D_DALITZ__Ds+_pipipi.json
index 89b4596..ed9b57e 100644
--- a/test/jsonFiles/D_DALITZ__Ds+_pipipi.json
+++ b/test/jsonFiles/D_DALITZ__Ds+_pipipi.json
@@ -1,23 +1,23 @@
{
"parent" : "D_s+",
"daughters" : ["pi-", "pi+", "pi+"],
"models" : ["D_DALITZ"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(#pi^{-} #pi^{+})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.2, "xmax" : 1.9},
{"variable" : "mass", "title" : "m(#pi^{-} #pi^{+})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.2, "xmax" : 1.9},
{"variable" : "mass", "title" : "m(#pi^{+} #pi^{+})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.2, "xmax" : 1.9},
{"variable" : "massSq", "title" : "Dalitz m^{2}(#pi^{-} #pi^{+}) vs m^{2}(#pi^{-} #pi^{+})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 3.5, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 3.5},
{"variable" : "massSq", "title" : "Dalitz m^{2}(#pi^{+} #pi^{+}) vs m^{2}(#pi^{-} #pi^{+})", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : 0.0, "xmax" : 3.5, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 3.5},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel12", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel23", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel13", "d1" : 1, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "D_DALITZ__Ds+_pipipi.root",
"reference" : "RefD_DALITZ__Ds+_pipipi.root"
}
diff --git a/test/jsonFiles/ETA_DALITZ__eta_pipipi0.json b/test/jsonFiles/ETA_DALITZ__eta_pipipi0.json
index faca958..522436a 100644
--- a/test/jsonFiles/ETA_DALITZ__eta_pipipi0.json
+++ b/test/jsonFiles/ETA_DALITZ__eta_pipipi0.json
@@ -1,22 +1,22 @@
{
"parent" : "eta",
"daughters" : ["pi+", "pi-", "pi0"],
"models" : ["ETA_DALITZ"],
"parameters" : [[]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(#pi^{+} #pi^{-})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.25, "xmax" : 0.45},
{"variable" : "mass", "title" : "m(#pi^{+} #pi^{0})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.25, "xmax" : 0.45},
{"variable" : "mass", "title" : "m(#pi^{-} #pi^{0})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.25, "xmax" : 0.45},
{"variable" : "massSq", "title" : "Dalitz m^{2}(#pi^{+} #pi^{-}) vs m^{2}(#pi^{+} #pi^{0})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.06, "xmax" : 0.18, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.06, "ymax" : 0.18},
{"variable" : "massSq", "title" : "Dalitz m^{2}(#pi^{-} #pi^{0}) vs m^{2}(#pi^{+} #pi^{-})", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : 0.06, "xmax" : 0.18, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 50, "ymin" : 0.06, "ymax" : 0.18},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel12", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel23", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel13", "d1" : 1, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "ETA_DALITZ__eta_pipipi0.root",
"reference" : "RefETA_DALITZ__eta_pipipi0.root"
}
diff --git a/test/jsonFiles/ETA_LLPIPI__etap_eepipi.json b/test/jsonFiles/ETA_LLPIPI__etap_eepipi.json
index 37153c8..3e9c31f 100644
--- a/test/jsonFiles/ETA_LLPIPI__etap_eepipi.json
+++ b/test/jsonFiles/ETA_LLPIPI__etap_eepipi.json
@@ -1,19 +1,19 @@
{
"parent" : "eta'",
"daughters" : ["e+", "e-", "pi+", "pi-"],
"models" : ["ETA_LLPIPI"],
"parameters" : [[]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "mPiPi", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "mLL" , "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.5},
{"variable" : "mass", "title" : "mPiL1", "d1" : 1, "d2" : 4, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.85},
{"variable" : "mass", "title" : "mPiL2", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.85},
{"variable" : "cosHel", "title" : "cosL", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosPi", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "ETA_LLPIPI__etap_eepipi.root",
"reference" : "RefETA_LLPIPI__etap_eepipi.root"
}
diff --git a/test/jsonFiles/ETA_LLPIPI__etap_mumupipi.json b/test/jsonFiles/ETA_LLPIPI__etap_mumupipi.json
index 7f47324..70f2156 100644
--- a/test/jsonFiles/ETA_LLPIPI__etap_mumupipi.json
+++ b/test/jsonFiles/ETA_LLPIPI__etap_mumupipi.json
@@ -1,19 +1,19 @@
{
"parent" : "eta'",
"daughters" : ["mu+", "mu-", "pi+", "pi-"],
"models" : ["ETA_LLPIPI"],
"parameters" : [[]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "mPiPi", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "mLL" , "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.1, "xmax" : 0.75},
{"variable" : "mass", "title" : "mPiL1", "d1" : 1, "d2" : 4, "nbins" : 100, "xmin" : 0.1, "xmax" : 0.8},
{"variable" : "mass", "title" : "mPiL2", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.1, "xmax" : 0.8},
{"variable" : "cosHel", "title" : "cosL", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosPi", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "ETA_LLPIPI__etap_mumupipi.root",
"reference" : "RefETA_LLPIPI__etap_mumupipi.root"
}
diff --git a/test/jsonFiles/EvtBcToNPi=VLL__Bc_Jpsipipipi_ee.json b/test/jsonFiles/EvtBcToNPi=VLL__Bc_Jpsipipipi_ee.json
index 0879ca3..fa1aab7 100644
--- a/test/jsonFiles/EvtBcToNPi=VLL__Bc_Jpsipipipi_ee.json
+++ b/test/jsonFiles/EvtBcToNPi=VLL__Bc_Jpsipipipi_ee.json
@@ -1,20 +1,20 @@
{
"parent" : "B_c+",
"daughters" : ["J/psi", "pi+", "pi-", "pi+"],
"grand_daughters" : [["e+", "e-"], [], [], []],
"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", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B_s0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(EvtBcToNPi)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(VLL)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "parMass", "title" : "m(B_{c}^{+})", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 6.2, "xmax" : 6.3},
{"variable" : "mass", "title" : "m(J/#psi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 3.0, "xmax" : 3.2},
{"variable" : "mass3", "title" : "m(#pi^{+}#pi^{-}#pi^{+})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.5},
{"variable" : "cosHel", "title" : "cosHel(e^{+}, J/#psi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "EvtBcToNPi=VLL__Bc_Jpsipipipi_ee.root",
"reference" : "RefEvtBcToNPi=VLL__Bc_Jpsipipipi_ee.root"
}
diff --git a/test/jsonFiles/FLATQ2=VSS__Bs_phimumu_KK.json b/test/jsonFiles/FLATQ2=VSS__Bs_phimumu_KK.json
index a968b46..751791b 100644
--- a/test/jsonFiles/FLATQ2=VSS__Bs_phimumu_KK.json
+++ b/test/jsonFiles/FLATQ2=VSS__Bs_phimumu_KK.json
@@ -1,38 +1,38 @@
{
"parent" : "B_s0",
"daughters" : ["phi", "mu+", "mu-"],
"grand_daughters" : [["K+", "K-"], [], []],
"models" : ["FLATQ2", "VSS", ""],
"parameters" : [["1"], [], []],
"do_conjugate_decay" : [true, false, false, false],
- "extras" : ["Define dm_incohMix_B_s0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B_s0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(phi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.95, "xmax" : 1.1},
{"variable" : "mass", "title" : "m(phi mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(phi mu-)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(mu+mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "pSumSq", "title" : "qSq(mu+ mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "p", "title" : "p(phi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pSq", "title" : "pSq(phi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 8.0},
{"variable" : "pz", "title" : "pz(phi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(phi,mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(mu+,mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(K+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(phi)", "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},
{"variable" : "cosTheta", "title" : "cosTheta(mu-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(phi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(K+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 2.0},
{"variable" : "pLab_daug1", "title" : "pLab(K-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 2.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(K+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(K+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(K-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(K-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "FLATQ2=VSS__Bs_phimumu_KK.root",
"reference" : "RefFLATQ2=VSS__Bs_phimumu_KK.root"
}
diff --git a/test/jsonFiles/FLATSQDALITZ__Bu_pi+pi+pi-.json b/test/jsonFiles/FLATSQDALITZ__Bu_pi+pi+pi-.json
index e5f1cb5..61d6f28 100644
--- a/test/jsonFiles/FLATSQDALITZ__Bu_pi+pi+pi-.json
+++ b/test/jsonFiles/FLATSQDALITZ__Bu_pi+pi+pi-.json
@@ -1,19 +1,19 @@
{
"parent" : "B+",
"daughters" : ["pi+", "pi+", "pi-"],
"models" : ["FLATSQDALITZ"],
"parameters" : [[]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 1000000,
"histograms" : [
{"variable" : "mass", "title" : "m12", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.6, "xmax" : 2.25},
{"variable" : "mass", "title" : "m13", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 3.2, "xmax" : 4.8},
{"variable" : "mass", "title" : "m12", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 3.5, "xmax" : 5.2},
{"variable" : "cosHel", "title" : "cosTheta1", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosTheta2", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosTheta3", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 20, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 20, "ymin" : 0.0, "ymax" : 1.0}
],
"outfile" : "FLATSQDALITZ__Bu_pi+pi+pi-.root",
"reference" : "RefFLATSQDALITZ__Bu_pi+pi+pi-.root"
}
diff --git a/test/jsonFiles/FLATSQDALITZ__Lb_KKLz.json b/test/jsonFiles/FLATSQDALITZ__Lb_KKLz.json
index 7545fc9..d56354b 100644
--- a/test/jsonFiles/FLATSQDALITZ__Lb_KKLz.json
+++ b/test/jsonFiles/FLATSQDALITZ__Lb_KKLz.json
@@ -1,20 +1,20 @@
{
"parent" : "Lambda_b0",
"daughters" : ["K+", "K-", "Lambda0"],
"do_conjugate_decay" : [ true, true, true, true ],
"models" : ["FLATSQDALITZ"],
"parameters" : [[]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 1000000,
"histograms" : [
{"variable" : "mass", "title" : "mKPi", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.6, "xmax" : 2.25},
{"variable" : "mass", "title" : "mJpsiPi", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 3.2, "xmax" : 4.8},
{"variable" : "mass", "title" : "mJpsiK", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 3.5, "xmax" : 5.2},
{"variable" : "cosHel", "title" : "cosTheta1", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosTheta2", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosTheta3", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0}
],
"outfile" : "FLATSQDALITZ__Lb_KKLz.root",
"reference" : "RefFLATSQDALITZ__Lb_KKLz.root"
}
diff --git a/test/jsonFiles/FLATSQDALITZ__Lb_KKLz_cuts.json b/test/jsonFiles/FLATSQDALITZ__Lb_KKLz_cuts.json
index 94aa283..6c53033 100644
--- a/test/jsonFiles/FLATSQDALITZ__Lb_KKLz_cuts.json
+++ b/test/jsonFiles/FLATSQDALITZ__Lb_KKLz_cuts.json
@@ -1,20 +1,20 @@
{
"parent" : "Lambda_b0",
"daughters" : ["K+", "K-", "Lambda0"],
"do_conjugate_decay" : [ true, true, true, true ],
"models" : ["FLATSQDALITZ"],
"parameters" : [["0.2", "0.7", "0.3", "0.8"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 1000000,
"histograms" : [
{"variable" : "mass", "title" : "mKPi", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.6, "xmax" : 2.25},
{"variable" : "mass", "title" : "mJpsiPi", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 3.2, "xmax" : 4.8},
{"variable" : "mass", "title" : "mJpsiK", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 3.5, "xmax" : 5.2},
{"variable" : "cosHel", "title" : "cosTheta1", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosTheta2", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosTheta3", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 20, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 20, "ymin" : 0.0, "ymax" : 1.0}
],
"outfile" : "FLATSQDALITZ__Lb_KKLz_cuts.root",
"reference" : "RefFLATSQDALITZ__Lb_KKLz_cuts.root"
}
diff --git a/test/jsonFiles/FOURBODYPHSP__Bu_mumuKrho0.json b/test/jsonFiles/FOURBODYPHSP__Bu_mumuKrho0.json
index c3a5de0..22636e2 100644
--- a/test/jsonFiles/FOURBODYPHSP__Bu_mumuKrho0.json
+++ b/test/jsonFiles/FOURBODYPHSP__Bu_mumuKrho0.json
@@ -1,50 +1,50 @@
{
"parent" : "B+",
"daughters" : ["mu+", "mu-", "K+", "rho0"],
"do_conjugate_decay" : [true,false,false,true,false],
"models" : ["FOURBODYPHSP"],
"parameters" : [["1.0", "2.0", "1.0", "2.0"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "parMass", "title" : "M(B+)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 5.0, "xmax" : 5.5},
{"variable" : "px", "title" : "px(B+)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "py", "title" : "py(B+)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(B+)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "E", "title" : "E(B+)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "mass", "title" : "M(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.2},
{"variable" : "px", "title" : "px(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "py", "title" : "py(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(mu+", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "E", "title" : "E(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "mass", "title" : "M(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.2},
{"variable" : "px", "title" : "px(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "py", "title" : "py(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "E", "title" : "E(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "mass", "title" : "M(K+)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "px", "title" : "px(K+)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "py", "title" : "py(K+)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(K+)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "E", "title" : "E(K+)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "mass", "title" : "M(rho0)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.5},
{"variable" : "px", "title" : "px(rho0)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "py", "title" : "py(rho0)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(rho0)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "E", "title" : "E(rho0)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "mass", "title" : "m1m2(mu+ + mu-)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.8, "xmax" : 1.2},
{"variable" : "mass", "title" : "m1m3(mu+ + K+)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "mass", "title" : "m1m4(mu+ + rho0)", "d1" : 1, "d2" : 4, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "mass", "title" : "m2m3(mu- + K+)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "mass", "title" : "m2m4(mu- + rho0)", "d1" : 2, "d2" : 4, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "mass", "title" : "m3m4(K+ + rho0)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.8, "xmax" : 1.2},
{"variable" : "mass3_specified", "title" : "m1m2m3(mu+, mu-, K+)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass3_specified", "title" : "m1m2m3(mu+, mu-, rho0)", "d1" : 1, "d2" : 4, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass3_specified", "title" : "m2m3m4(mu-, K+, rho0)", "d1" : 2, "d2" : 4, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "decayangle", "title" : "theta1(mu+,mu-)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 200.0},
{"variable" : "decayangle", "title" : "theta3(K+,rho0)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.0, "xmax" : 200.0},
{"variable" : "chi", "title" : "chi(mu+,mu-,K+,rho0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 360.0}
],
"outfile" : "FOURBODYPHSP__Bu_mumuKrho0.root",
"reference" : "RefFOURBODYPHSP__Bu_mumuKrho0.root"
}
diff --git a/test/jsonFiles/GENERIC_DALITZ__D0_KsKK.json b/test/jsonFiles/GENERIC_DALITZ__D0_KsKK.json
index 3c08ce7..e5f4e35 100644
--- a/test/jsonFiles/GENERIC_DALITZ__D0_KsKK.json
+++ b/test/jsonFiles/GENERIC_DALITZ__D0_KsKK.json
@@ -1,22 +1,22 @@
{
"parent" : "D0",
"daughters" : ["K_S0", "K+", "K-"],
"models" : ["GENERIC_DALITZ"],
"parameters" : [["../validation/DalitzFiles/DalitzDecays.xml"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(K^{0}_{S} K^{+})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.9, "xmax" : 1.5},
{"variable" : "mass", "title" : "m(K^{0}_{S} K^{-})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.9, "xmax" : 1.5},
{"variable" : "mass", "title" : "m(K^{-} K^{+})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.9, "xmax" : 1.5},
{"variable" : "massSq", "title" : "Dalitz m^{2}(K^{0}_{S} K^{+}) vs m^{2}(K^{0}_{S} K^{-})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.8, "xmax" : 2.0, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.8, "ymax" : 2.0},
{"variable" : "massSq", "title" : "Dalitz m^{2}(K^{+} K^{-}) vs m^{2}(K^{0}_{S} K^{+})", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : 0.8, "xmax" : 2.0, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 50, "ymin" : 0.8, "ymax" : 2.0},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel12", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel23", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel13", "d1" : 1, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "GENERIC_DALITZ__D0_KsKK.root",
"reference" : "RefGENERIC_DALITZ__D0_KsKK.root"
}
diff --git a/test/jsonFiles/GOITY_ROBERTS=VSS__Bd_Dst0pienu_D0pi0.json b/test/jsonFiles/GOITY_ROBERTS=VSS__Bd_Dst0pienu_D0pi0.json
index ca883cd..38cc85d 100644
--- a/test/jsonFiles/GOITY_ROBERTS=VSS__Bd_Dst0pienu_D0pi0.json
+++ b/test/jsonFiles/GOITY_ROBERTS=VSS__Bd_Dst0pienu_D0pi0.json
@@ -1,42 +1,42 @@
{
"parent" : "B0",
"daughters" : ["anti-D*0", "pi-", "e+", "nu_e"],
"grand_daughters" : [["anti-D0", "pi0"], [], []],
"models" : ["GOITY_ROBERTS", "VSS", ""],
"parameters" : [[], [], []],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "M(#it{D}*^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.9, "xmax" : 2.1},
{"variable" : "mass", "title" : "M(#it{D}*^{0}#it{#pi})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 1.5, "xmax" : 6.0},
{"variable" : "mass", "title" : "M(#it{D}*^{0}#it{e})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 1.5, "xmax" : 6.0},
{"variable" : "mass", "title" : "M(#it{D}*^{0}#it{#nu})", "d1" : 1, "d2" : 4, "nbins" : 100, "xmin" : 1.5, "xmax" : 6.0},
{"variable" : "mass", "title" : "M(#it{e}#it{#nu})", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.0, "xmax" : 4.0},
{"variable" : "mass3", "title" : "M(#it{D}*^{0}#it{#pi}#it{e})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 1.5, "xmax" : 6.0},
{"variable" : "pSumSq", "title" : "q^{2}(#it{e}#it{#nu})", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "p", "title" : "p(#it{D}*^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pSq", "title" : "p^{2}(#it{D}*^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "pz", "title" : "pz(#it{D}*^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "decayangle", "title" : "#theta(#it{D}*^{0},#it{e})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0, "xmax" : 200.0},
{"variable" : "cosHel", "title" : "cosHel(#it{D}*^{0},#it{#pi})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(#it{D}*^{0},#it{e})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(#it{e}#it{#nu})", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(#it{D}^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(#it{D}*^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#it{#pi})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#it{e})", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#it{#nu})", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(#it{D}*^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(#it{D}^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 2.5},
{"variable" : "pLab_daug1", "title" : "pLab(#it{pi}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.25},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#it{D}^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#it{D}^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#it{pi}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#it{pi}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "GOITY_ROBERTS=VSS__Bd_Dst0pienu_D0pi0.root",
"reference" : "RefGOITY_ROBERTS=VSS__Bd_Dst0pienu_D0pi0.root"
}
diff --git a/test/jsonFiles/HELAMP=HELAMP=VSS__Bu_psi2SKstar_Jpsigamma,K0pi.json b/test/jsonFiles/HELAMP=HELAMP=VSS__Bu_psi2SKstar_Jpsigamma,K0pi.json
index 629e89d..3ddcb4d 100644
--- a/test/jsonFiles/HELAMP=HELAMP=VSS__Bu_psi2SKstar_Jpsigamma,K0pi.json
+++ b/test/jsonFiles/HELAMP=HELAMP=VSS__Bu_psi2SKstar_Jpsigamma,K0pi.json
@@ -1,46 +1,46 @@
{
"parent" : "B+",
"daughters" : ["psi(2S)", "K*+"],
"grand_daughters" : [["J/psi", "gamma"], ["K0", "pi+"]],
"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"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(HELAMP,B)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(HELAMP,psi2S)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug2", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "parMass", "title" : "m(B+)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 5.27, "xmax" : 5.29},
{"variable" : "mass", "title" : "m(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 3.6, "xmax" : 3.8},
{"variable" : "mass", "title" : "m(K*+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.6, "xmax" : 1.6},
{"variable" : "mass_daug1", "title" : "m(J/psi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 3.0, "xmax" : 3.2},
{"variable" : "mass_daug2", "title" : "m(K0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.4, "xmax" : 0.6},
{"variable" : "mass_daug2", "title" : "m(pi+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.13, "xmax" : 0.15},
{"variable" : "cosHel", "title" : "cosHel(J/psi,psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(K0,K*+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 180.0},
{"variable" : "decayangle", "title" : "decayAngle(psi2S,K*+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0},
{"variable" : "decayangle_daug1", "title" : "decayAngle(J/psi,gamma)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0},
{"variable" : "decayangle_daug2", "title" : "decayAngle(K0,pi+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(K*+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(J/psi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(gamma)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(K0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(pi+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(J/psi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi_daug1", "title" : "phi(gamma)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi_daug2", "title" : "phi(K0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi_daug2", "title" : "phi(pi+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "p", "title" : "p(psi2S)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.4, "xmax" : 1.3},
{"variable" : "p", "title" : "p(K*+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.4, "xmax" : 1.3},
{"variable" : "p_daug1", "title" : "p(J/psi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 0.6},
{"variable" : "p_daug1", "title" : "p(gamma)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 0.6},
{"variable" : "p_daug2", "title" : "p(K0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.8},
{"variable" : "p_daug2", "title" : "p(pi+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.8}
],
"outfile" : "HELAMP=HELAMP=VSS__Bu_psi2SKstar_Jpsigamma,K0pi.root",
"reference" : "RefHELAMP=HELAMP=VSS__Bu_psi2SKstar_Jpsigamma,K0pi.root"
}
diff --git a/test/jsonFiles/HQET2=VSS__Bd_Dstenu_D0pi.json b/test/jsonFiles/HQET2=VSS__Bd_Dstenu_D0pi.json
index b1f9ab1..a5acd26 100644
--- a/test/jsonFiles/HQET2=VSS__Bd_Dstenu_D0pi.json
+++ b/test/jsonFiles/HQET2=VSS__Bd_Dstenu_D0pi.json
@@ -1,37 +1,37 @@
{
"parent" : "B0",
"daughters" : ["D*-", "e+", "nu_e"],
"grand_daughters" : [["anti-D0", "pi-"], [], []],
"models" : ["HQET2", "VSS", ""],
"parameters" : [["1.122", "0.921", "1.270", "0.852"], [], []],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "M(#it{D}*)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.9, "xmax" : 2.1},
{"variable" : "mass", "title" : "M(#it{D}*#it{e})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 1.5, "xmax" : 6.0},
{"variable" : "mass", "title" : "M(#it{D}*#it{#nu})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 1.5, "xmax" : 6.0},
{"variable" : "mass", "title" : "M(#it{e}#it{#nu})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 4.0},
{"variable" : "pSumSq", "title" : "q^{2}(#it{e}#it{#nu})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "p", "title" : "p(#it{D}*)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pSq", "title" : "p^{2}(#it{D}*)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "pz", "title" : "pz(#it{D}*)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosHel", "title" : "cosHel(#it{D}*,#it{e})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(#it{e}#it{#nu})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(#it{D}^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(#it{D}*)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#it{e})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#it{#nu})", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(#it{D}*)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(#it{D}^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 2.5},
{"variable" : "pLab_daug1", "title" : "pLab(#it{#pi})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.25},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#it{D}^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#it{D}^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#it{#pi})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#it{#pi})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "HQET2=VSS__Bd_Dstenu_D0pi.root",
"reference" : "RefHQET2=VSS__Bd_Dstenu_D0pi.root"
}
diff --git a/test/jsonFiles/HQET=VSS__Bd_Dstenu_D0pi.json b/test/jsonFiles/HQET=VSS__Bd_Dstenu_D0pi.json
index 8e181b3..77161cb 100644
--- a/test/jsonFiles/HQET=VSS__Bd_Dstenu_D0pi.json
+++ b/test/jsonFiles/HQET=VSS__Bd_Dstenu_D0pi.json
@@ -1,37 +1,37 @@
{
"parent" : "B0",
"daughters" : ["D*-", "e+", "nu_e"],
"grand_daughters" : [["anti-D0", "pi-"], [], []],
"models" : ["HQET", "VSS", ""],
"parameters" : [["0.92", "1.18", "0.72"], [], []],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(Dst)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.9, "xmax" : 2.1},
{"variable" : "mass", "title" : "m(Dst e)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 1.5, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(Dst nu)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 1.5, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(e nu)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 4.0},
{"variable" : "pSumSq", "title" : "qSq(e nu)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "p", "title" : "p(Dst)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pSq", "title" : "pSq(Dst)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "pz", "title" : "pz(Dst)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosHel", "title" : "cosHel(Dst,e)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(e,nu)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(Dst)", "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},
{"variable" : "cosTheta", "title" : "cosTheta(nu)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(Dst)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 2.5},
{"variable" : "pLab_daug1", "title" : "pLab(pi)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.25},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(pi)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "HQET=VSS__Bd_Dstenu_D0pi.root",
"reference" : "RefHQET=VSS__Bd_Dstenu_D0pi.root"
}
diff --git a/test/jsonFiles/HypNonLepton__Lambda0_ppi.json b/test/jsonFiles/HypNonLepton__Lambda0_ppi.json
index 1c6cb20..6b76237 100644
--- a/test/jsonFiles/HypNonLepton__Lambda0_ppi.json
+++ b/test/jsonFiles/HypNonLepton__Lambda0_ppi.json
@@ -1,19 +1,19 @@
{
"parent" : "Lambda0",
"daughters" : ["p+", "pi-"],
"models" : ["HypNonLepton"],
"parameters" : [["0.642", "-6.5"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "parMass", "title" : "m(#Lambda^{0})", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 1.0, "xmax" : 1.2},
{"variable" : "mass", "title" : "m(p #pi)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 1.0, "xmax" : 1.2},
{"variable" : "cosTheta", "title" : "cosTheta(p)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#pi)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(p)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi(#pi)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "HypNonLepton__Lambda0_ppi.root",
"reference" : "RefHypNonLepton__Lambda0_ppi.root"
}
diff --git a/test/jsonFiles/ISGW2=PHSP=TAUSCALARNU__Bu_D0taunu_Kpi,pinu.json b/test/jsonFiles/ISGW2=PHSP=TAUSCALARNU__Bu_D0taunu_Kpi,pinu.json
index 3271575..9ba07c2 100644
--- a/test/jsonFiles/ISGW2=PHSP=TAUSCALARNU__Bu_D0taunu_Kpi,pinu.json
+++ b/test/jsonFiles/ISGW2=PHSP=TAUSCALARNU__Bu_D0taunu_Kpi,pinu.json
@@ -1,52 +1,52 @@
{
"parent" : "B+",
"daughters" : ["anti-D0", "tau+", "nu_tau"],
"grand_daughters" : [["K+", "pi-"], ["pi+", "anti-nu_tau"], []],
"models" : ["ISGW2", "PHSP", "TAUSCALARNU"],
"parameters" : [[], [], []],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 100000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(D0 tau)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 3.0, "xmax" : 6.0},
{"variable" : "pSumSq", "title" : "qSq(tau nu)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 3.0, "xmax" : 15.0},
{"variable" : "p", "title" : "p(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "pSq", "title" : "pSq(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 4.0},
{"variable" : "pz", "title" : "pz(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.0, "xmax" : 2.0},
{"variable" : "cosHel", "title" : "cosHel(tau,D0)", "d1" : 2, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(tau)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(pi2)", "d1" : 2, "d2" : 1, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(nu2)", "d1" : 2, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau", "title" : "cosHel(K)", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(K+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(tau)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "pLab_daug1", "title" : "pLab(K+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(K+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(K+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "pLab_daug1", "title" : "pLab(pi1)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi1)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(pi1)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "pLab_daug2", "title" : "pLab(pi2)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(pi2)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(pi2)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "pLab_daug2", "title" : "pLab(nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "E", "title" : "Energy(D0)", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 3},
{"variable" : "E_over_Eparent", "title" : "E(D0)/E(B)", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "E_daug2", "title" : "E(pi2)", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 3},
{"variable" : "E_over_Eparent_daug2", "title" : "E(pi2)/E(tau)", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "p_daug2", "title" : "p(pi2)", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 3},
{"variable" : "pz_daug2", "title" : "pz(pi2)", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 3},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(pi2)", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(pi1)", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 180.0, "xmax" : 180},
{"variable" : "E_daug2", "title" : "E(nu)", "d1" : 2, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 3},
{"variable" : "E_over_Eparent_daug2", "title" : "E(nu2)/E(tau)", "d1" : 2, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "p_daug2", "title" : "p(nu2)", "d1" : 2, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 3},
{"variable" : "pz_daug2", "title" : "pz(nu2)", "d1" : 2, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 3},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(nu2)", "d1" : 2, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(nu2)", "d1" : 2, "d2" : 2, "nbins" : 50, "xmin" : 180.0, "xmax" : 180}
],
"outfile" : "ISGW2=PHSP=TAUSCALARNU__Bu_D0taunu_Kpi,pinu.root",
"reference" : "RefISGW2=PHSP=TAUSCALARNU__Bu_D0taunu_Kpi,pinu.root"
}
diff --git a/test/jsonFiles/ISGW2=VSS=TAUSCALARNU__Bd_Dsttaunu_D0pi,pinu.json b/test/jsonFiles/ISGW2=VSS=TAUSCALARNU__Bd_Dsttaunu_D0pi,pinu.json
index e72b48d..b4741d2 100644
--- a/test/jsonFiles/ISGW2=VSS=TAUSCALARNU__Bd_Dsttaunu_D0pi,pinu.json
+++ b/test/jsonFiles/ISGW2=VSS=TAUSCALARNU__Bd_Dsttaunu_D0pi,pinu.json
@@ -1,38 +1,38 @@
{
"parent" : "B0",
"daughters" : ["D*-", "tau+", "nu_tau"],
"grand_daughters" : [["anti-D0", "pi-"], ["pi+", "anti-nu_tau"], []],
"models" : ["ISGW2", "VSS", "TAUSCALARNU"],
"parameters" : [[], [], []],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 100000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(Dst tau)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 3.0, "xmax" : 6.0},
{"variable" : "pSumSq", "title" : "qSq(tau nu)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 3.0, "xmax" : 12.0},
{"variable" : "p", "title" : "p(Dst)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "pSq", "title" : "pSq(Dst)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 4.0},
{"variable" : "pz", "title" : "pz(Dst)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.0, "xmax" : 2.0},
{"variable" : "cosHel", "title" : "cosHel(tau,Dst)", "d1" : 2, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(tau)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau", "title" : "cosHel(Dst)", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(nu2)", "d1" : 2, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(pi2)", "d1" : 2, "d2" : 1, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(tau)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "pLab_daug1", "title" : "pLab(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "pLab_daug1", "title" : "pLab(pi1)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.2},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi1)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(pi1)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "pLab_daug2", "title" : "pLab(pi2)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(pi2)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(pi2)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "pLab_daug2", "title" : "pLab(nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180}
],
"outfile" : "ISGW2=VSS=TAUSCALARNU__Bd_Dsttaunu_D0pi,pinu.root",
"reference" : "RefISGW2=VSS=TAUSCALARNU__Bd_Dsttaunu_D0pi,pinu.root"
}
diff --git a/test/jsonFiles/ISGW2=VSS__Bd_Dstmunu_D0pi.json b/test/jsonFiles/ISGW2=VSS__Bd_Dstmunu_D0pi.json
index 1701895..1e35b95 100644
--- a/test/jsonFiles/ISGW2=VSS__Bd_Dstmunu_D0pi.json
+++ b/test/jsonFiles/ISGW2=VSS__Bd_Dstmunu_D0pi.json
@@ -1,37 +1,37 @@
{
"parent" : "B0",
"daughters" : ["D*-", "mu+", "nu_mu"],
"grand_daughters" : [["anti-D0", "pi-"], [], []],
"models" : ["ISGW2", "VSS", ""],
"parameters" : [[], [], []],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(Dst)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.9, "xmax" : 2.1},
{"variable" : "mass", "title" : "m(Dst mu)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 1.5, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(Dst nu)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 1.5, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(mu nu)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 4.0},
{"variable" : "pSumSq", "title" : "qSq(mu nu)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "p", "title" : "p(Dst)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pSq", "title" : "pSq(Dst)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "pz", "title" : "pz(Dst)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosHel", "title" : "cosHel(Dst,mu)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(mu,nu)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(Dst)", "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},
{"variable" : "cosTheta", "title" : "cosTheta(nu)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(Dst)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 2.5},
{"variable" : "pLab_daug1", "title" : "pLab(pi)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.3},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(pi)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "ISGW2=VSS__Bd_Dstmunu_D0pi.root",
"reference" : "RefISGW2=VSS__Bd_Dstmunu_D0pi.root"
}
diff --git a/test/jsonFiles/ISGW2=VVS_PWAVE=TAUSCALARNU__Bd_Dst2Staunu_Dst0pi,pinu.json b/test/jsonFiles/ISGW2=VVS_PWAVE=TAUSCALARNU__Bd_Dst2Staunu_Dst0pi,pinu.json
index aa8de73..fc2eb44 100644
--- a/test/jsonFiles/ISGW2=VVS_PWAVE=TAUSCALARNU__Bd_Dst2Staunu_Dst0pi,pinu.json
+++ b/test/jsonFiles/ISGW2=VVS_PWAVE=TAUSCALARNU__Bd_Dst2Staunu_Dst0pi,pinu.json
@@ -1,43 +1,43 @@
{
"parent" : "B0",
"daughters" : ["D*(2S)-", "tau+", "nu_tau"],
"grand_daughters" : [["anti-D*0", "pi-"], ["pi+", "anti-nu_tau"], []],
"models" : ["ISGW2", "VVS_PWAVE", "TAUSCALARNU"],
"parameters" : [[], ["1.0", "0.0", "0.0", "0.0", "0.0", "0.0"], []],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 100000,
"histograms" : [
{"variable" : "mass", "title" : "m(Dst2S,tau)" , "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "psumsq", "title" : "qSq", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mtmLab", "title" : "pLab(Dst2S)", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 3},
{"variable" : "mtm2", "title" : "p^{2}(Dst2S)", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 3},
{"variable" : "pz", "title" : "pz(Dst2S)", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 3},
{"variable" : "coshel", "title" : "cosHel(Dst2S)", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "abscoshel", "title" : "absCosHel(Dst2S)", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(Dst2S)", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau", "title" : "cosHelTau(Dst0)", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(nu2)", "d1" : 2, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(pi2)", "d1" : 2, "d2" : 1, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "E", "title" : "E(Dst2S)", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 3},
{"variable" : "E_over_Eparent", "title" : "E(Dst2S)/E(B)", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "p", "title" : "p(Dst2S)", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 3},
{"variable" : "pz", "title" : "pz(Dst2S)", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 3},
{"variable" : "cosTheta", "title" : "cosTheta(Dst(2S)", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(Dst2S)", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : 180.0, "xmax" : 180},
{"variable" : "E_daug2", "title" : "E(pi2)", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 3},
{"variable" : "E_over_Eparent_daug2", "title" : "E(pi2)/(tau)", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "p_daug2", "title" : "p(pi2)", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 3},
{"variable" : "pz_daug2", "title" : "pz(pi2)", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 3},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(pi2)", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(pi2)", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : 180.0, "xmax" : 180},
{"variable" : "E_daug2", "title" : "E(nu2)", "d1" : 2, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 3},
{"variable" : "E_over_Eparent_daug2", "title" : "E(nu2)/E(tau)", "d1" : 2, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "p_daug2", "title" : "p(nu2)", "d1" : 2, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 3},
{"variable" : "pz_daug2", "title" : "pz(nu2)", "d1" : 2, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 3},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(nu2)", "d1" : 2, "d2" : 0, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(nu2)", "d1" : 2, "d2" : 0, "nbins" : 50, "xmin" : 180.0, "xmax" : 180}
],
"outfile" : "ISGW2=VVS_PWAVE=TAUSCALARNU__Bd_Dst2Staunu_Dst0pi,pinu.root",
"reference" : "RefISGW2=VVS_PWAVE=TAUSCALARNU__Bd_Dst2Staunu_Dst0pi,pinu.root"
}
diff --git a/test/jsonFiles/ISGW=VSS__Bd_Dstmunu_D0pi.json b/test/jsonFiles/ISGW=VSS__Bd_Dstmunu_D0pi.json
index 5631fca..882996a 100644
--- a/test/jsonFiles/ISGW=VSS__Bd_Dstmunu_D0pi.json
+++ b/test/jsonFiles/ISGW=VSS__Bd_Dstmunu_D0pi.json
@@ -1,37 +1,37 @@
{
"parent" : "B0",
"daughters" : ["D*-", "mu+", "nu_mu"],
"grand_daughters" : [["anti-D0", "pi-"], [], []],
"models" : ["ISGW", "VSS", ""],
"parameters" : [[], [], []],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(Dst)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.9, "xmax" : 2.1},
{"variable" : "mass", "title" : "m(Dst mu)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 1.5, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(Dst nu)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 1.5, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(mu nu)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 4.0},
{"variable" : "pSumSq", "title" : "qSq(mu nu)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "p", "title" : "p(Dst)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pSq", "title" : "pSq(Dst)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "pz", "title" : "pz(Dst)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosHel", "title" : "cosHel(Dst,mu)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(mu,nu)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(Dst)", "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},
{"variable" : "cosTheta", "title" : "cosTheta(nu)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(Dst)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 2.5},
{"variable" : "pLab_daug1", "title" : "pLab(pi)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.3},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(pi)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "ISGW=VSS__Bd_Dstmunu_D0pi.root",
"reference" : "RefISGW=VSS__Bd_Dstmunu_D0pi.root"
}
diff --git a/test/jsonFiles/KK_LAMBDAC_SL=HELAMP__Lambdac_Lambda0munu_ppi.json b/test/jsonFiles/KK_LAMBDAC_SL=HELAMP__Lambdac_Lambda0munu_ppi.json
index 24edaa1..d93a897 100644
--- a/test/jsonFiles/KK_LAMBDAC_SL=HELAMP__Lambdac_Lambda0munu_ppi.json
+++ b/test/jsonFiles/KK_LAMBDAC_SL=HELAMP__Lambdac_Lambda0munu_ppi.json
@@ -1,22 +1,22 @@
{
"parent" : "Lambda_c+",
"daughters" : ["Lambda0", "mu+", "nu_mu"],
"grand_daughters" : [["p+","pi-"], [], []],
"models" : ["KK_LAMBDAC_SL", "HELAMP", ""],
"parameters" : [["1.0", "2.0"], ["0.936", "0.0", "0.351", "0.0"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(KK_LAMBDAC_SL)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(HELAMP)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "parMass", "title" : "m(#Lambda^{+}_{c})", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 2.2, "xmax" : 2.4},
{"variable" : "mass", "title" : "m(#Lambda^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.0, "xmax" : 1.2},
{"variable" : "mass", "title" : "m(#Lambda^{0} #mu^{+})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 1.0, "xmax" : 2.5},
{"variable" : "mass", "title" : "m(#Lambda^{0} #nu_{#mu})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 1.0, "xmax" : 2.5},
{"variable" : "pSumSq", "title" : "q^{2}(#mu^{+} #nu_{#mu})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "cosHel", "title" : "cosHel(p,#Lambda^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "decayangle_daug1", "title" : "decayAngle(#Lambda^{0},p,#pi^{-})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0}
],
"outfile" : "KK_LAMBDAC_SL=HELAMP__Lambdac_Lambda0munu_ppi.root",
"reference" : "RefKK_LAMBDAC_SL=HELAMP__Lambdac_Lambda0munu_ppi.root"
}
diff --git a/test/jsonFiles/KSTARNUNU__Bd_Kstar0nunu.json b/test/jsonFiles/KSTARNUNU__Bd_Kstar0nunu.json
index e147f85..205dcac 100644
--- a/test/jsonFiles/KSTARNUNU__Bd_Kstar0nunu.json
+++ b/test/jsonFiles/KSTARNUNU__Bd_Kstar0nunu.json
@@ -1,16 +1,16 @@
{
"parent" : "B0",
"daughters" : ["K*0","nu_e","anti-nu_e"],
"models" : ["KSTARNUNU"],
"parameters" : [[]],
- "extras" : ["Define dm_incohMix_B0 0.0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0.0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "massSq", "title" : "q2", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 25.0},
{"variable" : "E", "title" : "E(nu_e)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "totE_over_Mparent", "title" : "E(nu_e + anti-nu_e)/M(B)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.4, "xmax" : 0.9}
],
"outfile" : "KSTARNUNU__Bd_Kstar0nunu.root",
"reference" : "RefKSTARNUNU__Bd_Kstar0nunu.root"
}
diff --git a/test/jsonFiles/KS_PI0MUMU__Ks_pi0mumu.json b/test/jsonFiles/KS_PI0MUMU__Ks_pi0mumu.json
index 3de0dbb..378c293 100644
--- a/test/jsonFiles/KS_PI0MUMU__Ks_pi0mumu.json
+++ b/test/jsonFiles/KS_PI0MUMU__Ks_pi0mumu.json
@@ -1,22 +1,22 @@
{
"parent" : "K_S0",
"daughters" : ["pi0", "mu+", "mu-"],
"models" : ["KS_PI0MUMU"],
"parameters" : [["1.2", "0.49", "-3.9", "0.2", "2.5"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.02},
{"variable" : "mass", "title" : "m(#pi^{0} #mu^{+})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.2, "xmax" : 0.4},
{"variable" : "mass", "title" : "m(#mu^{+} #mu^{-})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.2, "xmax" : 0.4},
{"variable" : "mass", "title" : "m(#pi^{0} #mu^{-})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.2, "xmax" : 0.4},
{"variable" : "massSq", "title" : "Dalitz m^{2}(#pi^{0} #mu^{+}) vs m^{2}(#pi^{0} #mu^{-})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.05, "xmax" : 0.16, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.05, "ymax" : 0.16},
{"variable" : "massSq", "title" : "Dalitz m^{2}(#mu^{+} #mu^{-}) vs m^{2}(#pi^{0} #mu^{+})", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : 0.03, "xmax" : 0.14, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 50, "ymin" : 0.05, "ymax" : 0.16},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel12", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel23", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel13", "d1" : 1, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "KS_PI0MUMU__Ks_pi0mumu.root",
"reference" : "RefKS_PI0MUMU__Ks_pi0mumu.root"
}
diff --git a/test/jsonFiles/LAMBDAC_PHH__Lc_pKpi.json b/test/jsonFiles/LAMBDAC_PHH__Lc_pKpi.json
index ba9a8a1..4905cc1 100644
--- a/test/jsonFiles/LAMBDAC_PHH__Lc_pKpi.json
+++ b/test/jsonFiles/LAMBDAC_PHH__Lc_pKpi.json
@@ -1,20 +1,20 @@
{
"parent" : "Lambda_c+",
"daughters" : ["p+", "K-", "pi+"],
"do_conjugate_decay" : [ true, true, true, true ],
"models" : ["LAMBDAC_PHH"],
"parameters" : [[]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 100000,
"histograms" : [
{"variable" : "mass", "title" : "mPK", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 1.4, "xmax" : 2.2},
{"variable" : "mass", "title" : "mPPi", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 1.05, "xmax" : 1.85},
{"variable" : "mass", "title" : "mKpi", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.6, "xmax" : 1.4},
{"variable" : "cosHel", "title" : "cosTheta1", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosTheta2", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosTheta3", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "massSq", "title" : "Dalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 1.9, "xmax" : 4.8, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 25, "ymin" : 1.0, "ymax" : 3.4}
],
"outfile" : "LAMBDAC_PHH__Lc_pKpi.root",
"reference" : "RefLAMBDAC_PHH__Lc_pKpi.root"
}
diff --git a/test/jsonFiles/LNUGAMMA__Bu_enugamma.json b/test/jsonFiles/LNUGAMMA__Bu_enugamma.json
index f54d8c4..ea5f0bd 100644
--- a/test/jsonFiles/LNUGAMMA__Bu_enugamma.json
+++ b/test/jsonFiles/LNUGAMMA__Bu_enugamma.json
@@ -1,26 +1,26 @@
{
"parent" : "B+",
"daughters" : ["e+", "nu_e", "gamma"],
"models" : ["LNUGAMMA"],
"parameters" : [["0.35", "3.0", "5.0", "0.0"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "parMass", "title" : "m(B^{+})", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 5.27, "xmax" : 5.29},
{"variable" : "mass", "title" : "m(e^{+},#nu_{e})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.3},
{"variable" : "pSumSq", "title" : "q^{2}(e^{+},nue)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 25.0},
{"variable" : "p", "title" : "p(e^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "phi", "title" : "phi(e^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(e^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "p", "title" : "p(#nu_{e})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "phi", "title" : "phi(#nu_{e})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(#nu_{e})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "p", "title" : "p(#gamma)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "phi", "title" : "phi(#gamma)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(#gamma)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "E", "title" : "Dalitz q^{2}(e^{+},#nu_{e}) vs E(#gamma)", "d1" : 3, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 3.0, "variableY" : "pSumSq", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 27.0}
],
"outfile" : "LNUGAMMA__Bu_enugamma.root",
"reference" : "RefLNUGAMMA__Bu_enugamma.root"
}
diff --git a/test/jsonFiles/Lb2Baryonlnu__Lb_Lc2593munu.json b/test/jsonFiles/Lb2Baryonlnu__Lb_Lc2593munu.json
index 38f9e7d..07df02c 100644
--- a/test/jsonFiles/Lb2Baryonlnu__Lb_Lc2593munu.json
+++ b/test/jsonFiles/Lb2Baryonlnu__Lb_Lc2593munu.json
@@ -1,15 +1,15 @@
{
"parent" : "Lambda_b0",
"daughters" : ["Lambda_c(2593)+", "mu-", "anti-nu_mu"],
"do_conjugate_decay" : [ true, true, true, true ],
"models" : ["Lb2Baryonlnu"],
"parameters" : [["1.0", "1.0", "1.0", "1.0"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "massSq", "title" : "q2", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 9.5},
{"variable" : "cosHel", "title" : "cosTheta", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "Lb2Baryonlnu__Lb_Lc2593munu.root",
"reference" : "RefLb2Baryonlnu__Lb_Lc2593munu.root"
}
diff --git a/test/jsonFiles/Lb2Baryonlnu__Lb_Lc2625munu.json b/test/jsonFiles/Lb2Baryonlnu__Lb_Lc2625munu.json
index 02b0abe..558a75c 100644
--- a/test/jsonFiles/Lb2Baryonlnu__Lb_Lc2625munu.json
+++ b/test/jsonFiles/Lb2Baryonlnu__Lb_Lc2625munu.json
@@ -1,15 +1,15 @@
{
"parent" : "Lambda_b0",
"daughters" : ["Lambda_c(2625)+", "mu-", "anti-nu_mu"],
"do_conjugate_decay" : [ true, true, true, true ],
"models" : ["Lb2Baryonlnu"],
"parameters" : [["1.0", "1.0", "1.0", "1.0"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "massSq", "title" : "q2", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 9.5},
{"variable" : "cosHel", "title" : "cosTheta", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "Lb2Baryonlnu__Lb_Lc2625munu.root",
"reference" : "RefLb2Baryonlnu__Lb_Lc2625munu.root"
}
diff --git a/test/jsonFiles/Lb2Baryonlnu__Lb_Lcmunu.json b/test/jsonFiles/Lb2Baryonlnu__Lb_Lcmunu.json
index 98585a2..15d5fa7 100644
--- a/test/jsonFiles/Lb2Baryonlnu__Lb_Lcmunu.json
+++ b/test/jsonFiles/Lb2Baryonlnu__Lb_Lcmunu.json
@@ -1,15 +1,15 @@
{
"parent" : "Lambda_b0",
"daughters" : ["Lambda_c+", "mu-", "anti-nu_mu"],
"do_conjugate_decay" : [ true, true, true, true ],
"models" : ["Lb2Baryonlnu"],
"parameters" : [["1.0", "1.0", "1.0", "1.0"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "massSq", "title" : "q2", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 11.5},
{"variable" : "cosHel", "title" : "cosTheta", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "Lb2Baryonlnu__Lb_Lcmunu.root",
"reference" : "RefLb2Baryonlnu__Lb_Lcmunu.root"
}
diff --git a/test/jsonFiles/Lb2Baryonlnu__Lb_pmunu.json b/test/jsonFiles/Lb2Baryonlnu__Lb_pmunu.json
index fa61ba3..e6348ac 100644
--- a/test/jsonFiles/Lb2Baryonlnu__Lb_pmunu.json
+++ b/test/jsonFiles/Lb2Baryonlnu__Lb_pmunu.json
@@ -1,15 +1,15 @@
{
"parent" : "Lambda_b0",
"daughters" : ["p+", "mu-", "anti-nu_mu"],
"do_conjugate_decay" : [ true, true, true, true ],
"models" : ["Lb2Baryonlnu"],
"parameters" : [["1.0", "1.0", "1.0", "1.0"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "massSq", "title" : "q2", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 22.0},
{"variable" : "cosHel", "title" : "cosTheta", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "Lb2Baryonlnu__Lb_pmunu.root",
"reference" : "RefLb2Baryonlnu__Lb_pmunu.root"
}
diff --git a/test/jsonFiles/Lb2plnuLCSR__Lb_pmunu.json b/test/jsonFiles/Lb2plnuLCSR__Lb_pmunu.json
index 1257d1d..1494ac0 100644
--- a/test/jsonFiles/Lb2plnuLCSR__Lb_pmunu.json
+++ b/test/jsonFiles/Lb2plnuLCSR__Lb_pmunu.json
@@ -1,15 +1,15 @@
{
"parent" : "Lambda_b0",
"daughters" : ["p+", "mu-", "anti-nu_mu"],
"do_conjugate_decay" : [ true, true, true, true ],
"models" : ["Lb2plnuLCSR"],
"parameters" : [["1.0", "1.0", "1.0", "1.0"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "massSq", "title" : "q2", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 22.0},
{"variable" : "cosHel", "title" : "cosTheta", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "Lb2plnuLCSR__Lb_pmunu.root",
"reference" : "RefLb2plnuLCSR__Lb_pmunu.root"
}
diff --git a/test/jsonFiles/Lb2plnuLQCD__Lb_pmunu.json b/test/jsonFiles/Lb2plnuLQCD__Lb_pmunu.json
index 6584538..e5a89b5 100644
--- a/test/jsonFiles/Lb2plnuLQCD__Lb_pmunu.json
+++ b/test/jsonFiles/Lb2plnuLQCD__Lb_pmunu.json
@@ -1,15 +1,15 @@
{
"parent" : "Lambda_b0",
"daughters" : ["p+", "mu-", "anti-nu_mu"],
"do_conjugate_decay" : [ true, true, true, true ],
"models" : ["Lb2plnuLQCD"],
"parameters" : [["1.0", "1.0", "1.0", "1.0"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "massSq", "title" : "q2", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 22.0},
{"variable" : "cosHel", "title" : "cosTheta", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "Lb2plnuLQCD__Lb_pmunu.root",
"reference" : "RefLb2plnuLQCD__Lb_pmunu.root"
}
diff --git a/test/jsonFiles/MELIKHOV=VSS__Bd_rhomunu_pipi0.json b/test/jsonFiles/MELIKHOV=VSS__Bd_rhomunu_pipi0.json
index 4db503a..f361eaa 100644
--- a/test/jsonFiles/MELIKHOV=VSS__Bd_rhomunu_pipi0.json
+++ b/test/jsonFiles/MELIKHOV=VSS__Bd_rhomunu_pipi0.json
@@ -1,37 +1,37 @@
{
"parent" : "B0",
"daughters" : ["rho-", "mu+", "nu_mu"],
"grand_daughters" : [["pi-", "pi0"], [], []],
"models" : ["MELIKHOV", "VSS", ""],
"parameters" : [["1"], [], []],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(MELIKHOV)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "M(#rho)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.4, "xmax" : 1.5},
{"variable" : "mass", "title" : "M(#rho#mu)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 1.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "M(#rho#nu)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 1.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "M(#mu#nu)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "pSumSq", "title" : "q^{2}(#mu#nu)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "p", "title" : "p(#rho)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(#rho)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosHel", "title" : "cosHel(#rho,#mu)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(#mu#nu)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(#pi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(#rho)", "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},
{"variable" : "cosTheta", "title" : "cosTheta(#nu)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(#rho)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(#pi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pLab_daug1", "title" : "pLab(#pi^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#pi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#pi^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#pi^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "MELIKHOV=VSS__Bd_rhomunu_pipi0.root",
"reference" : "RefMELIKHOV=VSS__Bd_rhomunu_pipi0.root"
}
diff --git a/test/jsonFiles/OMEGA_DALITZ__omega_pipipi0.json b/test/jsonFiles/OMEGA_DALITZ__omega_pipipi0.json
index 323df81..cd22562 100644
--- a/test/jsonFiles/OMEGA_DALITZ__omega_pipipi0.json
+++ b/test/jsonFiles/OMEGA_DALITZ__omega_pipipi0.json
@@ -1,22 +1,22 @@
{
"parent" : "omega",
"daughters" : ["pi+", "pi-", "pi0"],
"models" : ["OMEGA_DALITZ"],
"parameters" : [[]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(#pi^{+} #pi^{-})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.25, "xmax" : 0.75},
{"variable" : "mass", "title" : "m(#pi^{+} #pi^{0})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.25, "xmax" : 0.75},
{"variable" : "mass", "title" : "m(#pi^{-} #pi^{0})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.25, "xmax" : 0.75},
{"variable" : "massSq", "title" : "Dalitz m^{2}(#pi^{+} #pi^{-}) vs m^{2}(#pi^{+} #pi^{0})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.05, "xmax" : 0.55, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.05, "ymax" : 0.55},
{"variable" : "massSq", "title" : "Dalitz m^{2}(#pi^{-} #pi^{0}) vs m^{2}(#pi^{+} #pi^{-})", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : 0.05, "xmax" : 0.55, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 50, "ymin" : 0.05, "ymax" : 0.55},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel12", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel23", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel13", "d1" : 1, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "OMEGA_DALITZ__omega_pipipi0.root",
"reference" : "RefOMEGA_DALITZ__omega_pipipi0.root"
}
diff --git a/test/jsonFiles/PARTWAVE=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu_pWave.json b/test/jsonFiles/PARTWAVE=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu_pWave.json
index d7702de..1bb97c5 100644
--- a/test/jsonFiles/PARTWAVE=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu_pWave.json
+++ b/test/jsonFiles/PARTWAVE=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu_pWave.json
@@ -1,53 +1,53 @@
{
"parent" : "B0",
"daughters" : ["tau+", "tau-"],
"grand_daughters" : [["pi+", "anti-nu_tau"], ["pi-", "nu_tau"]],
"models" : ["PARTWAVE", "TAUSCALARNU", "TAUSCALARNU"],
"parameters" : [["0", "0", "1", "0"], [], []],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 100000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "mass", "title" : "m(tau+tau-)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 5.1, "xmax" : 5.4},
{"variable" : "pSumSq", "title" : "qSq(tau+tau-)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 25.0, "xmax" : 30.0},
{"variable" : "p", "title" : "p(tau+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.5, "xmax" : 2.5},
{"variable" : "pSq", "title" : "pSq(tau+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 3.5, "xmax" : 4.5},
{"variable" : "pz", "title" : "pz(tau+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosTheta", "title" : "cosTheta(tau+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(tau-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau", "title" : "cosHelTau1(pi+)", "d1" : 1, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau", "title" : "cosHelTau2(pi-)", "d1" : 2, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau_over05", "title" : "cosHelTau1(pi+)", "d1" : 1, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau_over05", "title" : "cosHelTau2(pi-)", "d1" : 2, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau_under05", "title" : "cosHelTau1(pi+)", "d1" : 1, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau_under05", "title" : "cosHelTau2(pi-)", "d1" : 2, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 180.0},
{"variable" : "E_daug1", "title" : "E(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "E_over_Eparent_daug1", "title" : "E(pi+)/E(tau+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pLab_daug1", "title" : "pLab(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "pzLab_daug1", "title" : "pzLab(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "E_daug1", "title" : "E(nubar)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "E_over_Eparent_daug1", "title" : "E(nubar)/E(tau+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pLab_daug1", "title" : "pLab(nubar)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "pzLab_daug1", "title" : "pzLab(nubar)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(nubar)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(nubar)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "E_daug2", "title" : "E(pi-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "E_over_Eparent_daug2", "title" : "E(pi-)/E(tau+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pLab_daug2", "title" : "pLab(pi-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "pzLab_daug2", "title" : "pzLab(pi-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(pi-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(pi-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "E_daug2", "title" : "E(nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "E_over_Eparent_daug2", "title" : "E(nu)/E(tau+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pLab_daug2", "title" : "pLab(nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "pzLab_daug2", "title" : "pzLab(nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180}
],
"outfile" : "PARTWAVE=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu_pWave.root",
"reference" : "RefPARTWAVE=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu_pWave.root"
}
diff --git a/test/jsonFiles/PARTWAVE=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu_sWave.json b/test/jsonFiles/PARTWAVE=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu_sWave.json
index 93a483c..818eaf7 100644
--- a/test/jsonFiles/PARTWAVE=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu_sWave.json
+++ b/test/jsonFiles/PARTWAVE=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu_sWave.json
@@ -1,53 +1,53 @@
{
"parent" : "B0",
"daughters" : ["tau+", "tau-"],
"grand_daughters" : [["pi+", "anti-nu_tau"], ["pi-", "nu_tau"]],
"models" : ["PARTWAVE", "TAUSCALARNU", "TAUSCALARNU"],
"parameters" : [["1", "0", "0", "0"], [], []],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 100000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "mass", "title" : "m(tau+tau-)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 5.1, "xmax" : 5.4},
{"variable" : "pSumSq", "title" : "qSq(tau+tau-)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 25.0, "xmax" : 30.0},
{"variable" : "p", "title" : "p(tau+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.5, "xmax" : 2.5},
{"variable" : "pSq", "title" : "pSq(tau+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 3.5, "xmax" : 4.5},
{"variable" : "pz", "title" : "pz(tau+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosTheta", "title" : "cosTheta(tau+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(tau-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau", "title" : "cosHelTau1(pi+)", "d1" : 1, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau", "title" : "cosHelTau2(pi-)", "d1" : 2, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau_over05", "title" : "cosHelTau1(pi+)", "d1" : 1, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau_over05", "title" : "cosHelTau2(pi-)", "d1" : 2, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau_under05", "title" : "cosHelTau1(pi+)", "d1" : 1, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau_under05", "title" : "cosHelTau2(pi-)", "d1" : 2, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 180.0},
{"variable" : "E_daug1", "title" : "E(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "E_over_Eparent_daug1", "title" : "E(pi+)/E(tau+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pLab_daug1", "title" : "pLab(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "pzLab_daug1", "title" : "pzLab(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "E_daug1", "title" : "E(nubar)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "E_over_Eparent_daug1", "title" : "E(nubar)/E(tau+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pLab_daug1", "title" : "pLab(nubar)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "pzLab_daug1", "title" : "pzLab(nubar)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(nubar)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(nubar)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "E_daug2", "title" : "E(pi-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "E_over_Eparent_daug2", "title" : "E(pi-)/E(tau+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pLab_daug2", "title" : "pLab(pi-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "pzLab_daug2", "title" : "pzLab(pi-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(pi-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(pi-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "E_daug2", "title" : "E(nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "E_over_Eparent_daug2", "title" : "E(nu)/E(tau+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pLab_daug2", "title" : "pLab(nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "pzLab_daug2", "title" : "pzLab(nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180}
],
"outfile" : "PARTWAVE=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu_sWave.root",
"reference" : "RefPARTWAVE=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu_sWave.root"
}
diff --git a/test/jsonFiles/PARTWAVE=VSS=VSS__Bd_DstarDstar_D0pi,D0pi.json b/test/jsonFiles/PARTWAVE=VSS=VSS__Bd_DstarDstar_D0pi,D0pi.json
index 5f9b366..8aeb7e5 100644
--- a/test/jsonFiles/PARTWAVE=VSS=VSS__Bd_DstarDstar_D0pi,D0pi.json
+++ b/test/jsonFiles/PARTWAVE=VSS=VSS__Bd_DstarDstar_D0pi,D0pi.json
@@ -1,46 +1,46 @@
{
"parent" : "B0",
"daughters" : ["D*+", "D*-"],
"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", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(PARTWAVE,B)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(VSS,D*+)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug2", "title" : "Prob(VSS,D*-)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.1},
{"variable" : "parMass", "title" : "m(B0)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 5.27, "xmax" : 5.29},
{"variable" : "mass", "title" : "m(D*+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.95, "xmax" : 2.05},
{"variable" : "mass", "title" : "m(D*-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.95, "xmax" : 2.05},
{"variable" : "mass_daug1", "title" : "m(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.85, "xmax" : 1.9},
{"variable" : "mass_daug1", "title" : "m(pi+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.13, "xmax" : 0.15},
{"variable" : "mass_daug2", "title" : "m(D0bar)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.85, "xmax" : 1.9},
{"variable" : "mass_daug2", "title" : "m(pi-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.13, "xmax" : 0.15},
{"variable" : "cosHel", "title" : "cosHel(D0,D*+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(D0bar,D*-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 180.0},
{"variable" : "decayangle", "title" : "decayAngle(D*+,D*-)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0},
{"variable" : "decayangle_daug1", "title" : "decayAngle(D0,pi+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0},
{"variable" : "decayangle_daug2", "title" : "decayAngle(D0bar,pi-)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(D*+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(D*-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(D0bar)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(pi-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi_daug1", "title" : "phi(pi+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi_daug2", "title" : "phi(D0bar)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi_daug2", "title" : "phi(pi-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "p", "title" : "p(D*+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.65, "xmax" : 1.75},
{"variable" : "p", "title" : "p(D*-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.65, "xmax" : 1.75},
{"variable" : "p_daug1", "title" : "p(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.1},
{"variable" : "p_daug1", "title" : "p(pi+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.1},
{"variable" : "p_daug2", "title" : "p(D0bar)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.1},
{"variable" : "p_daug2", "title" : "p(pi-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.1}
],
"outfile" : "PARTWAVE=VSS=VSS__Bd_DstarDstar_D0pi,D0pi.root",
"reference" : "RefPARTWAVE=VSS=VSS__Bd_DstarDstar_D0pi,D0pi.root"
}
diff --git a/test/jsonFiles/PHI_DALITZ__phi_pipipi0.json b/test/jsonFiles/PHI_DALITZ__phi_pipipi0.json
index 70f7a6e..39b1391 100644
--- a/test/jsonFiles/PHI_DALITZ__phi_pipipi0.json
+++ b/test/jsonFiles/PHI_DALITZ__phi_pipipi0.json
@@ -1,28 +1,28 @@
{
"parent" : "phi",
"daughters" : ["pi+", "pi-", "pi0"],
"models" : ["PHI_DALITZ"],
"parameters" : [[]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(#pi^{+} #pi^{-})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.2, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(#pi^{+} #pi^{0})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.2, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(#pi^{-} #pi^{0})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.2, "xmax" : 1.0},
{"variable" : "massSq", "title" : "Dalitz m^{2}(#pi^{+} #pi^{-}) vs m^{2}(#pi^{+} #pi^{0})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 0.8, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 0.8},
{"variable" : "massSq", "title" : "Dalitz m^{2}(#pi^{-} #pi^{0}) vs m^{2}(#pi^{+} #pi^{-})", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : 0.0, "xmax" : 0.8, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 0.8},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel12", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel23", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel13", "d1" : 1, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta1", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta2", "d1" : 2, "d2" : 0, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta3", "d1" : 3, "d2" : 0, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi1", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi2", "d1" : 2, "d2" : 0, "nbins" : 50, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi3", "d1" : 3, "d2" : 0, "nbins" : 50, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "PHI_DALITZ__phi_pipipi0.root",
"reference" : "RefPHI_DALITZ__phi_pipipi0.root"
}
diff --git a/test/jsonFiles/PHSP=PHSP=TAUSCALARNU__Bu_D0taunu_Kpi,pinu.json b/test/jsonFiles/PHSP=PHSP=TAUSCALARNU__Bu_D0taunu_Kpi,pinu.json
index 843fe50..dd4aeb1 100644
--- a/test/jsonFiles/PHSP=PHSP=TAUSCALARNU__Bu_D0taunu_Kpi,pinu.json
+++ b/test/jsonFiles/PHSP=PHSP=TAUSCALARNU__Bu_D0taunu_Kpi,pinu.json
@@ -1,52 +1,52 @@
{
"parent" : "B+",
"daughters" : ["anti-D0", "tau+", "nu_tau"],
"grand_daughters" : [["K+", "pi-"], ["pi+", "anti-nu_tau"], []],
"models" : ["PHSP", "PHSP", "TAUSCALARNU"],
"parameters" : [[], [], []],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 100000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(D0 tau)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 3.0, "xmax" : 6.0},
{"variable" : "pSumSq", "title" : "qSq(tau nu)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 3.0, "xmax" : 15.0},
{"variable" : "p", "title" : "p(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "pSq", "title" : "pSq(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 4.0},
{"variable" : "pz", "title" : "pz(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.0, "xmax" : 2.0},
{"variable" : "cosHel", "title" : "cosHel(tau,D0)", "d1" : 2, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(tau)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(pi2)", "d1" : 2, "d2" : 1, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(nu2)", "d1" : 2, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau", "title" : "cosHel(K)", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(K+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(tau)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "pLab_daug1", "title" : "pLab(K+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(K+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(K+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "pLab_daug1", "title" : "pLab(pi1)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi1)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(pi1)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "pLab_daug2", "title" : "pLab(pi2)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(pi2)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(pi2)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "pLab_daug2", "title" : "pLab(nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "E", "title" : "Energy(D0)", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 3},
{"variable" : "E_over_Eparent", "title" : "E(D0)/E(B)", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "E_daug2", "title" : "E(pi2)", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 3},
{"variable" : "E_over_Eparent_daug2", "title" : "E(pi2)/E(tau)", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "p_daug2", "title" : "p(pi2)", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 3},
{"variable" : "pz_daug2", "title" : "pz(pi2)", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 3},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(pi2)", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(pi1)", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 180.0, "xmax" : 180},
{"variable" : "E_daug2", "title" : "E(nu)", "d1" : 2, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 3},
{"variable" : "E_over_Eparent_daug2", "title" : "E(nu2)/E(tau)", "d1" : 2, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "p_daug2", "title" : "p(nu2)", "d1" : 2, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 3},
{"variable" : "pz_daug2", "title" : "pz(nu2)", "d1" : 2, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 3},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(nu2)", "d1" : 2, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(nu2)", "d1" : 2, "d2" : 2, "nbins" : 50, "xmin" : 180.0, "xmax" : 180}
],
"outfile" : "PHSP=PHSP=TAUSCALARNU__Bu_D0taunu_Kpi,pinu.root",
"reference" : "RefPHSP=PHSP=TAUSCALARNU__Bu_D0taunu_Kpi,pinu.root"
}
diff --git a/test/jsonFiles/PHSP=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu.json b/test/jsonFiles/PHSP=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu.json
index 90537aa..7adfbbb 100644
--- a/test/jsonFiles/PHSP=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu.json
+++ b/test/jsonFiles/PHSP=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu.json
@@ -1,53 +1,53 @@
{
"parent" : "B0",
"daughters" : ["tau+", "tau-"],
"grand_daughters" : [["pi+", "anti-nu_tau"], ["pi-", "nu_tau"]],
"models" : ["PHSP", "TAUSCALARNU", "TAUSCALARNU"],
"parameters" : [[], [], []],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "mass", "title" : "m(tau+tau-)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 5.1, "xmax" : 5.4},
{"variable" : "pSumSq", "title" : "qSq(tau+tau-)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 25.0, "xmax" : 30.0},
{"variable" : "p", "title" : "p(tau+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.5, "xmax" : 2.5},
{"variable" : "pSq", "title" : "pSq(tau+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 3.5, "xmax" : 4.5},
{"variable" : "pz", "title" : "pz(tau+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosTheta", "title" : "cosTheta(tau+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(tau-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau", "title" : "cosHelTau1(pi+)", "d1" : 1, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau", "title" : "cosHelTau2(pi-)", "d1" : 2, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau_over05", "title" : "cosHelTau1(pi+)", "d1" : 1, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau_over05", "title" : "cosHelTau2(pi-)", "d1" : 2, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau_under05", "title" : "cosHelTau1(pi+)", "d1" : 1, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau_under05", "title" : "cosHelTau2(pi-)", "d1" : 2, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 180.0},
{"variable" : "E_daug1", "title" : "E(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "E_over_Eparent_daug1", "title" : "E(pi+)/E(tau+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pLab_daug1", "title" : "pLab(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "pzLab_daug1", "title" : "pzLab(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "E_daug1", "title" : "E(nubar)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "E_over_Eparent_daug1", "title" : "E(nubar)/E(tau+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pLab_daug1", "title" : "pLab(nubar)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "pzLab_daug1", "title" : "pzLab(nubar)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(nubar)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(nubar)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "E_daug2", "title" : "E(pi-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "E_over_Eparent_daug2", "title" : "E(pi-)/E(tau+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pLab_daug2", "title" : "pLab(pi-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "pzLab_daug2", "title" : "pzLab(pi-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(pi-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(pi-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "E_daug2", "title" : "E(nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "E_over_Eparent_daug2", "title" : "E(nu)/E(tau+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pLab_daug2", "title" : "pLab(nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "pzLab_daug2", "title" : "pzLab(nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180}
],
"outfile" : "PHSP=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu.root",
"reference" : "RefPHSP=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu.root"
}
diff --git a/test/jsonFiles/PHSP=VSS=TAUSCALARNU__Bd_Dsttaunu_D0pi,pinu.json b/test/jsonFiles/PHSP=VSS=TAUSCALARNU__Bd_Dsttaunu_D0pi,pinu.json
index 8a24bcf..13d65f7 100644
--- a/test/jsonFiles/PHSP=VSS=TAUSCALARNU__Bd_Dsttaunu_D0pi,pinu.json
+++ b/test/jsonFiles/PHSP=VSS=TAUSCALARNU__Bd_Dsttaunu_D0pi,pinu.json
@@ -1,38 +1,38 @@
{
"parent" : "B0",
"daughters" : ["D*-", "tau+", "nu_tau"],
"grand_daughters" : [["anti-D0", "pi-"], ["pi+", "anti-nu_tau"], []],
"models" : ["PHSP", "VSS", "TAUSCALARNU"],
"parameters" : [[], [], []],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 100000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(Dst tau)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 3.0, "xmax" : 6.0},
{"variable" : "pSumSq", "title" : "qSq(tau nu)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 3.0, "xmax" : 12.0},
{"variable" : "p", "title" : "p(Dst)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "pSq", "title" : "pSq(Dst)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 4.0},
{"variable" : "pz", "title" : "pz(Dst)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.0, "xmax" : 2.0},
{"variable" : "cosHel", "title" : "cosHel(tau,Dst)", "d1" : 2, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(tau)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau", "title" : "cosHel(Dst)", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(nu2)", "d1" : 2, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(pi2)", "d1" : 2, "d2" : 1, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(tau)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "pLab_daug1", "title" : "pLab(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "pLab_daug1", "title" : "pLab(pi1)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.2},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi1)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(pi1)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "pLab_daug2", "title" : "pLab(pi2)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(pi2)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(pi2)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "pLab_daug2", "title" : "pLab(nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180}
],
"outfile" : "PHSP=VSS=TAUSCALARNU__Bd_Dsttaunu_D0pi,pinu.root",
"reference" : "RefPHSP=VSS=TAUSCALARNU__Bd_Dsttaunu_D0pi,pinu.root"
}
diff --git a/test/jsonFiles/PHSPDECAYTIMECUT__Bu_JpsiK+.json b/test/jsonFiles/PHSPDECAYTIMECUT__Bu_JpsiK+.json
index d93e057..e4742e9 100644
--- a/test/jsonFiles/PHSPDECAYTIMECUT__Bu_JpsiK+.json
+++ b/test/jsonFiles/PHSPDECAYTIMECUT__Bu_JpsiK+.json
@@ -1,14 +1,14 @@
{
"parent" : "B+",
"daughters" : ["J/psi", "K+"],
"do_conjugate_decay" : [ true, false, true ],
"models" : ["PHSPDECAYTIMECUT"],
"parameters" : [["0.4"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "lifetime", "title" : "tau", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 10.0}
],
"outfile" : "PHSPDECAYTIMECUT__Bu_JpsiK+.root",
"reference" : "RefPHSPDECAYTIMECUT__Bu_JpsiK+.root"
}
diff --git a/test/jsonFiles/PHSPFLATLIFETIME__Bu_JpsiKpi0.json b/test/jsonFiles/PHSPFLATLIFETIME__Bu_JpsiKpi0.json
index d6874a6..07da5cf 100644
--- a/test/jsonFiles/PHSPFLATLIFETIME__Bu_JpsiKpi0.json
+++ b/test/jsonFiles/PHSPFLATLIFETIME__Bu_JpsiKpi0.json
@@ -1,21 +1,21 @@
{
"parent" : "B+",
"daughters" : ["J/psi", "K+", "pi0"],
"do_conjugate_decay" : [ true, false, true, false ],
"models" : ["PHSPFLATLIFETIME"],
"parameters" : [["5.0"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 20000,
"histograms" : [
{"variable" : "lifetime", "title" : "tau", "d1" : 0, "d2" : 0, "nbins" : 110, "xmin" : 0.0, "xmax" : 5.5},
{"variable" : "mass", "title" : "mKPi", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.6, "xmax" : 2.25},
{"variable" : "mass", "title" : "mJpsiPi", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 3.2, "xmax" : 4.8},
{"variable" : "mass", "title" : "mJpsiK", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 3.5, "xmax" : 5.2},
{"variable" : "cosHel", "title" : "cosTheta1", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosTheta2", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosTheta3", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "massSq", "title" : "dalitz", "d1" : 2, "d2" : 3, "nbins" : 25, "xmin" : 0.30, "xmax" : 5.30, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 25, "ymin" : 10.2, "ymax" : 23.2}
],
"outfile" : "PHSPFLATLIFETIME__Bu_JpsiKpi0.root",
"reference" : "RefPHSPFLATLIFETIME__Bu_JpsiKpi0.root"
}
diff --git a/test/jsonFiles/PHSP__Bd_KKpipi_yesPhotos.json b/test/jsonFiles/PHSP__Bd_KKpipi_yesFSR.json
similarity index 95%
rename from test/jsonFiles/PHSP__Bd_KKpipi_yesPhotos.json
rename to test/jsonFiles/PHSP__Bd_KKpipi_yesFSR.json
index 17148ce..3875c0b 100644
--- a/test/jsonFiles/PHSP__Bd_KKpipi_yesPhotos.json
+++ b/test/jsonFiles/PHSP__Bd_KKpipi_yesFSR.json
@@ -1,33 +1,33 @@
{
"parent" : "B0",
"daughters" : ["K+", "K-", "pi+", "pi-"],
"models" : ["PHSP"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
- "extras" : ["yesPhotos"],
+ "extras" : ["yesFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.5 },
{"variable" : "nFSRPhotons", "title" : "nFSRPhotons", "d1" : 0, "d2" : 0, "nbins" : 10, "xmin" : 0, "xmax" : 10.0 },
{"variable" : "totalFSREnergy", "title" : "totalFSREnergy", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.0 },
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma) cut off", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 0.5e-6},
{"variable" : "cosTheta_FSRPhotons", "title" : "FSR cosTheta/#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"variable" : "cosTheta_EnergyWeight_FSRPhotons", "title" : "FSR cosTheta(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_EnergyWeight_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"variable" : "parMass", "title" : "m(B^{0})", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 3.0967, "xmax" : 3.09695},
{"variable" : "mass", "title" : "m(K^{+}K^{-})", "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(K^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "E", "title" : "E(K^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "pz", "title" : "p_{z}(K^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.6, "xmax" : 1.6},
{"variable" : "pz", "title" : "p_{z}(K^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.6, "xmax" : 1.6},
{"variable" : "pLab", "title" : "pLab(K^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "pLab", "title" : "pLab(K^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "cosTheta", "title" : "cosTheta(K^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(K^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
- "outfile" : "PHSP__Bd_KKpipi_yesPhotos.root",
- "reference" : "RefPHSP__Bd_KKpipi_yesPhotos.root"
+ "outfile" : "PHSP__Bd_KKpipi_yesFSR.root",
+ "reference" : "RefPHSP__Bd_KKpipi_yesFSR.root"
}
diff --git a/test/jsonFiles/PHSP__Bd_pipipipi.json b/test/jsonFiles/PHSP__Bd_pipipipi.json
index 894d01f..fc5e302 100644
--- a/test/jsonFiles/PHSP__Bd_pipipipi.json
+++ b/test/jsonFiles/PHSP__Bd_pipipipi.json
@@ -1,39 +1,39 @@
{
"parent" : "B0",
"daughters" : ["pi+", "pi-", "pi+", "pi-"],
"models" : ["PHSP"],
"parameters" : [[]],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "mass", "title" : "m(pi1+pi1-)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.1, "xmax" : 5.0},
{"variable" : "mass", "title" : "m(pi1+pi2+)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "mass", "title" : "m(pi1- pi2+)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "mass", "title" : "m(pi2+ pi2-)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "pSumSq", "title" : "qSq(pi1+pi1-)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 25.0},
{"variable" : "pSumSq", "title" : "qSq(pi2+pi2-)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.0, "xmax" : 25.0},
{"variable" : "p", "title" : "p(pi1+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(pi1+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(pi1-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(pi1-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(pi2+)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(pi2+)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(pi2-)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(pi2-)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(pi1+,pi1-)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(pi2+,pi2-)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(pi1-,pi2+)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(pi1+,pi2+)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(pi1+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(pi1-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(pi2+)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(pi2-)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(pi1+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "phi", "title" : "phi(pi1-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "phi", "title" : "phi(pi2+)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "phi", "title" : "phi(pi2-)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180}
],
"outfile" : "PHSP__Bd_pipipipi.root",
"reference" : "RefPHSP__Bd_pipipipi.root"
}
diff --git a/test/jsonFiles/PHSP__Bu_Kpi0_yesPhotos.json b/test/jsonFiles/PHSP__Bu_Kpi0_yesFSR.json
similarity index 95%
rename from test/jsonFiles/PHSP__Bu_Kpi0_yesPhotos.json
rename to test/jsonFiles/PHSP__Bu_Kpi0_yesFSR.json
index 0e24d92..d2fd1da 100644
--- a/test/jsonFiles/PHSP__Bu_Kpi0_yesPhotos.json
+++ b/test/jsonFiles/PHSP__Bu_Kpi0_yesFSR.json
@@ -1,33 +1,33 @@
{
"parent" : "B+",
"daughters" : ["K+", "pi0"],
"models" : ["PHSP"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
- "extras" : ["yesPhotos"],
+ "extras" : ["yesFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.5 },
{"variable" : "nFSRPhotons", "title" : "nFSRPhotons", "d1" : 0, "d2" : 0, "nbins" : 10, "xmin" : 0, "xmax" : 10.0 },
{"variable" : "totalFSREnergy", "title" : "totalFSREnergy", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.0 },
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma) cut off", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 0.5e-6},
{"variable" : "cosTheta_FSRPhotons", "title" : "FSR cosTheta/#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"variable" : "cosTheta_EnergyWeight_FSRPhotons", "title" : "FSR cosTheta(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_EnergyWeight_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"variable" : "parMass", "title" : "m(B^{+})", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 3.0967, "xmax" : 3.09695},
{"variable" : "mass", "title" : "m(K^{+}#pi^{-})", "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(K^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "E", "title" : "E(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "pz", "title" : "p_{z}(K^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.6, "xmax" : 1.6},
{"variable" : "pz", "title" : "p_{z}(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.6, "xmax" : 1.6},
{"variable" : "pLab", "title" : "pLab(K^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "pLab", "title" : "pLab(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "cosTheta", "title" : "cosTheta(K^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
- "outfile" : "PHSP__Bu_Kpi0_yesPhotos.root",
- "reference" : "RefPHSP__Bu_Kpi0_yesPhotos.root"
+ "outfile" : "PHSP__Bu_Kpi0_yesFSR.root",
+ "reference" : "RefPHSP__Bu_Kpi0_yesFSR.root"
}
diff --git a/test/jsonFiles/PHSP__D0_KK_yesPhotos.json b/test/jsonFiles/PHSP__D0_KK_yesFSR.json
similarity index 95%
rename from test/jsonFiles/PHSP__D0_KK_yesPhotos.json
rename to test/jsonFiles/PHSP__D0_KK_yesFSR.json
index 9fb1ef0..a1cda7a 100644
--- a/test/jsonFiles/PHSP__D0_KK_yesPhotos.json
+++ b/test/jsonFiles/PHSP__D0_KK_yesFSR.json
@@ -1,33 +1,33 @@
{
"parent" : "D0",
"daughters" : ["K+", "K-"],
"models" : ["PHSP"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
- "extras" : ["yesPhotos"],
+ "extras" : ["yesFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.5 },
{"variable" : "nFSRPhotons", "title" : "nFSRPhotons", "d1" : 0, "d2" : 0, "nbins" : 10, "xmin" : 0, "xmax" : 10.0 },
{"variable" : "totalFSREnergy", "title" : "totalFSREnergy", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 0.8 },
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.8},
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma) cut off", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 0.5e-6},
{"variable" : "cosTheta_FSRPhotons", "title" : "FSR cosTheta/#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"variable" : "cosTheta_EnergyWeight_FSRPhotons", "title" : "FSR cosTheta(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_EnergyWeight_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"variable" : "parMass", "title" : "m(D^{0})", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 3.0967, "xmax" : 3.09695},
{"variable" : "mass", "title" : "m(K^{+}K^{-})", "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(K^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "E", "title" : "E(K^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "pz", "title" : "p_{z}(K^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.6, "xmax" : 1.6},
{"variable" : "pz", "title" : "p_{z}(K^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.6, "xmax" : 1.6},
{"variable" : "pLab", "title" : "pLab(K^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "pLab", "title" : "pLab(K^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "cosTheta", "title" : "cosTheta(K^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(K^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
- "outfile" : "PHSP__D0_KK_yesPhotos.root",
- "reference" : "RefPHSP__D0_KK_yesPhotos.root"
+ "outfile" : "PHSP__D0_KK_yesFSR.root",
+ "reference" : "RefPHSP__D0_KK_yesFSR.root"
}
diff --git a/test/jsonFiles/PHSP__D0_Kpi_yesPhotos.json b/test/jsonFiles/PHSP__D0_Kpi_yesFSR.json
similarity index 95%
rename from test/jsonFiles/PHSP__D0_Kpi_yesPhotos.json
rename to test/jsonFiles/PHSP__D0_Kpi_yesFSR.json
index ab5d1dc..3864cf3 100644
--- a/test/jsonFiles/PHSP__D0_Kpi_yesPhotos.json
+++ b/test/jsonFiles/PHSP__D0_Kpi_yesFSR.json
@@ -1,33 +1,33 @@
{
"parent" : "D0",
"daughters" : ["K-", "pi+"],
"models" : ["PHSP"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
- "extras" : ["yesPhotos"],
+ "extras" : ["yesFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.5 },
{"variable" : "nFSRPhotons", "title" : "nFSRPhotons", "d1" : 0, "d2" : 0, "nbins" : 10, "xmin" : 0, "xmax" : 10.0 },
{"variable" : "totalFSREnergy", "title" : "totalFSREnergy", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 0.8 },
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.8},
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma) cut off", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 0.5e-6},
{"variable" : "cosTheta_FSRPhotons", "title" : "FSR cosTheta/#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"variable" : "cosTheta_EnergyWeight_FSRPhotons", "title" : "FSR cosTheta(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_EnergyWeight_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"variable" : "parMass", "title" : "m(D^{0})", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 3.0967, "xmax" : 3.09695},
{"variable" : "mass", "title" : "m(K^{-}#pi^{+})", "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(K^{-})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "E", "title" : "E(#pi^{+})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "pz", "title" : "p_{z}(K^{-})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.6, "xmax" : 1.6},
{"variable" : "pz", "title" : "p_{z}(#pi^{+})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.6, "xmax" : 1.6},
{"variable" : "pLab", "title" : "pLab(K^{-})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "pLab", "title" : "pLab(#pi^{+})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "cosTheta", "title" : "cosTheta(K^{-})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#pi^{+})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
- "outfile" : "PHSP__D0_Kpi_yesPhotos.root",
- "reference" : "RefPHSP__D0_Kpi_yesPhotos.root"
+ "outfile" : "PHSP__D0_Kpi_yesFSR.root",
+ "reference" : "RefPHSP__D0_Kpi_yesFSR.root"
}
diff --git a/test/jsonFiles/PHSP__D0_pipi_yesPhotos.json b/test/jsonFiles/PHSP__D0_pipi_yesFSR.json
similarity index 95%
rename from test/jsonFiles/PHSP__D0_pipi_yesPhotos.json
rename to test/jsonFiles/PHSP__D0_pipi_yesFSR.json
index a4ae339..8ce7faf 100644
--- a/test/jsonFiles/PHSP__D0_pipi_yesPhotos.json
+++ b/test/jsonFiles/PHSP__D0_pipi_yesFSR.json
@@ -1,33 +1,33 @@
{
"parent" : "D0",
"daughters" : ["pi+", "pi-"],
"models" : ["PHSP"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
- "extras" : ["yesPhotos"],
+ "extras" : ["yesFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.5 },
{"variable" : "nFSRPhotons", "title" : "nFSRPhotons", "d1" : 0, "d2" : 0, "nbins" : 10, "xmin" : 0, "xmax" : 10.0 },
{"variable" : "totalFSREnergy", "title" : "totalFSREnergy", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 0.8 },
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.8},
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma) cut off", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 0.5e-6},
{"variable" : "cosTheta_FSRPhotons", "title" : "FSR cosTheta/#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"variable" : "cosTheta_EnergyWeight_FSRPhotons", "title" : "FSR cosTheta(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_EnergyWeight_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"variable" : "parMass", "title" : "m(D^{0})", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 3.0967, "xmax" : 3.09695},
{"variable" : "mass", "title" : "m(#pi^{+}#pi^{-})", "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(#pi^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "E", "title" : "E(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "pz", "title" : "p_{z}(#pi^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.6, "xmax" : 1.6},
{"variable" : "pz", "title" : "p_{z}(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.6, "xmax" : 1.6},
{"variable" : "pLab", "title" : "pLab(#pi^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "pLab", "title" : "pLab(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "cosTheta", "title" : "cosTheta(#pi^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
- "outfile" : "PHSP__D0_pipi_yesPhotos.root",
- "reference" : "RefPHSP__D0_pipi_yesPhotos.root"
+ "outfile" : "PHSP__D0_pipi_yesFSR.root",
+ "reference" : "RefPHSP__D0_pipi_yesFSR.root"
}
diff --git a/test/jsonFiles/PHSP__Lambda0_ppi_yesPhotos.json b/test/jsonFiles/PHSP__Lambda0_ppi_yesFSR.json
similarity index 95%
rename from test/jsonFiles/PHSP__Lambda0_ppi_yesPhotos.json
rename to test/jsonFiles/PHSP__Lambda0_ppi_yesFSR.json
index 99ecd64..8275858 100644
--- a/test/jsonFiles/PHSP__Lambda0_ppi_yesPhotos.json
+++ b/test/jsonFiles/PHSP__Lambda0_ppi_yesFSR.json
@@ -1,33 +1,33 @@
{
"parent" : "Lambda0",
"daughters" : ["p+", "pi-"],
"models" : ["PHSP"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
- "extras" : ["yesPhotos"],
+ "extras" : ["yesFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.5 },
{"variable" : "nFSRPhotons", "title" : "nFSRPhotons", "d1" : 0, "d2" : 0, "nbins" : 6, "xmin" : 0, "xmax" : 6.0 },
{"variable" : "totalFSREnergy", "title" : "totalFSREnergy", "d1" : 0, "d2" : 0, "nbins" : 50, "xmin" : 0, "xmax" : 0.05 },
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 0.05},
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma) cut off", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 0.5e-6},
{"variable" : "cosTheta_FSRPhotons", "title" : "FSR cosTheta/#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"variable" : "cosTheta_EnergyWeight_FSRPhotons", "title" : "FSR cosTheta(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_EnergyWeight_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"variable" : "parMass", "title" : "m(#Lambda)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 3.0967, "xmax" : 3.09695},
{"variable" : "mass", "title" : "m(p^{+}#pi^{-})", "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(p^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "E", "title" : "E(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "pz", "title" : "p_{z}(p^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.6, "xmax" : 1.6},
{"variable" : "pz", "title" : "p_{z}(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.6, "xmax" : 1.6},
{"variable" : "pLab", "title" : "pLab(p^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "pLab", "title" : "pLab(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "cosTheta", "title" : "cosTheta(p^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
- "outfile" : "PHSP__Lambda0_ppi_yesPhotos.root",
- "reference" : "RefPHSP__Lambda0_ppi_yesPhotos.root"
+ "outfile" : "PHSP__Lambda0_ppi_yesFSR.root",
+ "reference" : "RefPHSP__Lambda0_ppi_yesFSR.root"
}
diff --git a/test/jsonFiles/PHSP__Lambdab0_ppi_yesPhotos.json b/test/jsonFiles/PHSP__Lambdab0_ppi_yesFSR.json
similarity index 95%
rename from test/jsonFiles/PHSP__Lambdab0_ppi_yesPhotos.json
rename to test/jsonFiles/PHSP__Lambdab0_ppi_yesFSR.json
index 6fc4c1e..d027c91 100644
--- a/test/jsonFiles/PHSP__Lambdab0_ppi_yesPhotos.json
+++ b/test/jsonFiles/PHSP__Lambdab0_ppi_yesFSR.json
@@ -1,33 +1,33 @@
{
"parent" : "Lambda_b0",
"daughters" : ["p+", "pi-"],
"models" : ["PHSP"],
"parameters" : [[]],
"do_conjugate_decay" : [true],
- "extras" : ["yesPhotos"],
+ "extras" : ["yesFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.5 },
{"variable" : "nFSRPhotons", "title" : "nFSRPhotons", "d1" : 0, "d2" : 0, "nbins" : 10, "xmin" : 0, "xmax" : 10.0 },
{"variable" : "totalFSREnergy", "title" : "totalFSREnergy", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.0 },
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma) cut off", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 0.5e-6},
{"variable" : "cosTheta_FSRPhotons", "title" : "FSR cosTheta/#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"variable" : "cosTheta_EnergyWeight_FSRPhotons", "title" : "FSR cosTheta(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_EnergyWeight_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"variable" : "parMass", "title" : "m(#Lambda_{b})", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 3.0967, "xmax" : 3.09695},
{"variable" : "mass", "title" : "m(p^{+}#pi^{-})", "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(p^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "E", "title" : "E(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "pz", "title" : "p_{z}(p^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.6, "xmax" : 1.6},
{"variable" : "pz", "title" : "p_{z}(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.6, "xmax" : 1.6},
{"variable" : "pLab", "title" : "pLab(p^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "pLab", "title" : "pLab(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "cosTheta", "title" : "cosTheta(p^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
- "outfile" : "PHSP__Lambdab0_ppi_yesPhotos.root",
- "reference" : "RefPHSP__Lambdab0_ppi_yesPhotos.root"
+ "outfile" : "PHSP__Lambdab0_ppi_yesFSR.root",
+ "reference" : "RefPHSP__Lambdab0_ppi_yesFSR.root"
}
diff --git a/test/jsonFiles/PI0_DALITZ__pi0_eegamma.json b/test/jsonFiles/PI0_DALITZ__pi0_eegamma.json
index 6d2ee8d..1d3c026 100644
--- a/test/jsonFiles/PI0_DALITZ__pi0_eegamma.json
+++ b/test/jsonFiles/PI0_DALITZ__pi0_eegamma.json
@@ -1,22 +1,22 @@
{
"parent" : "pi0",
"daughters" : ["e+", "e-", "gamma"],
"models" : ["PI0_DALITZ"],
"parameters" : [[], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(e+ e-)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.15},
{"variable" : "mass", "title" : "m(e+ #gamma)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.15},
{"variable" : "mass", "title" : "m(e- #gamma)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.15},
{"variable" : "massSq", "title" : "Dalitz m^{2}(e+ e-) vs m^{2}(e+ #gamma)", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 0.02, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 0.02},
{"variable" : "massSq", "title" : "Dalitz m^{2}(e- #gamma) vs m^{2}(e+ e-)", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : 0.0, "xmax" : 0.02, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 0.02},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel12", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel23", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel13", "d1" : 1, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "PI0_DALITZ__pi0_eegamma.root",
"reference" : "RefPI0_DALITZ__pi0_eegamma.root"
}
diff --git a/test/jsonFiles/PSI2JPSIPIPI__X3872_Jpsipipi_nlo.json b/test/jsonFiles/PSI2JPSIPIPI__X3872_Jpsipipi_nlo.json
index cc0ddab..dd219e5 100644
--- a/test/jsonFiles/PSI2JPSIPIPI__X3872_Jpsipipi_nlo.json
+++ b/test/jsonFiles/PSI2JPSIPIPI__X3872_Jpsipipi_nlo.json
@@ -1,16 +1,16 @@
{
"parent" : "X_2(3872)",
"daughters" : ["J/psi", "pi+", "pi-"],
"models" : ["PSI2JPSIPIPI"],
"parameters" : [["0.78539816"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "mPiPi", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.25, "xmax" : 0.85},
{"variable" : "cosHel", "title" : "cosTheta1", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosTheta2", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "PSI2JPSIPIPI__X3872_Jpsipipi_nlo.root",
"reference" : "RefPSI2JPSIPIPI__X3872_Jpsipipi_nlo.root"
}
diff --git a/test/jsonFiles/PSI2JPSIPIPI__X3872_Jpsipipi_tree.json b/test/jsonFiles/PSI2JPSIPIPI__X3872_Jpsipipi_tree.json
index 2aec938..929492c 100644
--- a/test/jsonFiles/PSI2JPSIPIPI__X3872_Jpsipipi_tree.json
+++ b/test/jsonFiles/PSI2JPSIPIPI__X3872_Jpsipipi_tree.json
@@ -1,16 +1,16 @@
{
"parent" : "X_2(3872)",
"daughters" : ["J/psi", "pi+", "pi-"],
"models" : ["PSI2JPSIPIPI"],
"parameters" : [[]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "mPiPi", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.25, "xmax" : 0.85},
{"variable" : "cosHel", "title" : "cosTheta1", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosTheta2", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "PSI2JPSIPIPI__X3872_Jpsipipi_tree.root",
"reference" : "RefPSI2JPSIPIPI__X3872_Jpsipipi_tree.root"
}
diff --git a/test/jsonFiles/PTO3P__D0_K0sKK.json b/test/jsonFiles/PTO3P__D0_K0sKK.json
index e40dfdd..705e93c 100644
--- a/test/jsonFiles/PTO3P__D0_K0sKK.json
+++ b/test/jsonFiles/PTO3P__D0_K0sKK.json
@@ -1,26 +1,26 @@
{
"parent" : "D0",
"daughters" : ["K_S0", "K+", "K-"],
"models" : ["PTO3P"],
"parameters" : [["MAXPDF 6.0",
"AMPLITUDE RESONANCE BC a_00 ANGULAR AC TYPE NBW COEFFICIENT POLAR_RAD 1.0 0.0",
"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"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(K^{0}_{S} K^{+})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.9, "xmax" : 1.5},
{"variable" : "mass", "title" : "m(K^{0}_{S} K^{-})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.9, "xmax" : 1.5},
{"variable" : "mass", "title" : "m(K^{-} K^{+})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.9, "xmax" : 1.5},
{"variable" : "massSq", "title" : "Dalitz m^{2}(K^{0}_{S} K^{+}) vs m^{2}(K^{0}_{S} K^{-})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.8, "xmax" : 2.0, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.8, "ymax" : 2.0},
{"variable" : "massSq", "title" : "Dalitz m^{2}(K^{+} K^{-}) vs m^{2}(K^{0}_{S} K^{+})", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : 0.8, "xmax" : 2.0, "variableY" : "massSq", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 50, "ymin" : 0.8, "ymax" : 2.0},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel12", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel23", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel13", "d1" : 1, "d2" : 3, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "PTO3P__D0_K0sKK.root",
"reference" : "RefPTO3P__D0_K0sKK.root"
}
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
index ef81581..57b99fd 100644
--- a/test/jsonFiles/PVV_CPLH=VLL=VSS__B0s_Jpsiphi_ee,KK.json
+++ b/test/jsonFiles/PVV_CPLH=VLL=VSS__B0s_Jpsiphi_ee,KK.json
@@ -1,26 +1,26 @@
{
"parent" : "B_s0",
"daughters" : ["J/psi", "phi"],
"grand_daughters" : [["e+", "e-"], ["K+", "K-"]],
"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", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B_s0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(PVV_CPLH)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(VLL)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug2", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "parMass", "title" : "m(B0s)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 5.2, "xmax" : 5.5},
{"variable" : "mass", "title" : "m(J/psi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.5, "xmax" : 3.5},
{"variable" : "mass", "title" : "m(phi)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.8, "xmax" : 1.2},
{"variable" : "cosHel", "title" : "cosHel(e)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(K)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "decayangle_daug1", "title" : "DecayAngle(e)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0},
{"variable" : "decayangle_daug2", "title" : "DecayAngle(K)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0},
{"variable" : "p_daug1", "title" : "p(e)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.0, "xmax" : 1.8},
{"variable" : "p_daug2", "title" : "p(K)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.3}
],
"outfile" : "PVV_CPLH=VLL=VSS__B0s_Jpsiphi_ee,KK.root",
"reference" : "RefPVV_CPLH=VLL=VSS__B0s_Jpsiphi_ee,KK.root"
}
diff --git a/test/jsonFiles/RareLbToLll=HELAMP__Lambdab0_Lambda0mumu_ppi.json b/test/jsonFiles/RareLbToLll=HELAMP__Lambdab0_Lambda0mumu_ppi.json
index 37b1410..82779c4 100644
--- a/test/jsonFiles/RareLbToLll=HELAMP__Lambdab0_Lambda0mumu_ppi.json
+++ b/test/jsonFiles/RareLbToLll=HELAMP__Lambdab0_Lambda0mumu_ppi.json
@@ -1,22 +1,22 @@
{
"parent" : "Lambda_b0",
"daughters" : ["Lambda0", "mu-", "mu+"],
"grand_daughters" : [["p+","pi-"], [], []],
"models" : ["RareLbToLll", "HELAMP", ""],
"parameters" : [[], ["0.936", "0.0", "0.351", "0.0"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(RareLbToLll)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(HELAMP)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "parMass", "title" : "m(#Lambda^{0}_{b})", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 5.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(#Lambda^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.0, "xmax" : 1.2},
{"variable" : "mass", "title" : "m(#Lambda^{0} #mu^{-})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass", "title" : "m(#Lambda^{0} #mu^{+})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "pSumSq", "title" : "q^{2}(#mu^{-} #mu^{+})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 21.0},
{"variable" : "cosHel", "title" : "cosHel(p,#Lambda^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "decayangle_daug1", "title" : "decayAngle(#Lambda^{0},p,#pi^{-})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0}
],
"outfile" : "RareLbToLll=HELAMP__Lambdab0_Lambda0mumu_ppi.root",
"reference" : "RefRareLbToLll=HELAMP__Lambdab0_Lambda0mumu_ppi.root"
}
diff --git a/test/jsonFiles/SINGLE__Upsilon4S_mu.json b/test/jsonFiles/SINGLE__Upsilon4S_mu.json
index ca0ed5f..6e31139 100644
--- a/test/jsonFiles/SINGLE__Upsilon4S_mu.json
+++ b/test/jsonFiles/SINGLE__Upsilon4S_mu.json
@@ -1,17 +1,17 @@
{
"parent" : "Upsilon(4S)",
"daughters" : ["mu+"],
"models" : ["SINGLE"],
"parameters" : [["0.5", "1.0", "-0.8", "0.5", "0.0", "6.2832"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 100000,
"histograms" : [
{"variable" : "parMass", "title" : "m(Upsilon4S)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 10.0, "xmax" : 11.0},
{"variable" : "mass", "title" : "m(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.05, "xmax" : 0.15},
{"variable" : "p", "title" : "p(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.4, "xmax" : 1.1},
{"variable" : "cosTheta", "title" : "cosTheta(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "SINGLE__Upsilon4S_mu.root",
"reference" : "RefSINGLE__Upsilon4S_mu.root"
}
diff --git a/test/jsonFiles/SLBKPOLE=PHSP__D+_Ksenu_pipi.json b/test/jsonFiles/SLBKPOLE=PHSP__D+_Ksenu_pipi.json
index c1e8649..35fb714 100644
--- a/test/jsonFiles/SLBKPOLE=PHSP__D+_Ksenu_pipi.json
+++ b/test/jsonFiles/SLBKPOLE=PHSP__D+_Ksenu_pipi.json
@@ -1,38 +1,38 @@
{
"parent" : "D+",
"daughters" : ["K_S0", "e+", "nu_e"],
"grand_daughters" : [["pi+", "pi-"], [], []],
"models" : ["SLBKPOLE", "PHSP", ""],
"parameters" : [["1.0", "0.303", "1.0", "2.112"], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "M(#it{K}_{S}^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.6, "xmax" : 1.4},
{"variable" : "mass", "title" : "M(#it{K}_{S}^{0}#it{e})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.5, "xmax" : 2.0},
{"variable" : "mass", "title" : "M(#it{K}_{S}^{0}#it{#nu})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.5, "xmax" : 2.0},
{"variable" : "mass", "title" : "M(#it{e}#it{#nu})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "pSumSq", "title" : "q^{2}(#it{e}#it{#nu})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.5},
{"variable" : "p", "title" : "p(#it{K}_{S}^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pSq", "title" : "p^{2}(#it{K}_{S}^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pz", "title" : "pz(#it{K}_{S}^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(#it{K}_{S}^{0},#it{e})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(#it{e}#it{#nu})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(#it{K}_{S}^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 180.0},
{"variable" : "decayangle", "title" : "#theta(#it{K}_{S}^{0},#it{e})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 200.0},
{"variable" : "cosTheta", "title" : "cosTheta(#it{K}_{S}^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#it{e})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#it{#nu})", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(#it{K}_{S}^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(#it{#pi})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pLab_daug1", "title" : "pLab(#it{#pi})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#it{#pi})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#it{#pi})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#it{#pi})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#it{#pi})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "SLBKPOLE=PHSP__D+_Ksenu_pipi.root",
"reference" : "RefSLBKPOLE=PHSP__D+_Ksenu_pipi.root"
}
diff --git a/test/jsonFiles/SLL=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu.json b/test/jsonFiles/SLL=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu.json
index c82989c..07ba376 100644
--- a/test/jsonFiles/SLL=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu.json
+++ b/test/jsonFiles/SLL=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu.json
@@ -1,53 +1,53 @@
{
"parent" : "B0",
"daughters" : ["tau+", "tau-"],
"grand_daughters" : [["pi+", "anti-nu_tau"], ["pi-", "nu_tau"]],
"models" : ["SLL", "TAUSCALARNU", "TAUSCALARNU"],
"parameters" : [[], [], []],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(SLL)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob_{1}(TAUSCALARNU)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug2", "title" : "Prob_{2}(TAUSCALARNU)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(#tau^{+}#tau^{-})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 5.1, "xmax" : 5.4},
{"variable" : "p", "title" : "p(#tau^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.5, "xmax" : 2.5},
{"variable" : "pz", "title" : "pz(#tau^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosTheta", "title" : "cosTheta(#tau^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#tau^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau", "title" : "cosHelTau1(#pi^{+})", "d1" : 1, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau", "title" : "cosHelTau2(#pi^{-})", "d1" : 2, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau_over05", "title" : "cosHelTau1(#pi^{+})", "d1" : 1, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau_over05", "title" : "cosHelTau2(#pi^{-})", "d1" : 2, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau_under05", "title" : "cosHelTau1(#pi^{+})", "d1" : 1, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau_under05", "title" : "cosHelTau2(#pi^{-})", "d1" : 2, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 180.0},
{"variable" : "E_daug1", "title" : "E(#pi^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "E_over_Eparent_daug1", "title" : "E(#pi^{+})/E(#tau^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pLab_daug1", "title" : "pLab(#pi^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "pzLab_daug1", "title" : "pzLab(#pi^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#pi^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#pi^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "E_daug1", "title" : "E(#bar{#nu})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "E_over_Eparent_daug1", "title" : "E(#bar{#nu})/E(#tau^{+})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pLab_daug1", "title" : "pLab(#bar{#nu})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "pzLab_daug1", "title" : "pzLab(#bar{#nu})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#bar{#nu})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#bar{#nu})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "E_daug2", "title" : "E(#pi^{-})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "E_over_Eparent_daug2", "title" : "E(#pi^{-})/E(#tau^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pLab_daug2", "title" : "pLab(#pi^{-})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "pzLab_daug2", "title" : "pzLab(#pi^{-})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(#pi^{-})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(#pi^{-})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "E_daug2", "title" : "E(#nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "E_over_Eparent_daug2", "title" : "E(#nu)/E(#tau^{+})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pLab_daug2", "title" : "pLab(#nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "pzLab_daug2", "title" : "pzLab(#nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(#nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(#nu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180}
],
"outfile" : "SLL=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu.root",
"reference" : "RefSLL=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu.root"
}
diff --git a/test/jsonFiles/SLN=TAUHADNU__Bu_taunu_pi0pi0pinu.json b/test/jsonFiles/SLN=TAUHADNU__Bu_taunu_pi0pi0pinu.json
index c95a302..ebe81ed 100644
--- a/test/jsonFiles/SLN=TAUHADNU__Bu_taunu_pi0pi0pinu.json
+++ b/test/jsonFiles/SLN=TAUHADNU__Bu_taunu_pi0pi0pinu.json
@@ -1,42 +1,42 @@
{
"parent" : "B+",
"daughters" : ["tau+", "nu_tau"],
"grand_daughters" : [["pi0", "pi0", "pi+", "anti-nu_tau"], []],
"models" : ["SLN", "TAUHADNU", ""],
"parameters" : [[], ["-0.108", "0.775", "0.149", "1.364", "0.400", "1.23", "0.4"], []],
"extras" : ["Define TauolaBR1 1.0",
- "Define dm_incohMix_B0 0", "noPhotos"],
+ "Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.8, "xmax" : 1.2},
{"variable" : "p", "title" : "p(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.2, "xmax" : 2.6},
{"variable" : "pz", "title" : "pz(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosTheta", "title" : "cosTheta(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "E", "title" : "E(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.5, "xmax" : 3.5},
{"variable" : "E_over_Eparent", "title" : "E(tau)/E(B)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "E_over_Eparent_daug1", "title" : "E(pi0_{1})/E(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "E_over_Eparent_daug1", "title" : "E(pi0_{2})/E(tau)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "E_over_Eparent_daug1", "title" : "E(pi+)/E(tau)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "E_over_Eparent_daug1", "title" : "E(nu)/E(tau)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi0_{1})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi0_{2})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi+)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(nu)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(pi0_{1})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(pi0_{1})", "d1" : 1, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(pi0_{2})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(pi+)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(nu)", "d1" : 1, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "mass_daug1", "title" : "m(pi0_{1} pi0_{2})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass_daug1", "title" : "m(pi0_{1} pi+)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass_daug1", "title" : "m(pi0_{1} nu)", "d1" : 1, "d2" : 4, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass_daug1", "title" : "m(pi0_{2} pi+)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass_daug1", "title" : "m(pi0_{2} nu)", "d1" : 2, "d2" : 4, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass_daug1", "title" : "m(pi+ nu)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass3_daug1", "title" : "m(pi0_{1} pi0_{2} pi+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.2, "xmax" : 1.8},
{"variable" : "cosTheta3_daug1", "title" : "cosTheta3", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "SLN=TAUHADNU__Bu_taunu_pi0pi0pinu.root",
"reference" : "RefSLN=TAUHADNU__Bu_taunu_pi0pi0pinu.root"
}
diff --git a/test/jsonFiles/SLN=TAULNUNU__Bu_taunu_enunu.json b/test/jsonFiles/SLN=TAULNUNU__Bu_taunu_enunu.json
index e87d656..3cc02d5 100644
--- a/test/jsonFiles/SLN=TAULNUNU__Bu_taunu_enunu.json
+++ b/test/jsonFiles/SLN=TAULNUNU__Bu_taunu_enunu.json
@@ -1,33 +1,33 @@
{
"parent" : "B+",
"daughters" : ["tau+", "nu_tau"],
"grand_daughters" : [["e+", "nu_e", "anti-nu_tau"], []],
"models" : ["SLN", "TAULNUNU", ""],
"parameters" : [[], [], []],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 100000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.8, "xmax" : 1.2},
{"variable" : "p", "title" : "p(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.2, "xmax" : 2.6},
{"variable" : "pz", "title" : "pz(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosTheta", "title" : "cosTheta(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "E", "title" : "E(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.5, "xmax" : 3.5},
{"variable" : "E_over_Eparent", "title" : "E(tau)/E(B)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "E_over_Eparent_daug1", "title" : "E(e)/E(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "E_over_Eparent_daug1", "title" : "E(nue)/E(tau)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "E_over_Eparent_daug1", "title" : "E(nutau_{2})/E(tau)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(e)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(nue)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(nutau_{2})", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(e)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(e)", "d1" : 1, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(nue)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(nutau_{2})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "mass_daug1", "title" : "m(e nue)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass_daug1", "title" : "m(e nutau_{2})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass_daug1", "title" : "m(nue nutau_{2})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0}
],
"outfile" : "SLN=TAULNUNU__Bu_taunu_enunu.root",
"reference" : "RefSLN=TAULNUNU__Bu_taunu_enunu.root"
}
diff --git a/test/jsonFiles/SLN=TAULNUNU__Bu_taunu_mununu.json b/test/jsonFiles/SLN=TAULNUNU__Bu_taunu_mununu.json
index 5ca49e2..ea07f8d 100644
--- a/test/jsonFiles/SLN=TAULNUNU__Bu_taunu_mununu.json
+++ b/test/jsonFiles/SLN=TAULNUNU__Bu_taunu_mununu.json
@@ -1,33 +1,33 @@
{
"parent" : "B+",
"daughters" : ["tau+", "nu_tau"],
"grand_daughters" : [["mu+", "nu_mu", "anti-nu_tau"], []],
"models" : ["SLN", "TAULNUNU", ""],
"parameters" : [[], [], []],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 100000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.8, "xmax" : 1.2},
{"variable" : "p", "title" : "p(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.2, "xmax" : 2.6},
{"variable" : "pz", "title" : "pz(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosTheta", "title" : "cosTheta(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "E", "title" : "E(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.5, "xmax" : 3.5},
{"variable" : "E_over_Eparent", "title" : "E(tau)/E(B)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "E_over_Eparent_daug1", "title" : "E(mu)/E(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "E_over_Eparent_daug1", "title" : "E(numu)/E(tau)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "E_over_Eparent_daug1", "title" : "E(nutau)/E(tau)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(mu)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(numu)", "d1" : 2, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(nutau)", "d1" : 3, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(mu)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(mu)", "d1" : 1, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(numu)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(nutau)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "mass_daug1", "title" : "m(mu numu)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass_daug1", "title" : "m(mu nutau)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass_daug1", "title" : "m(numu nutau)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0}
],
"outfile" : "SLN=TAULNUNU__Bu_taunu_mununu.root",
"reference" : "RefSLN=TAULNUNU__Bu_taunu_mununu.root"
}
diff --git a/test/jsonFiles/SLN=TAUOLA__Bu_taunu_pipipinu_BaBar.json b/test/jsonFiles/SLN=TAUOLA__Bu_taunu_pipipinu_BaBar.json
index b513164..e0f18d1 100644
--- a/test/jsonFiles/SLN=TAUOLA__Bu_taunu_pipipinu_BaBar.json
+++ b/test/jsonFiles/SLN=TAUOLA__Bu_taunu_pipipinu_BaBar.json
@@ -1,43 +1,43 @@
{
"parent" : "B+",
"daughters" : ["tau+", "nu_tau"],
"grand_daughters" : [[" "], []],
"models" : ["SLN", "TAUOLA", ""],
"parameters" : [[], ["5"], []],
"extras" : ["Define TauolaCurrentOption 1",
"Define TauolaBR1 1.0",
- "Define dm_incohMix_B0 0", "noPhotos"],
+ "Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.8, "xmax" : 1.2},
{"variable" : "p", "title" : "p(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.2, "xmax" : 2.6},
{"variable" : "pz", "title" : "pz(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosTheta", "title" : "cosTheta(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "E", "title" : "E(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.5, "xmax" : 3.5},
{"variable" : "E_over_Eparent", "title" : "E(tau)/E(B)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "E_over_Eparent_daug1", "title" : "E(nutau_{2})/E(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "E_over_Eparent_daug1", "title" : "E(pi+_{1})/E(tau)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "E_over_Eparent_daug1", "title" : "E(pi+_{2})/E(tau)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "E_over_Eparent_daug1", "title" : "E(pi-)/E(tau)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(nutau_{2})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi+_{1})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi+_{2})", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi-)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(nutau_{2})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(nutau_{2})", "d1" : 1, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(pi+_{1})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(pi+_{2})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(pi-)", "d1" : 1, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "mass_daug1", "title" : "m(nutau_{2} pi+_{1})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass_daug1", "title" : "m(nutau_{2} pi+_{2})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass_daug1", "title" : "m(nutau_{2} pi-)", "d1" : 1, "d2" : 4, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass_daug1", "title" : "m(pi+_{1} pi+_{2})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass_daug1", "title" : "m(pi+_{1} pi-)", "d1" : 2, "d2" : 4, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass_daug1", "title" : "m(pi+_{2} pi-)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass3_daug1", "title" : "m(pi+_{1} pi+_{2} pi-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.2, "xmax" : 1.8},
{"variable" : "cosTheta3_daug1", "title" : "cosTheta3pi", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "SLN=TAUOLA__Bu_taunu_pipipinu_BaBar.root",
"reference" : "RefSLN=TAUOLA__Bu_taunu_pipipinu_BaBar.root"
}
diff --git a/test/jsonFiles/SLN=TAUOLA__Bu_taunu_pipipinu_CLEO.json b/test/jsonFiles/SLN=TAUOLA__Bu_taunu_pipipinu_CLEO.json
index 0d0f2b3..81f0577 100644
--- a/test/jsonFiles/SLN=TAUOLA__Bu_taunu_pipipinu_CLEO.json
+++ b/test/jsonFiles/SLN=TAUOLA__Bu_taunu_pipipinu_CLEO.json
@@ -1,43 +1,43 @@
{
"parent" : "B+",
"daughters" : ["tau+", "nu_tau"],
"grand_daughters" : [[" "], []],
"models" : ["SLN", "TAUOLA", ""],
"parameters" : [[], ["5"], []],
"extras" : ["Define TauolaCurrentOption 0",
"Define TauolaBR1 1.0",
- "Define dm_incohMix_B0 0", "noPhotos"],
+ "Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.8, "xmax" : 1.2},
{"variable" : "p", "title" : "p(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.2, "xmax" : 2.6},
{"variable" : "pz", "title" : "pz(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosTheta", "title" : "cosTheta(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "E", "title" : "E(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.5, "xmax" : 3.5},
{"variable" : "E_over_Eparent", "title" : "E(tau)/E(B)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "E_over_Eparent_daug1", "title" : "E(nutau_{2})/E(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "E_over_Eparent_daug1", "title" : "E(pi+_{1})/E(tau)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "E_over_Eparent_daug1", "title" : "E(pi+_{2})/E(tau)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "E_over_Eparent_daug1", "title" : "E(pi-)/E(tau)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(nutau_{2})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi+_{1})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi+_{2})", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi-)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(nutau_{2})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(nutau_{2})", "d1" : 1, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(pi+_{1})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(pi+_{2})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(pi-)", "d1" : 1, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "mass_daug1", "title" : "m(nutau_{2} pi+_{1})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass_daug1", "title" : "m(nutau_{2} pi+_{2})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass_daug1", "title" : "m(nutau_{2} pi-)", "d1" : 1, "d2" : 4, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass_daug1", "title" : "m(pi+_{1} pi+_{2})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass_daug1", "title" : "m(pi+_{1} pi-)", "d1" : 2, "d2" : 4, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass_daug1", "title" : "m(pi+_{2} pi-)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass3_daug1", "title" : "m(pi+_{1} pi+_{2} pi-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.2, "xmax" : 1.8},
{"variable" : "cosTheta3_daug1", "title" : "cosTheta3pi", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "SLN=TAUOLA__Bu_taunu_pipipinu_CLEO.root",
"reference" : "RefSLN=TAUOLA__Bu_taunu_pipipinu_CLEO.root"
}
diff --git a/test/jsonFiles/SLN=TAUSCALARNU__Bu_taunu_pinu.json b/test/jsonFiles/SLN=TAUSCALARNU__Bu_taunu_pinu.json
index ebfde24..78ad30b 100644
--- a/test/jsonFiles/SLN=TAUSCALARNU__Bu_taunu_pinu.json
+++ b/test/jsonFiles/SLN=TAUSCALARNU__Bu_taunu_pinu.json
@@ -1,28 +1,28 @@
{
"parent" : "B+",
"daughters" : ["tau+", "nu_tau"],
"grand_daughters" : [["pi+", "anti-nu_tau"], []],
"models" : ["SLN", "TAUSCALARNU", ""],
"parameters" : [[], [], []],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.8, "xmax" : 1.2},
{"variable" : "p", "title" : "p(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.2, "xmax" : 2.6},
{"variable" : "pz", "title" : "pz(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosTheta", "title" : "cosTheta(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "E", "title" : "E(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.5, "xmax" : 3.5},
{"variable" : "E_over_Eparent", "title" : "E(tau)/E(B)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "E_over_Eparent_daug1", "title" : "E(pi)/E(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "E_over_Eparent_daug1", "title" : "E(nutau_{2})/E(tau)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(nutau_{2})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(pi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(pi)", "d1" : 1, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(nutau_{2})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "mass_daug1", "title" : "m(pi nutau_{2})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 1.7, "xmax" : 1.9}
],
"outfile" : "SLN=TAUSCALARNU__Bu_taunu_pinu.root",
"reference" : "RefSLN=TAUSCALARNU__Bu_taunu_pinu.root"
}
diff --git a/test/jsonFiles/SLN=TAUVECTORNU__Bu_taunu_rhonu.json b/test/jsonFiles/SLN=TAUVECTORNU__Bu_taunu_rhonu.json
index 672b522..4404401 100644
--- a/test/jsonFiles/SLN=TAUVECTORNU__Bu_taunu_rhonu.json
+++ b/test/jsonFiles/SLN=TAUVECTORNU__Bu_taunu_rhonu.json
@@ -1,29 +1,29 @@
{
"parent" : "B+",
"daughters" : ["tau+", "nu_tau"],
"grand_daughters" : [["rho+", "anti-nu_tau"], []],
"models" : ["SLN", "TAUVECTORNU", ""],
"parameters" : [[], [], []],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.8, "xmax" : 1.2},
{"variable" : "p", "title" : "p(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.2, "xmax" : 2.6},
{"variable" : "pz", "title" : "pz(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosTheta", "title" : "cosTheta(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "E", "title" : "E(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.5, "xmax" : 3.5},
{"variable" : "E_over_Eparent", "title" : "E(tau)/E(B)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "E_over_Eparent_daug1", "title" : "E(rho)/E(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "E_over_Eparent_daug1", "title" : "E(nutau_{2})/E(tau)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(rho)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(nutau_{2})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(rho)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(rho)", "d1" : 1, "d2" : 1, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelTau", "title" : "cosHelTau(nutau_{2})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "mass_daug1", "title" : "m(rho nutau_{2})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 1.7, "xmax" : 1.9},
{"variable" : "mass_daug1", "title" : "m(rho)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0}
],
"outfile" : "SLN=TAUVECTORNU__Bu_taunu_rhonu.root",
"reference" : "RefSLN=TAUVECTORNU__Bu_taunu_rhonu.root"
}
diff --git a/test/jsonFiles/SLPOLE=VSS__D+_Kst0enu_Kpi.json b/test/jsonFiles/SLPOLE=VSS__D+_Kst0enu_Kpi.json
index 7e2d0ef..3b028ab 100644
--- a/test/jsonFiles/SLPOLE=VSS__D+_Kst0enu_Kpi.json
+++ b/test/jsonFiles/SLPOLE=VSS__D+_Kst0enu_Kpi.json
@@ -1,38 +1,38 @@
{
"parent" : "D+",
"daughters" : ["anti-K*0", "e+", "nu_e"],
"grand_daughters" : [["K-", "pi+"], [], []],
"models" : ["SLPOLE", "VSS", ""],
"parameters" : [["1.00", "-0.558", "0.0", "1.0", "0.85", "-0.558", "0.0", "1.0", "1.50", "-0.790", "0.0", "1.0", "0.00", "-0.558", "0.0", "1.0"], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "M(#it{K}*^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.6, "xmax" : 1.4},
{"variable" : "mass", "title" : "M(#it{K}*^{0}#it{e})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.5, "xmax" : 2.0},
{"variable" : "mass", "title" : "M(#it{K}*^{0}#it{#nu})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.5, "xmax" : 2.0},
{"variable" : "mass", "title" : "M(#it{e}#it{#nu})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "pSumSq", "title" : "q^{2}(#it{e}#it{#nu})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.5},
{"variable" : "p", "title" : "p(#it{K}*^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pSq", "title" : "p^{2}(#it{K}*^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pz", "title" : "pz(#it{K}*^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(#it{K}*^{0},#it{e})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(#it{e}#it{#nu})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(#it{K})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 180.0},
{"variable" : "decayangle", "title" : "#theta(#it{K}*^{0},#it{e})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 200.0},
{"variable" : "cosTheta", "title" : "cosTheta(#it{K}*^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#it{e})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#it{#nu})", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(#it{K}*^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(#it{K})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pLab_daug1", "title" : "pLab(#it{#pi})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#it{K})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#it{K})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#it{#pi})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#it{#pi})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "SLPOLE=VSS__D+_Kst0enu_Kpi.root",
"reference" : "RefSLPOLE=VSS__D+_Kst0enu_Kpi.root"
}
diff --git a/test/jsonFiles/SSD_DirectCP=TSS__Bu_f2pi+_pi+pi-.json b/test/jsonFiles/SSD_DirectCP=TSS__Bu_f2pi+_pi+pi-.json
index 9157e1e..35a3916 100644
--- a/test/jsonFiles/SSD_DirectCP=TSS__Bu_f2pi+_pi+pi-.json
+++ b/test/jsonFiles/SSD_DirectCP=TSS__Bu_f2pi+_pi+pi-.json
@@ -1,20 +1,20 @@
{
"parent" : "B+",
"daughters" : ["f_2", "pi+"],
"grand_daughters" : [["pi+", "pi-"], []],
"models" : ["SSD_DirectCP", "TSS", ""],
"parameters" : [["0.40"], [], []],
"do_conjugate_decay" : [ true, false, false ],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "id", "title" : "StdHep ID", "d1" : 0, "d2" : 0, "nbins" : 2, "xmin" : -600.0, "xmax" : 600.0},
{"variable" : "p", "title" : "f_2 Mtm", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.0, "xmax" : 3.0},
{"variable" : "p", "title" : "pi Mtm", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.0, "xmax" : 3.0},
{"variable" : "mass", "title" : "f_2 Mass", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "f_2 Helicity Angle", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0}
],
"outfile" : "SSD_DirectCP=TSS__Bu_f2pi+_pi+pi-.root",
"reference" : "RefSSD_DirectCP=TSS__Bu_f2pi+_pi+pi-.root"
}
diff --git a/test/jsonFiles/SSD_DirectCP=VSS__Bu_Kst0pi+_K+pi-.json b/test/jsonFiles/SSD_DirectCP=VSS__Bu_Kst0pi+_K+pi-.json
index d568849..24382d8 100644
--- a/test/jsonFiles/SSD_DirectCP=VSS__Bu_Kst0pi+_K+pi-.json
+++ b/test/jsonFiles/SSD_DirectCP=VSS__Bu_Kst0pi+_K+pi-.json
@@ -1,20 +1,20 @@
{
"parent" : "B+",
"daughters" : ["K*0", "pi+"],
"grand_daughters" : [["K+", "pi-"], []],
"models" : ["SSD_DirectCP", "VSS", ""],
"parameters" : [["0.032"], [], []],
"do_conjugate_decay" : [ true, true, false ],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "id", "title" : "StdHep ID", "d1" : 0, "d2" : 0, "nbins" : 2, "xmin" : -600.0, "xmax" : 600.0},
{"variable" : "p", "title" : "Kst Mtm", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.0, "xmax" : 3.0},
{"variable" : "p", "title" : "pi Mtm", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 2.0, "xmax" : 3.0},
{"variable" : "mass", "title" : "Kst Mass", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 1.5},
{"variable" : "cosHel", "title" : "Kst Helicity Angle", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0}
],
"outfile" : "SSD_DirectCP=VSS__Bu_Kst0pi+_K+pi-.root",
"reference" : "RefSSD_DirectCP=VSS__Bu_Kst0pi+_K+pi-.root"
}
diff --git a/test/jsonFiles/SSD_DirectCP__Bd_K+pi-.json b/test/jsonFiles/SSD_DirectCP__Bd_K+pi-.json
index 0d9e18a..28dc6c0 100644
--- a/test/jsonFiles/SSD_DirectCP__Bd_K+pi-.json
+++ b/test/jsonFiles/SSD_DirectCP__Bd_K+pi-.json
@@ -1,17 +1,17 @@
{
"parent" : "B0",
"daughters" : ["K+", "pi-"],
"models" : ["SSD_DirectCP"],
"parameters" : [["-0.083"]],
"do_conjugate_decay" : [ true ],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "id", "title" : "StdHep ID", "d1" : 0, "d2" : 0, "nbins" : 2, "xmin" : -600.0, "xmax" : 600.0},
{"variable" : "p", "title" : "K Mtm", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.0, "xmax" : 3.0},
{"variable" : "p", "title" : "pi Mtm", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 2.0, "xmax" : 3.0},
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0}
],
"outfile" : "SSD_DirectCP__Bd_K+pi-.root",
"reference" : "RefSSD_DirectCP__Bd_K+pi-.root"
}
diff --git a/test/jsonFiles/STS=TSS__Bu_D2st0pi_Dpi.json b/test/jsonFiles/STS=TSS__Bu_D2st0pi_Dpi.json
index 7a18823..365de0e 100644
--- a/test/jsonFiles/STS=TSS__Bu_D2st0pi_Dpi.json
+++ b/test/jsonFiles/STS=TSS__Bu_D2st0pi_Dpi.json
@@ -1,29 +1,29 @@
{
"parent" : "B+",
"daughters" : ["D_2*0", "pi+"],
"grand_daughters" : [["D+", "pi-"], [], []],
"models" : ["STS", "TSS", ""],
"parameters" : [[], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "mass", "title" : "m(D2st)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.0, "xmax" : 3.5},
{"variable" : "mass", "title" : "m(D2st pi+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 5.0, "xmax" : 5.5},
{"variable" : "p", "title" : "p(D2st)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.6, "xmax" : 2.3},
{"variable" : "pSq", "title" : "pSq(D2st)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.5, "xmax" : 5.0},
{"variable" : "pz", "title" : "pz(D2st)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -2.5, "xmax" : 2.5},
{"variable" : "cosHel", "title" : "cosHel(D+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(Dst)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(pi+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(D2st)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(D+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "pLab_daug1", "title" : "pLab(pi-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.8},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(pi-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "STS=TSS__Bu_D2st0pi_Dpi.root",
"reference" : "RefSTS=TSS__Bu_D2st0pi_Dpi.root"
}
diff --git a/test/jsonFiles/STS_CP=TVS_PWAVE__Bd_a2pi_rho0pi.json b/test/jsonFiles/STS_CP=TVS_PWAVE__Bd_a2pi_rho0pi.json
index ef76ef7..d8a55c9 100644
--- a/test/jsonFiles/STS_CP=TVS_PWAVE__Bd_a2pi_rho0pi.json
+++ b/test/jsonFiles/STS_CP=TVS_PWAVE__Bd_a2pi_rho0pi.json
@@ -1,30 +1,30 @@
{
"parent" : "B0",
"daughters" : ["a_2+", "pi-"],
"grand_daughters" : [["rho0", "pi+"], []],
"models" : ["STS_CP", "TVS_PWAVE"],
"parameters" : [["0.4", "0.51e12", "1.0", "1.0", "0.0", "1.0", "0.0"], ["0.0", "0.0", "1.0", "0.0", "0.0", "0.0"]],
"do_conjugate_decay" : [true, true],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(a2)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.0},
{"variable" : "mass", "title" : "m(a2pi1)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 5.2, "xmax" : 5.4},
{"variable" : "lifetime", "title" : "B0 lifetime", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "p", "title" : "p(a2)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.8, "xmax" : 2.8},
{"variable" : "pSq", "title" : "pSq(a2)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 3.5, "xmax" : 7.0},
{"variable" : "pz", "title" : "pz(a2)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(rho0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(a2)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(pi1)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "pLab_daug1", "title" : "pLab(rho)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "pLab_daug1", "title" : "pLab(pi2)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(rho)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi2)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(rho)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi_daug1", "title" : "phi(pi2)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "STS_CP=TVS_PWAVE__Bd_a2pi_rho0pi.root",
"reference" : "RefSTS_CP=TVS_PWAVE__Bd_a2pi_rho0pi.root"
}
diff --git a/test/jsonFiles/SVP_CP=VSS__Bd_Kst0gamma_Kpi.json b/test/jsonFiles/SVP_CP=VSS__Bd_Kst0gamma_Kpi.json
index 313bb0e..94694f3 100644
--- a/test/jsonFiles/SVP_CP=VSS__Bd_Kst0gamma_Kpi.json
+++ b/test/jsonFiles/SVP_CP=VSS__Bd_Kst0gamma_Kpi.json
@@ -1,35 +1,35 @@
{
"parent" : "B0",
"daughters" : ["K*0", "gamma"],
"grand_daughters" : [["K+", "pi-"], []],
"models" : ["SVP_CP", "VSS"],
"parameters" : [["0.0", "0.472e12", "1.0", "1.0", "0.0", "1.0", "0.0"], [], []],
"do_conjugate_decay" : [true, true],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "M(#it{K}*^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.6, "xmax" : 1.5},
{"variable" : "mass", "title" : "M(#it{#gamma})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 0.01},
{"variable" : "p", "title" : "p(#it{K}*^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.3, "xmax" : 2.7},
{"variable" : "pSq", "title" : "p^{2}(#it{K}*^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 5.5, "xmax" : 7.0},
{"variable" : "pz", "title" : "pz(#it{K}*^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(#it{#gamma})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 2.3, "xmax" : 2.7},
{"variable" : "pSq", "title" : "p^{2}(#it{#gamma})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 5.5, "xmax" : 7.0},
{"variable" : "pz", "title" : "pz(#it{#gamma})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(#it{K}*^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau", "title" : "cosHel(#it{K}*^{0})", "d1" : 1, "d2" : 1, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#it{K}*^{0})", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#it{#gamma})", "d1" : 2, "d2" : 0, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(#it{K}*^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi(#it{#gamma})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(#it{K}^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 3.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#it{K}^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#it{K}^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(#it{#pi}^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#it{#pi}^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#it{#pi}^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "SVP_CP=VSS__Bd_Kst0gamma_Kpi.root",
"reference" : "RefSVP_CP=VSS__Bd_Kst0gamma_Kpi.root"
}
diff --git a/test/jsonFiles/SVP_HELAMP=VSS__Bu_Kstgamma_Kspi.json b/test/jsonFiles/SVP_HELAMP=VSS__Bu_Kstgamma_Kspi.json
index f172f6e..5485a07 100644
--- a/test/jsonFiles/SVP_HELAMP=VSS__Bu_Kstgamma_Kspi.json
+++ b/test/jsonFiles/SVP_HELAMP=VSS__Bu_Kstgamma_Kspi.json
@@ -1,34 +1,34 @@
{
"parent" : "B+",
"daughters" : ["K*+", "gamma"],
"grand_daughters" : [["K_S0", "pi+"], []],
"models" : ["SVP_HELAMP", "VSS", ""],
"parameters" : [["1.0", "0.0", "1.0", "0.0"], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "M(#it{K}*^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.6, "xmax" : 1.5},
{"variable" : "mass", "title" : "M(#it{#gamma})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 0.01},
{"variable" : "p", "title" : "p(#it{K}*^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.0, "xmax" : 3.0},
{"variable" : "pSq", "title" : "p^{2}(#it{K}*^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.0, "xmax" : 7.0},
{"variable" : "pz", "title" : "pz(#it{K}*^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(#it{#gamma})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.0, "xmax" : 3.0},
{"variable" : "pSq", "title" : "p^{2}(#it{#gamma})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 2.0, "xmax" : 7.0},
{"variable" : "pz", "title" : "pz(#it{#gamma})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(#it{K}*^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau", "title" : "cosHel(#it{K}*^{+})", "d1" : 1, "d2" : 1, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#it{K}*^{+})", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#it{#gamma})", "d1" : 2, "d2" : 0, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(#it{K}*^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi(#it{#gamma})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(#it{K}^{0}_{S})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 3.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#it{K}^{0}_{S})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#it{K}^{0}_{S})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(#it{#pi}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#it{#pi}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#it{#pi}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "SVP_HELAMP=VSS__Bu_Kstgamma_Kspi.root",
"reference" : "RefSVP_HELAMP=VSS__Bu_Kstgamma_Kspi.root"
}
diff --git a/test/jsonFiles/SVP_HELAMP=VSS__Bu_Kstgamma_Kspi_yesPhotos.json b/test/jsonFiles/SVP_HELAMP=VSS__Bu_Kstgamma_Kspi_yesFSR.json
similarity index 96%
rename from test/jsonFiles/SVP_HELAMP=VSS__Bu_Kstgamma_Kspi_yesPhotos.json
rename to test/jsonFiles/SVP_HELAMP=VSS__Bu_Kstgamma_Kspi_yesFSR.json
index f1e22dc..f7a25be 100644
--- a/test/jsonFiles/SVP_HELAMP=VSS__Bu_Kstgamma_Kspi_yesPhotos.json
+++ b/test/jsonFiles/SVP_HELAMP=VSS__Bu_Kstgamma_Kspi_yesFSR.json
@@ -1,42 +1,42 @@
{
"parent" : "B+",
"daughters" : ["K*+", "gamma"],
"grand_daughters" : [["K_S0", "pi+"], []],
"models" : ["SVP_HELAMP", "VSS", ""],
"parameters" : [["1.0", "0.0", "1.0", "0.0"], [], []],
- "extras" : ["yesPhotos"],
+ "extras" : ["yesFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "nFSRPhotons", "title" : "nFSRPhotons", "d1" : 0, "d2" : 0, "nbins" : 10, "xmin" : 0, "xmax" : 10.0 },
{"variable" : "totalFSREnergy", "title" : "totalFSREnergy", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.0 },
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma) cut off", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 0.5e-6},
{"variable" : "cosTheta_FSRPhotons", "title" : "FSR cosTheta(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"variable" : "cosTheta_EnergyWeight_FSRPhotons", "title" : "FSR cosTheta(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_EnergyWeight_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"variable" : "mass", "title" : "M(#it{B}^{+})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 5.0, "xmax" : 5.28},
{"variable" : "p", "title" : "p(#it{K}*^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.0, "xmax" : 3.0},
{"variable" : "pSq", "title" : "p^{2}(#it{K}*^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.0, "xmax" : 7.0},
{"variable" : "pz", "title" : "pz(#it{K}*^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(#it{#gamma})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.0, "xmax" : 3.0},
{"variable" : "pSq", "title" : "p^{2}(#it{#gamma})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 2.0, "xmax" : 7.0},
{"variable" : "pz", "title" : "pz(#it{#gamma})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(#it{K}*^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau", "title" : "cosHel(#it{K}*^{+})", "d1" : 1, "d2" : 1, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#it{K}*^{+})", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#it{#gamma})", "d1" : 2, "d2" : 0, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(#it{K}*^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi(#it{#gamma})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "mass_daug1", "title" : "M(#it{K}*^{+})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.6, "xmax" : 1.5},
{"variable" : "pLab_daug1", "title" : "pLab(#it{K}^{0}_{S})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 3.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#it{K}^{0}_{S})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#it{K}^{0}_{S})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(#it{#pi}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#it{#pi}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#it{#pi}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
- "outfile" : "SVP_HELAMP=VSS__Bu_Kstgamma_Kspi_yesPhotos.root",
- "reference" : "RefSVP_HELAMP=VSS__Bu_Kstgamma_Kspi_yesPhotos.root"
+ "outfile" : "SVP_HELAMP=VSS__Bu_Kstgamma_Kspi_yesFSR.root",
+ "reference" : "RefSVP_HELAMP=VSS__Bu_Kstgamma_Kspi_yesFSR.root"
}
diff --git a/test/jsonFiles/SVP_HELAMP=VVS_PWAVE__Bu_Kprime1gamma_Kstpi.json b/test/jsonFiles/SVP_HELAMP=VVS_PWAVE__Bu_Kprime1gamma_Kstpi.json
index b6cd186..09a4349 100644
--- a/test/jsonFiles/SVP_HELAMP=VVS_PWAVE__Bu_Kprime1gamma_Kstpi.json
+++ b/test/jsonFiles/SVP_HELAMP=VVS_PWAVE__Bu_Kprime1gamma_Kstpi.json
@@ -1,34 +1,34 @@
{
"parent" : "B+",
"daughters" : ["K'_1+", "gamma"],
"grand_daughters" : [["K*0", "pi+"], []],
"models" : ["SVP_HELAMP", "VVS_PWAVE", ""],
"parameters" : [["1.0", "0.0", "0.0", "0.0"], ["1.0", "0.0", "0.0", "0.0", "0.0", "0.0"], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "M(#it{K}_{1}^{+}')", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.6, "xmax" : 2.5},
{"variable" : "mass", "title" : "M(#it{#gamma})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 0.01},
{"variable" : "p", "title" : "p(#it{K}_{1}^{+}')", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.0, "xmax" : 3.0},
{"variable" : "pSq", "title" : "p^{2}(#it{K}_{1}^{+}')", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.0, "xmax" : 7.0},
{"variable" : "pz", "title" : "pz(#it{K}_{1}^{+}')", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(#it{#gamma})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.0, "xmax" : 3.0},
{"variable" : "pSq", "title" : "p^{2}(#it{#gamma})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 2.0, "xmax" : 7.0},
{"variable" : "pz", "title" : "pz(#it{#gamma})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(#it{K}_{1}^{+}')", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau", "title" : "cosHel(#it{K}_{1}^{+}')", "d1" : 1, "d2" : 1, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#it{K}_{1}^{+}')", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#it{#gamma})", "d1" : 2, "d2" : 0, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(#it{K}_{1}^{+}')", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi(#it{#gamma})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(#it{K}*^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 3.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#it{K}*^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#it{K}*^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(#it{#pi}^{+})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#it{#pi}^{+})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#it{#pi}^{+})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "SVP_HELAMP=VVS_PWAVE__Bu_Kprime1gamma_Kstpi.root",
"reference" : "RefSVP_HELAMP=VVS_PWAVE__Bu_Kprime1gamma_Kstpi.root"
}
diff --git a/test/jsonFiles/SVS=VSS=PHSP__Bu_rhoD0_pipi0,Kpi.json b/test/jsonFiles/SVS=VSS=PHSP__Bu_rhoD0_pipi0,Kpi.json
index 1a2f1a1..e9c9af5 100644
--- a/test/jsonFiles/SVS=VSS=PHSP__Bu_rhoD0_pipi0,Kpi.json
+++ b/test/jsonFiles/SVS=VSS=PHSP__Bu_rhoD0_pipi0,Kpi.json
@@ -1,37 +1,37 @@
{
"parent" : "B+",
"daughters" : ["rho+", "anti-D0"],
"grand_daughters" : [["pi+", "pi0"], ["K+", "pi-"]],
"models" : ["SVS", "VSS", "PHSP"],
"parameters" : [[], [], []],
- "extras" : ["Define dm_incohMix_B_s0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B_s0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(SVS)", "d1" : 0, "d2" : 0, "nbins" : 110, "xmin" : 0.0, "xmax" : 1.1},
{"variable" : "prob_daug1", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 110, "xmin" : 0.0, "xmax" : 1.1},
{"variable" : "mass", "title" : "m(#rho^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.2, "xmax" : 2.0},
{"variable" : "mass", "title" : "m(#bar{D}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.85, "xmax" : 1.88},
{"variable" : "cosTheta", "title" : "cosTheta(#rho^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#bar{D}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(#rho^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi(#bar{D}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosHel", "title" : "cosHel(#pi^{+},#rho^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(K^{+},#bar{D}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0},
{"variable" : "p_daug1", "title" : "p(#pi^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.5},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#pi^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#pi^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "p_daug1", "title" : "p(#pi^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.5},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#pi^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#pi^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "p_daug2", "title" : "p(K^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 1.5},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(K^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(K^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180},
{"variable" : "p_daug2", "title" : "p(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 1.5},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180}
],
"outfile" : "SVS=VSS=PHSP__Bu_rhoD0_pipi0,Kpi.root",
"reference" : "RefSVS=VSS=PHSP__Bu_rhoD0_pipi0,Kpi.root"
}
diff --git a/test/jsonFiles/SVS=VSS=SLL__Bs_phichic0_KK,mumu.json b/test/jsonFiles/SVS=VSS=SLL__Bs_phichic0_KK,mumu.json
index 617e51e..a27b1b0 100644
--- a/test/jsonFiles/SVS=VSS=SLL__Bs_phichic0_KK,mumu.json
+++ b/test/jsonFiles/SVS=VSS=SLL__Bs_phichic0_KK,mumu.json
@@ -1,36 +1,36 @@
{
"parent" : "B_s0",
"daughters" : ["phi", "chi_c0"],
"grand_daughters" : [["K+", "K-"], ["mu+", "mu-"]],
"models" : ["SVS", "VSS", "SLL"],
"parameters" : [[], [], []],
"do_conjugate_decay" : [true, false, false],
- "extras" : ["Define dm_incohMix_B_s0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B_s0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "mass", "title" : "m(phi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 1.5},
{"variable" : "mass", "title" : "m(chi_c0)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 3.0, "xmax" : 4.0},
{"variable" : "p", "title" : "p(phi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.1, "xmax" : 1.5},
{"variable" : "pSq", "title" : "pSq(phi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.0, "xmax" : 2.5},
{"variable" : "pz", "title" : "pz(phi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.5, "xmax" : 1.5},
{"variable" : "cosHel", "title" : "cosHel(K)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(mu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(phi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(chi_c0)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "pLab_daug1", "title" : "pLab(K+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.2},
{"variable" : "pLab_daug1", "title" : "pLab(K-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.2},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(K+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(K-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(K+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi_daug1", "title" : "phi(K-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug2", "title" : "pLab(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.0},
{"variable" : "pLab_daug2", "title" : "pLab(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.0},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi_daug2", "title" : "phi(mu-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "SVS=VSS=SLL__Bs_phichic0_KK,mumu.root",
"reference" : "RefSVS=VSS=SLL__Bs_phichic0_KK,mumu.root"
}
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
index 179af0e..510c1aa 100644
--- a/test/jsonFiles/SVV_CPLH=VLL=VSS__Bs0_Jpsiphi_ee,KK.json
+++ b/test/jsonFiles/SVV_CPLH=VLL=VSS__Bs0_Jpsiphi_ee,KK.json
@@ -1,26 +1,26 @@
{
"parent" : "B_s0",
"daughters" : ["J/psi", "phi"],
"grand_daughters" : [["e+", "e-"], ["K+", "K-"]],
"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", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B_s0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(SVV_CPLH)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(VLL)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug2", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "parMass", "title" : "m(B0s)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 5.2, "xmax" : 5.5},
{"variable" : "mass", "title" : "m(J/psi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.5, "xmax" : 3.5},
{"variable" : "mass", "title" : "m(phi)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.8, "xmax" : 1.2},
{"variable" : "cosHel", "title" : "cosHel(e)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(K)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "decayangle_daug1", "title" : "DecayAngle(e)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0},
{"variable" : "decayangle_daug2", "title" : "DecayAngle(K)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0},
{"variable" : "p_daug1", "title" : "p(e)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.0, "xmax" : 1.8},
{"variable" : "p_daug2", "title" : "p(K)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.3}
],
"outfile" : "SVV_CPLH=VLL=VSS__Bs0_Jpsiphi_ee,KK.root",
"reference" : "RefSVV_CPLH=VLL=VSS__Bs0_Jpsiphi_ee,KK.root"
}
diff --git a/test/jsonFiles/SVV_HELAMP=VLL=VSS__Bu_JpsiKst_mumu,Kspi.json b/test/jsonFiles/SVV_HELAMP=VLL=VSS__Bu_JpsiKst_mumu,Kspi.json
index d8e45c4..e15b0fa 100644
--- a/test/jsonFiles/SVV_HELAMP=VLL=VSS__Bu_JpsiKst_mumu,Kspi.json
+++ b/test/jsonFiles/SVV_HELAMP=VLL=VSS__Bu_JpsiKst_mumu,Kspi.json
@@ -1,35 +1,35 @@
{
"parent" : "B+",
"daughters" : ["J/psi", "K*+"],
"grand_daughters" : [["mu+", "mu-"], ["K_S0", "pi+"]],
"models" : ["SVV_HELAMP", "VLL", "VSS"],
"parameters" : [["0.159", "1.563", "0.775", "0.0", "0.612", "2.712"], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "M(#it{J/#psi})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 3.0966, "xmax" : 3.098},
{"variable" : "mass", "title" : "M(#it{K}*^{+})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.6, "xmax" : 1.5},
{"variable" : "p", "title" : "p(#it{J/#psi})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.0, "xmax" : 3.0},
{"variable" : "pSq", "title" : "p^{2}(#it{J/#psi})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.0, "xmax" : 7.0},
{"variable" : "pz", "title" : "pz(#it{J/#psi})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(#it{J/#psi})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(#it{K}*^{+})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau", "title" : "cosHel(#it{J/#psi})", "d1" : 1, "d2" : 1, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau", "title" : "cosHel(#it{K}*^{+})", "d1" : 2, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(#it{J/#psi})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#it{K}*^{+})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(#it{J/#psi})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi(#it{K}*^{+})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(#it{#mu}^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 3.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#it{#mu}^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#it{#mu}^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(#it{#mu}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#it{#mu}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#it{#mu}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "SVV_HELAMP=VLL=VSS__Bu_JpsiKst_mumu,Kspi.root",
"reference" : "RefSVV_HELAMP=VLL=VSS__Bu_JpsiKst_mumu,Kspi.root"
}
diff --git a/test/jsonFiles/SVV_HELAMP=VSS=VSS__Bu_rhorho0_pipi0,pipi_Longitudinal.json b/test/jsonFiles/SVV_HELAMP=VSS=VSS__Bu_rhorho0_pipi0,pipi_Longitudinal.json
index 71c1884..504019b 100644
--- a/test/jsonFiles/SVV_HELAMP=VSS=VSS__Bu_rhorho0_pipi0,pipi_Longitudinal.json
+++ b/test/jsonFiles/SVV_HELAMP=VSS=VSS__Bu_rhorho0_pipi0,pipi_Longitudinal.json
@@ -1,35 +1,35 @@
{
"parent" : "B+",
"daughters" : ["rho+", "rho0"],
"grand_daughters" : [["pi+", "pi0"], ["pi+", "pi-"]],
"models" : ["SVV_HELAMP", "VSS", "VSS"],
"parameters" : [["0.0", "0.0", "1.0", "0.0", "0.0", "0.0"], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "M(#it{#rho}^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.4, "xmax" : 1.5},
{"variable" : "mass", "title" : "M(#it{#rho}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.4, "xmax" : 1.5},
{"variable" : "p", "title" : "p(#it{#rho}^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.0, "xmax" : 3.0},
{"variable" : "pSq", "title" : "p^{2}(#it{#rho}^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.0, "xmax" : 7.0},
{"variable" : "pz", "title" : "pz(#it{#rho}^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(#it{#rho}^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(#it{#rho}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau", "title" : "cosHel(#it{#rho}^{+})", "d1" : 1, "d2" : 1, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau", "title" : "cosHel(#it{#rho}^{0})", "d1" : 2, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(#it{#rho}^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#it{#rho}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(#it{#rho}^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi(#it{#rho}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(#it{#pi}^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 3.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#it{#pi}^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#it{#pi}^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(#it{#pi}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#it{#pi}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#it{#pi}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "SVV_HELAMP=VSS=VSS__Bu_rhorho0_pipi0,pipi_Longitudinal.root",
"reference" : "RefSVV_HELAMP=VSS=VSS__Bu_rhorho0_pipi0,pipi_Longitudinal.root"
}
diff --git a/test/jsonFiles/SVV_HELAMP=VSS=VSS__Bu_rhorho0_pipi0,pipi_Transverse.json b/test/jsonFiles/SVV_HELAMP=VSS=VSS__Bu_rhorho0_pipi0,pipi_Transverse.json
index 18599f3..38de26b 100644
--- a/test/jsonFiles/SVV_HELAMP=VSS=VSS__Bu_rhorho0_pipi0,pipi_Transverse.json
+++ b/test/jsonFiles/SVV_HELAMP=VSS=VSS__Bu_rhorho0_pipi0,pipi_Transverse.json
@@ -1,35 +1,35 @@
{
"parent" : "B+",
"daughters" : ["rho+", "rho0"],
"grand_daughters" : [["pi+", "pi0"], ["pi+", "pi-"]],
"models" : ["SVV_HELAMP", "VSS", "VSS"],
"parameters" : [["1.0", "0.0", "0.0", "0.0", "1.0", "0.0"], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "M(#it{#rho}^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.4, "xmax" : 1.5},
{"variable" : "mass", "title" : "M(#it{#rho}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.4, "xmax" : 1.5},
{"variable" : "p", "title" : "p(#it{#rho}^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.0, "xmax" : 3.0},
{"variable" : "pSq", "title" : "p^{2}(#it{#rho}^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.0, "xmax" : 7.0},
{"variable" : "pz", "title" : "pz(#it{#rho}^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(#it{#rho}^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(#it{#rho}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau", "title" : "cosHel(#it{#rho}^{+})", "d1" : 1, "d2" : 1, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHelDiTau", "title" : "cosHel(#it{#rho}^{0})", "d1" : 2, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosAcoplanarityAngle", "title" : "cosAcopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "acoplanarityAngle", "title" : "acopl", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(#it{#rho}^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#it{#rho}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(#it{#rho}^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi(#it{#rho}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(#it{#pi}^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 3.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#it{#pi}^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#it{#pi}^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(#it{#pi}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(#it{#pi}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(#it{#pi}^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "SVV_HELAMP=VSS=VSS__Bu_rhorho0_pipi0,pipi_Transverse.root",
"reference" : "RefSVV_HELAMP=VSS=VSS__Bu_rhorho0_pipi0,pipi_Transverse.root"
}
diff --git a/test/jsonFiles/TAULNUNU__tau_enunu_yesPhotos.json b/test/jsonFiles/TAULNUNU__tau_enunu_yesFSR.json
similarity index 95%
rename from test/jsonFiles/TAULNUNU__tau_enunu_yesPhotos.json
rename to test/jsonFiles/TAULNUNU__tau_enunu_yesFSR.json
index 0334ee7..cedb485 100644
--- a/test/jsonFiles/TAULNUNU__tau_enunu_yesPhotos.json
+++ b/test/jsonFiles/TAULNUNU__tau_enunu_yesFSR.json
@@ -1,32 +1,32 @@
{
"parent" : "tau+",
"daughters" : ["e+", "nu_e", "anti-nu_tau"],
"models" : ["TAULNUNU"],
"parameters" : [[]],
- "extras" : ["yesPhotos"],
+ "extras" : ["yesFSR"],
"events" : 100000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.8, "xmax" : 1.2},
{"variable" : "nFSRPhotons", "title" : "nFSRPhotons", "d1" : 0, "d2" : 0, "nbins" : 8, "xmin" : 0, "xmax" : 8.0 },
{"variable" : "totalFSREnergy", "title" : "totalFSREnergy", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 1.0 },
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma) cut off", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 0.5e-6},
{"variable" : "cosTheta_FSRPhotons", "title" : "FSR cosTheta/#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"variable" : "cosTheta_EnergyWeight_FSRPhotons", "title" : "FSR cosTheta(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_EnergyWeight_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"variable" : "pSumSq", "title" : "qSq(e#nu_{e})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(e)", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "E_over_Eparent", "title" : "E(e)/E(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.5},
{"variable" : "E_over_Eparent", "title" : "E(nue)/E(tau)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.5},
{"variable" : "E_over_Eparent", "title" : "E(nutau_{2})/E(tau)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.5},
{"variable" : "cosTheta", "title" : "cosTheta(e)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(nue)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(nutau_{2})", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(e nue)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass", "title" : "m(e nutau_{2})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass", "title" : "m(nue nutau_{2})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0}
],
- "outfile" : "TAULNUNU__tau_enunu_yesPhotos.root",
- "reference" : "RefTAULNUNU__tau_enunu_yesPhotos.root"
+ "outfile" : "TAULNUNU__tau_enunu_yesFSR.root",
+ "reference" : "RefTAULNUNU__tau_enunu_yesFSR.root"
}
diff --git a/test/jsonFiles/TAUOLA__tau_pipipinu_yesPhotos.json b/test/jsonFiles/TAUOLA__tau_pipipinu_yesFSR.json
similarity index 96%
rename from test/jsonFiles/TAUOLA__tau_pipipinu_yesPhotos.json
rename to test/jsonFiles/TAUOLA__tau_pipipinu_yesFSR.json
index 0a33ebd..97a1bfc 100644
--- a/test/jsonFiles/TAUOLA__tau_pipipinu_yesPhotos.json
+++ b/test/jsonFiles/TAUOLA__tau_pipipinu_yesFSR.json
@@ -1,40 +1,40 @@
{
"parent" : "tau+",
"daughters" : [" "],
"models" : ["TAUOLA"],
"parameters" : [["5"]],
"extras" : ["Define TauolaCurrentOption 1",
"Define TauolaBR1 1.0",
- "yesPhotos"],
+ "yesFSR"],
"events" : 100000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.8, "xmax" : 1.2},
{"variable" : "nFSRPhotons", "title" : "nFSRPhotons", "d1" : 0, "d2" : 0, "nbins" : 6, "xmin" : 0, "xmax" : 6.0 },
{"variable" : "totalFSREnergy", "title" : "totalFSREnergy", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 0.8 },
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.8},
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma) cut off", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 0.5e-6},
{"variable" : "cosTheta_FSRPhotons", "title" : "FSR cosTheta/#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"variable" : "cosTheta_EnergyWeight_FSRPhotons", "title" : "FSR cosTheta(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_EnergyWeight_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"variable" : "E_over_Eparent", "title" : "E(nutau_{2})/E(tau)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.5},
{"variable" : "E_over_Eparent", "title" : "E(pi+_{1})/E(tau)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.5},
{"variable" : "E_over_Eparent", "title" : "E(pi+_{2})/E(tau)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.5},
{"variable" : "E_over_Eparent", "title" : "E(pi-)/E(tau)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.5},
{"variable" : "cosTheta", "title" : "cosTheta(nutau_{2})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(pi+_{1})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(pi+_{2})", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(pi-)", "d1" : 4, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(nutau_{2})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(nutau_{2} pi+_{1})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass", "title" : "m(nutau_{2} pi+_{2})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass", "title" : "m(nutau_{2} pi-)", "d1" : 1, "d2" : 4, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass", "title" : "m(pi+_{1} pi+_{2})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass", "title" : "m(pi+_{1} pi-)", "d1" : 2, "d2" : 4, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass", "title" : "m(pi+_{2} pi-)", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.25, "xmax" : 2.0},
{"variable" : "mass3", "title" : "m(pi+_{1} pi+_{2} pi-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.2, "xmax" : 1.8},
{"variable" : "cosTheta3", "title" : "cosTheta3pi", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
- "outfile" : "TAUOLA__tau_pipipinu_yesPhotos.root",
- "reference" : "RefTAUOLA__tau_pipipinu_yesPhotos.root"
+ "outfile" : "TAUOLA__tau_pipipinu_yesFSR.root",
+ "reference" : "RefTAUOLA__tau_pipipinu_yesFSR.root"
}
diff --git a/test/jsonFiles/THREEBODYPHSP=VLL=PHSP__Bu_JpsiKpi0_mumu,gammagamma.json b/test/jsonFiles/THREEBODYPHSP=VLL=PHSP__Bu_JpsiKpi0_mumu,gammagamma.json
index c6ab972..2f3e600 100644
--- a/test/jsonFiles/THREEBODYPHSP=VLL=PHSP__Bu_JpsiKpi0_mumu,gammagamma.json
+++ b/test/jsonFiles/THREEBODYPHSP=VLL=PHSP__Bu_JpsiKpi0_mumu,gammagamma.json
@@ -1,21 +1,21 @@
{
"parent" : "B+",
"daughters" : ["J/psi", "K+", "pi0"],
"grand_daughters" : [["mu+", "mu-"], [], ["gamma", "gamma"]],
"models" : ["THREEBODYPHSP", "VLL", "", "PHSP"],
"parameters" : [["15.0", "22.0", "1.5", "4.5"], [], [], []],
"do_conjugate_decay" : [true, false, false, false],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "px", "title" : "px(J/psi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "py", "title" : "py(J/psi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "pz", "title" : "pz(J/psi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -3.0, "xmax" : 3.0},
{"variable" : "px", "title" : "pxpy(J/psi)", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : -1.8, "xmax" : 1.8, "variableY" : "py", "d1Y" : 1, "d2Y" : 0, "nbinsY" : 50, "ymin" :-1.8, "ymax" : 1.8},
{"variable" : "px", "title" : "pxpz(J/psi)", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : -1.8, "xmax" : 1.8, "variableY" : "pz", "d1Y" : 1, "d2Y" : 0, "nbinsY" : 50, "ymin" :-1.8, "ymax" : 1.8},
{"variable" : "py", "title" : "pypz(J/psi)", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : -1.8, "xmax" : 1.8, "variableY" : "pz", "d1Y" : 1, "d2Y" : 0, "nbinsY" : 50, "ymin" :-1.8, "ymax" : 1.8},
{"variable" : "massSq", "title" : "dalitz", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 12.5, "xmax" : 27.0, "variableY" : "massSq", "d1Y" : 2, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.35, "ymax" : 4.8}
],
"outfile" : "THREEBODYPHSP=VLL=PHSP__Bu_JpsiKpi0_mumu,gammagamma.root",
"reference" : "RefTHREEBODYPHSP=VLL=PHSP__Bu_JpsiKpi0_mumu,gammagamma.root"
}
diff --git a/test/jsonFiles/VECTORISR=VSS__Upsilon4S_psi4160gamma_DD.json b/test/jsonFiles/VECTORISR=VSS__Upsilon4S_psi4160gamma_DD.json
index e1773b6..5b72cf6 100644
--- a/test/jsonFiles/VECTORISR=VSS__Upsilon4S_psi4160gamma_DD.json
+++ b/test/jsonFiles/VECTORISR=VSS__Upsilon4S_psi4160gamma_DD.json
@@ -1,28 +1,28 @@
{
"parent" : "Upsilon(4S)",
"daughters" : ["psi(4160)", "gamma"],
"grand_daughters" : [["D+", "D-"], []],
"models" : ["VECTORISR", "VSS", ""],
"parameters" : [["0.9", "0.9"], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob_daug1", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "parMass", "title" : "m(Upsilon4S)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 10.5, "xmax" : 11.0},
{"variable" : "mass", "title" : "m(psi4160)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 3.5, "xmax" : 5.5},
{"variable" : "mass_daug1", "title" : "m(D+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.85, "xmax" : 1.9},
{"variable" : "mass_daug1", "title" : "m(D-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.85, "xmax" : 1.9},
{"variable" : "cosHel", "title" : "cosHel(D+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "decayangle_daug1", "title" : "decayAngle(D+,D-)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0},
{"variable" : "p", "title" : "p(psi4160)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.0, "xmax" : 5.0},
{"variable" : "phi", "title" : "phi(psi4160)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(psi4160)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "p", "title" : "p(gamma)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.0, "xmax" : 5.0},
{"variable" : "phi", "title" : "phi(gamma)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(gamma)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "p_daug1", "title" : "p(D+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.6, "xmax" : 2.0},
{"variable" : "p_daug1", "title" : "p(D-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.6, "xmax" : 2.0}
],
"outfile" : "VECTORISR=VSS__Upsilon4S_psi4160gamma_DD.root",
"reference" : "RefVECTORISR=VSS__Upsilon4S_psi4160gamma_DD.root"
}
diff --git a/test/jsonFiles/VLL__Jpsi_ee.json b/test/jsonFiles/VLL__Jpsi_ee.json
index 64131f4..5e089ff 100644
--- a/test/jsonFiles/VLL__Jpsi_ee.json
+++ b/test/jsonFiles/VLL__Jpsi_ee.json
@@ -1,26 +1,26 @@
{
"parent" : "J/psi",
"daughters" : ["e+", "e-"],
"models" : ["VLL"],
"parameters" : [[]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"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" : 10, "xmin" : 0, "xmax" : 10.0 },
{"variable" : "totalFSREnergy", "title" : "totalFSREnergy(J/#psi)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.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_yesFSR.json
similarity index 95%
rename from test/jsonFiles/VLL__Jpsi_ee_yesPhotos.json
rename to test/jsonFiles/VLL__Jpsi_ee_yesFSR.json
index dafc540..deeaa9f 100644
--- a/test/jsonFiles/VLL__Jpsi_ee_yesPhotos.json
+++ b/test/jsonFiles/VLL__Jpsi_ee_yesFSR.json
@@ -1,32 +1,32 @@
{
"parent" : "J/psi",
"daughters" : ["e+", "e-"],
"models" : ["VLL"],
"parameters" : [[]],
- "extras" : ["yesPhotos"],
+ "extras" : ["yesFSR"],
"events" : 100000,
"histograms" : [
{"variable" : "prob", "title" : "probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.5 },
{"variable" : "nFSRPhotons", "title" : "nFSRPhotons", "d1" : 0, "d2" : 0, "nbins" : 10, "xmin" : 0, "xmax" : 10.0 },
{"variable" : "totalFSREnergy", "title" : "totalFSREnergy", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.0 },
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma) cut off", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 0.5e-6},
{"variable" : "cosTheta_FSRPhotons", "title" : "FSR cosTheta(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"variable" : "cosTheta_EnergyWeight_FSRPhotons", "title" : "FSR cosTheta(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_EnergyWeight_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"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"
+ "outfile" : "VLL__Jpsi_ee_yesFSR.root",
+ "reference" : "RefVLL__Jpsi_ee_yesFSR.root"
}
diff --git a/test/jsonFiles/VLL__Jpsi_mumu.json b/test/jsonFiles/VLL__Jpsi_mumu.json
index 62f8c0b..077e4d7 100644
--- a/test/jsonFiles/VLL__Jpsi_mumu.json
+++ b/test/jsonFiles/VLL__Jpsi_mumu.json
@@ -1,26 +1,26 @@
{
"parent" : "J/psi",
"daughters" : ["mu+", "mu-"],
"models" : ["VLL"],
"parameters" : [[]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"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" : 10, "xmin" : 0, "xmax" : 10.0 },
{"variable" : "totalFSREnergy", "title" : "totalFSREnergy(J/#psi)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.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_yesFSR.json
similarity index 95%
rename from test/jsonFiles/VLL__Jpsi_mumu_yesPhotos.json
rename to test/jsonFiles/VLL__Jpsi_mumu_yesFSR.json
index a4c2354..fcd4759 100644
--- a/test/jsonFiles/VLL__Jpsi_mumu_yesPhotos.json
+++ b/test/jsonFiles/VLL__Jpsi_mumu_yesFSR.json
@@ -1,32 +1,32 @@
{
"parent" : "J/psi",
"daughters" : ["mu+", "mu-"],
"models" : ["VLL"],
"parameters" : [[]],
- "extras" : ["yesPhotos"],
+ "extras" : ["yesFSR"],
"events" : 100000,
"histograms" : [
{"variable" : "prob", "title" : "probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.5 },
{"variable" : "nFSRPhotons", "title" : "nFSRPhotons", "d1" : 0, "d2" : 0, "nbins" : 10, "xmin" : 0, "xmax" : 10.0 },
{"variable" : "totalFSREnergy", "title" : "totalFSREnergy", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.0 },
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma) cut off", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 0.5e-6},
{"variable" : "cosTheta_FSRPhotons", "title" : "FSR cosTheta(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"variable" : "cosTheta_EnergyWeight_FSRPhotons", "title" : "FSR cosTheta(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_EnergyWeight_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"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"
+ "outfile" : "VLL__Jpsi_mumu_yesFSR.root",
+ "reference" : "RefVLL__Jpsi_mumu_yesFSR.root"
}
diff --git a/test/jsonFiles/VPHOTOVISRHI=VSS__psi4415_psi4160gamma_DD.json b/test/jsonFiles/VPHOTOVISRHI=VSS__psi4415_psi4160gamma_DD.json
index b20df62..f8af2fd 100644
--- a/test/jsonFiles/VPHOTOVISRHI=VSS__psi4415_psi4160gamma_DD.json
+++ b/test/jsonFiles/VPHOTOVISRHI=VSS__psi4415_psi4160gamma_DD.json
@@ -1,27 +1,27 @@
{
"parent" : "psi(4415)",
"daughters" : ["psi(4160)", "gamma"],
"grand_daughters" : [["D+", "D-"], []],
"models" : ["VPHOTOVISRHI", "VSS", ""],
"parameters" : [["1.0"], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "parMass", "title" : "m(#psi(4415))", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 4.2, "xmax" : 5.4},
{"variable" : "mass", "title" : "m(#psi(4160))", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 3.8, "xmax" : 5.4},
{"variable" : "E", "title" : "E(#gamma)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.55},
{"variable" : "p", "title" : "p(#psi(4160))", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.55},
{"variable" : "cosTheta", "title" : "cosTheta(#psi(4160))", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#gamma))", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(D+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "mass_daug1", "title" : "m(D^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.8, "xmax" : 1.9},
{"variable" : "mass_daug1", "title" : "m(D^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.8, "xmax" : 1.9},
{"variable" : "pLab_daug1", "title" : "pLab(D^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.2, "xmax" : 2.0},
{"variable" : "pLab_daug1", "title" : "pLab(D^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.2, "xmax" : 2.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(D^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(D^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "VPHOTOVISRHI=VSS__psi4415_psi4160gamma_DD.root",
"reference" : "RefVPHOTOVISRHI=VSS__psi4415_psi4160gamma_DD.root"
}
diff --git a/test/jsonFiles/VSP_PWAVE=PHSP__Dst0_D0gamma_Kpi.json b/test/jsonFiles/VSP_PWAVE=PHSP__Dst0_D0gamma_Kpi.json
index 79dc2bf..db68e53 100644
--- a/test/jsonFiles/VSP_PWAVE=PHSP__Dst0_D0gamma_Kpi.json
+++ b/test/jsonFiles/VSP_PWAVE=PHSP__Dst0_D0gamma_Kpi.json
@@ -1,29 +1,29 @@
{
"parent" : "D*0",
"daughters" : ["D0", "gamma"],
"grand_daughters" : [["K-", "pi+"],[]],
"models" : ["VSP_PWAVE", "PHSP", ""],
"parameters" : [[], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass", "title" : "m(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.8, "xmax" : 1.95},
{"variable" : "mass", "title" : "m(D0 gamma)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 1.8, "xmax" : 2.1},
{"variable" : "p", "title" : "p(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.2},
{"variable" : "pz", "title" : "pz(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -0.15, "xmax" : 0.15},
{"variable" : "cosHel", "title" : "cosHel(K-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(gamma)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi(gamma)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(K-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.7, "xmax" : 1.0},
{"variable" : "pLab_daug1", "title" : "pLab(pi+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.7, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(K-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(K-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(pi+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "VSP_PWAVE=PHSP__Dst0_D0gamma_Kpi.root",
"reference" : "RefVSP_PWAVE=PHSP__Dst0_D0gamma_Kpi.root"
}
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
index 3ee8964..77e851f 100644
--- 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
@@ -1,34 +1,34 @@
{
"parent" : "Upsilon(4S)",
"daughters" : ["B0", "anti-B0"],
"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", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"do_conjugate_decay" : [false, true, true],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(BTO2PI_CP_ISO)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.1},
{"variable" : "prob_daug2", "title" : "Prob(ISGW2)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "lifetime", "title" : "tau(B0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "lifetime", "title" : "tau(B0b)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "deltaT", "title" : "deltaT", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -12.0, "xmax" : 12.0},
{"variable" : "mass", "title" : "m(B0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 5.27, "xmax" : 5.29},
{"variable" : "mass", "title" : "m(B0b)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 5.27, "xmax" : 5.29},
{"variable" : "mass_daug1", "title" : "m(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.13, "xmax" : 0.15},
{"variable" : "mass_daug1", "title" : "m(pi-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.13, "xmax" : 0.15},
{"variable" : "mass_daug2", "title" : "m(D)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.85, "xmax" : 1.90},
{"variable" : "pSumSq_daug2", "title" : "qSq(e- anti-nu_e)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "cosHel_daug1", "title" : "cosHel(pi+,pi-)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug2", "title" : "cosHel(D,e)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "decayangle_daug1", "title" : "decayAngle(pi+,pi-)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0},
{"variable" : "p_daug1", "title" : "p(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.0, "xmax" : 3.0},
{"variable" : "p_daug1", "title" : "p(pi-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 2.0, "xmax" : 3.0},
{"variable" : "p_daug2", "title" : "p(D)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "p_daug2", "title" : "p(e)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "p_daug2", "title" : "p(anti-nu_e)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5}
],
"outfile" : "VSS=BTO2PI_CP_ISO=ISGW2__Upsilon4S_BdBdbar_pipi,Denue.root",
"reference" : "RefVSS=BTO2PI_CP_ISO=ISGW2__Upsilon4S_BdBdbar_pipi,Denue.root"
}
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
index cded7fc..675de34 100644
--- 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
@@ -1,23 +1,23 @@
{
"parent" : "Upsilon(4S)",
"daughters" : ["B0", "anti-B0"],
"grand_daughters" : [["pi+","pi-","pi0"], ["D+","e-","anti-nu_e"]],
"models" : ["VSS", "BTO3PI_CP", "ISGW2"],
"parameters" : [[], ["0.51e12", "0.4"], []],
"do_conjugate_decay" : [false, true, true],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob_daug1", "title" : "Prob(BTO3PI_CP)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass_daug1", "title" : "m(#pi^{+} #pi^{-})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass_daug1", "title" : "m(#pi^{-} #pi^{0})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass_daug1", "title" : "m(#pi^{+} #pi^{0})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "massSq_daug1", "title" : "Dalitz m^{2}(#pi^{+} #pi^{-}) vs m^{2}(#pi^{+} #pi^{0})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 30.0, "variableY" : "massSq_daug1", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 30.0},
{"variable" : "massSq_daug1", "title" : "Dalitz m^{2}(#pi^{-} #pi^{0}) vs m^{2}(#pi^{+} #pi^{+})", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : 0.0, "xmax" : 30.0, "variableY" : "massSq_daug1", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 30.0},
{"variable" : "mPrime_daug1", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime_daug1", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0},
{"variable" : "lifetime_daug1", "title" : "tau(#pi^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 200000.0},
{"variable" : "lifetime_daug1", "title" : "tau(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 200000.0}
],
"outfile" :"VSS=BTO3PI_CP=ISGW2__Upsilon4S_BdBdbar_pipipi0,Deanti-nue.root",
"reference" : "RefVSS=BTO3PI_CP=ISGW2__Upsilon4S_BdBdbar_pipipi0,Deanti-nue.root"
}
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
index 846341e..1aa59dc 100644
--- 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
@@ -1,23 +1,23 @@
{
"parent" : "Upsilon(4S)",
"daughters" : ["B0", "anti-B0"],
"grand_daughters" : [["pi+","pi-","pi+","pi-"], ["D+","e-","anti-nu_e"]],
"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"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob_daug1", "title" : "Prob(BTO4PI_CP)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "lifetime", "title" : "tau1", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "lifetime", "title" : "tau2", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "id", "title" : "ID1", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1000.0, "xmax" : 1000.0},
{"variable" : "id", "title" : "ID2", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1000.0, "xmax" : 1000.0},
{"variable" : "mass_daug1", "title" : "mass(pi1pi2)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass3_daug1", "title" : "mass(pi1pi2pi3)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "decayangle3_daug1", "title" : "theta(rho+=pi1+pi2,pi3) B0 as parent", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 200.0},
{"variable" : "decayangle_BTO4PI_daug1", "title" : "theta(pi1,pi2) a2=pi1+pi2+pi3 as parent", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 200.0}
],
"outfile" :"VSS=BTO4PI_CP=ISGW2__Upsilon4S_BdBdbar_pipipipi,D+enu.root",
"reference" : "RefVSS=BTO4PI_CP=ISGW2__Upsilon4S_BdBdbar_pipipipi,D+enu.root"
}
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
index 609408d..08a2d85 100644
--- 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
@@ -1,23 +1,23 @@
{
"parent" : "Upsilon(4S)",
"daughters" : ["B0", "anti-B0"],
"grand_daughters" : [["K+","pi-","pi0"], ["D+","e-","anti-nu_e"]],
"models" : ["VSS", "BTOKPIPI_CP", "ISGW2"],
"parameters" : [[], ["0.51e12", "1.5", "0.4"], []],
"do_conjugate_decay" : [false, true, true],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob_daug1", "title" : "Prob(BTOKPIPI_CP)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass_daug1", "title" : "m(K^{+} #pi^{-})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass_daug1", "title" : "m(#pi^{-} #pi^{0})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "mass_daug1", "title" : "m(K^{+} #pi^{0})", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 6.0},
{"variable" : "massSq_daug1", "title" : "Dalitz m^{2}(K^{+} #pi^{-}) vs m^{2}(K^{+} #pi^{0})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 30.0, "variableY" : "massSq_daug1", "d1Y" : 1, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 30.0},
{"variable" : "massSq_daug1", "title" : "Dalitz m^{2}(#pi^{-} #pi^{0}) vs m^{2}(K^{+} K^{+})", "d1" : 2, "d2" : 3, "nbins" : 50, "xmin" : 0.0, "xmax" : 30.0, "variableY" : "massSq_daug1", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 30.0},
{"variable" : "mPrime_daug1", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime_daug1", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0},
{"variable" : "lifetime_daug1", "title" : "tau(K^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 200000.0},
{"variable" : "lifetime_daug1", "title" : "tau(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 200000.0}
],
"outfile" :"VSS=BTOKPIPI_CP=ISGW2__Upsilon4S_BdBdbar_Kpipi0,Deanti-nue.root",
"reference" : "RefVSS=BTOKPIPI_CP=ISGW2__Upsilon4S_BdBdbar_Kpipi0,Deanti-nue.root"
}
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
index ab548ca..de13f90 100644
--- 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
@@ -1,34 +1,34 @@
{
"parent" : "Upsilon(4S)",
"daughters" : ["B0", "anti-B0"],
"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", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"do_conjugate_decay" : [false, true, true],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(BTO2PI_CP_ISO)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.1},
{"variable" : "prob_daug2", "title" : "Prob(ISGW2)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "lifetime", "title" : "tau(B0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "lifetime", "title" : "tau(B0b)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "deltaT", "title" : "deltaT", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -12.0, "xmax" : 12.0},
{"variable" : "mass", "title" : "m(B0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 5.27, "xmax" : 5.29},
{"variable" : "mass", "title" : "m(B0b)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 5.27, "xmax" : 5.29},
{"variable" : "mass_daug1", "title" : "m(K+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.45, "xmax" : 0.55},
{"variable" : "mass_daug1", "title" : "m(pi-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.13, "xmax" : 0.15},
{"variable" : "mass_daug2", "title" : "m(D)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.85, "xmax" : 1.90},
{"variable" : "pSumSq_daug2", "title" : "qSq(e- anti-nu_e)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "cosHel_daug1", "title" : "cosHel(K+,pi-)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug2", "title" : "cosHel(D,e)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "decayangle_daug1", "title" : "decayAngle(K+,pi-)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0},
{"variable" : "p_daug1", "title" : "p(K+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.0, "xmax" : 3.0},
{"variable" : "p_daug1", "title" : "p(pi-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 2.0, "xmax" : 3.0},
{"variable" : "p_daug2", "title" : "p(D)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "p_daug2", "title" : "p(e)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "p_daug2", "title" : "p(anti-nu_e)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5}
],
"outfile" : "VSS=BTOKPI_CP_ISO=ISGW2__Upsilon4S_BdBdbar_Kpi,Denue.root",
"reference" : "RefVSS=BTOKPI_CP_ISO=ISGW2__Upsilon4S_BdBdbar_Kpi,Denue.root"
}
diff --git a/test/jsonFiles/VSS=DMIX=DMIX__psi3770_D0D0bar_Kpi,Kpi.json b/test/jsonFiles/VSS=DMIX=DMIX__psi3770_D0D0bar_Kpi,Kpi.json
index bd8f3b2..16242a9 100644
--- a/test/jsonFiles/VSS=DMIX=DMIX__psi3770_D0D0bar_Kpi,Kpi.json
+++ b/test/jsonFiles/VSS=DMIX=DMIX__psi3770_D0D0bar_Kpi,Kpi.json
@@ -1,30 +1,30 @@
{
"parent" : "psi(3770)",
"daughters" : ["D0", "anti-D0"],
"grand_daughters" : [["K+", "pi-"], ["K-", "pi+"]],
"models" : ["VSS", "DMIX", "DMIX"],
"parameters" : [[], ["3.4e-3", "0.1e-3", "1.0e-3"], ["3.4e-3", "0.1e-3", "1.0e-3"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 20000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(DMIX)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.1},
{"variable" : "prob_daug2", "title" : "Prob(DMIX)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.1},
{"variable" : "parMass", "title" : "m(#psi(3770))", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 3.7, "xmax" : 4.0},
{"variable" : "mass", "title" : "m(D^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.8, "xmax" : 1.9},
{"variable" : "mass", "title" : "m(anti-D^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.8, "xmax" : 1.9},
{"variable" : "cosHel", "title" : "cosHel(K^{+},D^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(K^{-},anti-D^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "decayangle_daug1", "title" : "DecayAngle(K^{+},#pi^{-})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0},
{"variable" : "decayangle_daug2", "title" : "DecayAngle(K^{-},#pi^{+})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0},
{"variable" : "lifetime", "title" : "#tau(D^{0})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 4.0},
{"variable" : "lifetime", "title" : "#tau(anti-D^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 4.0},
{"variable" : "deltaT", "title" : "#Delta #tau", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -4.0, "xmax" : 4.0},
{"variable" : "pLab_daug1", "title" : "p(K^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.4, "xmax" : 1.5},
{"variable" : "pLab_daug1", "title" : "p(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.4, "xmax" : 1.5},
{"variable" : "pLab_daug2", "title" : "p(K^{-})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.4, "xmax" : 1.5},
{"variable" : "pLab_daug2", "title" : "p(#pi^{+})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.4, "xmax" : 1.5}
],
"outfile" : "VSS=DMIX=DMIX__psi3770_D0D0bar_Kpi,Kpi.root",
"reference" : "RefVSS=DMIX=DMIX__psi3770_D0D0bar_Kpi,Kpi.root"
}
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
index 7f43aef..fadfd20 100644
--- a/test/jsonFiles/VSS=SSD_CP=HQET__Upsilon4S_BdBdbar_Dpi,Dstenue.json
+++ b/test/jsonFiles/VSS=SSD_CP=HQET__Upsilon4S_BdBdbar_Dpi,Dstenue.json
@@ -1,32 +1,32 @@
{
"parent" : "Upsilon(4S)",
"daughters" : ["B0", "anti-B0"],
"grand_daughters" : [["D-", "pi+"], ["D*+","e-","anti-nu_e"]],
"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"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(SSD_CP)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug2", "title" : "Prob(HQET)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "lifetime", "title" : "tau(B0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "lifetime", "title" : "tau(B0b)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "deltaT", "title" : "deltaT", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -12.0, "xmax" : 12.0},
{"variable" : "mass", "title" : "m(B0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 5.2, "xmax" : 5.3},
{"variable" : "mass", "title" : "m(B0b)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 5.2, "xmax" : 5.3},
{"variable" : "mass_daug1", "title" : "m(D-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.8, "xmax" : 1.9},
{"variable" : "mass_daug1", "title" : "m(pi+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.3},
{"variable" : "mass_daug2", "title" : "m(D*+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.8, "xmax" : 2.2},
{"variable" : "pSumSq_daug2", "title" : "qSq(e- anti-nu_e)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "cosHel_daug2", "title" : "cosHel(D*+,e+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "p_daug1", "title" : "p(D-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.0, "xmax" : 3.0},
{"variable" : "p_daug1", "title" : "p(pi+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.5, "xmax" : 2.5},
{"variable" : "p_daug2", "title" : "p(D*+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p_daug2", "title" : "p(e-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p_daug2", "title" : "p(anti-nu_e)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0}
],
"outfile" : "VSS=SSD_CP=HQET__Upsilon4S_BdBdbar_Dpi,Dstenue.root",
"reference" : "RefVSS=SSD_CP=HQET__Upsilon4S_BdBdbar_Dpi,Dstenue.root"
}
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
index e8e9fcb..ccc6ca5 100644
--- a/test/jsonFiles/VSS=SSS_CP=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.json
+++ b/test/jsonFiles/VSS=SSS_CP=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.json
@@ -1,30 +1,30 @@
{
"parent" : "Upsilon(4S)",
"daughters" : ["B0", "anti-B0"],
"grand_daughters" : [["pi+","pi-"], ["D*+","e-","anti-nu_e"]],
"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"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(SSS_CP)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug2", "title" : "Prob(ISGW2)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "lifetime", "title" : "tau(B0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "lifetime", "title" : "tau(B0b)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "deltaT", "title" : "deltaT", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -12.0, "xmax" : 12.0},
{"variable" : "mass", "title" : "m(B0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 5.2, "xmax" : 5.3},
{"variable" : "mass", "title" : "m(B0b)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 5.2, "xmax" : 5.3},
{"variable" : "mass_daug2", "title" : "m(D*+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.8, "xmax" : 2.2},
{"variable" : "pSumSq_daug2", "title" : "qSq(e- anti-nu_e)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "cosHel_daug2", "title" : "cosHel(D*+,e+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "p_daug1", "title" : "p(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.5, "xmax" : 3.0},
{"variable" : "p_daug1", "title" : "p(pi-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.5, "xmax" : 3.0},
{"variable" : "p_daug2", "title" : "p(D*+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p_daug2", "title" : "p(e-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p_daug2", "title" : "p(anti-nu_e)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0}
],
"outfile" : "VSS=SSS_CP=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.root",
"reference" : "RefVSS=SSS_CP=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.root"
}
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
index cc7edfb..c596c05 100644
--- a/test/jsonFiles/VSS=SSS_CPT=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.json
+++ b/test/jsonFiles/VSS=SSS_CPT=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.json
@@ -1,30 +1,30 @@
{
"parent" : "Upsilon(4S)",
"daughters" : ["B0", "anti-B0"],
"grand_daughters" : [["pi+","pi-"], ["D*+","e-","anti-nu_e"]],
"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"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(SSS_CPT)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug2", "title" : "Prob(ISGW2)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "lifetime", "title" : "tau(B0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "lifetime", "title" : "tau(B0b)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "deltaT", "title" : "deltaT", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -12.0, "xmax" : 12.0},
{"variable" : "mass", "title" : "m(B0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 5.2, "xmax" : 5.3},
{"variable" : "mass", "title" : "m(B0b)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 5.2, "xmax" : 5.3},
{"variable" : "mass_daug2", "title" : "m(D*+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.8, "xmax" : 2.2},
{"variable" : "pSumSq_daug2", "title" : "qSq(e- anti-nu_e)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "cosHel_daug2", "title" : "cosHel(D*+,e+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "p_daug1", "title" : "p(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.5, "xmax" : 3.0},
{"variable" : "p_daug1", "title" : "p(pi-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.5, "xmax" : 3.0},
{"variable" : "p_daug2", "title" : "p(D*+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p_daug2", "title" : "p(e-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p_daug2", "title" : "p(anti-nu_e)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0}
],
"outfile" : "VSS=SSS_CPT=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.root",
"reference" : "RefVSS=SSS_CPT=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.root"
}
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
index accc017..fd46be5 100644
--- 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
@@ -1,30 +1,30 @@
{
"parent" : "Upsilon(4S)",
"daughters" : ["B0", "anti-B0"],
"grand_daughters" : [["pi+","pi-"], ["D*+","e-","anti-nu_e"]],
"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"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(SSS_CP_PNG)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug2", "title" : "Prob(ISGW2)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "lifetime", "title" : "tau(B0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "lifetime", "title" : "tau(B0b)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "deltaT", "title" : "deltaT", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -12.0, "xmax" : 12.0},
{"variable" : "mass", "title" : "m(B0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 5.2, "xmax" : 5.3},
{"variable" : "mass", "title" : "m(B0b)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 5.2, "xmax" : 5.3},
{"variable" : "mass_daug2", "title" : "m(D*+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.8, "xmax" : 2.2},
{"variable" : "pSumSq_daug2", "title" : "qSq(e- anti-nu_e)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "cosHel_daug2", "title" : "cosHel(D*+,e+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "p_daug1", "title" : "p(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.5, "xmax" : 3.0},
{"variable" : "p_daug1", "title" : "p(pi-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.5, "xmax" : 3.0},
{"variable" : "p_daug2", "title" : "p(D*+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p_daug2", "title" : "p(e-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p_daug2", "title" : "p(anti-nu_e)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0}
],
"outfile" : "VSS=SSS_CP_PNG=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.root",
"reference" : "RefVSS=SSS_CP_PNG=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.root"
}
diff --git a/test/jsonFiles/VSS=SVPHELCPMIX=ISGW2__Upsilon5S_BsBsbar_phigamma,Dsenue.json b/test/jsonFiles/VSS=SVPHELCPMIX=ISGW2__Upsilon5S_BsBsbar_phigamma,Dsenue.json
index dd80f46..4b1e2c0 100644
--- a/test/jsonFiles/VSS=SVPHELCPMIX=ISGW2__Upsilon5S_BsBsbar_phigamma,Dsenue.json
+++ b/test/jsonFiles/VSS=SVPHELCPMIX=ISGW2__Upsilon5S_BsBsbar_phigamma,Dsenue.json
@@ -1,33 +1,33 @@
{
"parent" : "Upsilon(5S)",
"daughters" : ["B_s0", "anti-B_s0"],
"grand_daughters" : [["phi", "gamma"], ["D_s+","e-","anti-nu_e"]],
"models" : ["VSS", "SVPHELCPMIX", "ISGW2"],
"parameters" : [[], ["1.0", "0.0", "1.0", "0.0", "0.025"], []],
"do_conjugate_decay" : [false, true, true],
- "extras" : ["Define dm_incohMix_B_s0 17.8e12", "Define qoverp_incohMix_B_s0 1.0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B_s0 17.8e12", "Define qoverp_incohMix_B_s0 1.0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(SVPHELCPMIX)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug2", "title" : "Prob(ISGW2)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "lifetime", "title" : "tau(B_{s})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "lifetime", "title" : "tau(anti-B_{s})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "deltaT", "title" : "deltaT", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -12.0, "xmax" : 12.0},
{"variable" : "mass", "title" : "m(B_{s})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 5.3, "xmax" : 5.4},
{"variable" : "mass", "title" : "m(anti-B_{s})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 5.3, "xmax" : 5.4},
{"variable" : "mass_daug1", "title" : "m(#phi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.95, "xmax" : 1.15},
{"variable" : "E_daug1", "title" : "E_{Lab}(#gamma)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.5, "xmax" : 4.0},
{"variable" : "mass_daug2", "title" : "m(D_{s}^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.9, "xmax" : 2.1},
{"variable" : "pSumSq_daug2", "title" : "qSq(e^{-} anti-#nu_{e})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "cosHel_daug2", "title" : "cosHel(D_{s}^{+},e^{-})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "decayangle_daug1", "title" : "decayAngle(#phi,#gamma)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0},
{"variable" : "p_daug1", "title" : "p(#phi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.5, "xmax" : 2.7},
{"variable" : "p_daug1", "title" : "p(#gamma)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 2.5, "xmax" : 2.7},
{"variable" : "p_daug2", "title" : "p(D_s^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "p_daug2", "title" : "p(e^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "p_daug2", "title" : "p(anti-#nu_{e})", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5}
],
"outfile" : "VSS=SVPHELCPMIX=ISGW2__Upsilon5S_BsBsbar_phigamma,Dsenue.root",
"reference" : "RefVSS=SVPHELCPMIX=ISGW2__Upsilon5S_BsBsbar_phigamma,Dsenue.root"
}
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
index 692cdc0..4252104 100644
--- a/test/jsonFiles/VSS=SVS_CP=ISGW2__Upsilon4S_BdBdbar_JpsiK0,Dstenue.json
+++ b/test/jsonFiles/VSS=SVS_CP=ISGW2__Upsilon4S_BdBdbar_JpsiK0,Dstenue.json
@@ -1,32 +1,32 @@
{
"parent" : "Upsilon(4S)",
"daughters" : ["B0", "anti-B0"],
"grand_daughters" : [["J/psi", "K0"], ["D*+","e-","anti-nu_e"]],
"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"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(SVS_CP)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug2", "title" : "Prob(ISGW2)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "lifetime", "title" : "tau(B0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "lifetime", "title" : "tau(B0b)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "deltaT", "title" : "deltaT", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -12.0, "xmax" : 12.0},
{"variable" : "mass", "title" : "m(B0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 5.2, "xmax" : 5.3},
{"variable" : "mass", "title" : "m(B0b)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 5.2, "xmax" : 5.3},
{"variable" : "mass_daug1", "title" : "m(J/psi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.5, "xmax" : 3.5},
{"variable" : "mass_daug1", "title" : "m(K0)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass_daug2", "title" : "m(D*+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.8, "xmax" : 2.2},
{"variable" : "pSumSq_daug2", "title" : "qSq(e- anti-nu_e)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "cosHel_daug2", "title" : "cosHel(D*+,e+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "p_daug1", "title" : "p(J/psi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.5, "xmax" : 2.0},
{"variable" : "p_daug1", "title" : "p(K0)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.5, "xmax" : 2.0},
{"variable" : "p_daug2", "title" : "p(D*+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p_daug2", "title" : "p(e-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p_daug2", "title" : "p(anti-nu_e)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0}
],
"outfile" : "VSS=SVS_CP=ISGW2__Upsilon4S_BdBdbar_JpsiK0,Dstenue.root",
"reference" : "RefVSS=SVS_CP=ISGW2__Upsilon4S_BdBdbar_JpsiK0,Dstenue.root"
}
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
index 5f114fd..25a3652 100644
--- a/test/jsonFiles/VSS=SVS_CPLH=ISGW2__Upsilon4S_BdBdbar_JpsiK0s,Denue.json
+++ b/test/jsonFiles/VSS=SVS_CPLH=ISGW2__Upsilon4S_BdBdbar_JpsiK0s,Denue.json
@@ -1,32 +1,32 @@
{
"parent" : "Upsilon(4S)",
"daughters" : ["B0", "anti-B0"],
"grand_daughters" : [["J/psi", "K_S0"], ["D+","e-","anti-nu_e"]],
"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"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(SVS_CPLH)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug2", "title" : "Prob(ISGW2)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "lifetime", "title" : "tau(B0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "lifetime", "title" : "tau(B0b)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "deltaT", "title" : "deltaT", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -12.0, "xmax" : 12.0},
{"variable" : "mass", "title" : "m(B0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 5.2, "xmax" : 5.3},
{"variable" : "mass", "title" : "m(B0b)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 5.2, "xmax" : 5.3},
{"variable" : "mass_daug1", "title" : "m(J/psi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.5, "xmax" : 3.5},
{"variable" : "mass_daug1", "title" : "m(K_S0)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass_daug2", "title" : "m(D+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.8, "xmax" : 2.0},
{"variable" : "pSumSq_daug2", "title" : "qSq(e- anti-nu_e)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "cosHel_daug1", "title" : "cosHel(J/psi,K_S0)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug2", "title" : "cosHel(D+,e+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "decayangle_daug1", "title" : "DecayAngle(Jpsi,K_S0)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0},
{"variable" : "p_daug2", "title" : "p(D+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p_daug2", "title" : "p(e-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p_daug2", "title" : "p(anti-nu_e)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0}
],
"outfile" : "VSS=SVS_CPLH=ISGW2__Upsilon4S_BdBdbar_JpsiK0s,Denue.root",
"reference" : "RefVSS=SVS_CPLH=ISGW2__Upsilon4S_BdBdbar_JpsiK0s,Denue.root"
}
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
index d86ffdd..28f0646 100644
--- 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
@@ -1,32 +1,32 @@
{
"parent" : "Upsilon(4S)",
"daughters" : ["B0", "anti-B0"],
"grand_daughters" : [["a_1-", "pi+"], ["D*+","e-","anti-nu_e"]],
"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"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(SVS_CP_ISO)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug2", "title" : "Prob(ISGW2)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "lifetime", "title" : "tau(B0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "lifetime", "title" : "tau(B0b)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "deltaT", "title" : "deltaT", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -12.0, "xmax" : 12.0},
{"variable" : "mass", "title" : "m(B0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 5.2, "xmax" : 5.3},
{"variable" : "mass", "title" : "m(B0b)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 5.2, "xmax" : 5.3},
{"variable" : "mass_daug1", "title" : "m(a1-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.05, "xmax" : 5.0},
{"variable" : "mass_daug1", "title" : "m(pi+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "mass_daug2", "title" : "m(D*+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.8, "xmax" : 2.2},
{"variable" : "pSumSq_daug2", "title" : "qSq(e- anti-nu_e)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "cosHel_daug2", "title" : "cosHel(D*+,e+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "p_daug1", "title" : "p(a1-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.0},
{"variable" : "p_daug1", "title" : "p(pi+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 3.0},
{"variable" : "p_daug2", "title" : "p(D*+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p_daug2", "title" : "p(e-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p_daug2", "title" : "p(anti-nu_e)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0}
],
"outfile" : "VSS=SVS_CP_ISO=ISGW2__Upsilon4S_BdBdbar_a1pi,Dstenue.root",
"reference" : "RefVSS=SVS_CP_ISO=ISGW2__Upsilon4S_BdBdbar_a1pi,Dstenue.root"
}
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
index c307638..b172ef9 100644
--- a/test/jsonFiles/VSS=SVS_NONCPEIGEN=ISGW2__Upsilon4S_BdBdbar_a1pi,Dstenue.json
+++ b/test/jsonFiles/VSS=SVS_NONCPEIGEN=ISGW2__Upsilon4S_BdBdbar_a1pi,Dstenue.json
@@ -1,33 +1,33 @@
{
"parent" : "Upsilon(4S)",
"daughters" : ["B0", "anti-B0"],
"grand_daughters" : [["a_1-", "pi+"], ["D*+","e-","anti-nu_e"]],
"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"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(SVS_NONCPEIGEN)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug2", "title" : "Prob(ISGW2)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "lifetime", "title" : "tau(B0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "lifetime", "title" : "tau(B0b)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "deltaT", "title" : "deltaT", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -12.0, "xmax" : 12.0},
{"variable" : "mass", "title" : "m(B0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 5.2, "xmax" : 5.3},
{"variable" : "mass", "title" : "m(B0b)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 5.2, "xmax" : 5.3},
{"variable" : "mass_daug1", "title" : "m(a_1)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 4.0},
{"variable" : "mass_daug1", "title" : "m(pi)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.3},
{"variable" : "mass_daug2", "title" : "m(D*+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.8, "xmax" : 2.2},
{"variable" : "pSumSq_daug2", "title" : "qSq(e- anti-nu_e)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "cosHel_daug2", "title" : "cosHel(D*+,e+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "decayangle_daug1", "title" : "DecayAngle(a1, pi)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 200.0},
{"variable" : "p_daug1", "title" : "p(a_1)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p_daug1", "title" : "p(pi)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p_daug2", "title" : "p(D*+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p_daug2", "title" : "p(e-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p_daug2", "title" : "p(anti-nu_e)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0}
],
"outfile" : "VSS=SVS_NONCPEIGEN=ISGW2__Upsilon4S_BdBdbar_a1pi,Dstenue.root",
"reference" : "RefVSS=SVS_NONCPEIGEN=ISGW2__Upsilon4S_BdBdbar_a1pi,Dstenue.root"
}
diff --git a/test/jsonFiles/VSS=SVVHELCPMIX=ISGW2__Upsilon5S_BsBsbar_Jpsiphi,Dsenue.json b/test/jsonFiles/VSS=SVVHELCPMIX=ISGW2__Upsilon5S_BsBsbar_Jpsiphi,Dsenue.json
index f83a418..3a9ce31 100644
--- a/test/jsonFiles/VSS=SVVHELCPMIX=ISGW2__Upsilon5S_BsBsbar_Jpsiphi,Dsenue.json
+++ b/test/jsonFiles/VSS=SVVHELCPMIX=ISGW2__Upsilon5S_BsBsbar_Jpsiphi,Dsenue.json
@@ -1,33 +1,33 @@
{
"parent" : "Upsilon(5S)",
"daughters" : ["B_s0", "anti-B_s0"],
"grand_daughters" : [["J/psi", "phi"], ["D_s+","e-","anti-nu_e"]],
"models" : ["VSS", "SVVHELCPMIX", "ISGW2"],
"parameters" : [[], ["1.0", "0.0", "1.0", "0.0", "1.0", "0.0", "8.15e24", "17.8e12", "65.78e10", "8.42e10", "0.0", "0.025"], []],
"do_conjugate_decay" : [false, true, true],
- "extras" : ["Define dm_incohMix_B_s0 17.8e12", "Define qoverp_incohMix_B_s0 1.0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B_s0 17.8e12", "Define qoverp_incohMix_B_s0 1.0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(SVVHELCPMIX)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.1},
{"variable" : "prob_daug2", "title" : "Prob(ISGW2)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "lifetime", "title" : "tau(B_{s})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "lifetime", "title" : "tau(anti-B_{s})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "deltaT", "title" : "deltaT", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -12.0, "xmax" : 12.0},
{"variable" : "mass", "title" : "m(B_{s})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 5.3, "xmax" : 5.4},
{"variable" : "mass", "title" : "m(anti-B_{s})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 5.3, "xmax" : 5.4},
{"variable" : "mass_daug1", "title" : "m(J/#psi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.5, "xmax" : 3.5},
{"variable" : "mass_daug1", "title" : "m(#phi)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.95, "xmax" : 1.10},
{"variable" : "mass_daug2", "title" : "m(D_{s}^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.9, "xmax" : 2.1},
{"variable" : "pSumSq_daug2", "title" : "qSq(e^{-} anti-#nu_{e})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "cosHel_daug2", "title" : "cosHel(D_{s}^{+},e^{-})", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "decayangle_daug1", "title" : "decayAngle(J/#psi,#phi)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0},
{"variable" : "p_daug1", "title" : "p(J/#psi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.5, "xmax" : 1.65},
{"variable" : "p_daug1", "title" : "p(#phi)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.5, "xmax" : 1.65},
{"variable" : "p_daug2", "title" : "p(D_s^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "p_daug2", "title" : "p(e^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5},
{"variable" : "p_daug2", "title" : "p(anti-#nu_{e})", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.5}
],
"outfile" : "VSS=SVVHELCPMIX=ISGW2__Upsilon5S_BsBsbar_Jpsiphi,Dsenue.root",
"reference" : "RefVSS=SVVHELCPMIX=ISGW2__Upsilon5S_BsBsbar_Jpsiphi,Dsenue.root"
}
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
index 1915720..45e6931 100644
--- a/test/jsonFiles/VSS=SVV_CP=ISGW2__Upsilon4S_BdBdbar_JpsiKst,Denue.json
+++ b/test/jsonFiles/VSS=SVV_CP=ISGW2__Upsilon4S_BdBdbar_JpsiKst,Denue.json
@@ -1,33 +1,33 @@
{
"parent" : "Upsilon(4S)",
"daughters" : ["B0", "anti-B0"],
"grand_daughters" : [["J/psi", "K*0"], ["D+","e-","anti-nu_e"]],
"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"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(SVV_CP)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug2", "title" : "Prob(ISGW2)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "lifetime", "title" : "tau(B0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "lifetime", "title" : "tau(B0b)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "deltaT", "title" : "deltaT", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -12.0, "xmax" : 12.0},
{"variable" : "mass", "title" : "m(B0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 5.2, "xmax" : 5.3},
{"variable" : "mass", "title" : "m(B0b)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 5.2, "xmax" : 5.3},
{"variable" : "mass_daug1", "title" : "m(J/psi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 2.5, "xmax" : 3.5},
{"variable" : "mass_daug1", "title" : "m(K*)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.5, "xmax" : 1.5},
{"variable" : "mass_daug2", "title" : "m(D+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.8, "xmax" : 2.0},
{"variable" : "pSumSq_daug2", "title" : "qSq(e- anti-nu_e)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "cosHel_daug2", "title" : "cosHel(D+,e-)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "decayangle_daug1", "title" : "DecayAngle(Jpsi,K*0)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0},
{"variable" : "p_daug1", "title" : "p(J/psi)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.1, "xmax" : 1.7},
{"variable" : "p_daug1", "title" : "p(K*)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.1, "xmax" : 1.7},
{"variable" : "p_daug2", "title" : "p(D+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p_daug2", "title" : "p(e-)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p_daug2", "title" : "p(anti-nu_e)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0}
],
"outfile" : "VSS=SVV_CP=ISGW2__Upsilon4S_BdBdbar_JpsiKst,Denue.root",
"reference" : "RefVSS=SVV_CP=ISGW2__Upsilon4S_BdBdbar_JpsiKst,Denue.root"
}
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
index 3ae0231..495c910 100644
--- a/test/jsonFiles/VSS=SVV_NONCPEIGEN=ISGW2__Upsilon4S_BdBdbar_Dstrho,Denue.json
+++ b/test/jsonFiles/VSS=SVV_NONCPEIGEN=ISGW2__Upsilon4S_BdBdbar_Dstrho,Denue.json
@@ -1,34 +1,34 @@
{
"parent" : "Upsilon(4S)",
"daughters" : ["B0", "anti-B0"],
"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", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"do_conjugate_decay" : [false, true, true],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug1", "title" : "Prob(SVV_NONCPEIGEN)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "prob_daug2", "title" : "Prob(ISGW2)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "lifetime", "title" : "tau(B0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "lifetime", "title" : "tau(B0b)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 20.0},
{"variable" : "deltaT", "title" : "deltaT", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -12.0, "xmax" : 12.0},
{"variable" : "mass", "title" : "m(B0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 5.27, "xmax" : 5.29},
{"variable" : "mass", "title" : "m(B0b)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 5.27, "xmax" : 5.29},
{"variable" : "mass_daug1", "title" : "m(D*)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.9, "xmax" : 2.1},
{"variable" : "mass_daug1", "title" : "m(rho)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.2, "xmax" : 2.0},
{"variable" : "mass_daug2", "title" : "m(D)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.85, "xmax" : 1.90},
{"variable" : "pSumSq_daug2", "title" : "qSq(e- anti-nu_e)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "cosHel_daug1", "title" : "cosHel(D*,rho)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel_daug2", "title" : "cosHel(D,e)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "decayangle_daug1", "title" : "decayAngle(D*, rho)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 180.0},
{"variable" : "p_daug1", "title" : "p(D*)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.0, "xmax" : 2.5},
{"variable" : "p_daug1", "title" : "p(rho)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.0, "xmax" : 2.5},
{"variable" : "p_daug2", "title" : "p(D)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p_daug2", "title" : "p(e)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p_daug2", "title" : "p(anti-nu_e)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0}
],
"outfile" : "VSS=SVV_NONCPEIGEN=ISGW2__Upsilon4S_BdBdbar_Dstrho,Denue.root",
"reference" : "RefVSS=SVV_NONCPEIGEN=ISGW2__Upsilon4S_BdBdbar_Dstrho,Denue.root"
}
diff --git a/test/jsonFiles/VSS_BMIX__Upsilon4S_BdBdbar.json b/test/jsonFiles/VSS_BMIX__Upsilon4S_BdBdbar.json
index 41b9966..5c91e8a 100644
--- a/test/jsonFiles/VSS_BMIX__Upsilon4S_BdBdbar.json
+++ b/test/jsonFiles/VSS_BMIX__Upsilon4S_BdBdbar.json
@@ -1,18 +1,18 @@
{
"parent" : "Upsilon(4S)",
"daughters" : ["B0", "anti-B0"],
"models" : ["VSS_BMIX"],
"parameters" : [["0.474e12", "0.5", "0.8", "0.0"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "id", "title" : "StdHep ID1", "d1" : 1, "d2" : 0, "nbins" : 2, "xmin" : -600.0, "xmax" : 600.0},
{"variable" : "id", "title" : "StdHep ID2", "d1" : 2, "d2" : 0, "nbins" : 2, "xmin" : -600.0, "xmax" : 600.0},
{"variable" : "lifetime", "title" : "tau1", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "lifetime", "title" : "tau2", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "deltaT", "title" : "deltaT", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -12.0, "xmax" : 12.0},
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0}
],
"outfile" : "VSS_BMIX__Upsilon4S_BdBdbar.root",
"reference" : "RefVSS_BMIX__Upsilon4S_BdBdbar.root"
}
diff --git a/test/jsonFiles/VSS_MIX__Upsilon4S_BdBdbar.json b/test/jsonFiles/VSS_MIX__Upsilon4S_BdBdbar.json
index 3be70f3..e0ac83b 100644
--- a/test/jsonFiles/VSS_MIX__Upsilon4S_BdBdbar.json
+++ b/test/jsonFiles/VSS_MIX__Upsilon4S_BdBdbar.json
@@ -1,18 +1,18 @@
{
"parent" : "Upsilon(4S)",
"daughters" : ["B0", "anti-B0"],
"models" : ["VSS_MIX"],
"parameters" : [["0.474e12"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "id", "title" : "StdHep ID1", "d1" : 1, "d2" : 0, "nbins" : 2, "xmin" : -600.0, "xmax" : 600.0},
{"variable" : "id", "title" : "StdHep ID2", "d1" : 2, "d2" : 0, "nbins" : 2, "xmin" : -600.0, "xmax" : 600.0},
{"variable" : "lifetime", "title" : "tau1", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "lifetime", "title" : "tau2", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
{"variable" : "deltaT", "title" : "deltaT", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -12.0, "xmax" : 12.0},
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0}
],
"outfile" : "VSS_MIX__Upsilon4S_BdBdbar.root",
"reference" : "RefVSS_MIX__Upsilon4S_BdBdbar.root"
}
diff --git a/test/jsonFiles/VSS__rho0_pipi_yesPhotos.json b/test/jsonFiles/VSS__rho0_pipi_yesFSR.json
similarity index 95%
rename from test/jsonFiles/VSS__rho0_pipi_yesPhotos.json
rename to test/jsonFiles/VSS__rho0_pipi_yesFSR.json
index c2375f7..0f9a65a 100644
--- a/test/jsonFiles/VSS__rho0_pipi_yesPhotos.json
+++ b/test/jsonFiles/VSS__rho0_pipi_yesFSR.json
@@ -1,32 +1,32 @@
{
"parent" : "rho0",
"daughters" : ["pi+", "pi-"],
"models" : ["VSS"],
"parameters" : [[]],
- "extras" : ["yesPhotos"],
+ "extras" : ["yesFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.5 },
{"variable" : "nFSRPhotons", "title" : "nFSRPhotons", "d1" : 0, "d2" : 0, "nbins" : 10, "xmin" : 0, "xmax" : 10.0 },
{"variable" : "totalFSREnergy", "title" : "totalFSREnergy", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 1.0 },
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma) cut off", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 0.5e-6},
{"variable" : "cosTheta_FSRPhotons", "title" : "FSR cosTheta(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"variable" : "cosTheta_EnergyWeight_FSRPhotons", "title" : "FSR cosTheta(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_EnergyWeight_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"variable" : "parMass", "title" : "m(#rho^{+})", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 3.0967, "xmax" : 3.09695},
{"variable" : "mass", "title" : "m(#pi^{+}#pi^{-})", "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(#pi^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "E", "title" : "E(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "pz", "title" : "p_{z}(#pi^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.6, "xmax" : 1.6},
{"variable" : "pz", "title" : "p_{z}(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.6, "xmax" : 1.6},
{"variable" : "pLab", "title" : "pLab(#pi^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "pLab", "title" : "pLab(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "cosTheta", "title" : "cosTheta(#pi^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#pi^{-})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
- "outfile" : "VSS__rho0_pipi_yesPhotos.root",
- "reference" : "RefVSS__rho0_pipi_yesPhotos.root"
+ "outfile" : "VSS__rho0_pipi_yesFSR.root",
+ "reference" : "RefVSS__rho0_pipi_yesFSR.root"
}
diff --git a/test/jsonFiles/VSS__rho_pipi0_yesPhotos.json b/test/jsonFiles/VSS__rho_pipi0_yesFSR.json
similarity index 95%
rename from test/jsonFiles/VSS__rho_pipi0_yesPhotos.json
rename to test/jsonFiles/VSS__rho_pipi0_yesFSR.json
index ff86dd3..e93e6db 100644
--- a/test/jsonFiles/VSS__rho_pipi0_yesPhotos.json
+++ b/test/jsonFiles/VSS__rho_pipi0_yesFSR.json
@@ -1,32 +1,32 @@
{
"parent" : "rho+",
"daughters" : ["pi+", "pi0"],
"models" : ["VSS"],
"parameters" : [[]],
- "extras" : ["yesPhotos"],
+ "extras" : ["yesFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.5 },
{"variable" : "nFSRPhotons", "title" : "nFSRPhotons", "d1" : 0, "d2" : 0, "nbins" : 10, "xmin" : 0, "xmax" : 10.0 },
{"variable" : "totalFSREnergy", "title" : "totalFSREnergy", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 1.0 },
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "E_FSRPhotons", "title" : "FSR E(#gamma) cut off", "d1" : 1, "d2" : 0, "nbins" : 50, "xmin" : 0.0, "xmax" : 0.5e-6},
{"variable" : "cosTheta_FSRPhotons", "title" : "FSR cosTheta(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"variable" : "cosTheta_EnergyWeight_FSRPhotons", "title" : "FSR cosTheta(#gamma)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "openingAngle_EnergyWeight_FSRPhotons", "title" : "FSR opening angle", "d1" : 0, "d2" : 0, "nbins" : 90, "xmin" : 0, "xmax" : 180},
{"variable" : "parMass", "title" : "m(#rho^{+})", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 3.0967, "xmax" : 3.09695},
{"variable" : "mass", "title" : "m(#pi^{+}#pi^{0})", "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(#pi^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "E", "title" : "E(#pi^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "pz", "title" : "p_{z}(#pi^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.6, "xmax" : 1.6},
{"variable" : "pz", "title" : "p_{z}(#pi^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.6, "xmax" : 1.6},
{"variable" : "pLab", "title" : "pLab(#pi^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "pLab", "title" : "pLab(#pi^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 1.2, "xmax" : 1.6},
{"variable" : "cosTheta", "title" : "cosTheta(#pi^{+})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(#pi^{0})", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
- "outfile" : "VSS__rho_pipi0_yesPhotos.root",
- "reference" : "RefVSS__rho_pipi0_yesPhotos.root"
+ "outfile" : "VSS__rho_pipi0_yesFSR.root",
+ "reference" : "RefVSS__rho_pipi0_yesFSR.root"
}
diff --git a/test/jsonFiles/VTOSLL=PHSP__Dst0_D0ee_Kpi.json b/test/jsonFiles/VTOSLL=PHSP__Dst0_D0ee_Kpi.json
index cfbd70c..6ed2fdb 100644
--- a/test/jsonFiles/VTOSLL=PHSP__Dst0_D0ee_Kpi.json
+++ b/test/jsonFiles/VTOSLL=PHSP__Dst0_D0ee_Kpi.json
@@ -1,35 +1,35 @@
{
"parent" : "D*0",
"daughters" : ["D0", "e+", "e-"],
"grand_daughters" : [["K-", "pi+"], [], []],
"models" : ["VTOSLL", "PHSP", ""],
"parameters" : [[], [], []],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "mass", "title" : "m(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.8, "xmax" : 1.95},
{"variable" : "mass", "title" : "m(D0 e+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 1.8, "xmax" : 2.1},
{"variable" : "mass", "title" : "m(D0 e-)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 1.8, "xmax" : 2.1},
{"variable" : "mass", "title" : "m(e+e-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.15},
{"variable" : "pSumSq", "title" : "qSq(e+ e-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.02},
{"variable" : "p", "title" : "p(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.2},
{"variable" : "pSq", "title" : "pSq(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.02},
{"variable" : "pz", "title" : "pz(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -0.15, "xmax" : 0.15},
{"variable" : "cosHel", "title" : "cosHel(D0,e+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(e+,e-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(K-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(D0)", "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},
{"variable" : "cosTheta", "title" : "cosTheta(e-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(D0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "pLab_daug1", "title" : "pLab(K-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.7, "xmax" : 1.0},
{"variable" : "pLab_daug1", "title" : "pLab(pi+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.7, "xmax" : 1.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(K-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(K-)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(pi+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "VTOSLL=PHSP__Dst0_D0ee_Kpi.root",
"reference" : "RefVTOSLL=PHSP__Dst0_D0ee_Kpi.root"
}
diff --git a/test/jsonFiles/VTOSLL__Jpsi_pi0ee.json b/test/jsonFiles/VTOSLL__Jpsi_pi0ee.json
index debe774..123d33c 100644
--- a/test/jsonFiles/VTOSLL__Jpsi_pi0ee.json
+++ b/test/jsonFiles/VTOSLL__Jpsi_pi0ee.json
@@ -1,26 +1,26 @@
{
"parent" : "J/psi",
"daughters" : ["pi0", "e+", "e-"],
"models" : ["VTOSLL"],
"parameters" : [[]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "mass", "title" : "m(pi0 e+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.14, "xmax" : 3.1},
{"variable" : "mass", "title" : "m(pi0 e-)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.14, "xmax" : 3.1},
{"variable" : "mass", "title" : "m(e+e-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.1},
{"variable" : "pSumSq", "title" : "qSq(e+ e-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "p", "title" : "p(pi0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.2, "xmax" : 1.6},
{"variable" : "pSq", "title" : "pSq(pi0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.6},
{"variable" : "pz", "title" : "pz(pi0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.6, "xmax" : 1.6},
{"variable" : "cosHel", "title" : "cosHel(pi0,e+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(e+,e-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(pi0)", "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},
{"variable" : "cosTheta", "title" : "cosTheta(e-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(pi0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "VTOSLL__Jpsi_pi0ee.root",
"reference" : "RefVTOSLL__Jpsi_pi0ee.root"
}
diff --git a/test/jsonFiles/VTOSLL__Jpsi_pi0mumu.json b/test/jsonFiles/VTOSLL__Jpsi_pi0mumu.json
index e323c3b..e06b13c 100644
--- a/test/jsonFiles/VTOSLL__Jpsi_pi0mumu.json
+++ b/test/jsonFiles/VTOSLL__Jpsi_pi0mumu.json
@@ -1,26 +1,26 @@
{
"parent" : "J/psi",
"daughters" : ["pi0", "mu+", "mu-"],
"models" : ["VTOSLL"],
"parameters" : [[]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "mass", "title" : "m(pi0 mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.14, "xmax" : 3.1},
{"variable" : "mass", "title" : "m(pi0 mu-)", "d1" : 1, "d2" : 3, "nbins" : 100, "xmin" : 0.14, "xmax" : 3.1},
{"variable" : "mass", "title" : "m(mu+mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.1},
{"variable" : "pSumSq", "title" : "qSq(mu+ mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "p", "title" : "p(pi0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.2, "xmax" : 1.6},
{"variable" : "pSq", "title" : "pSq(pi0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.6},
{"variable" : "pz", "title" : "pz(pi0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.6, "xmax" : 1.6},
{"variable" : "cosHel", "title" : "cosHel(pi0,mu+)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(mu+,mu-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(pi0)", "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},
{"variable" : "cosTheta", "title" : "cosTheta(mu-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(pi0)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "VTOSLL__Jpsi_pi0mumu.root",
"reference" : "RefVTOSLL__Jpsi_pi0mumu.root"
}
diff --git a/test/jsonFiles/VUBHYBRID__Bd_Xumunu.json b/test/jsonFiles/VUBHYBRID__Bd_Xumunu.json
index 66c830b..863c23c 100644
--- a/test/jsonFiles/VUBHYBRID__Bd_Xumunu.json
+++ b/test/jsonFiles/VUBHYBRID__Bd_Xumunu.json
@@ -1,29 +1,29 @@
{
"parent" : "B0",
"daughters" : ["Xu-", "mu+", "nu_mu"],
"models" : ["VUBHYBRID"],
"parameters" : [["4.8", "1.29", "0.22"]],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.2},
{"variable" : "mass", "title" : "m(X_{u})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "pSumSq", "title" : "qSq(#mu #nu_{#mu})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 25.0},
{"variable" : "p", "title" : "p(X_{u})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(#mu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(#nu_{#mu})", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(X_{u},#mu)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(#mu,#nu_{#mu})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(X_{u})", "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},
{"variable" : "cosTheta", "title" : "cosTheta(#nu_{#mu})", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(X_{u})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi(#mu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi(#nu_{#mu})", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "massSq", "title" : "Dalitz m^{2}(X_{u} #mu) vs m^{2}(#mu #nu_{#mu})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 30.0, "variableY" : "massSq", "d1Y" : 2, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 25.0},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0}
],
"outfile" : "VUBHYBRID__Bd_Xumunu.root",
"reference" : "RefVUBHYBRID__Bd_Xumunu.root"
}
diff --git a/test/jsonFiles/VUB_BLNPHYBRID__Bd_Xumunu.json b/test/jsonFiles/VUB_BLNPHYBRID__Bd_Xumunu.json
index bae4bc6..46956b9 100644
--- a/test/jsonFiles/VUB_BLNPHYBRID__Bd_Xumunu.json
+++ b/test/jsonFiles/VUB_BLNPHYBRID__Bd_Xumunu.json
@@ -1,29 +1,29 @@
{
"parent" : "B0",
"daughters" : ["Xu-", "mu+", "nu_mu"],
"models" : ["VUB_BLNPHYBRID"],
"parameters" : [["3.95", "0.72", "0.5", "1.5", "1.5", "1.0", "1.0", "1.0", "1.0", "1.0"]],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.2},
{"variable" : "mass", "title" : "m(X_{u})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "pSumSq", "title" : "qSq(#mu #nu_{#mu})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 25.0},
{"variable" : "p", "title" : "p(X_{u})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(#mu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(#nu_{#mu})", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(X_{u},#mu)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(#mu,#nu_{#mu})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(X_{u})", "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},
{"variable" : "cosTheta", "title" : "cosTheta(#nu_{#mu})", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(X_{u})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi(#mu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi(#nu_{#mu})", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "massSq", "title" : "Dalitz m^{2}(X_{u} #mu) vs m^{2}(#mu #nu_{#mu})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 30.0, "variableY" : "massSq", "d1Y" : 2, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 30.0},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0}
],
"outfile" : "VUB_BLNPHYBRID__Bd_Xumunu.root",
"reference" : "RefVUB_BLNPHYBRID__Bd_Xumunu.root"
}
diff --git a/test/jsonFiles/VUB_BLNP__Bd_Xumunu.json b/test/jsonFiles/VUB_BLNP__Bd_Xumunu.json
index d176bad..b89462b 100644
--- a/test/jsonFiles/VUB_BLNP__Bd_Xumunu.json
+++ b/test/jsonFiles/VUB_BLNP__Bd_Xumunu.json
@@ -1,29 +1,29 @@
{
"parent" : "B0",
"daughters" : ["Xu-", "mu+", "nu_mu"],
"models" : ["VUB_BLNP"],
"parameters" : [["3.95", "0.72", "0.5", "1.5", "1.5", "1.0", "1.0", "1.0", "1.0", "1.0"]],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.2},
{"variable" : "mass", "title" : "m(X_{u})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "pSumSq", "title" : "qSq(#mu #nu_{#mu})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 25.0},
{"variable" : "p", "title" : "p(X_{u})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(#mu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(#nu_{#mu})", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(X_{u},#mu)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(#mu,#nu_{#mu})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(X_{u})", "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},
{"variable" : "cosTheta", "title" : "cosTheta(#nu_{#mu})", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(X_{u})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi(#mu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi(#nu_{#mu})", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "massSq", "title" : "Dalitz m^{2}(X_{u} #mu) vs m^{2}(#mu #nu_{#mu})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 30.0, "variableY" : "massSq", "d1Y" : 2, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 30.0},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0}
],
"outfile" : "VUB_BLNP__Bd_Xumunu.root",
"reference" : "RefVUB_BLNP__Bd_Xumunu.root"
}
diff --git a/test/jsonFiles/VUB_NLO__Bd_Xumunu.json b/test/jsonFiles/VUB_NLO__Bd_Xumunu.json
index 3f10df2..60fe6ba 100644
--- a/test/jsonFiles/VUB_NLO__Bd_Xumunu.json
+++ b/test/jsonFiles/VUB_NLO__Bd_Xumunu.json
@@ -1,29 +1,29 @@
{
"parent" : "B0",
"daughters" : ["Xu-", "mu+", "nu_mu"],
"models" : ["VUB_NLO"],
"parameters" : [["4.8", "1.29", "1.0", "0.0", "1.0", "1.0", "0.3", "1.0"]],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.2},
{"variable" : "mass", "title" : "m(X_{u})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "pSumSq", "title" : "qSq(#mu #nu_{#mu})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 25.0},
{"variable" : "p", "title" : "p(X_{u})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(#mu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(#nu_{#mu})", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(X_{u},#mu)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(#mu,#nu_{#mu})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(X_{u})", "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},
{"variable" : "cosTheta", "title" : "cosTheta(#nu_{#mu})", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(X_{u})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi(#mu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi(#nu_{#mu})", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "massSq", "title" : "Dalitz m^{2}(X_{u} #mu) vs m^{2}(#mu #nu_{#mu})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 30.0, "variableY" : "massSq", "d1Y" : 2, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 30.0},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0}
],
"outfile" : "VUB_NLO__Bd_Xumunu.root",
"reference" : "RefVUB_NLO__Bd_Xumunu.root"
}
diff --git a/test/jsonFiles/VUB__Bd_Xumunu.json b/test/jsonFiles/VUB__Bd_Xumunu.json
index 77c4058..60128a1 100644
--- a/test/jsonFiles/VUB__Bd_Xumunu.json
+++ b/test/jsonFiles/VUB__Bd_Xumunu.json
@@ -1,29 +1,29 @@
{
"parent" : "B0",
"daughters" : ["Xu-", "mu+", "nu_mu"],
"models" : ["VUB"],
"parameters" : [["4.8", "1.29", "0.22", "1.0", "0.3", "1.0"]],
- "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+ "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "Prob", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.2},
{"variable" : "mass", "title" : "m(X_{u})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 5.0},
{"variable" : "pSumSq", "title" : "qSq(#mu #nu_{#mu})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 25.0},
{"variable" : "p", "title" : "p(X_{u})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(#mu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "p", "title" : "p(#nu_{#mu})", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.0},
{"variable" : "cosHel", "title" : "cosHel(X_{u},#mu)", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosHel", "title" : "cosHel(#mu,#nu_{#mu})", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(X_{u})", "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},
{"variable" : "cosTheta", "title" : "cosTheta(#nu_{#mu})", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(X_{u})", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi(#mu)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi(#nu_{#mu})", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "massSq", "title" : "Dalitz m^{2}(X_{u} #mu) vs m^{2}(#mu #nu_{#mu})", "d1" : 1, "d2" : 2, "nbins" : 50, "xmin" : 0.0, "xmax" : 30.0, "variableY" : "massSq", "d1Y" : 2, "d2Y" : 3, "nbinsY" : 50, "ymin" : 0.0, "ymax" : 25.0},
{"variable" : "mPrime", "title" : "sqDalitz", "d1" : 1, "d2" : 2, "nbins" : 25, "xmin" : 0.0, "xmax" : 1.00, "variableY" : "thetaPrime", "d1Y" : 1, "d2Y" : 2, "nbinsY" : 25, "ymin" : 0.0, "ymax" : 1.0}
],
"outfile" : "VUB__Bd_Xumunu.root",
"reference" : "RefVUB__Bd_Xumunu.root"
}
diff --git a/test/jsonFiles/X38722-+_PSI_GAMMA=VLL__X3872_gammaJpsi_mumu.json b/test/jsonFiles/X38722-+_PSI_GAMMA=VLL__X3872_gammaJpsi_mumu.json
index 857e60c..67b8e5a 100644
--- a/test/jsonFiles/X38722-+_PSI_GAMMA=VLL__X3872_gammaJpsi_mumu.json
+++ b/test/jsonFiles/X38722-+_PSI_GAMMA=VLL__X3872_gammaJpsi_mumu.json
@@ -1,18 +1,18 @@
{
"parent" : "X_2(3872)",
"daughters" : ["gamma", "J/psi"],
"grand_daughters" : [[], ["mu+", "mu-"]],
"models" : ["X38722-+_PSI_GAMMA", "", "VLL"],
"parameters" : [["1.58", "-0.74", "-0.29", "0.28", "0.036", "0.121"], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 2.5 },
{"variable" : "pLab_daug2", "title" : "pLab(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 1.0, "xmax" : 2.0},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta", "title" : "cosTheta(gamma)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0}
],
"outfile" : "X38722-+_PSI_GAMMA=VLL__X3872_gammaJpsi_mumu.root",
"reference" : "RefX38722-+_PSI_GAMMA=VLL__X3872_gammaJpsi_mumu.root"
}
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
index 5e5bc10..fef0860 100644
--- 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
@@ -1,23 +1,23 @@
{
"parent" : "X_2(3872)",
"daughters" : ["omega", "J/psi"],
"grand_daughters" : [["pi+", "pi-"], ["mu+", "mu-"]],
"models" : ["X38722-+_PSI_GAMMA", "VSS", "VLL"],
"parameters" : [[], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 5000,
"histograms" : [
{"variable" : "prob", "title" : "probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 20 },
{"variable" : "mass", "title" : "m(omega)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.3, "xmax" : 0.8},
{"variable" : "p", "title" : "p(J/psi)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.65},
{"variable" : "pLab_daug2", "title" : "pLab(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "pLab_daug1", "title" : "pLab(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.6},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "X38722-+_PSI_GAMMA=VSS=VLL__X3872_omegaJpsi_pipi,mumu.root",
"reference" : "RefX38722-+_PSI_GAMMA=VSS=VLL__X3872_omegaJpsi_pipi,mumu.root"
}
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
index 7377642..dd1158b 100644
--- 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
@@ -1,23 +1,23 @@
{
"parent" : "X_2(3872)",
"daughters" : ["rho0", "J/psi"],
"grand_daughters" : [["pi+", "pi-"], ["mu+", "mu-"]],
"models" : ["X38722-+_PSI_GAMMA", "VSS", "VLL"],
"parameters" : [[], [], []],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 5000,
"histograms" : [
{"variable" : "prob", "title" : "probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 80 },
{"variable" : "mass", "title" : "m(rho)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.3, "xmax" : 0.8},
{"variable" : "p", "title" : "p(J/psi)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.65},
{"variable" : "pLab_daug2", "title" : "pLab(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 2.0},
{"variable" : "pLab_daug1", "title" : "pLab(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.6},
{"variable" : "cosTheta_daug2", "title" : "cosTheta(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug2", "title" : "phi(mu+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "cosTheta_daug1", "title" : "cosTheta(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi_daug1", "title" : "phi(pi+)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "X38722-+_PSI_GAMMA=VSS=VLL__X3872_rho0Jpsi_pipi,mumu.root",
"reference" : "RefX38722-+_PSI_GAMMA=VSS=VLL__X3872_rho0Jpsi_pipi,mumu.root"
}
diff --git a/test/jsonFiles/Y3STOY1SPIPIMOXHAY__Upsilon3S_Upsilonpipi.json b/test/jsonFiles/Y3STOY1SPIPIMOXHAY__Upsilon3S_Upsilonpipi.json
index 21d80cf..16dbccf 100644
--- a/test/jsonFiles/Y3STOY1SPIPIMOXHAY__Upsilon3S_Upsilonpipi.json
+++ b/test/jsonFiles/Y3STOY1SPIPIMOXHAY__Upsilon3S_Upsilonpipi.json
@@ -1,27 +1,27 @@
{
"parent" : "Upsilon(3S)",
"daughters" : ["Upsilon", "pi+", "pi-"],
"models" : ["Y3STOY1SPIPIMOXHAY"],
"parameters" : [["0.2196", "0.2983"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 1.0},
{"variable" : "parMass", "title" : "m(Upsilon3S)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 10.0, "xmax" : 11.0},
{"variable" : "mass", "title" : "m(Upsilon)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 9.0, "xmax" : 10.0},
{"variable" : "mass", "title" : "m(pi+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.13, "xmax" : 0.15},
{"variable" : "mass", "title" : "m(pi-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.13, "xmax" : 0.15},
{"variable" : "p", "title" : "p(Upsilon)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "p", "title" : "p(pi+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "p", "title" : "p(pi-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pSumSq", "title" : "qSq(pi+pi-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(Upsilon)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(pi+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(pi-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(Upsilon)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi(pi+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi(pi-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "Y3STOY1SPIPIMOXHAY__Upsilon3S_Upsilonpipi.root",
"reference" : "RefY3STOY1SPIPIMOXHAY__Upsilon3S_Upsilonpipi.root"
}
diff --git a/test/jsonFiles/YMSTOYNSPIPICLEO__Upsilon3S_Upsilonpipi.json b/test/jsonFiles/YMSTOYNSPIPICLEO__Upsilon3S_Upsilonpipi.json
index ec10009..4027987 100644
--- a/test/jsonFiles/YMSTOYNSPIPICLEO__Upsilon3S_Upsilonpipi.json
+++ b/test/jsonFiles/YMSTOYNSPIPICLEO__Upsilon3S_Upsilonpipi.json
@@ -1,27 +1,27 @@
{
"parent" : "Upsilon(3S)",
"daughters" : ["Upsilon", "pi+", "pi-"],
"models" : ["YMSTOYNSPIPICLEO"],
"parameters" : [["2.523", "1.189"]],
- "extras" : ["noPhotos"],
+ "extras" : ["noFSR"],
"events" : 10000,
"histograms" : [
{"variable" : "prob", "title" : "probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0, "xmax" : 1.0},
{"variable" : "parMass", "title" : "m(Upsilon3S)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 10.0, "xmax" : 11.0},
{"variable" : "mass", "title" : "m(Upsilon)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 9.0, "xmax" : 10.0},
{"variable" : "mass", "title" : "m(pi+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.13, "xmax" : 0.15},
{"variable" : "mass", "title" : "m(pi-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.13, "xmax" : 0.15},
{"variable" : "p", "title" : "p(Upsilon)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "p", "title" : "p(pi+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "p", "title" : "p(pi-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "pSumSq", "title" : "qSq(pi+pi-)", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(Upsilon)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(pi+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "cosTheta", "title" : "cosTheta(pi-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
{"variable" : "phi", "title" : "phi(Upsilon)", "d1" : 1, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi(pi+)", "d1" : 2, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0},
{"variable" : "phi", "title" : "phi(pi-)", "d1" : 3, "d2" : 0, "nbins" : 100, "xmin" : -180.0, "xmax" : 180.0}
],
"outfile" : "YMSTOYNSPIPICLEO__Upsilon3S_Upsilonpipi.root",
"reference" : "RefYMSTOYNSPIPICLEO__Upsilon3S_Upsilonpipi.root"
}