Page MenuHomeHEPForge
Files F11222226

No OneTemporary
Actions

View Options

diff --git a/History.txt b/History.txt
index 7cde2da..54d2c2d 100644
--- a/History.txt
+++ b/History.txt
@@ -1,328 +1,337 @@
//==========================================================================
//
// History file for EvtGen
//
//===========================================================================
+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.
+
+ 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 doesn't 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 '05
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/setupEvtGen.sh b/setupEvtGen.sh
index caaf3ac..7739374 100644
--- a/setupEvtGen.sh
+++ b/setupEvtGen.sh
@@ -1,70 +1,71 @@
#!/bin/bash
# This script installs EvtGen with all external dependencies. The variable VERSION specifies
-# the tag of EvtGen you want to use. The list of available tags can be found using either the
+# the tag of EvtGen you want to use. The list of available tags can be found using either the
# command "svn ls -v http://svn.cern.ch/guest/evtgen/tags" or by going to the url
# http://svn.cern.ch/guest/evtgen/tags in a web browser. Note that some earlier EvtGen versions
-# will not be compatible with all external depedency versions given below, owing to C++
+# will not be compatible with all external dependency versions given below, owing to C++
# interface differences; see the specific tagged version of the EvtGen/README file for guidance
-VERSION=R01-05-00
+# Version or tag number. No extraneous spaces on this line!
+VERSION=R01-04-00
mkdir -p EvtGen
cd EvtGen
INSTALL_BASE=`pwd`
echo Will setup EvtGen $VERSION in $INSTALL_BASE
echo Downloading EvtGen from SVN
svn export http://svn.cern.ch/guest/evtgen/tags/$VERSION
echo Downloading external dependencies
mkdir -p external
cd external
# Minimum required versions of the external packages. Later versions should be OK as well,
# assuming their C++ interfaces do not change
-wget http://home.thep.lu.se/~torbjorn/pythia8/pythia8180.tgz
-wget http://photospp.web.cern.ch/photospp/resources/PHOTOS.3.54/PHOTOS.3.54.tar.gz
-wget http://tauolapp.web.cern.ch/tauolapp/resources/TAUOLA.1.1.4/TAUOLA.1.1.4.tar.gz
-wget http://lcgapp.cern.ch/project/simu/HepMC/download/HepMC-2.06.08.tar.gz
+wget http://home.thep.lu.se/~torbjorn/pythia8/pythia8186.tgz
+wget http://photospp.web.cern.ch/photospp/resources/PHOTOS.3.56/PHOTOS.3.56.tar.gz
+wget http://tauolapp.web.cern.ch/tauolapp/resources/TAUOLA.1.1.5/TAUOLA.1.1.5.tar.gz
+wget http://lcgapp.cern.ch/project/simu/HepMC/download/HepMC-2.06.09.tar.gz
echo Extracting external dependencies
-tar -xzf PHOTOS.3.54.tar.gz
-tar -xzf HepMC-2.06.08.tar.gz
-tar -xzf pythia8180.tgz
-tar -xzf TAUOLA.1.1.4.tar.gz
+tar -xzf PHOTOS.3.56.tar.gz
+tar -xzf HepMC-2.06.09.tar.gz
+tar -xzf pythia8186.tgz
+tar -xzf TAUOLA.1.1.5.tar.gz
echo Installing HepMC in $INSTALL_BASE/external/HepMC/
mkdir -p HepMC
cd HepMC/
-cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_BASE/external/HepMC/ $INSTALL_BASE/external/HepMC-2.06.08/ -Dmomentum:STRING=MEV -Dlength:STRING=MM
+cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_BASE/external/HepMC/ $INSTALL_BASE/external/HepMC-2.06.09/ -Dmomentum:STRING=GEV -Dlength:STRING=MM
make
make install
-echo Installing pythia8 in $INSTALL_BASE/external/pythia8180/
-cd ../pythia8180/
-./configure --with-hepmc=$INSTALL_BASE/external/HepMC/ --with-hepmcversion=2.06.08 --enable-shared
+echo Installing pythia8 in $INSTALL_BASE/external/pythia8186/
+cd ../pythia8186/
+./configure --with-hepmc=$INSTALL_BASE/external/HepMC/ --with-hepmcversion=2.06.09 --enable-shared
make
echo Installing TAUOLA in $INSTALL_BASE/external/TAUOLA/
cd ../TAUOLA/
./configure --with-hepmc=$INSTALL_BASE/external/HepMC/
make
echo Installing PHOTOS in $INSTALL_BASE/external/PHOTOS/
cd ../PHOTOS/
./configure --with-hepmc=$INSTALL_BASE/external/HepMC/
make
echo Building EvtGen
cd $INSTALL_BASE/$VERSION
-./configure --hepmcdir=$INSTALL_BASE/external/HepMC/ --photosdir=$INSTALL_BASE/external/PHOTOS/ --pythiadir=$INSTALL_BASE/external/pythia8180/ --tauoladir=$INSTALL_BASE/external/TAUOLA/
+./configure --hepmcdir=$INSTALL_BASE/external/HepMC/ --photosdir=$INSTALL_BASE/external/PHOTOS/ --pythiadir=$INSTALL_BASE/external/pythia8186/ --tauoladir=$INSTALL_BASE/external/TAUOLA/
make
echo Setup done.
echo To complete, add the following command to your .bashrc file or run it in your terminal before running any programs that use the EvtGen library:
-echo LD_LIBRARY_PATH=$INSTALL_BASE/external/HepMC/lib:$INSTALL_BASE/external/pythia8180/lib:$INSTALL_BASE/external/PHOTOS/lib:$INSTALL_BASE/external/TAUOLA/lib:$INSTALL_BASE/$VERSION/lib:\$LD_LIBRARY_PATH
+echo LD_LIBRARY_PATH=$INSTALL_BASE/external/HepMC/lib:$INSTALL_BASE/external/pythia8186/lib:$INSTALL_BASE/external/PHOTOS/lib:$INSTALL_BASE/external/TAUOLA/lib:$INSTALL_BASE/$VERSION/lib:\$LD_LIBRARY_PATH
echo Also set the Pythia8 data path:
-echo PYTHIA8DATA=$INSTALL_BASE/external/pythia8180/xmldoc
+echo PYTHIA8DATA=$INSTALL_BASE/external/pythia8186/xmldoc
diff --git a/validation/compareB0PythiaDecays.sh b/validation/compareB0PythiaDecays.sh
index 5934036..f1d133e 100644
--- a/validation/compareB0PythiaDecays.sh
+++ b/validation/compareB0PythiaDecays.sh
@@ -1,20 +1,20 @@
-./compareRootFiles "B0PythiaDecay1" "rootFiles/B0PythiaDecay1.root" "rootFiles/B0PythiaDecay1.root" "B^{0} #rightarrow #bar{cd}_{0} ud_{0}"
-./compareRootFiles "B0PythiaDecay2" "rootFiles/B0PythiaDecay2.root" "rootFiles/B0PythiaDecay2.root" "B^{0} #rightarrow #bar{cd}_{1} ud_{1}"
-./compareRootFiles "B0PythiaDecay3" "rootFiles/B0PythiaDecay3.root" "rootFiles/B0PythiaDecay3.root" "B^{0} #rightarrow #bar{cs}_{0} ud_{0}"
-./compareRootFiles "B0PythiaDecay4" "rootFiles/B0PythiaDecay4.root" "rootFiles/B0PythiaDecay4.root" "B^{0} #rightarrow #bar{cs}_{1} ud_{1}"
-./compareRootFiles "B0PythiaDecay5" "rootFiles/B0PythiaDecay5.root" "rootFiles/B0PythiaDecay5.root" "B^{0} #rightarrow u #bar{d} #bar{c} d (weak)"
-./compareRootFiles "B0PythiaDecay6" "rootFiles/B0PythiaDecay6.root" "rootFiles/B0PythiaDecay6.root" "B^{0} #rightarrow u #bar{d} #bar{c} d"
-./compareRootFiles "B0PythiaDecay7" "rootFiles/B0PythiaDecay7.root" "rootFiles/B0PythiaDecay7.root" "B^{0} #rightarrow u #bar{s} #bar{c} d"
-./compareRootFiles "B0PythiaDecay8" "rootFiles/B0PythiaDecay8.root" "rootFiles/B0PythiaDecay8.root" "B^{0} #rightarrow u #bar{c} #bar{d} d (weak)"
-./compareRootFiles "B0PythiaDecay9" "rootFiles/B0PythiaDecay9.root" "rootFiles/B0PythiaDecay9.root" "B^{0} #rightarrow u #bar{c} #bar{s} d (weak)"
-./compareRootFiles "B0PythiaDecay10" "rootFiles/B0PythiaDecay10.root" "rootFiles/B0PythiaDecay10.root" "B^{0} #rightarrow c #bar{s} #bar{c} d"
-./compareRootFiles "B0PythiaDecay11" "rootFiles/B0PythiaDecay11.root" "rootFiles/B0PythiaDecay11.root" "B^{0} #rightarrow c #bar{d} #bar{c} d"
-./compareRootFiles "B0PythiaDecay12" "rootFiles/B0PythiaDecay12.root" "rootFiles/B0PythiaDecay12.root" "B^{0} #rightarrow u #bar{d} #bar{u} d (weak)"
-./compareRootFiles "B0PythiaDecay13" "rootFiles/B0PythiaDecay13.root" "rootFiles/B0PythiaDecay13.root" "B^{0} #rightarrow c #bar{s} #bar{u} d (weak)"
-./compareRootFiles "B0PythiaDecay14" "rootFiles/B0PythiaDecay14.root" "rootFiles/B0PythiaDecay14.root" "B^{0} #rightarrow u #bar{u} #bar{d} d (weak)"
-./compareRootFiles "B0PythiaDecay15" "rootFiles/B0PythiaDecay15.root" "rootFiles/B0PythiaDecay15.root" "B^{0} #rightarrow d #bar{d} #bar{d} d (weak)"
-./compareRootFiles "B0PythiaDecay16" "rootFiles/B0PythiaDecay16.root" "rootFiles/B0PythiaDecay16.root" "B^{0} #rightarrow s #bar{s} #bar{d} d (weak)"
-./compareRootFiles "B0PythiaDecay17" "rootFiles/B0PythiaDecay17.root" "rootFiles/B0PythiaDecay17.root" "B^{0} #rightarrow u #bar{u} #bar{s} d (weak)"
-./compareRootFiles "B0PythiaDecay18" "rootFiles/B0PythiaDecay18.root" "rootFiles/B0PythiaDecay18.root" "B^{0} #rightarrow d #bar{d} #bar{s} d (weak)"
-./compareRootFiles "B0PythiaDecay19" "rootFiles/B0PythiaDecay19.root" "rootFiles/B0PythiaDecay19.root" "B^{0} #rightarrow s #bar{s} #bar{s} d (weak)"
-./compareRootFiles "B0PythiaDecay20" "rootFiles/B0PythiaDecay20.root" "rootFiles/B0PythiaDecay20.root" "B^{0} #rightarrow #bar{s} d"
+./compareRootFiles "B0PythiaDecay1" "rootFiles/B0PythiaDecay1.root" "oldRootFiles/B0PythiaDecay1.root" "B^{0} #rightarrow #bar{cd}_{0} ud_{0}"
+./compareRootFiles "B0PythiaDecay2" "rootFiles/B0PythiaDecay2.root" "oldRootFiles/B0PythiaDecay2.root" "B^{0} #rightarrow #bar{cd}_{1} ud_{1}"
+./compareRootFiles "B0PythiaDecay3" "rootFiles/B0PythiaDecay3.root" "oldRootFiles/B0PythiaDecay3.root" "B^{0} #rightarrow #bar{cs}_{0} ud_{0}"
+./compareRootFiles "B0PythiaDecay4" "rootFiles/B0PythiaDecay4.root" "oldRootFiles/B0PythiaDecay4.root" "B^{0} #rightarrow #bar{cs}_{1} ud_{1}"
+./compareRootFiles "B0PythiaDecay5" "rootFiles/B0PythiaDecay5.root" "oldRootFiles/B0PythiaDecay5.root" "B^{0} #rightarrow u #bar{d} #bar{c} d (weak)"
+./compareRootFiles "B0PythiaDecay6" "rootFiles/B0PythiaDecay6.root" "oldRootFiles/B0PythiaDecay6.root" "B^{0} #rightarrow u #bar{d} #bar{c} d"
+./compareRootFiles "B0PythiaDecay7" "rootFiles/B0PythiaDecay7.root" "oldRootFiles/B0PythiaDecay7.root" "B^{0} #rightarrow u #bar{s} #bar{c} d"
+./compareRootFiles "B0PythiaDecay8" "rootFiles/B0PythiaDecay8.root" "oldRootFiles/B0PythiaDecay8.root" "B^{0} #rightarrow u #bar{c} #bar{d} d (weak)"
+./compareRootFiles "B0PythiaDecay9" "rootFiles/B0PythiaDecay9.root" "oldRootFiles/B0PythiaDecay9.root" "B^{0} #rightarrow u #bar{c} #bar{s} d (weak)"
+./compareRootFiles "B0PythiaDecay10" "rootFiles/B0PythiaDecay10.root" "oldRootFiles/B0PythiaDecay10.root" "B^{0} #rightarrow c #bar{s} #bar{c} d"
+./compareRootFiles "B0PythiaDecay11" "rootFiles/B0PythiaDecay11.root" "oldRootFiles/B0PythiaDecay11.root" "B^{0} #rightarrow c #bar{d} #bar{c} d"
+./compareRootFiles "B0PythiaDecay12" "rootFiles/B0PythiaDecay12.root" "oldRootFiles/B0PythiaDecay12.root" "B^{0} #rightarrow u #bar{d} #bar{u} d (weak)"
+./compareRootFiles "B0PythiaDecay13" "rootFiles/B0PythiaDecay13.root" "oldRootFiles/B0PythiaDecay13.root" "B^{0} #rightarrow c #bar{s} #bar{u} d (weak)"
+./compareRootFiles "B0PythiaDecay14" "rootFiles/B0PythiaDecay14.root" "oldRootFiles/B0PythiaDecay14.root" "B^{0} #rightarrow u #bar{u} #bar{d} d (weak)"
+./compareRootFiles "B0PythiaDecay15" "rootFiles/B0PythiaDecay15.root" "oldRootFiles/B0PythiaDecay15.root" "B^{0} #rightarrow d #bar{d} #bar{d} d (weak)"
+./compareRootFiles "B0PythiaDecay16" "rootFiles/B0PythiaDecay16.root" "oldRootFiles/B0PythiaDecay16.root" "B^{0} #rightarrow s #bar{s} #bar{d} d (weak)"
+./compareRootFiles "B0PythiaDecay17" "rootFiles/B0PythiaDecay17.root" "oldRootFiles/B0PythiaDecay17.root" "B^{0} #rightarrow u #bar{u} #bar{s} d (weak)"
+./compareRootFiles "B0PythiaDecay18" "rootFiles/B0PythiaDecay18.root" "oldRootFiles/B0PythiaDecay18.root" "B^{0} #rightarrow d #bar{d} #bar{s} d (weak)"
+./compareRootFiles "B0PythiaDecay19" "rootFiles/B0PythiaDecay19.root" "oldRootFiles/B0PythiaDecay19.root" "B^{0} #rightarrow s #bar{s} #bar{s} d (weak)"
+./compareRootFiles "B0PythiaDecay20" "rootFiles/B0PythiaDecay20.root" "oldRootFiles/B0PythiaDecay20.root" "B^{0} #rightarrow #bar{s} d"
diff --git a/validation/compareBpPythiaDecays.sh b/validation/compareBpPythiaDecays.sh
index 9790690..23dcb52 100644
--- a/validation/compareBpPythiaDecays.sh
+++ b/validation/compareBpPythiaDecays.sh
@@ -1,16 +1,16 @@
-./compareRootFiles "BpPythiaDecay1" "rootFiles/BpPythiaDecay1.root" "rootFiles/BpPythiaDecay1.root" "B^{+} #rightarrow #bar{cd}_{1} uu_{1}"
-./compareRootFiles "BpPythiaDecay2" "rootFiles/BpPythiaDecay2.root" "rootFiles/BpPythiaDecay2.root" "B^{+} #rightarrow u #bar{d} #bar{c} u (weak)"
-./compareRootFiles "BpPythiaDecay3" "rootFiles/BpPythiaDecay3.root" "rootFiles/BpPythiaDecay3.root" "B^{+} #rightarrow u #bar{d} #bar{c} u"
-./compareRootFiles "BpPythiaDecay4" "rootFiles/BpPythiaDecay4.root" "rootFiles/BpPythiaDecay4.root" "B^{+} #rightarrow u #bar{s} #bar{c} u"
-./compareRootFiles "BpPythiaDecay5" "rootFiles/BpPythiaDecay5.root" "rootFiles/BpPythiaDecay5.root" "B^{+} #rightarrow c #bar{s} #bar{c} u"
-./compareRootFiles "BpPythiaDecay6" "rootFiles/BpPythiaDecay6.root" "rootFiles/BpPythiaDecay6.root" "B^{+} #rightarrow c #bar{d} #bar{c} u"
-./compareRootFiles "BpPythiaDecay7" "rootFiles/BpPythiaDecay7.root" "rootFiles/BpPythiaDecay7.root" "B^{+} #rightarrow u #bar{d} #bar{u} u (weak)"
-./compareRootFiles "BpPythiaDecay8" "rootFiles/BpPythiaDecay8.root" "rootFiles/BpPythiaDecay8.root" "B^{+} #rightarrow c #bar{s} #bar{u} u (weak)"
-./compareRootFiles "BpPythiaDecay9" "rootFiles/BpPythiaDecay9.root" "rootFiles/BpPythiaDecay9.root" "B^{+} #rightarrow u #bar{u} #bar{d} u (weak)"
-./compareRootFiles "BpPythiaDecay10" "rootFiles/BpPythiaDecay10.root" "rootFiles/BpPythiaDecay10.root" "B^{+} #rightarrow d #bar{d} #bar{d} u (weak)"
-./compareRootFiles "BpPythiaDecay11" "rootFiles/BpPythiaDecay11.root" "rootFiles/BpPythiaDecay11.root" "B^{+} #rightarrow s #bar{s} #bar{d} u (weak)"
-./compareRootFiles "BpPythiaDecay12" "rootFiles/BpPythiaDecay12.root" "rootFiles/BpPythiaDecay12.root" "B^{+} #rightarrow u #bar{u} #bar{s} u (weak)"
-./compareRootFiles "BpPythiaDecay13" "rootFiles/BpPythiaDecay13.root" "rootFiles/BpPythiaDecay13.root" "B^{+} #rightarrow d #bar{d} #bar{s} u (weak)"
-./compareRootFiles "BpPythiaDecay14" "rootFiles/BpPythiaDecay14.root" "rootFiles/BpPythiaDecay14.root" "B^{+} #rightarrow s #bar{s} #bar{s} u (weak)"
-./compareRootFiles "BpPythiaDecay15" "rootFiles/BpPythiaDecay15.root" "rootFiles/BpPythiaDecay15.root" "B^{+} #rightarrow #bar{s} u"
-./compareRootFiles "BpPythiaDecay16" "rootFiles/BpPythiaDecay16.root" "rootFiles/BpPythiaDecay16.root" "B^{+} #rightarrow #bar{cs}_{1} uu_{1}"
+./compareRootFiles "BpPythiaDecay1" "rootFiles/BpPythiaDecay1.root" "oldRootFiles/BpPythiaDecay1.root" "B^{+} #rightarrow #bar{cd}_{1} uu_{1}"
+./compareRootFiles "BpPythiaDecay2" "rootFiles/BpPythiaDecay2.root" "oldRootFiles/BpPythiaDecay2.root" "B^{+} #rightarrow u #bar{d} #bar{c} u (weak)"
+./compareRootFiles "BpPythiaDecay3" "rootFiles/BpPythiaDecay3.root" "oldRootFiles/BpPythiaDecay3.root" "B^{+} #rightarrow u #bar{d} #bar{c} u"
+./compareRootFiles "BpPythiaDecay4" "rootFiles/BpPythiaDecay4.root" "oldRootFiles/BpPythiaDecay4.root" "B^{+} #rightarrow u #bar{s} #bar{c} u"
+./compareRootFiles "BpPythiaDecay5" "rootFiles/BpPythiaDecay5.root" "oldRootFiles/BpPythiaDecay5.root" "B^{+} #rightarrow c #bar{s} #bar{c} u"
+./compareRootFiles "BpPythiaDecay6" "rootFiles/BpPythiaDecay6.root" "oldRootFiles/BpPythiaDecay6.root" "B^{+} #rightarrow c #bar{d} #bar{c} u"
+./compareRootFiles "BpPythiaDecay7" "rootFiles/BpPythiaDecay7.root" "oldRootFiles/BpPythiaDecay7.root" "B^{+} #rightarrow u #bar{d} #bar{u} u (weak)"
+./compareRootFiles "BpPythiaDecay8" "rootFiles/BpPythiaDecay8.root" "oldRootFiles/BpPythiaDecay8.root" "B^{+} #rightarrow c #bar{s} #bar{u} u (weak)"
+./compareRootFiles "BpPythiaDecay9" "rootFiles/BpPythiaDecay9.root" "oldRootFiles/BpPythiaDecay9.root" "B^{+} #rightarrow u #bar{u} #bar{d} u (weak)"
+./compareRootFiles "BpPythiaDecay10" "rootFiles/BpPythiaDecay10.root" "oldRootFiles/BpPythiaDecay10.root" "B^{+} #rightarrow d #bar{d} #bar{d} u (weak)"
+./compareRootFiles "BpPythiaDecay11" "rootFiles/BpPythiaDecay11.root" "oldRootFiles/BpPythiaDecay11.root" "B^{+} #rightarrow s #bar{s} #bar{d} u (weak)"
+./compareRootFiles "BpPythiaDecay12" "rootFiles/BpPythiaDecay12.root" "oldRootFiles/BpPythiaDecay12.root" "B^{+} #rightarrow u #bar{u} #bar{s} u (weak)"
+./compareRootFiles "BpPythiaDecay13" "rootFiles/BpPythiaDecay13.root" "oldRootFiles/BpPythiaDecay13.root" "B^{+} #rightarrow d #bar{d} #bar{s} u (weak)"
+./compareRootFiles "BpPythiaDecay14" "rootFiles/BpPythiaDecay14.root" "oldRootFiles/BpPythiaDecay14.root" "B^{+} #rightarrow s #bar{s} #bar{s} u (weak)"
+./compareRootFiles "BpPythiaDecay15" "rootFiles/BpPythiaDecay15.root" "oldRootFiles/BpPythiaDecay15.root" "B^{+} #rightarrow #bar{s} u"
+./compareRootFiles "BpPythiaDecay16" "rootFiles/BpPythiaDecay16.root" "oldRootFiles/BpPythiaDecay16.root" "B^{+} #rightarrow #bar{cs}_{1} uu_{1}"
diff --git a/validation/compareBs0PythiaDecays.sh b/validation/compareBs0PythiaDecays.sh
index 69b9ee3..3fecb5e 100644
--- a/validation/compareBs0PythiaDecays.sh
+++ b/validation/compareBs0PythiaDecays.sh
@@ -1,18 +1,18 @@
-./compareRootFiles "Bs0PythiaDecay1" "rootFiles/Bs0PythiaDecay1.root" "rootFiles/Bs0PythiaDecay1.root" "B^{0}_{s} #rightarrow #bar{cs}_{0} ud_{0}"
-./compareRootFiles "Bs0PythiaDecay2" "rootFiles/Bs0PythiaDecay2.root" "rootFiles/Bs0PythiaDecay2.root" "B^{0}_{s} #rightarrow #bar{cs}_{1} ud_{1}"
-./compareRootFiles "Bs0PythiaDecay3" "rootFiles/Bs0PythiaDecay3.root" "rootFiles/Bs0PythiaDecay3.root" "B^{0}_{s} #rightarrow u #bar{d} #bar{c} s (weak)"
-./compareRootFiles "Bs0PythiaDecay4" "rootFiles/Bs0PythiaDecay4.root" "rootFiles/Bs0PythiaDecay4.root" "B^{0}_{s} #rightarrow u #bar{d} #bar{c} s"
-./compareRootFiles "Bs0PythiaDecay5" "rootFiles/Bs0PythiaDecay5.root" "rootFiles/Bs0PythiaDecay5.root" "B^{0}_{s} #rightarrow u #bar{c} #bar{d} s (weak)"
-./compareRootFiles "Bs0PythiaDecay6" "rootFiles/Bs0PythiaDecay6.root" "rootFiles/Bs0PythiaDecay6.root" "B^{0}_{s} #rightarrow c #bar{s} #bar{u} s (weak)"
-./compareRootFiles "Bs0PythiaDecay7" "rootFiles/Bs0PythiaDecay7.root" "rootFiles/Bs0PythiaDecay7.root" "B^{0}_{s} #rightarrow u #bar{s} #bar{c} s (weak)"
-./compareRootFiles "Bs0PythiaDecay8" "rootFiles/Bs0PythiaDecay8.root" "rootFiles/Bs0PythiaDecay8.root" "B^{0}_{s} #rightarrow u #bar{s} #bar{c} s"
-./compareRootFiles "Bs0PythiaDecay9" "rootFiles/Bs0PythiaDecay9.root" "rootFiles/Bs0PythiaDecay9.root" "B^{0}_{s} #rightarrow u #bar{c} #bar{s} s (weak)"
-./compareRootFiles "Bs0PythiaDecay10" "rootFiles/Bs0PythiaDecay10.root" "rootFiles/Bs0PythiaDecay10.root" "B^{0}_{s} #rightarrow c #bar{d} #bar{c} s"
-./compareRootFiles "Bs0PythiaDecay11" "rootFiles/Bs0PythiaDecay11.root" "rootFiles/Bs0PythiaDecay11.root" "B^{0}_{s} #rightarrow c #bar{d} #bar{c} s"
-./compareRootFiles "Bs0PythiaDecay12" "rootFiles/Bs0PythiaDecay12.root" "rootFiles/Bs0PythiaDecay12.root" "B^{0}_{s} #rightarrow u #bar{u} #bar{d} s (weak)"
-./compareRootFiles "Bs0PythiaDecay13" "rootFiles/Bs0PythiaDecay13.root" "rootFiles/Bs0PythiaDecay13.root" "B^{0}_{s} #rightarrow d #bar{d} #bar{d} s (weak)"
-./compareRootFiles "Bs0PythiaDecay14" "rootFiles/Bs0PythiaDecay14.root" "rootFiles/Bs0PythiaDecay14.root" "B^{0}_{s} #rightarrow s #bar{s} #bar{d} s (weak)"
-./compareRootFiles "Bs0PythiaDecay15" "rootFiles/Bs0PythiaDecay15.root" "rootFiles/Bs0PythiaDecay15.root" "B^{0}_{s} #rightarrow u #bar{u} #bar{s} s (weak)"
-./compareRootFiles "Bs0PythiaDecay16" "rootFiles/Bs0PythiaDecay16.root" "rootFiles/Bs0PythiaDecay16.root" "B^{0}_{s} #rightarrow d #bar{d} #bar{s} s (weak)"
-./compareRootFiles "Bs0PythiaDecay17" "rootFiles/Bs0PythiaDecay17.root" "rootFiles/Bs0PythiaDecay17.root" "B^{0}_{s} #rightarrow s #bar{s} #bar{s} s (weak)"
-./compareRootFiles "Bs0PythiaDecay18" "rootFiles/Bs0PythiaDecay18.root" "rootFiles/Bs0PythiaDecay18.root" "B^{0}_{s} #rightarrow #bar{s} s"
+./compareRootFiles "Bs0PythiaDecay1" "rootFiles/Bs0PythiaDecay1.root" "oldRootFiles/Bs0PythiaDecay1.root" "B^{0}_{s} #rightarrow #bar{cs}_{0} ud_{0}"
+./compareRootFiles "Bs0PythiaDecay2" "rootFiles/Bs0PythiaDecay2.root" "oldRootFiles/Bs0PythiaDecay2.root" "B^{0}_{s} #rightarrow #bar{cs}_{1} ud_{1}"
+./compareRootFiles "Bs0PythiaDecay3" "rootFiles/Bs0PythiaDecay3.root" "oldRootFiles/Bs0PythiaDecay3.root" "B^{0}_{s} #rightarrow u #bar{d} #bar{c} s (weak)"
+./compareRootFiles "Bs0PythiaDecay4" "rootFiles/Bs0PythiaDecay4.root" "oldRootFiles/Bs0PythiaDecay4.root" "B^{0}_{s} #rightarrow u #bar{d} #bar{c} s"
+./compareRootFiles "Bs0PythiaDecay5" "rootFiles/Bs0PythiaDecay5.root" "oldRootFiles/Bs0PythiaDecay5.root" "B^{0}_{s} #rightarrow u #bar{c} #bar{d} s (weak)"
+./compareRootFiles "Bs0PythiaDecay6" "rootFiles/Bs0PythiaDecay6.root" "oldRootFiles/Bs0PythiaDecay6.root" "B^{0}_{s} #rightarrow c #bar{s} #bar{u} s (weak)"
+./compareRootFiles "Bs0PythiaDecay7" "rootFiles/Bs0PythiaDecay7.root" "oldRootFiles/Bs0PythiaDecay7.root" "B^{0}_{s} #rightarrow u #bar{s} #bar{c} s (weak)"
+./compareRootFiles "Bs0PythiaDecay8" "rootFiles/Bs0PythiaDecay8.root" "oldRootFiles/Bs0PythiaDecay8.root" "B^{0}_{s} #rightarrow u #bar{s} #bar{c} s"
+./compareRootFiles "Bs0PythiaDecay9" "rootFiles/Bs0PythiaDecay9.root" "oldRootFiles/Bs0PythiaDecay9.root" "B^{0}_{s} #rightarrow u #bar{c} #bar{s} s (weak)"
+./compareRootFiles "Bs0PythiaDecay10" "rootFiles/Bs0PythiaDecay10.root" "oldRootFiles/Bs0PythiaDecay10.root" "B^{0}_{s} #rightarrow c #bar{d} #bar{c} s"
+./compareRootFiles "Bs0PythiaDecay11" "rootFiles/Bs0PythiaDecay11.root" "oldRootFiles/Bs0PythiaDecay11.root" "B^{0}_{s} #rightarrow c #bar{d} #bar{c} s"
+./compareRootFiles "Bs0PythiaDecay12" "rootFiles/Bs0PythiaDecay12.root" "oldRootFiles/Bs0PythiaDecay12.root" "B^{0}_{s} #rightarrow u #bar{u} #bar{d} s (weak)"
+./compareRootFiles "Bs0PythiaDecay13" "rootFiles/Bs0PythiaDecay13.root" "oldRootFiles/Bs0PythiaDecay13.root" "B^{0}_{s} #rightarrow d #bar{d} #bar{d} s (weak)"
+./compareRootFiles "Bs0PythiaDecay14" "rootFiles/Bs0PythiaDecay14.root" "oldRootFiles/Bs0PythiaDecay14.root" "B^{0}_{s} #rightarrow s #bar{s} #bar{d} s (weak)"
+./compareRootFiles "Bs0PythiaDecay15" "rootFiles/Bs0PythiaDecay15.root" "oldRootFiles/Bs0PythiaDecay15.root" "B^{0}_{s} #rightarrow u #bar{u} #bar{s} s (weak)"
+./compareRootFiles "Bs0PythiaDecay16" "rootFiles/Bs0PythiaDecay16.root" "oldRootFiles/Bs0PythiaDecay16.root" "B^{0}_{s} #rightarrow d #bar{d} #bar{s} s (weak)"
+./compareRootFiles "Bs0PythiaDecay17" "rootFiles/Bs0PythiaDecay17.root" "oldRootFiles/Bs0PythiaDecay17.root" "B^{0}_{s} #rightarrow s #bar{s} #bar{s} s (weak)"
+./compareRootFiles "Bs0PythiaDecay18" "rootFiles/Bs0PythiaDecay18.root" "oldRootFiles/Bs0PythiaDecay18.root" "B^{0}_{s} #rightarrow #bar{s} s"
diff --git a/validation/compareTauPythiaDecays.sh b/validation/compareTauPythiaDecays.sh
index 3bca5df..d948f92 100644
--- a/validation/compareTauPythiaDecays.sh
+++ b/validation/compareTauPythiaDecays.sh
@@ -1,16 +1,16 @@
-./compareRootFiles "tauPythiaDecay1" "rootFiles/tauPythiaDecay1.root" "rootFiles/tauPythiaDecay1.root" "#tau^{-} #rightarrow #nu_{#tau} #gamma #pi^{-} #pi^{0}"
-./compareRootFiles "tauPythiaDecay2" "rootFiles/tauPythiaDecay2.root" "rootFiles/tauPythiaDecay2.root" "#tau^{-} #rightarrow #nu_{#tau} K^{-} #pi^{0} #pi^{0}"
-./compareRootFiles "tauPythiaDecay3" "rootFiles/tauPythiaDecay3.root" "rootFiles/tauPythiaDecay3.root" "#tau^{-} #rightarrow #nu_{#tau} #pi^{-} #pi^{0} #pi^{0} #pi^{0}"
-./compareRootFiles "tauPythiaDecay4" "rootFiles/tauPythiaDecay4.root" "rootFiles/tauPythiaDecay4.root" "#tau^{-} #rightarrow #nu_{#tau} #pi^{-} #bar{K^{0}}"
-./compareRootFiles "tauPythiaDecay5" "rootFiles/tauPythiaDecay5.root" "rootFiles/tauPythiaDecay5.root" "#tau^{-} #rightarrow #nu_{#tau} K^{-} K^{0}"
-./compareRootFiles "tauPythiaDecay6" "rootFiles/tauPythiaDecay6.root" "rootFiles/tauPythiaDecay6.root" "#tau^{-} #rightarrow #nu_{#tau} K^{0} #pi^{-} #bar{K^{0}}"
-./compareRootFiles "tauPythiaDecay7" "rootFiles/tauPythiaDecay7.root" "rootFiles/tauPythiaDecay7.root" "#tau^{-} #rightarrow #nu_{#tau} K^{-} #pi^{0} #pi^{0}"
-./compareRootFiles "tauPythiaDecay8" "rootFiles/tauPythiaDecay8.root" "rootFiles/tauPythiaDecay8.root" "#tau^{-} #rightarrow #nu_{#tau} #pi^{-} #bar{K^{0}} #pi^{0}"
-./compareRootFiles "tauPythiaDecay9" "rootFiles/tauPythiaDecay9.root" "rootFiles/tauPythiaDecay9.root" "#tau^{-} #rightarrow #nu_{#tau} #pi^{-} #pi^{+} #pi^{-} #pi^{0}"
-./compareRootFiles "tauPythiaDecay10" "rootFiles/tauPythiaDecay10.root" "rootFiles/tauPythiaDecay10.root" "#tau^{-} #rightarrow #nu_{#tau} K^{-} #pi^{+} #pi^{-}"
-./compareRootFiles "tauPythiaDecay11" "rootFiles/tauPythiaDecay11.root" "rootFiles/tauPythiaDecay11.root" "#tau^{-} #rightarrow #nu_{#tau} K^{-} #pi^{+} #pi^{-} #pi^{0}"
-./compareRootFiles "tauPythiaDecay12" "rootFiles/tauPythiaDecay12.root" "rootFiles/tauPythiaDecay12.root" "#tau^{-} #rightarrow #nu_{#tau} K^{-} #pi^{-} K^{+}"
-./compareRootFiles "tauPythiaDecay13" "rootFiles/tauPythiaDecay13.root" "rootFiles/tauPythiaDecay13.root" "#tau^{-} #rightarrow #nu_{#tau} K^{-} K^{+} K^{-}"
-./compareRootFiles "tauPythiaDecay14" "rootFiles/tauPythiaDecay14.root" "rootFiles/tauPythiaDecay14.root" "#tau^{-} #rightarrow #nu_{#tau} #eta #pi^{-} #pi^{0}"
-./compareRootFiles "tauPythiaDecay15" "rootFiles/tauPythiaDecay15.root" "rootFiles/tauPythiaDecay15.root" "#tau^{-} #rightarrow #nu_{#tau} #pi^{-} #omega #pi^{0}"
-./compareRootFiles "tauPythiaDecay16" "rootFiles/tauPythiaDecay16.root" "rootFiles/tauPythiaDecay16.root" "#tau^{-} #rightarrow #nu_{#tau} K^{-} #omega"
+./compareRootFiles "tauPythiaDecay1" "rootFiles/tauPythiaDecay1.root" "oldRootFiles/tauPythiaDecay1.root" "#tau^{-} #rightarrow #nu_{#tau} #gamma #pi^{-} #pi^{0}"
+./compareRootFiles "tauPythiaDecay2" "rootFiles/tauPythiaDecay2.root" "oldRootFiles/tauPythiaDecay2.root" "#tau^{-} #rightarrow #nu_{#tau} K^{-} #pi^{0} #pi^{0}"
+./compareRootFiles "tauPythiaDecay3" "rootFiles/tauPythiaDecay3.root" "oldRootFiles/tauPythiaDecay3.root" "#tau^{-} #rightarrow #nu_{#tau} #pi^{-} #pi^{0} #pi^{0} #pi^{0}"
+./compareRootFiles "tauPythiaDecay4" "rootFiles/tauPythiaDecay4.root" "oldRootFiles/tauPythiaDecay4.root" "#tau^{-} #rightarrow #nu_{#tau} #pi^{-} #bar{K^{0}}"
+./compareRootFiles "tauPythiaDecay5" "rootFiles/tauPythiaDecay5.root" "oldRootFiles/tauPythiaDecay5.root" "#tau^{-} #rightarrow #nu_{#tau} K^{-} K^{0}"
+./compareRootFiles "tauPythiaDecay6" "rootFiles/tauPythiaDecay6.root" "oldRootFiles/tauPythiaDecay6.root" "#tau^{-} #rightarrow #nu_{#tau} K^{0} #pi^{-} #bar{K^{0}}"
+./compareRootFiles "tauPythiaDecay7" "rootFiles/tauPythiaDecay7.root" "oldRootFiles/tauPythiaDecay7.root" "#tau^{-} #rightarrow #nu_{#tau} K^{-} #pi^{0} #pi^{0}"
+./compareRootFiles "tauPythiaDecay8" "rootFiles/tauPythiaDecay8.root" "oldRootFiles/tauPythiaDecay8.root" "#tau^{-} #rightarrow #nu_{#tau} #pi^{-} #bar{K^{0}} #pi^{0}"
+./compareRootFiles "tauPythiaDecay9" "rootFiles/tauPythiaDecay9.root" "oldRootFiles/tauPythiaDecay9.root" "#tau^{-} #rightarrow #nu_{#tau} #pi^{-} #pi^{+} #pi^{-} #pi^{0}"
+./compareRootFiles "tauPythiaDecay10" "rootFiles/tauPythiaDecay10.root" "oldRootFiles/tauPythiaDecay10.root" "#tau^{-} #rightarrow #nu_{#tau} K^{-} #pi^{+} #pi^{-}"
+./compareRootFiles "tauPythiaDecay11" "rootFiles/tauPythiaDecay11.root" "oldRootFiles/tauPythiaDecay11.root" "#tau^{-} #rightarrow #nu_{#tau} K^{-} #pi^{+} #pi^{-} #pi^{0}"
+./compareRootFiles "tauPythiaDecay12" "rootFiles/tauPythiaDecay12.root" "oldRootFiles/tauPythiaDecay12.root" "#tau^{-} #rightarrow #nu_{#tau} K^{-} #pi^{-} K^{+}"
+./compareRootFiles "tauPythiaDecay13" "rootFiles/tauPythiaDecay13.root" "oldRootFiles/tauPythiaDecay13.root" "#tau^{-} #rightarrow #nu_{#tau} K^{-} K^{+} K^{-}"
+./compareRootFiles "tauPythiaDecay14" "rootFiles/tauPythiaDecay14.root" "oldRootFiles/tauPythiaDecay14.root" "#tau^{-} #rightarrow #nu_{#tau} #eta #pi^{-} #pi^{0}"
+./compareRootFiles "tauPythiaDecay15" "rootFiles/tauPythiaDecay15.root" "oldRootFiles/tauPythiaDecay15.root" "#tau^{-} #rightarrow #nu_{#tau} #pi^{-} #omega #pi^{0}"
+./compareRootFiles "tauPythiaDecay16" "rootFiles/tauPythiaDecay16.root" "oldRootFiles/tauPythiaDecay16.root" "#tau^{-} #rightarrow #nu_{#tau} K^{-} #omega"
diff --git a/validation/compareTauolaDecays.sh b/validation/compareTauolaDecays.sh
index 3ea866e..3f5817b 100644
--- a/validation/compareTauolaDecays.sh
+++ b/validation/compareTauolaDecays.sh
@@ -1,22 +1,22 @@
-./compareRootFiles "tauolaDecay1" "rootFiles/tauolaDecay1.root" "rootFiles/tauolaDecay1.root" "#tau^{-} #rightarrow e^{-} #nu_{#tau} #bar{#nu_{e}}"
-./compareRootFiles "tauolaDecay2" "rootFiles/tauolaDecay2.root" "rootFiles/tauolaDecay2.root" "#tau^{-} #rightarrow #mu^{-} #nu_{#tau} #bar{#nu_{#mu}}"
-./compareRootFiles "tauolaDecay3" "rootFiles/tauolaDecay3.root" "rootFiles/tauolaDecay3.root" "#tau^{-} #rightarrow #pi^{-} #nu_{#tau}"
-./compareRootFiles "tauolaDecay4" "rootFiles/tauolaDecay4.root" "rootFiles/tauolaDecay4.root" "#tau^{-} #rightarrow #rho^{-} #nu_{#tau}"
-./compareRootFiles "tauolaDecay5" "rootFiles/tauolaDecay5.root" "rootFiles/tauolaDecay5.root" "#tau^{-} #rightarrow a_{1}^{-} #nu_{#tau}"
-./compareRootFiles "tauolaDecay6" "rootFiles/tauolaDecay6.root" "rootFiles/tauolaDecay6.root" "#tau^{-} #rightarrow K^{-} #nu_{#tau}"
-./compareRootFiles "tauolaDecay7" "rootFiles/tauolaDecay7.root" "rootFiles/tauolaDecay7.root" "#tau^{-} #rightarrow K^{*-} #nu_{#tau}"
-./compareRootFiles "tauolaDecay8" "rootFiles/tauolaDecay8.root" "rootFiles/tauolaDecay8.root" "#tau^{-} #rightarrow 2#pi^{-} #pi^{+} #pi^{0} #nu_{#tau}"
-./compareRootFiles "tauolaDecay9" "rootFiles/tauolaDecay9.root" "rootFiles/tauolaDecay9.root" "#tau^{-} #rightarrow 3#pi^{0} #pi^{-} #nu_{#tau}"
-./compareRootFiles "tauolaDecay10" "rootFiles/tauolaDecay10.root" "rootFiles/tauolaDecay10.root" "#tau^{-} #rightarrow 2#pi^{-} #pi^{+} 2#pi^{0} #nu_{#tau}"
-./compareRootFiles "tauolaDecay11" "rootFiles/tauolaDecay11.root" "rootFiles/tauolaDecay11.root" "#tau^{-} #rightarrow 3#pi^{-} 2#pi^{+} #nu_{#tau}"
-./compareRootFiles "tauolaDecay12" "rootFiles/tauolaDecay12.root" "rootFiles/tauolaDecay12.root" "#tau^{-} #rightarrow 3#pi^{-} 2#pi^{+} #pi^{0} #nu_{#tau}"
-./compareRootFiles "tauolaDecay13" "rootFiles/tauolaDecay13.root" "rootFiles/tauolaDecay13.root" "#tau^{-} #rightarrow 2#pi^{-} #pi^{+} 3#pi^{0} #nu_{#tau}"
-./compareRootFiles "tauolaDecay14" "rootFiles/tauolaDecay14.root" "rootFiles/tauolaDecay14.root" "#tau^{-} #rightarrow K^{-} K^{+} #pi^{-} #nu_{#tau}"
-./compareRootFiles "tauolaDecay15" "rootFiles/tauolaDecay15.root" "rootFiles/tauolaDecay15.root" "#tau^{-} #rightarrow #bar{K^{0}} K^{0} #pi^{-} #nu_{#tau}"
-./compareRootFiles "tauolaDecay16" "rootFiles/tauolaDecay16.root" "rootFiles/tauolaDecay16.root" "#tau^{-} #rightarrow K^{-} #bar{K^{0}} #pi^{0} #nu_{#tau}"
-./compareRootFiles "tauolaDecay17" "rootFiles/tauolaDecay17.root" "rootFiles/tauolaDecay17.root" "#tau^{-} #rightarrow 2#pi^{0} K^{-} #nu_{#tau}"
-./compareRootFiles "tauolaDecay18" "rootFiles/tauolaDecay18.root" "rootFiles/tauolaDecay18.root" "#tau^{-} #rightarrow #pi^{-} #pi^{+} K^{-} #nu_{#tau}"
-./compareRootFiles "tauolaDecay19" "rootFiles/tauolaDecay19.root" "rootFiles/tauolaDecay19.root" "#tau^{-} #rightarrow #pi^{-} #pi^{0} K^{0} #nu_{#tau}"
-./compareRootFiles "tauolaDecay20" "rootFiles/tauolaDecay20.root" "rootFiles/tauolaDecay20.root" "#tau^{-} #rightarrow #eta #pi^{-} #pi^{0} #nu_{#tau}"
-./compareRootFiles "tauolaDecay21" "rootFiles/tauolaDecay21.root" "rootFiles/tauolaDecay21.root" "#tau^{-} #rightarrow #pi^{-} #pi^{0} #gamma #nu_{#tau}"
-./compareRootFiles "tauolaDecay22" "rootFiles/tauolaDecay22.root" "rootFiles/tauolaDecay22.root" "#tau^{-} #rightarrow K^{-} #bar{K^{0}} #nu_{#tau}"
+./compareRootFiles "tauolaDecay1" "rootFiles/tauolaDecay1.root" "oldRootFiles/tauolaDecay1.root" "#tau^{-} #rightarrow e^{-} #nu_{#tau} #bar{#nu_{e}}"
+./compareRootFiles "tauolaDecay2" "rootFiles/tauolaDecay2.root" "oldRootFiles/tauolaDecay2.root" "#tau^{-} #rightarrow #mu^{-} #nu_{#tau} #bar{#nu_{#mu}}"
+./compareRootFiles "tauolaDecay3" "rootFiles/tauolaDecay3.root" "oldRootFiles/tauolaDecay3.root" "#tau^{-} #rightarrow #pi^{-} #nu_{#tau}"
+./compareRootFiles "tauolaDecay4" "rootFiles/tauolaDecay4.root" "oldRootFiles/tauolaDecay4.root" "#tau^{-} #rightarrow #rho^{-} #nu_{#tau}"
+./compareRootFiles "tauolaDecay5" "rootFiles/tauolaDecay5.root" "oldRootFiles/tauolaDecay5.root" "#tau^{-} #rightarrow a_{1}^{-} #nu_{#tau}"
+./compareRootFiles "tauolaDecay6" "rootFiles/tauolaDecay6.root" "oldRootFiles/tauolaDecay6.root" "#tau^{-} #rightarrow K^{-} #nu_{#tau}"
+./compareRootFiles "tauolaDecay7" "rootFiles/tauolaDecay7.root" "oldRootFiles/tauolaDecay7.root" "#tau^{-} #rightarrow K^{*-} #nu_{#tau}"
+./compareRootFiles "tauolaDecay8" "rootFiles/tauolaDecay8.root" "oldRootFiles/tauolaDecay8.root" "#tau^{-} #rightarrow 2#pi^{-} #pi^{+} #pi^{0} #nu_{#tau}"
+./compareRootFiles "tauolaDecay9" "rootFiles/tauolaDecay9.root" "oldRootFiles/tauolaDecay9.root" "#tau^{-} #rightarrow 3#pi^{0} #pi^{-} #nu_{#tau}"
+./compareRootFiles "tauolaDecay10" "rootFiles/tauolaDecay10.root" "oldRootFiles/tauolaDecay10.root" "#tau^{-} #rightarrow 2#pi^{-} #pi^{+} 2#pi^{0} #nu_{#tau}"
+./compareRootFiles "tauolaDecay11" "rootFiles/tauolaDecay11.root" "oldRootFiles/tauolaDecay11.root" "#tau^{-} #rightarrow 3#pi^{-} 2#pi^{+} #nu_{#tau}"
+./compareRootFiles "tauolaDecay12" "rootFiles/tauolaDecay12.root" "oldRootFiles/tauolaDecay12.root" "#tau^{-} #rightarrow 3#pi^{-} 2#pi^{+} #pi^{0} #nu_{#tau}"
+./compareRootFiles "tauolaDecay13" "rootFiles/tauolaDecay13.root" "oldRootFiles/tauolaDecay13.root" "#tau^{-} #rightarrow 2#pi^{-} #pi^{+} 3#pi^{0} #nu_{#tau}"
+./compareRootFiles "tauolaDecay14" "rootFiles/tauolaDecay14.root" "oldRootFiles/tauolaDecay14.root" "#tau^{-} #rightarrow K^{-} K^{+} #pi^{-} #nu_{#tau}"
+./compareRootFiles "tauolaDecay15" "rootFiles/tauolaDecay15.root" "oldRootFiles/tauolaDecay15.root" "#tau^{-} #rightarrow #bar{K^{0}} K^{0} #pi^{-} #nu_{#tau}"
+./compareRootFiles "tauolaDecay16" "rootFiles/tauolaDecay16.root" "oldRootFiles/tauolaDecay16.root" "#tau^{-} #rightarrow K^{-} #bar{K^{0}} #pi^{0} #nu_{#tau}"
+./compareRootFiles "tauolaDecay17" "rootFiles/tauolaDecay17.root" "oldRootFiles/tauolaDecay17.root" "#tau^{-} #rightarrow 2#pi^{0} K^{-} #nu_{#tau}"
+./compareRootFiles "tauolaDecay18" "rootFiles/tauolaDecay18.root" "oldRootFiles/tauolaDecay18.root" "#tau^{-} #rightarrow #pi^{-} #pi^{+} K^{-} #nu_{#tau}"
+./compareRootFiles "tauolaDecay19" "rootFiles/tauolaDecay19.root" "oldRootFiles/tauolaDecay19.root" "#tau^{-} #rightarrow #pi^{-} #pi^{0} K^{0} #nu_{#tau}"
+./compareRootFiles "tauolaDecay20" "rootFiles/tauolaDecay20.root" "oldRootFiles/tauolaDecay20.root" "#tau^{-} #rightarrow #eta #pi^{-} #pi^{0} #nu_{#tau}"
+./compareRootFiles "tauolaDecay21" "rootFiles/tauolaDecay21.root" "oldRootFiles/tauolaDecay21.root" "#tau^{-} #rightarrow #pi^{-} #pi^{0} #gamma #nu_{#tau}"
+./compareRootFiles "tauolaDecay22" "rootFiles/tauolaDecay22.root" "oldRootFiles/tauolaDecay22.root" "#tau^{-} #rightarrow K^{-} #bar{K^{0}} #nu_{#tau}"
diff --git a/validation/compareUpsilonPythiaDecays.sh b/validation/compareUpsilonPythiaDecays.sh
index d805b27..3021902 100644
--- a/validation/compareUpsilonPythiaDecays.sh
+++ b/validation/compareUpsilonPythiaDecays.sh
@@ -1,2 +1,2 @@
-./compareRootFiles "UpsilonPythiaDecay1" "rootFiles/UpsilonPythiaDecay1.root" "rootFiles/UpsilonPythiaDecay1.root" "#Upsilon(4S) #rightarrow g g g"
-./compareRootFiles "UpsilonPythiaDecay2" "rootFiles/UpsilonPythiaDecay2.root" "rootFiles/UpsilonPythiaDecay2.root" "#Upsilon(4S) #rightarrow #gamma g g"
+./compareRootFiles "UpsilonPythiaDecay1" "rootFiles/UpsilonPythiaDecay1.root" "oldRootFiles/UpsilonPythiaDecay1.root" "#Upsilon(4S) #rightarrow g g g"
+./compareRootFiles "UpsilonPythiaDecay2" "rootFiles/UpsilonPythiaDecay2.root" "oldRootFiles/UpsilonPythiaDecay2.root" "#Upsilon(4S) #rightarrow #gamma g g"
diff --git a/validation/photosPlots.C b/validation/photosPlots.C
index 2379f26..9eee9a2 100644
--- a/validation/photosPlots.C
+++ b/validation/photosPlots.C
@@ -1,75 +1,99 @@
#include <string>
void photosPlots(std::string fileName = "Upsilon4S_PHOTOS.root") {
TFile* theFile = new TFile(fileName.c_str(), "read");
TTree* theTree = dynamic_cast<TTree*>(theFile->Get("Data"));
TTree* nDaugTree = dynamic_cast<TTree*>(theFile->Get("nDaugTree"));
TH1F* eMtmHist = new TH1F("eMtmHist", "", 100, 0.0, 5.5);
- eMtmHist->SetXTitle("e^{-} momentum (GeV/c)");
+ eMtmHist->SetXTitle("Electron momentum (GeV/c)");
eMtmHist->SetYTitle("Frequency/55 (MeV/c)");
- eMtmHist->SetTitleOffset(1.25, "Y");
-
+ eMtmHist->SetTitleOffset(1.1, "Y");
+ TAxis* exAxis = eMtmHist->GetXaxis();
+ exAxis->SetLabelSize(0.045);
+ exAxis->SetTitleSize(0.045);
+ TAxis* eyAxis = eMtmHist->GetYaxis();
+ eyAxis->SetLabelSize(0.045);
+ eyAxis->SetTitleSize(0.045);
+
TH1F* pMtmHist = new TH1F("pMtmHist", "", 100, 0.0, 5.5);
- pMtmHist->SetXTitle("e^{+} momentum (GeV/c)");
+ pMtmHist->SetXTitle("Positron momentum (GeV/c)");
pMtmHist->SetYTitle("Frequency/55 (MeV/c)");
- pMtmHist->SetTitleOffset(1.25, "Y");
+ pMtmHist->SetTitleOffset(1.1, "Y");
+ TAxis* pxAxis = pMtmHist->GetXaxis();
+ pxAxis->SetLabelSize(0.045);
+ pxAxis->SetTitleSize(0.045);
+ TAxis* pyAxis = pMtmHist->GetYaxis();
+ pyAxis->SetLabelSize(0.045);
+ pyAxis->SetTitleSize(0.045);
TH1F* gMtmHist = new TH1F("gMtmHist", "", 100, 0.0, 5.5);
- gMtmHist->SetXTitle("#gamma momentum (GeV/c)");
+ gMtmHist->SetXTitle("Photon momentum (GeV/c)");
gMtmHist->SetYTitle("Frequency/55 (MeV/c)");
- gMtmHist->SetTitleOffset(1.25, "Y");
+ gMtmHist->SetTitleOffset(1.1, "Y");
+ TAxis* gxAxis = gMtmHist->GetXaxis();
+ gxAxis->SetLabelSize(0.045);
+ gxAxis->SetTitleSize(0.045);
+ TAxis* gyAxis = gMtmHist->GetYaxis();
+ gyAxis->SetLabelSize(0.045);
+ gyAxis->SetTitleSize(0.045);
TH1F* nDaugHist = new TH1F("nDaugHist", "", 10, 0, 10);
nDaugHist->SetXTitle("Number of daughters");
nDaugHist->SetYTitle("Frequency");
- nDaugHist->SetTitleOffset(1.25, "Y");
+ nDaugHist->SetTitleOffset(1.15, "Y");
+ TAxis* nxAxis = nDaugHist->GetXaxis();
+ nxAxis->SetLabelSize(0.045);
+ nxAxis->SetTitleSize(0.045);
+ TAxis* nyAxis = nDaugHist->GetYaxis();
+ nyAxis->SetLabelSize(0.045);
+ nyAxis->SetTitleSize(0.045);
theTree->Draw("p>>eMtmHist", "id==11");
theTree->Draw("p>>pMtmHist", "id==-11");
theTree->Draw("p>>gMtmHist", "id==22");
nDaugTree->Draw("nDaug>>nDaugHist");
gROOT->SetStyle("Plain");
gStyle->SetOptStat(0);
TCanvas* theCanvas = new TCanvas("theCanvas", "", 900, 700);
theCanvas->UseCurrentStyle();
theCanvas->Divide(2,2);
theCanvas->cd(1);
gPad->SetLogy();
double scale = 1.0/eMtmHist->Integral(); // same normalisation number for all plots
eMtmHist->Scale(scale);
eMtmHist->SetMaximum(1.0);
eMtmHist->Draw();
theCanvas->cd(2);
gPad->SetLogy();
pMtmHist->Scale(scale);
pMtmHist->SetMaximum(1.0);
pMtmHist->Draw();
theCanvas->cd(3);
gPad->SetLogy();
gMtmHist->Scale(scale);
gMtmHist->SetMaximum(1.0);
gMtmHist->Draw();
theCanvas->cd(4);
gPad->SetLogy(0);
nDaugHist->Scale(scale);
nDaugHist->SetMaximum(0.5);
nDaugHist->Draw();
theCanvas->cd(1);
TLatex latex;
latex.SetNDC();
- latex.SetTextSize(0.05);
- latex.DrawLatex(0.1, 0.95, "#Upsilon(4S) #rightarrow e^{-} e^{+} decay with PHOTOS 3.0");
+ latex.SetTextSize(0.045);
+ latex.DrawLatex(0.1, 0.95, "#Upsilon(4S) #rightarrow e^{-} e^{+} decay with PHOTOS");
- theCanvas->Print("photosPlots.gif");
+ theCanvas->Print("photosPlots.png");
}
diff --git a/validation/runPhotosTest.sh b/validation/runPhotosTest.sh
new file mode 100644
index 0000000..b5c6239
--- /dev/null
+++ b/validation/runPhotosTest.sh
@@ -0,0 +1 @@
+./genExampleRootFiles photosTest.dec Upsilon4S_PHOTOS.root "Upsilon(4S)" 100000

File Metadata

Mime Type
text/x-diff
Expires
Wed, May 14, 11:37 AM (11 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5086805
Default Alt Text
(53 KB)

Event Timeline