diff --git a/EvtGenBase/EvtDecayBase.hh b/EvtGenBase/EvtDecayBase.hh
--- a/EvtGenBase/EvtDecayBase.hh
+++ b/EvtGenBase/EvtDecayBase.hh
@@ -53,23 +53,23 @@
     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 );
@@ -78,8 +78,8 @@
     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,
@@ -112,31 +112,34 @@
     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
--- a/History.md
+++ b/History.md
@@ -12,6 +12,10 @@
 ## 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.
 
diff --git a/src/EvtGenBase/EvtDecayAmp.cpp b/src/EvtGenBase/EvtDecayAmp.cpp
--- a/src/EvtGenBase/EvtDecayAmp.cpp
+++ b/src/EvtGenBase/EvtDecayAmp.cpp
@@ -248,7 +248,8 @@
         }
     }
 
-    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();
diff --git a/src/EvtGenBase/EvtDecayBase.cpp b/src/EvtGenBase/EvtDecayBase.cpp
--- a/src/EvtGenBase/EvtDecayBase.cpp
+++ b/src/EvtGenBase/EvtDecayBase.cpp
@@ -129,7 +129,7 @@
     EvtGenReport( EVTGEN_INFO, "" ) << endl;
 
     probmax = 0.0;
-    defaultprobmax = 0;
+    defaultprobmax = false;
     ntimes_prob = 0;
 
     return prob;
@@ -195,12 +195,12 @@
     //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;
 
@@ -269,31 +269,6 @@
     }
 }
 
-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 ) {
@@ -320,13 +295,13 @@
 
 void EvtDecayBase::setProbMax( double prbmx )
 {
-    defaultprobmax = 0;
+    defaultprobmax = false;
     probmax = prbmx;
 }
 
 void EvtDecayBase::noProbMax()
 {
-    defaultprobmax = 0;
+    defaultprobmax = false;
 }
 
 double EvtDecayBase::findMaxMass( EvtParticle* p )
diff --git a/src/EvtGenBase/EvtDecayIncoherent.cpp b/src/EvtGenBase/EvtDecayIncoherent.cpp
--- a/src/EvtGenBase/EvtDecayIncoherent.cpp
+++ b/src/EvtGenBase/EvtDecayIncoherent.cpp
@@ -46,7 +46,8 @@
 
     p->setSpinDensityBackward( rho );
 
-    if ( getPHOTOS() || EvtRadCorr::alwaysRadCorr() ) {
+    if ( ( getFSR() || EvtRadCorr::alwaysRadCorr() ) &&
+         !EvtRadCorr::neverRadCorr() ) {
         EvtRadCorr::doRadCorr( p );
     }
 
diff --git a/src/EvtGenBase/EvtDecayProb.cpp b/src/EvtGenBase/EvtDecayProb.cpp
--- a/src/EvtGenBase/EvtDecayProb.cpp
+++ b/src/EvtGenBase/EvtDecayProb.cpp
@@ -72,7 +72,9 @@
     EvtSpinDensity rho;
     rho.setDiag( p->getSpinStates() );
     p->setSpinDensityBackward( rho );
-    if ( getPHOTOS() || EvtRadCorr::alwaysRadCorr() ) {
+
+    if ( ( getFSR() || EvtRadCorr::alwaysRadCorr() ) &&
+         !EvtRadCorr::neverRadCorr() ) {
         EvtRadCorr::doRadCorr( p );
     }
 
diff --git a/src/EvtGenBase/EvtDecayTable.cpp b/src/EvtGenBase/EvtDecayTable.cpp
--- a/src/EvtGenBase/EvtDecayTable.cpp
+++ b/src/EvtGenBase/EvtDecayTable.cpp
@@ -157,24 +157,62 @@
     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;
@@ -622,25 +660,30 @@
 
                     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;
@@ -669,9 +712,10 @@
                     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();
                     }
@@ -910,25 +954,32 @@
     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;
                 }
 
@@ -1233,7 +1284,16 @@
                 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;
@@ -1268,8 +1328,8 @@
                 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 )
diff --git a/src/EvtGenBase/EvtParticleDecay.cpp b/src/EvtGenBase/EvtParticleDecay.cpp
--- a/src/EvtGenBase/EvtParticleDecay.cpp
+++ b/src/EvtGenBase/EvtParticleDecay.cpp
@@ -65,8 +65,8 @@
 
     _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
--- a/src/EvtGenBase/EvtParticleDecayList.cpp
+++ b/src/EvtGenBase/EvtParticleDecayList.cpp
@@ -47,8 +47,8 @@
         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();
@@ -354,8 +354,8 @@
             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();
diff --git a/test/checkJsonFiles.py b/test/checkJsonFiles.py
--- a/test/checkJsonFiles.py
+++ b/test/checkJsonFiles.py
@@ -111,9 +111,9 @@
             'nlo',
             'pWave',
             'sWave',
-            'yesPhotos',
+            'yesFSR',
             'Pars1',
-            'Pars2'
+            'Pars2',
             ]
 
     def __init__( self, jsonFileName ) :
diff --git a/test/jsonFiles/BC_BSSTAR_NPI__Bc_Bs0starpipipi.json b/test/jsonFiles/BC_BSSTAR_NPI__Bc_Bs0starpipipi.json
--- a/test/jsonFiles/BC_BSSTAR_NPI__Bc_Bs0starpipipi.json
+++ b/test/jsonFiles/BC_BSSTAR_NPI__Bc_Bs0starpipipi.json
@@ -4,7 +4,7 @@
     "models" : ["BC_BSSTAR_NPI", "", "", "", ""],
     "parameters" : [[], [], [], [], []],
     "do_conjugate_decay" : [true, false, false, false, false],
-    "extras" : ["Define dm_incohMix_B_s0 0", "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},
diff --git a/test/jsonFiles/BC_BS_NPI__Bc_Bs0pipipi.json b/test/jsonFiles/BC_BS_NPI__Bc_Bs0pipipi.json
--- a/test/jsonFiles/BC_BS_NPI__Bc_Bs0pipipi.json
+++ b/test/jsonFiles/BC_BS_NPI__Bc_Bs0pipipi.json
@@ -4,7 +4,7 @@
     "models" : ["BC_BS_NPI", "", "", "", ""],
     "parameters" : [[], [], [], [], []],
     "do_conjugate_decay" : [true, false, false, false, false],
-    "extras" : ["Define dm_incohMix_B_s0 0", "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},
diff --git a/test/jsonFiles/BC_PSI_NPI=VLL__Bc_Jpsipipipi_ee.json b/test/jsonFiles/BC_PSI_NPI=VLL__Bc_Jpsipipipi_ee.json
--- a/test/jsonFiles/BC_PSI_NPI=VLL__Bc_Jpsipipipi_ee.json
+++ b/test/jsonFiles/BC_PSI_NPI=VLL__Bc_Jpsipipipi_ee.json
@@ -5,7 +5,7 @@
     "models" : ["BC_PSI_NPI", "VLL", "", "", ""],
     "parameters" : [[], [], [], [], []],
     "do_conjugate_decay" : [true, false, false, false, false],
-    "extras" : ["Define dm_incohMix_B_s0 0", "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},
diff --git a/test/jsonFiles/BC_SMN=SVP__Bc_D0munu_gammaKst0.json b/test/jsonFiles/BC_SMN=SVP__Bc_D0munu_gammaKst0.json
--- a/test/jsonFiles/BC_SMN=SVP__Bc_D0munu_gammaKst0.json
+++ b/test/jsonFiles/BC_SMN=SVP__Bc_D0munu_gammaKst0.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/BC_TMN=TVP__Bc_chic2munu_gammaJpsi.json b/test/jsonFiles/BC_TMN=TVP__Bc_chic2munu_gammaJpsi.json
--- a/test/jsonFiles/BC_TMN=TVP__Bc_chic2munu_gammaJpsi.json
+++ b/test/jsonFiles/BC_TMN=TVP__Bc_chic2munu_gammaJpsi.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/BC_VHAD=VLL__Bc_Jpsipipi0_mumu.json b/test/jsonFiles/BC_VHAD=VLL__Bc_Jpsipipi0_mumu.json
--- a/test/jsonFiles/BC_VHAD=VLL__Bc_Jpsipipi0_mumu.json
+++ b/test/jsonFiles/BC_VHAD=VLL__Bc_Jpsipipi0_mumu.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/BC_VHAD=VLL__Bc_psi2SKKpi_mumu.json b/test/jsonFiles/BC_VHAD=VLL__Bc_psi2SKKpi_mumu.json
--- a/test/jsonFiles/BC_VHAD=VLL__Bc_psi2SKKpi_mumu.json
+++ b/test/jsonFiles/BC_VHAD=VLL__Bc_psi2SKKpi_mumu.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/BC_VHAD=VLL__Bc_psi2Spi_mumu.json b/test/jsonFiles/BC_VHAD=VLL__Bc_psi2Spi_mumu.json
--- a/test/jsonFiles/BC_VHAD=VLL__Bc_psi2Spi_mumu.json
+++ b/test/jsonFiles/BC_VHAD=VLL__Bc_psi2Spi_mumu.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/BC_VMN=VVPIPI_WEIGHTED__Bc_psi2Smunu_Jpsipipi.json b/test/jsonFiles/BC_VMN=VVPIPI_WEIGHTED__Bc_psi2Smunu_Jpsipipi.json
--- a/test/jsonFiles/BC_VMN=VVPIPI_WEIGHTED__Bc_psi2Smunu_Jpsipipi.json
+++ b/test/jsonFiles/BC_VMN=VVPIPI_WEIGHTED__Bc_psi2Smunu_Jpsipipi.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/BC_VMN=VVPIPI__Bc_psi2Smunu_Jpsipipi.json b/test/jsonFiles/BC_VMN=VVPIPI__Bc_psi2Smunu_Jpsipipi.json
--- a/test/jsonFiles/BC_VMN=VVPIPI__Bc_psi2Smunu_Jpsipipi.json
+++ b/test/jsonFiles/BC_VMN=VVPIPI__Bc_psi2Smunu_Jpsipipi.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/BC_VMN=VVP__Bc_psi2Smunu_chic1gamma.json b/test/jsonFiles/BC_VMN=VVP__Bc_psi2Smunu_chic1gamma.json
--- a/test/jsonFiles/BC_VMN=VVP__Bc_psi2Smunu_chic1gamma.json
+++ b/test/jsonFiles/BC_VMN=VVP__Bc_psi2Smunu_chic1gamma.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/BC_VNPI=VLL__Bc_psi2Spipipi_mumu.json b/test/jsonFiles/BC_VNPI=VLL__Bc_psi2Spipipi_mumu.json
--- a/test/jsonFiles/BC_VNPI=VLL__Bc_psi2Spipipi_mumu.json
+++ b/test/jsonFiles/BC_VNPI=VLL__Bc_psi2Spipipi_mumu.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/BC_VPPHAD=VLL__Bc_Jpsippbarpi_mumu_Pars1.json b/test/jsonFiles/BC_VPPHAD=VLL__Bc_Jpsippbarpi_mumu_Pars1.json
--- a/test/jsonFiles/BC_VPPHAD=VLL__Bc_Jpsippbarpi_mumu_Pars1.json
+++ b/test/jsonFiles/BC_VPPHAD=VLL__Bc_Jpsippbarpi_mumu_Pars1.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/BC_VPPHAD=VLL__Bc_Jpsippbarpi_mumu_Pars2.json b/test/jsonFiles/BC_VPPHAD=VLL__Bc_Jpsippbarpi_mumu_Pars2.json
--- a/test/jsonFiles/BC_VPPHAD=VLL__Bc_Jpsippbarpi_mumu_Pars2.json
+++ b/test/jsonFiles/BC_VPPHAD=VLL__Bc_Jpsippbarpi_mumu_Pars2.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/BC_VPPHAD=VLL__Bc_psi2Sppbarpi_mumu_Pars1.json b/test/jsonFiles/BC_VPPHAD=VLL__Bc_psi2Sppbarpi_mumu_Pars1.json
--- a/test/jsonFiles/BC_VPPHAD=VLL__Bc_psi2Sppbarpi_mumu_Pars1.json
+++ b/test/jsonFiles/BC_VPPHAD=VLL__Bc_psi2Sppbarpi_mumu_Pars1.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/BC_VPPHAD=VLL__Bc_psi2Sppbarpi_mumu_Pars2.json b/test/jsonFiles/BC_VPPHAD=VLL__Bc_psi2Sppbarpi_mumu_Pars2.json
--- a/test/jsonFiles/BC_VPPHAD=VLL__Bc_psi2Sppbarpi_mumu_Pars2.json
+++ b/test/jsonFiles/BC_VPPHAD=VLL__Bc_psi2Sppbarpi_mumu_Pars2.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/BLLNUL__Bu_eenumu.json b/test/jsonFiles/BLLNUL__Bu_eenumu.json
--- a/test/jsonFiles/BLLNUL__Bu_eenumu.json
+++ b/test/jsonFiles/BLLNUL__Bu_eenumu.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/BSQUARK__Bu_Dst0enue.json b/test/jsonFiles/BSQUARK__Bu_Dst0enue.json
--- a/test/jsonFiles/BSQUARK__Bu_Dst0enue.json
+++ b/test/jsonFiles/BSQUARK__Bu_Dst0enue.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/BSTOGLLISRFSR__Bs_gammamumu.json b/test/jsonFiles/BSTOGLLISRFSR__Bs_gammamumu.json
--- a/test/jsonFiles/BSTOGLLISRFSR__Bs_gammamumu.json
+++ b/test/jsonFiles/BSTOGLLISRFSR__Bs_gammamumu.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/BSTOGLLMNT__Bs_gammamumu.json b/test/jsonFiles/BSTOGLLMNT__Bs_gammamumu.json
--- a/test/jsonFiles/BSTOGLLMNT__Bs_gammamumu.json
+++ b/test/jsonFiles/BSTOGLLMNT__Bs_gammamumu.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/BS_MUMUKK__Bs_mumuKK.json b/test/jsonFiles/BS_MUMUKK__Bs_mumuKK.json
--- a/test/jsonFiles/BS_MUMUKK__Bs_mumuKK.json
+++ b/test/jsonFiles/BS_MUMUKK__Bs_mumuKK.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/BTODDALITZCPK=D0GAMMADALITZ__Bu_D0K_KsKK.json b/test/jsonFiles/BTODDALITZCPK=D0GAMMADALITZ__Bu_D0K_KsKK.json
--- a/test/jsonFiles/BTODDALITZCPK=D0GAMMADALITZ__Bu_D0K_KsKK.json
+++ b/test/jsonFiles/BTODDALITZCPK=D0GAMMADALITZ__Bu_D0K_KsKK.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/BTOKD3P=PTO3P=PTO3P__Bu_KD0D0bar_K0spipi,K0spipi.json b/test/jsonFiles/BTOKD3P=PTO3P=PTO3P__Bu_KD0D0bar_K0spipi,K0spipi.json
--- a/test/jsonFiles/BTOKD3P=PTO3P=PTO3P__Bu_KD0D0bar_K0spipi,K0spipi.json
+++ b/test/jsonFiles/BTOKD3P=PTO3P=PTO3P__Bu_KD0D0bar_K0spipi,K0spipi.json
@@ -23,7 +23,7 @@
 		     "AMPLITUDE RESONANCE BC omega ANGULAR AB TYPE RBW_ZEMACH COEFFICIENT POLAR_DEG 0.053 126.5",
 		     "AMPLITUDE RESONANCE BC f_2 ANGULAR AB TYPE RBW_ZEMACH COEFFICIENT POLAR_DEG 0.61 157.4",
 		     "AMPLITUDE PHASESPACE COEFFICIENT POLAR_DEG 0.3 0.0"]],
-    "extras" : ["noPhotos"],
+    "extras" : ["noFSR"],
     "events" : 10000,
     "histograms" : [
 	{"variable" : "prob", "title" : "Prob(BTOKD3P)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/BTOPLNUBK__Bu_pi0enu.json b/test/jsonFiles/BTOPLNUBK__Bu_pi0enu.json
--- a/test/jsonFiles/BTOPLNUBK__Bu_pi0enu.json
+++ b/test/jsonFiles/BTOPLNUBK__Bu_pi0enu.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/BTOSLLALI=VSS__Bs_phimumu_KK.json b/test/jsonFiles/BTOSLLALI=VSS__Bs_phimumu_KK.json
--- a/test/jsonFiles/BTOSLLALI=VSS__Bs_phimumu_KK.json
+++ b/test/jsonFiles/BTOSLLALI=VSS__Bs_phimumu_KK.json
@@ -5,7 +5,7 @@
     "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},
diff --git a/test/jsonFiles/BTOSLLBALL=PHSP__Bd_Ksmumu_pipi.json b/test/jsonFiles/BTOSLLBALL=PHSP__Bd_Ksmumu_pipi.json
--- a/test/jsonFiles/BTOSLLBALL=PHSP__Bd_Ksmumu_pipi.json
+++ b/test/jsonFiles/BTOSLLBALL=PHSP__Bd_Ksmumu_pipi.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/BTOSLLBALL=VSS__Bd_Kst0mumu_Kpi.json b/test/jsonFiles/BTOSLLBALL=VSS__Bd_Kst0mumu_Kpi.json
--- a/test/jsonFiles/BTOSLLBALL=VSS__Bd_Kst0mumu_Kpi.json
+++ b/test/jsonFiles/BTOSLLBALL=VSS__Bd_Kst0mumu_Kpi.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/BTOSLLBALL=VSS__Bs_phimumu_KK.json b/test/jsonFiles/BTOSLLBALL=VSS__Bs_phimumu_KK.json
--- a/test/jsonFiles/BTOSLLBALL=VSS__Bs_phimumu_KK.json
+++ b/test/jsonFiles/BTOSLLBALL=VSS__Bs_phimumu_KK.json
@@ -5,7 +5,7 @@
     "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},
diff --git a/test/jsonFiles/BTOSLLBALL=VSS__Bu_rhomumu_pipi0.json b/test/jsonFiles/BTOSLLBALL=VSS__Bu_rhomumu_pipi0.json
--- a/test/jsonFiles/BTOSLLBALL=VSS__Bu_rhomumu_pipi0.json
+++ b/test/jsonFiles/BTOSLLBALL=VSS__Bu_rhomumu_pipi0.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/BTOSLLBALL__Bu_Kmumu.json b/test/jsonFiles/BTOSLLBALL__Bu_Kmumu.json
--- a/test/jsonFiles/BTOSLLBALL__Bu_Kmumu.json
+++ b/test/jsonFiles/BTOSLLBALL__Bu_Kmumu.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/BTOSLLBALL__Bu_pimumu.json b/test/jsonFiles/BTOSLLBALL__Bu_pimumu.json
--- a/test/jsonFiles/BTOSLLBALL__Bu_pimumu.json
+++ b/test/jsonFiles/BTOSLLBALL__Bu_pimumu.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/BTOSLLMS=VSS__Bu_rhomumu_pipi0.json b/test/jsonFiles/BTOSLLMS=VSS__Bu_rhomumu_pipi0.json
--- a/test/jsonFiles/BTOSLLMS=VSS__Bu_rhomumu_pipi0.json
+++ b/test/jsonFiles/BTOSLLMS=VSS__Bu_rhomumu_pipi0.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/BTOSLLMSEXT=VVS_PWAVE__Bu_K1mumu_rho0K.json b/test/jsonFiles/BTOSLLMSEXT=VVS_PWAVE__Bu_K1mumu_rho0K.json
--- a/test/jsonFiles/BTOSLLMSEXT=VVS_PWAVE__Bu_K1mumu_rho0K.json
+++ b/test/jsonFiles/BTOSLLMSEXT=VVS_PWAVE__Bu_K1mumu_rho0K.json
@@ -5,7 +5,7 @@
     "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},
diff --git a/test/jsonFiles/BTOVLNUBALL__Bd_Kstarenu.json b/test/jsonFiles/BTOVLNUBALL__Bd_Kstarenu.json
--- a/test/jsonFiles/BTOVLNUBALL__Bd_Kstarenu.json
+++ b/test/jsonFiles/BTOVLNUBALL__Bd_Kstarenu.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/BTOXELNU=VSS__Bu_rho0munu_pipi.json b/test/jsonFiles/BTOXELNU=VSS__Bu_rho0munu_pipi.json
--- a/test/jsonFiles/BTOXELNU=VSS__Bu_rho0munu_pipi.json
+++ b/test/jsonFiles/BTOXELNU=VSS__Bu_rho0munu_pipi.json
@@ -5,7 +5,7 @@
     "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},
diff --git a/test/jsonFiles/BTOXSETAP=SVP_HELAMP__Bu_Xsuetap_rho0gamma.json b/test/jsonFiles/BTOXSETAP=SVP_HELAMP__Bu_Xsuetap_rho0gamma.json
--- a/test/jsonFiles/BTOXSETAP=SVP_HELAMP__Bu_Xsuetap_rho0gamma.json
+++ b/test/jsonFiles/BTOXSETAP=SVP_HELAMP__Bu_Xsuetap_rho0gamma.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/BTOXSGAMMA__Bd_Xsdgamma.json b/test/jsonFiles/BTOXSGAMMA__Bd_Xsdgamma.json
--- a/test/jsonFiles/BTOXSGAMMA__Bd_Xsdgamma.json
+++ b/test/jsonFiles/BTOXSGAMMA__Bd_Xsdgamma.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/BTOXSLL__Bu_Xsumumu.json b/test/jsonFiles/BTOXSLL__Bu_Xsumumu.json
--- a/test/jsonFiles/BTOXSLL__Bu_Xsumumu.json
+++ b/test/jsonFiles/BTOXSLL__Bu_Xsumumu.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/BToDiBaryonlnupQCD__Bu_Deltappbarmunu.json b/test/jsonFiles/BToDiBaryonlnupQCD__Bu_Deltappbarmunu.json
--- a/test/jsonFiles/BToDiBaryonlnupQCD__Bu_Deltappbarmunu.json
+++ b/test/jsonFiles/BToDiBaryonlnupQCD__Bu_Deltappbarmunu.json
@@ -3,7 +3,7 @@
     "daughters" : ["Delta+", "anti-p-", "mu-", "anti-nu_mu"],
     "models" : ["BToDiBaryonlnupQCD"],
     "parameters" : [["67.7", "-280.0", "-187.3", "-840.1", "-10.1", "-157.0", "7.0e6"]],
-    "extras" : ["noPhotos"],
+    "extras" : ["noFSR"],
     "events" : 10000,
     "histograms" : [
 	{"variable" : "prob", "title" : "Prob",  "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/BToDiBaryonlnupQCD__Bu_ppmunu.json b/test/jsonFiles/BToDiBaryonlnupQCD__Bu_ppmunu.json
--- a/test/jsonFiles/BToDiBaryonlnupQCD__Bu_ppmunu.json
+++ b/test/jsonFiles/BToDiBaryonlnupQCD__Bu_ppmunu.json
@@ -3,7 +3,7 @@
     "daughters" : ["p+", "anti-p-", "mu-", "anti-nu_mu"],
     "models" : ["BToDiBaryonlnupQCD"],
     "parameters" : [["67.7", "-280.0", "-187.3", "-840.1", "-10.1", "-157.0", "3.0e6"]],
-    "extras" : ["noPhotos"],
+    "extras" : ["noFSR"],
     "events" : 10000,
     "histograms" : [
 	{"variable" : "prob", "title" : "Prob",  "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/B_TO_2BARYON_SCALAR__Bu_Lambda0pbarpi0.json b/test/jsonFiles/B_TO_2BARYON_SCALAR__Bu_Lambda0pbarpi0.json
--- a/test/jsonFiles/B_TO_2BARYON_SCALAR__Bu_Lambda0pbarpi0.json
+++ b/test/jsonFiles/B_TO_2BARYON_SCALAR__Bu_Lambda0pbarpi0.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/B_TO_LAMBDA_PBAR_GAMMA__Bu_Lambda0pbargamma.json b/test/jsonFiles/B_TO_LAMBDA_PBAR_GAMMA__Bu_Lambda0pbargamma.json
--- a/test/jsonFiles/B_TO_LAMBDA_PBAR_GAMMA__Bu_Lambda0pbargamma.json
+++ b/test/jsonFiles/B_TO_LAMBDA_PBAR_GAMMA__Bu_Lambda0pbargamma.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/BaryonPCR=PHSP__Lambdab0_Lambdacmunu_Lambda0pi.json b/test/jsonFiles/BaryonPCR=PHSP__Lambdab0_Lambdacmunu_Lambda0pi.json
--- a/test/jsonFiles/BaryonPCR=PHSP__Lambdab0_Lambdacmunu_Lambda0pi.json
+++ b/test/jsonFiles/BaryonPCR=PHSP__Lambdab0_Lambdacmunu_Lambda0pi.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/CB3PI-MPP__Bu_pipipi.json b/test/jsonFiles/CB3PI-MPP__Bu_pipipi.json
--- a/test/jsonFiles/CB3PI-MPP__Bu_pipipi.json
+++ b/test/jsonFiles/CB3PI-MPP__Bu_pipipi.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/CB3PI-P00__Bu_pipi0pi0.json b/test/jsonFiles/CB3PI-P00__Bu_pipi0pi0.json
--- a/test/jsonFiles/CB3PI-P00__Bu_pipi0pi0.json
+++ b/test/jsonFiles/CB3PI-P00__Bu_pipi0pi0.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/D0MIXDALITZ__D0_KsKK.json b/test/jsonFiles/D0MIXDALITZ__D0_KsKK.json
--- a/test/jsonFiles/D0MIXDALITZ__D0_KsKK.json
+++ b/test/jsonFiles/D0MIXDALITZ__D0_KsKK.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/DToKpienu__D+_Kpimunu.json b/test/jsonFiles/DToKpienu__D+_Kpimunu.json
--- a/test/jsonFiles/DToKpienu__D+_Kpimunu.json
+++ b/test/jsonFiles/DToKpienu__D+_Kpimunu.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/D_DALITZ__D+_K+pipi.json b/test/jsonFiles/D_DALITZ__D+_K+pipi.json
--- a/test/jsonFiles/D_DALITZ__D+_K+pipi.json
+++ b/test/jsonFiles/D_DALITZ__D+_K+pipi.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/D_DALITZ__D+_K0pipi0.json b/test/jsonFiles/D_DALITZ__D+_K0pipi0.json
--- a/test/jsonFiles/D_DALITZ__D+_K0pipi0.json
+++ b/test/jsonFiles/D_DALITZ__D+_K0pipi0.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/D_DALITZ__D+_KKpi+.json b/test/jsonFiles/D_DALITZ__D+_KKpi+.json
--- a/test/jsonFiles/D_DALITZ__D+_KKpi+.json
+++ b/test/jsonFiles/D_DALITZ__D+_KKpi+.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/D_DALITZ__D+_Kpipi+.json b/test/jsonFiles/D_DALITZ__D+_Kpipi+.json
--- a/test/jsonFiles/D_DALITZ__D+_Kpipi+.json
+++ b/test/jsonFiles/D_DALITZ__D+_Kpipi+.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/D_DALITZ__D+_Kpipi+_yesPhotos.json b/test/jsonFiles/D_DALITZ__D+_Kpipi+_yesFSR.json
rename from test/jsonFiles/D_DALITZ__D+_Kpipi+_yesPhotos.json
rename to test/jsonFiles/D_DALITZ__D+_Kpipi+_yesFSR.json
--- a/test/jsonFiles/D_DALITZ__D+_Kpipi+_yesPhotos.json
+++ b/test/jsonFiles/D_DALITZ__D+_Kpipi+_yesFSR.json
@@ -4,7 +4,7 @@
     "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},
@@ -26,6 +26,6 @@
         {"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
--- a/test/jsonFiles/D_DALITZ__D+_pipipi+.json
+++ b/test/jsonFiles/D_DALITZ__D+_pipipi+.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/D_DALITZ__D0_KKKS0.json b/test/jsonFiles/D_DALITZ__D0_KKKS0.json
--- a/test/jsonFiles/D_DALITZ__D0_KKKS0.json
+++ b/test/jsonFiles/D_DALITZ__D0_KKKS0.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/D_DALITZ__D0_KKanti-K0.json b/test/jsonFiles/D_DALITZ__D0_KKanti-K0.json
--- a/test/jsonFiles/D_DALITZ__D0_KKanti-K0.json
+++ b/test/jsonFiles/D_DALITZ__D0_KKanti-K0.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/D_DALITZ__D0_Kpipi0.json b/test/jsonFiles/D_DALITZ__D0_Kpipi0.json
--- a/test/jsonFiles/D_DALITZ__D0_Kpipi0.json
+++ b/test/jsonFiles/D_DALITZ__D0_Kpipi0.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/D_DALITZ__D0_anti-K0pipi.json b/test/jsonFiles/D_DALITZ__D0_anti-K0pipi.json
--- a/test/jsonFiles/D_DALITZ__D0_anti-K0pipi.json
+++ b/test/jsonFiles/D_DALITZ__D0_anti-K0pipi.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/D_DALITZ__D0_pipiKS0.json b/test/jsonFiles/D_DALITZ__D0_pipiKS0.json
--- a/test/jsonFiles/D_DALITZ__D0_pipiKS0.json
+++ b/test/jsonFiles/D_DALITZ__D0_pipiKS0.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/D_DALITZ__D0_pipipi0.json b/test/jsonFiles/D_DALITZ__D0_pipipi0.json
--- a/test/jsonFiles/D_DALITZ__D0_pipipi0.json
+++ b/test/jsonFiles/D_DALITZ__D0_pipipi0.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/D_DALITZ__Ds+_KKpi.json b/test/jsonFiles/D_DALITZ__Ds+_KKpi.json
--- a/test/jsonFiles/D_DALITZ__Ds+_KKpi.json
+++ b/test/jsonFiles/D_DALITZ__Ds+_KKpi.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/D_DALITZ__Ds+_pipipi.json b/test/jsonFiles/D_DALITZ__Ds+_pipipi.json
--- a/test/jsonFiles/D_DALITZ__Ds+_pipipi.json
+++ b/test/jsonFiles/D_DALITZ__Ds+_pipipi.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/ETA_DALITZ__eta_pipipi0.json b/test/jsonFiles/ETA_DALITZ__eta_pipipi0.json
--- a/test/jsonFiles/ETA_DALITZ__eta_pipipi0.json
+++ b/test/jsonFiles/ETA_DALITZ__eta_pipipi0.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/ETA_LLPIPI__etap_eepipi.json b/test/jsonFiles/ETA_LLPIPI__etap_eepipi.json
--- a/test/jsonFiles/ETA_LLPIPI__etap_eepipi.json
+++ b/test/jsonFiles/ETA_LLPIPI__etap_eepipi.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/ETA_LLPIPI__etap_mumupipi.json b/test/jsonFiles/ETA_LLPIPI__etap_mumupipi.json
--- a/test/jsonFiles/ETA_LLPIPI__etap_mumupipi.json
+++ b/test/jsonFiles/ETA_LLPIPI__etap_mumupipi.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/EvtBcToNPi=VLL__Bc_Jpsipipipi_ee.json b/test/jsonFiles/EvtBcToNPi=VLL__Bc_Jpsipipipi_ee.json
--- a/test/jsonFiles/EvtBcToNPi=VLL__Bc_Jpsipipipi_ee.json
+++ b/test/jsonFiles/EvtBcToNPi=VLL__Bc_Jpsipipipi_ee.json
@@ -5,7 +5,7 @@
     "models" : ["EvtBcToNPi", "VLL", "", "", ""],
     "parameters" : [["0.9e5", "5.9", "0.049", "0.0015", "0.0", "0.0", "0.0", "-0.074", "0.049", "0.0015"], [], [], [], []],
     "do_conjugate_decay" : [true, false, false, false, false],
-    "extras" : ["Define dm_incohMix_B_s0 0", "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},
diff --git a/test/jsonFiles/FLATQ2=VSS__Bs_phimumu_KK.json b/test/jsonFiles/FLATQ2=VSS__Bs_phimumu_KK.json
--- a/test/jsonFiles/FLATQ2=VSS__Bs_phimumu_KK.json
+++ b/test/jsonFiles/FLATQ2=VSS__Bs_phimumu_KK.json
@@ -5,7 +5,7 @@
     "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},
diff --git a/test/jsonFiles/FLATSQDALITZ__Bu_pi+pi+pi-.json b/test/jsonFiles/FLATSQDALITZ__Bu_pi+pi+pi-.json
--- a/test/jsonFiles/FLATSQDALITZ__Bu_pi+pi+pi-.json
+++ b/test/jsonFiles/FLATSQDALITZ__Bu_pi+pi+pi-.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/FLATSQDALITZ__Lb_KKLz.json b/test/jsonFiles/FLATSQDALITZ__Lb_KKLz.json
--- a/test/jsonFiles/FLATSQDALITZ__Lb_KKLz.json
+++ b/test/jsonFiles/FLATSQDALITZ__Lb_KKLz.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/FLATSQDALITZ__Lb_KKLz_cuts.json b/test/jsonFiles/FLATSQDALITZ__Lb_KKLz_cuts.json
--- a/test/jsonFiles/FLATSQDALITZ__Lb_KKLz_cuts.json
+++ b/test/jsonFiles/FLATSQDALITZ__Lb_KKLz_cuts.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/FOURBODYPHSP__Bu_mumuKrho0.json b/test/jsonFiles/FOURBODYPHSP__Bu_mumuKrho0.json
--- a/test/jsonFiles/FOURBODYPHSP__Bu_mumuKrho0.json
+++ b/test/jsonFiles/FOURBODYPHSP__Bu_mumuKrho0.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/GENERIC_DALITZ__D0_KsKK.json b/test/jsonFiles/GENERIC_DALITZ__D0_KsKK.json
--- a/test/jsonFiles/GENERIC_DALITZ__D0_KsKK.json
+++ b/test/jsonFiles/GENERIC_DALITZ__D0_KsKK.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/GOITY_ROBERTS=VSS__Bd_Dst0pienu_D0pi0.json b/test/jsonFiles/GOITY_ROBERTS=VSS__Bd_Dst0pienu_D0pi0.json
--- a/test/jsonFiles/GOITY_ROBERTS=VSS__Bd_Dst0pienu_D0pi0.json
+++ b/test/jsonFiles/GOITY_ROBERTS=VSS__Bd_Dst0pienu_D0pi0.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/HELAMP=HELAMP=VSS__Bu_psi2SKstar_Jpsigamma,K0pi.json b/test/jsonFiles/HELAMP=HELAMP=VSS__Bu_psi2SKstar_Jpsigamma,K0pi.json
--- a/test/jsonFiles/HELAMP=HELAMP=VSS__Bu_psi2SKstar_Jpsigamma,K0pi.json
+++ b/test/jsonFiles/HELAMP=HELAMP=VSS__Bu_psi2SKstar_Jpsigamma,K0pi.json
@@ -5,7 +5,7 @@
     "models" : ["HELAMP", "HELAMP", "VSS"],
     "parameters" : [["0.0", "0.0", "0.0", "0.0", "1.0", "0.0"], ["1.0", "0.0", "1.0", "0.0", "0.0", "0.0", "0.0", "0.0"], []],
     "do_conjugate_decay" : [true, true, true],
-    "extras" : ["noPhotos"],
+    "extras" : ["noFSR"],
     "events" : 10000,
     "histograms" : [
         {"variable" : "prob", "title" : "Prob(HELAMP,B)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/HQET2=VSS__Bd_Dstenu_D0pi.json b/test/jsonFiles/HQET2=VSS__Bd_Dstenu_D0pi.json
--- a/test/jsonFiles/HQET2=VSS__Bd_Dstenu_D0pi.json
+++ b/test/jsonFiles/HQET2=VSS__Bd_Dstenu_D0pi.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/HQET=VSS__Bd_Dstenu_D0pi.json b/test/jsonFiles/HQET=VSS__Bd_Dstenu_D0pi.json
--- a/test/jsonFiles/HQET=VSS__Bd_Dstenu_D0pi.json
+++ b/test/jsonFiles/HQET=VSS__Bd_Dstenu_D0pi.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/HypNonLepton__Lambda0_ppi.json b/test/jsonFiles/HypNonLepton__Lambda0_ppi.json
--- a/test/jsonFiles/HypNonLepton__Lambda0_ppi.json
+++ b/test/jsonFiles/HypNonLepton__Lambda0_ppi.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/ISGW2=PHSP=TAUSCALARNU__Bu_D0taunu_Kpi,pinu.json b/test/jsonFiles/ISGW2=PHSP=TAUSCALARNU__Bu_D0taunu_Kpi,pinu.json
--- a/test/jsonFiles/ISGW2=PHSP=TAUSCALARNU__Bu_D0taunu_Kpi,pinu.json
+++ b/test/jsonFiles/ISGW2=PHSP=TAUSCALARNU__Bu_D0taunu_Kpi,pinu.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/ISGW2=VSS=TAUSCALARNU__Bd_Dsttaunu_D0pi,pinu.json b/test/jsonFiles/ISGW2=VSS=TAUSCALARNU__Bd_Dsttaunu_D0pi,pinu.json
--- a/test/jsonFiles/ISGW2=VSS=TAUSCALARNU__Bd_Dsttaunu_D0pi,pinu.json
+++ b/test/jsonFiles/ISGW2=VSS=TAUSCALARNU__Bd_Dsttaunu_D0pi,pinu.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/ISGW2=VSS__Bd_Dstmunu_D0pi.json b/test/jsonFiles/ISGW2=VSS__Bd_Dstmunu_D0pi.json
--- a/test/jsonFiles/ISGW2=VSS__Bd_Dstmunu_D0pi.json
+++ b/test/jsonFiles/ISGW2=VSS__Bd_Dstmunu_D0pi.json
@@ -4,7 +4,7 @@
     "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},
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
--- a/test/jsonFiles/ISGW2=VVS_PWAVE=TAUSCALARNU__Bd_Dst2Staunu_Dst0pi,pinu.json
+++ b/test/jsonFiles/ISGW2=VVS_PWAVE=TAUSCALARNU__Bd_Dst2Staunu_Dst0pi,pinu.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/ISGW=VSS__Bd_Dstmunu_D0pi.json b/test/jsonFiles/ISGW=VSS__Bd_Dstmunu_D0pi.json
--- a/test/jsonFiles/ISGW=VSS__Bd_Dstmunu_D0pi.json
+++ b/test/jsonFiles/ISGW=VSS__Bd_Dstmunu_D0pi.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/KK_LAMBDAC_SL=HELAMP__Lambdac_Lambda0munu_ppi.json b/test/jsonFiles/KK_LAMBDAC_SL=HELAMP__Lambdac_Lambda0munu_ppi.json
--- a/test/jsonFiles/KK_LAMBDAC_SL=HELAMP__Lambdac_Lambda0munu_ppi.json
+++ b/test/jsonFiles/KK_LAMBDAC_SL=HELAMP__Lambdac_Lambda0munu_ppi.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/KSTARNUNU__Bd_Kstar0nunu.json b/test/jsonFiles/KSTARNUNU__Bd_Kstar0nunu.json
--- a/test/jsonFiles/KSTARNUNU__Bd_Kstar0nunu.json
+++ b/test/jsonFiles/KSTARNUNU__Bd_Kstar0nunu.json
@@ -3,7 +3,7 @@
     "daughters" : ["K*0","nu_e","anti-nu_e"],
     "models" : ["KSTARNUNU"],
     "parameters" : [[]],
-    "extras" : ["Define dm_incohMix_B0 0.0", "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},
diff --git a/test/jsonFiles/KS_PI0MUMU__Ks_pi0mumu.json b/test/jsonFiles/KS_PI0MUMU__Ks_pi0mumu.json
--- a/test/jsonFiles/KS_PI0MUMU__Ks_pi0mumu.json
+++ b/test/jsonFiles/KS_PI0MUMU__Ks_pi0mumu.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/LAMBDAC_PHH__Lc_pKpi.json b/test/jsonFiles/LAMBDAC_PHH__Lc_pKpi.json
--- a/test/jsonFiles/LAMBDAC_PHH__Lc_pKpi.json
+++ b/test/jsonFiles/LAMBDAC_PHH__Lc_pKpi.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/LNUGAMMA__Bu_enugamma.json b/test/jsonFiles/LNUGAMMA__Bu_enugamma.json
--- a/test/jsonFiles/LNUGAMMA__Bu_enugamma.json
+++ b/test/jsonFiles/LNUGAMMA__Bu_enugamma.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/Lb2Baryonlnu__Lb_Lc2593munu.json b/test/jsonFiles/Lb2Baryonlnu__Lb_Lc2593munu.json
--- a/test/jsonFiles/Lb2Baryonlnu__Lb_Lc2593munu.json
+++ b/test/jsonFiles/Lb2Baryonlnu__Lb_Lc2593munu.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/Lb2Baryonlnu__Lb_Lc2625munu.json b/test/jsonFiles/Lb2Baryonlnu__Lb_Lc2625munu.json
--- a/test/jsonFiles/Lb2Baryonlnu__Lb_Lc2625munu.json
+++ b/test/jsonFiles/Lb2Baryonlnu__Lb_Lc2625munu.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/Lb2Baryonlnu__Lb_Lcmunu.json b/test/jsonFiles/Lb2Baryonlnu__Lb_Lcmunu.json
--- a/test/jsonFiles/Lb2Baryonlnu__Lb_Lcmunu.json
+++ b/test/jsonFiles/Lb2Baryonlnu__Lb_Lcmunu.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/Lb2Baryonlnu__Lb_pmunu.json b/test/jsonFiles/Lb2Baryonlnu__Lb_pmunu.json
--- a/test/jsonFiles/Lb2Baryonlnu__Lb_pmunu.json
+++ b/test/jsonFiles/Lb2Baryonlnu__Lb_pmunu.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/Lb2plnuLCSR__Lb_pmunu.json b/test/jsonFiles/Lb2plnuLCSR__Lb_pmunu.json
--- a/test/jsonFiles/Lb2plnuLCSR__Lb_pmunu.json
+++ b/test/jsonFiles/Lb2plnuLCSR__Lb_pmunu.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/Lb2plnuLQCD__Lb_pmunu.json b/test/jsonFiles/Lb2plnuLQCD__Lb_pmunu.json
--- a/test/jsonFiles/Lb2plnuLQCD__Lb_pmunu.json
+++ b/test/jsonFiles/Lb2plnuLQCD__Lb_pmunu.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/MELIKHOV=VSS__Bd_rhomunu_pipi0.json b/test/jsonFiles/MELIKHOV=VSS__Bd_rhomunu_pipi0.json
--- a/test/jsonFiles/MELIKHOV=VSS__Bd_rhomunu_pipi0.json
+++ b/test/jsonFiles/MELIKHOV=VSS__Bd_rhomunu_pipi0.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/OMEGA_DALITZ__omega_pipipi0.json b/test/jsonFiles/OMEGA_DALITZ__omega_pipipi0.json
--- a/test/jsonFiles/OMEGA_DALITZ__omega_pipipi0.json
+++ b/test/jsonFiles/OMEGA_DALITZ__omega_pipipi0.json
@@ -3,7 +3,7 @@
     "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},
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
--- a/test/jsonFiles/PARTWAVE=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu_pWave.json
+++ b/test/jsonFiles/PARTWAVE=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu_pWave.json
@@ -4,7 +4,7 @@
     "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},
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
--- a/test/jsonFiles/PARTWAVE=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu_sWave.json
+++ b/test/jsonFiles/PARTWAVE=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu_sWave.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/PARTWAVE=VSS=VSS__Bd_DstarDstar_D0pi,D0pi.json b/test/jsonFiles/PARTWAVE=VSS=VSS__Bd_DstarDstar_D0pi,D0pi.json
--- a/test/jsonFiles/PARTWAVE=VSS=VSS__Bd_DstarDstar_D0pi,D0pi.json
+++ b/test/jsonFiles/PARTWAVE=VSS=VSS__Bd_DstarDstar_D0pi,D0pi.json
@@ -4,7 +4,7 @@
     "grand_daughters" : [["D0", "pi+"], ["anti-D0", "pi-"]],
     "models" : ["PARTWAVE", "VSS", "VSS"],
     "parameters" : [["1.0", "0.0", "0.0", "0.0", "0.0", "0.0"], [], []],
-    "extras" : ["Define dm_incohMix_B0 0", "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},
diff --git a/test/jsonFiles/PHI_DALITZ__phi_pipipi0.json b/test/jsonFiles/PHI_DALITZ__phi_pipipi0.json
--- a/test/jsonFiles/PHI_DALITZ__phi_pipipi0.json
+++ b/test/jsonFiles/PHI_DALITZ__phi_pipipi0.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/PHSP=PHSP=TAUSCALARNU__Bu_D0taunu_Kpi,pinu.json b/test/jsonFiles/PHSP=PHSP=TAUSCALARNU__Bu_D0taunu_Kpi,pinu.json
--- a/test/jsonFiles/PHSP=PHSP=TAUSCALARNU__Bu_D0taunu_Kpi,pinu.json
+++ b/test/jsonFiles/PHSP=PHSP=TAUSCALARNU__Bu_D0taunu_Kpi,pinu.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/PHSP=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu.json b/test/jsonFiles/PHSP=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu.json
--- a/test/jsonFiles/PHSP=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu.json
+++ b/test/jsonFiles/PHSP=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/PHSP=VSS=TAUSCALARNU__Bd_Dsttaunu_D0pi,pinu.json b/test/jsonFiles/PHSP=VSS=TAUSCALARNU__Bd_Dsttaunu_D0pi,pinu.json
--- a/test/jsonFiles/PHSP=VSS=TAUSCALARNU__Bd_Dsttaunu_D0pi,pinu.json
+++ b/test/jsonFiles/PHSP=VSS=TAUSCALARNU__Bd_Dsttaunu_D0pi,pinu.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/PHSPDECAYTIMECUT__Bu_JpsiK+.json b/test/jsonFiles/PHSPDECAYTIMECUT__Bu_JpsiK+.json
--- a/test/jsonFiles/PHSPDECAYTIMECUT__Bu_JpsiK+.json
+++ b/test/jsonFiles/PHSPDECAYTIMECUT__Bu_JpsiK+.json
@@ -4,7 +4,7 @@
     "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}
diff --git a/test/jsonFiles/PHSPFLATLIFETIME__Bu_JpsiKpi0.json b/test/jsonFiles/PHSPFLATLIFETIME__Bu_JpsiKpi0.json
--- a/test/jsonFiles/PHSPFLATLIFETIME__Bu_JpsiKpi0.json
+++ b/test/jsonFiles/PHSPFLATLIFETIME__Bu_JpsiKpi0.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/PHSP__Bd_KKpipi_yesPhotos.json b/test/jsonFiles/PHSP__Bd_KKpipi_yesFSR.json
rename from test/jsonFiles/PHSP__Bd_KKpipi_yesPhotos.json
rename to test/jsonFiles/PHSP__Bd_KKpipi_yesFSR.json
--- a/test/jsonFiles/PHSP__Bd_KKpipi_yesPhotos.json
+++ b/test/jsonFiles/PHSP__Bd_KKpipi_yesFSR.json
@@ -4,7 +4,7 @@
     "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 },
@@ -28,6 +28,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
--- a/test/jsonFiles/PHSP__Bd_pipipipi.json
+++ b/test/jsonFiles/PHSP__Bd_pipipipi.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/PHSP__Bu_Kpi0_yesPhotos.json b/test/jsonFiles/PHSP__Bu_Kpi0_yesFSR.json
rename from test/jsonFiles/PHSP__Bu_Kpi0_yesPhotos.json
rename to test/jsonFiles/PHSP__Bu_Kpi0_yesFSR.json
--- a/test/jsonFiles/PHSP__Bu_Kpi0_yesPhotos.json
+++ b/test/jsonFiles/PHSP__Bu_Kpi0_yesFSR.json
@@ -4,7 +4,7 @@
     "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 },
@@ -28,6 +28,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
rename from test/jsonFiles/PHSP__D0_KK_yesPhotos.json
rename to test/jsonFiles/PHSP__D0_KK_yesFSR.json
--- a/test/jsonFiles/PHSP__D0_KK_yesPhotos.json
+++ b/test/jsonFiles/PHSP__D0_KK_yesFSR.json
@@ -4,7 +4,7 @@
     "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 },
@@ -28,6 +28,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
rename from test/jsonFiles/PHSP__D0_Kpi_yesPhotos.json
rename to test/jsonFiles/PHSP__D0_Kpi_yesFSR.json
--- a/test/jsonFiles/PHSP__D0_Kpi_yesPhotos.json
+++ b/test/jsonFiles/PHSP__D0_Kpi_yesFSR.json
@@ -4,7 +4,7 @@
     "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 },
@@ -28,6 +28,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
rename from test/jsonFiles/PHSP__D0_pipi_yesPhotos.json
rename to test/jsonFiles/PHSP__D0_pipi_yesFSR.json
--- a/test/jsonFiles/PHSP__D0_pipi_yesPhotos.json
+++ b/test/jsonFiles/PHSP__D0_pipi_yesFSR.json
@@ -4,7 +4,7 @@
     "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 },
@@ -28,6 +28,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
rename from test/jsonFiles/PHSP__Lambda0_ppi_yesPhotos.json
rename to test/jsonFiles/PHSP__Lambda0_ppi_yesFSR.json
--- a/test/jsonFiles/PHSP__Lambda0_ppi_yesPhotos.json
+++ b/test/jsonFiles/PHSP__Lambda0_ppi_yesFSR.json
@@ -4,7 +4,7 @@
     "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 },
@@ -28,6 +28,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
rename from test/jsonFiles/PHSP__Lambdab0_ppi_yesPhotos.json
rename to test/jsonFiles/PHSP__Lambdab0_ppi_yesFSR.json
--- a/test/jsonFiles/PHSP__Lambdab0_ppi_yesPhotos.json
+++ b/test/jsonFiles/PHSP__Lambdab0_ppi_yesFSR.json
@@ -4,7 +4,7 @@
     "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 },
@@ -28,6 +28,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
--- a/test/jsonFiles/PI0_DALITZ__pi0_eegamma.json
+++ b/test/jsonFiles/PI0_DALITZ__pi0_eegamma.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/PSI2JPSIPIPI__X3872_Jpsipipi_nlo.json b/test/jsonFiles/PSI2JPSIPIPI__X3872_Jpsipipi_nlo.json
--- a/test/jsonFiles/PSI2JPSIPIPI__X3872_Jpsipipi_nlo.json
+++ b/test/jsonFiles/PSI2JPSIPIPI__X3872_Jpsipipi_nlo.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/PSI2JPSIPIPI__X3872_Jpsipipi_tree.json b/test/jsonFiles/PSI2JPSIPIPI__X3872_Jpsipipi_tree.json
--- a/test/jsonFiles/PSI2JPSIPIPI__X3872_Jpsipipi_tree.json
+++ b/test/jsonFiles/PSI2JPSIPIPI__X3872_Jpsipipi_tree.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/PTO3P__D0_K0sKK.json b/test/jsonFiles/PTO3P__D0_K0sKK.json
--- a/test/jsonFiles/PTO3P__D0_K0sKK.json
+++ b/test/jsonFiles/PTO3P__D0_K0sKK.json
@@ -7,7 +7,7 @@
 		     "AMPLITUDE RESONANCE BC phi ANGULAR AC TYPE RBW_ZEMACH COEFFICIENT POLAR_RAD 0.437 1.91",
 		     "AMPLITUDE RESONANCE AB a_0+ ANGULAR CA TYPE NBW COEFFICIENT POLAR_RAD 0.460 3.59",
 		     "AMPLITUDE RESONANCE BC f'_0 ANGULAR AC TYPE RBW_ZEMACH COEFFICIENT POLAR_RAD 0.435 -2.65"]],
-    "extras" : ["noPhotos"],
+    "extras" : ["noFSR"],
     "events" : 10000,
     "histograms" : [
 	{"variable" : "prob", "title" : "Probability", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/PVV_CPLH=VLL=VSS__B0s_Jpsiphi_ee,KK.json b/test/jsonFiles/PVV_CPLH=VLL=VSS__B0s_Jpsiphi_ee,KK.json
--- a/test/jsonFiles/PVV_CPLH=VLL=VSS__B0s_Jpsiphi_ee,KK.json
+++ b/test/jsonFiles/PVV_CPLH=VLL=VSS__B0s_Jpsiphi_ee,KK.json
@@ -5,7 +5,7 @@
     "models" : ["PVV_CPLH", "VLL", "VSS"],
     "parameters" : [["-0.035", "1", "0.480", "3.30", "0.722", "0.0", "0.499", "3.07"], [], []],
     "do_conjugate_decay" : [true, false, false],
-    "extras" : ["Define dm_incohMix_B_s0 0", "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},
diff --git a/test/jsonFiles/RareLbToLll=HELAMP__Lambdab0_Lambda0mumu_ppi.json b/test/jsonFiles/RareLbToLll=HELAMP__Lambdab0_Lambda0mumu_ppi.json
--- a/test/jsonFiles/RareLbToLll=HELAMP__Lambdab0_Lambda0mumu_ppi.json
+++ b/test/jsonFiles/RareLbToLll=HELAMP__Lambdab0_Lambda0mumu_ppi.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/SINGLE__Upsilon4S_mu.json b/test/jsonFiles/SINGLE__Upsilon4S_mu.json
--- a/test/jsonFiles/SINGLE__Upsilon4S_mu.json
+++ b/test/jsonFiles/SINGLE__Upsilon4S_mu.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/SLBKPOLE=PHSP__D+_Ksenu_pipi.json b/test/jsonFiles/SLBKPOLE=PHSP__D+_Ksenu_pipi.json
--- a/test/jsonFiles/SLBKPOLE=PHSP__D+_Ksenu_pipi.json
+++ b/test/jsonFiles/SLBKPOLE=PHSP__D+_Ksenu_pipi.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/SLL=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu.json b/test/jsonFiles/SLL=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu.json
--- a/test/jsonFiles/SLL=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu.json
+++ b/test/jsonFiles/SLL=TAUSCALARNU=TAUSCALARNU__Bd_tautau_pinu,pinu.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/SLN=TAUHADNU__Bu_taunu_pi0pi0pinu.json b/test/jsonFiles/SLN=TAUHADNU__Bu_taunu_pi0pi0pinu.json
--- a/test/jsonFiles/SLN=TAUHADNU__Bu_taunu_pi0pi0pinu.json
+++ b/test/jsonFiles/SLN=TAUHADNU__Bu_taunu_pi0pi0pinu.json
@@ -5,7 +5,7 @@
     "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},
diff --git a/test/jsonFiles/SLN=TAULNUNU__Bu_taunu_enunu.json b/test/jsonFiles/SLN=TAULNUNU__Bu_taunu_enunu.json
--- a/test/jsonFiles/SLN=TAULNUNU__Bu_taunu_enunu.json
+++ b/test/jsonFiles/SLN=TAULNUNU__Bu_taunu_enunu.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/SLN=TAULNUNU__Bu_taunu_mununu.json b/test/jsonFiles/SLN=TAULNUNU__Bu_taunu_mununu.json
--- a/test/jsonFiles/SLN=TAULNUNU__Bu_taunu_mununu.json
+++ b/test/jsonFiles/SLN=TAULNUNU__Bu_taunu_mununu.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/SLN=TAUOLA__Bu_taunu_pipipinu_BaBar.json b/test/jsonFiles/SLN=TAUOLA__Bu_taunu_pipipinu_BaBar.json
--- a/test/jsonFiles/SLN=TAUOLA__Bu_taunu_pipipinu_BaBar.json
+++ b/test/jsonFiles/SLN=TAUOLA__Bu_taunu_pipipinu_BaBar.json
@@ -6,7 +6,7 @@
     "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},
diff --git a/test/jsonFiles/SLN=TAUOLA__Bu_taunu_pipipinu_CLEO.json b/test/jsonFiles/SLN=TAUOLA__Bu_taunu_pipipinu_CLEO.json
--- a/test/jsonFiles/SLN=TAUOLA__Bu_taunu_pipipinu_CLEO.json
+++ b/test/jsonFiles/SLN=TAUOLA__Bu_taunu_pipipinu_CLEO.json
@@ -6,7 +6,7 @@
     "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},
diff --git a/test/jsonFiles/SLN=TAUSCALARNU__Bu_taunu_pinu.json b/test/jsonFiles/SLN=TAUSCALARNU__Bu_taunu_pinu.json
--- a/test/jsonFiles/SLN=TAUSCALARNU__Bu_taunu_pinu.json
+++ b/test/jsonFiles/SLN=TAUSCALARNU__Bu_taunu_pinu.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/SLN=TAUVECTORNU__Bu_taunu_rhonu.json b/test/jsonFiles/SLN=TAUVECTORNU__Bu_taunu_rhonu.json
--- a/test/jsonFiles/SLN=TAUVECTORNU__Bu_taunu_rhonu.json
+++ b/test/jsonFiles/SLN=TAUVECTORNU__Bu_taunu_rhonu.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/SLPOLE=VSS__D+_Kst0enu_Kpi.json b/test/jsonFiles/SLPOLE=VSS__D+_Kst0enu_Kpi.json
--- a/test/jsonFiles/SLPOLE=VSS__D+_Kst0enu_Kpi.json
+++ b/test/jsonFiles/SLPOLE=VSS__D+_Kst0enu_Kpi.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/SSD_DirectCP=TSS__Bu_f2pi+_pi+pi-.json b/test/jsonFiles/SSD_DirectCP=TSS__Bu_f2pi+_pi+pi-.json
--- a/test/jsonFiles/SSD_DirectCP=TSS__Bu_f2pi+_pi+pi-.json
+++ b/test/jsonFiles/SSD_DirectCP=TSS__Bu_f2pi+_pi+pi-.json
@@ -5,7 +5,7 @@
     "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},
diff --git a/test/jsonFiles/SSD_DirectCP=VSS__Bu_Kst0pi+_K+pi-.json b/test/jsonFiles/SSD_DirectCP=VSS__Bu_Kst0pi+_K+pi-.json
--- a/test/jsonFiles/SSD_DirectCP=VSS__Bu_Kst0pi+_K+pi-.json
+++ b/test/jsonFiles/SSD_DirectCP=VSS__Bu_Kst0pi+_K+pi-.json
@@ -5,7 +5,7 @@
     "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},
diff --git a/test/jsonFiles/SSD_DirectCP__Bd_K+pi-.json b/test/jsonFiles/SSD_DirectCP__Bd_K+pi-.json
--- a/test/jsonFiles/SSD_DirectCP__Bd_K+pi-.json
+++ b/test/jsonFiles/SSD_DirectCP__Bd_K+pi-.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/STS=TSS__Bu_D2st0pi_Dpi.json b/test/jsonFiles/STS=TSS__Bu_D2st0pi_Dpi.json
--- a/test/jsonFiles/STS=TSS__Bu_D2st0pi_Dpi.json
+++ b/test/jsonFiles/STS=TSS__Bu_D2st0pi_Dpi.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/STS_CP=TVS_PWAVE__Bd_a2pi_rho0pi.json b/test/jsonFiles/STS_CP=TVS_PWAVE__Bd_a2pi_rho0pi.json
--- a/test/jsonFiles/STS_CP=TVS_PWAVE__Bd_a2pi_rho0pi.json
+++ b/test/jsonFiles/STS_CP=TVS_PWAVE__Bd_a2pi_rho0pi.json
@@ -5,7 +5,7 @@
     "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},
diff --git a/test/jsonFiles/SVP_CP=VSS__Bd_Kst0gamma_Kpi.json b/test/jsonFiles/SVP_CP=VSS__Bd_Kst0gamma_Kpi.json
--- a/test/jsonFiles/SVP_CP=VSS__Bd_Kst0gamma_Kpi.json
+++ b/test/jsonFiles/SVP_CP=VSS__Bd_Kst0gamma_Kpi.json
@@ -5,7 +5,7 @@
     "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},
diff --git a/test/jsonFiles/SVP_HELAMP=VSS__Bu_Kstgamma_Kspi.json b/test/jsonFiles/SVP_HELAMP=VSS__Bu_Kstgamma_Kspi.json
--- a/test/jsonFiles/SVP_HELAMP=VSS__Bu_Kstgamma_Kspi.json
+++ b/test/jsonFiles/SVP_HELAMP=VSS__Bu_Kstgamma_Kspi.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/SVP_HELAMP=VSS__Bu_Kstgamma_Kspi_yesPhotos.json b/test/jsonFiles/SVP_HELAMP=VSS__Bu_Kstgamma_Kspi_yesFSR.json
rename from test/jsonFiles/SVP_HELAMP=VSS__Bu_Kstgamma_Kspi_yesPhotos.json
rename to test/jsonFiles/SVP_HELAMP=VSS__Bu_Kstgamma_Kspi_yesFSR.json
--- a/test/jsonFiles/SVP_HELAMP=VSS__Bu_Kstgamma_Kspi_yesPhotos.json
+++ b/test/jsonFiles/SVP_HELAMP=VSS__Bu_Kstgamma_Kspi_yesFSR.json
@@ -4,7 +4,7 @@
     "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},
@@ -37,6 +37,6 @@
         {"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
--- a/test/jsonFiles/SVP_HELAMP=VVS_PWAVE__Bu_Kprime1gamma_Kstpi.json
+++ b/test/jsonFiles/SVP_HELAMP=VVS_PWAVE__Bu_Kprime1gamma_Kstpi.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/SVS=VSS=PHSP__Bu_rhoD0_pipi0,Kpi.json b/test/jsonFiles/SVS=VSS=PHSP__Bu_rhoD0_pipi0,Kpi.json
--- a/test/jsonFiles/SVS=VSS=PHSP__Bu_rhoD0_pipi0,Kpi.json
+++ b/test/jsonFiles/SVS=VSS=PHSP__Bu_rhoD0_pipi0,Kpi.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/SVS=VSS=SLL__Bs_phichic0_KK,mumu.json b/test/jsonFiles/SVS=VSS=SLL__Bs_phichic0_KK,mumu.json
--- a/test/jsonFiles/SVS=VSS=SLL__Bs_phichic0_KK,mumu.json
+++ b/test/jsonFiles/SVS=VSS=SLL__Bs_phichic0_KK,mumu.json
@@ -5,7 +5,7 @@
     "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},
diff --git a/test/jsonFiles/SVV_CPLH=VLL=VSS__Bs0_Jpsiphi_ee,KK.json b/test/jsonFiles/SVV_CPLH=VLL=VSS__Bs0_Jpsiphi_ee,KK.json
--- a/test/jsonFiles/SVV_CPLH=VLL=VSS__Bs0_Jpsiphi_ee,KK.json
+++ b/test/jsonFiles/SVV_CPLH=VLL=VSS__Bs0_Jpsiphi_ee,KK.json
@@ -5,7 +5,7 @@
     "models" : ["SVV_CPLH", "VLL", "VSS"],
     "parameters" : [["0.2", "2.0e12", "1.0", "1.0", "0.0", "1.0", "0.0", "1.0", "0.0"], [], []],
     "do_conjugate_decay" : [true, false, false],
-    "extras" : ["Define dm_incohMix_B_s0 0", "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},
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
--- a/test/jsonFiles/SVV_HELAMP=VLL=VSS__Bu_JpsiKst_mumu,Kspi.json
+++ b/test/jsonFiles/SVV_HELAMP=VLL=VSS__Bu_JpsiKst_mumu,Kspi.json
@@ -4,7 +4,7 @@
     "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},
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
--- 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
@@ -4,7 +4,7 @@
     "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},
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
--- 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
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/TAULNUNU__tau_enunu_yesPhotos.json b/test/jsonFiles/TAULNUNU__tau_enunu_yesFSR.json
rename from test/jsonFiles/TAULNUNU__tau_enunu_yesPhotos.json
rename to test/jsonFiles/TAULNUNU__tau_enunu_yesFSR.json
--- a/test/jsonFiles/TAULNUNU__tau_enunu_yesPhotos.json
+++ b/test/jsonFiles/TAULNUNU__tau_enunu_yesFSR.json
@@ -3,7 +3,7 @@
     "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},
@@ -27,6 +27,6 @@
         {"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
rename from test/jsonFiles/TAUOLA__tau_pipipinu_yesPhotos.json
rename to test/jsonFiles/TAUOLA__tau_pipipinu_yesFSR.json
--- a/test/jsonFiles/TAUOLA__tau_pipipinu_yesPhotos.json
+++ b/test/jsonFiles/TAUOLA__tau_pipipinu_yesFSR.json
@@ -5,7 +5,7 @@
     "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},
@@ -35,6 +35,6 @@
         {"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
--- a/test/jsonFiles/THREEBODYPHSP=VLL=PHSP__Bu_JpsiKpi0_mumu,gammagamma.json
+++ b/test/jsonFiles/THREEBODYPHSP=VLL=PHSP__Bu_JpsiKpi0_mumu,gammagamma.json
@@ -5,7 +5,7 @@
     "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},
diff --git a/test/jsonFiles/VECTORISR=VSS__Upsilon4S_psi4160gamma_DD.json b/test/jsonFiles/VECTORISR=VSS__Upsilon4S_psi4160gamma_DD.json
--- a/test/jsonFiles/VECTORISR=VSS__Upsilon4S_psi4160gamma_DD.json
+++ b/test/jsonFiles/VECTORISR=VSS__Upsilon4S_psi4160gamma_DD.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/VLL__Jpsi_ee.json b/test/jsonFiles/VLL__Jpsi_ee.json
--- a/test/jsonFiles/VLL__Jpsi_ee.json
+++ b/test/jsonFiles/VLL__Jpsi_ee.json
@@ -3,7 +3,7 @@
     "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 },
diff --git a/test/jsonFiles/VLL__Jpsi_ee_yesPhotos.json b/test/jsonFiles/VLL__Jpsi_ee_yesFSR.json
rename from test/jsonFiles/VLL__Jpsi_ee_yesPhotos.json
rename to test/jsonFiles/VLL__Jpsi_ee_yesFSR.json
--- a/test/jsonFiles/VLL__Jpsi_ee_yesPhotos.json
+++ b/test/jsonFiles/VLL__Jpsi_ee_yesFSR.json
@@ -3,7 +3,7 @@
     "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 },
@@ -27,6 +27,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
--- a/test/jsonFiles/VLL__Jpsi_mumu.json
+++ b/test/jsonFiles/VLL__Jpsi_mumu.json
@@ -3,7 +3,7 @@
     "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 },
diff --git a/test/jsonFiles/VLL__Jpsi_mumu_yesPhotos.json b/test/jsonFiles/VLL__Jpsi_mumu_yesFSR.json
rename from test/jsonFiles/VLL__Jpsi_mumu_yesPhotos.json
rename to test/jsonFiles/VLL__Jpsi_mumu_yesFSR.json
--- a/test/jsonFiles/VLL__Jpsi_mumu_yesPhotos.json
+++ b/test/jsonFiles/VLL__Jpsi_mumu_yesFSR.json
@@ -3,7 +3,7 @@
     "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 },
@@ -27,6 +27,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
--- a/test/jsonFiles/VPHOTOVISRHI=VSS__psi4415_psi4160gamma_DD.json
+++ b/test/jsonFiles/VPHOTOVISRHI=VSS__psi4415_psi4160gamma_DD.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/VSP_PWAVE=PHSP__Dst0_D0gamma_Kpi.json b/test/jsonFiles/VSP_PWAVE=PHSP__Dst0_D0gamma_Kpi.json
--- a/test/jsonFiles/VSP_PWAVE=PHSP__Dst0_D0gamma_Kpi.json
+++ b/test/jsonFiles/VSP_PWAVE=PHSP__Dst0_D0gamma_Kpi.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/VSS=BTO2PI_CP_ISO=ISGW2__Upsilon4S_BdBdbar_pipi,Denue.json b/test/jsonFiles/VSS=BTO2PI_CP_ISO=ISGW2__Upsilon4S_BdBdbar_pipi,Denue.json
--- a/test/jsonFiles/VSS=BTO2PI_CP_ISO=ISGW2__Upsilon4S_BdBdbar_pipi,Denue.json
+++ b/test/jsonFiles/VSS=BTO2PI_CP_ISO=ISGW2__Upsilon4S_BdBdbar_pipi,Denue.json
@@ -4,7 +4,7 @@
     "grand_daughters" : [["pi+", "pi-"], ["D+","e-","anti-nu_e"]],
     "models" : ["VSS", "BTO2PI_CP_ISO", "ISGW2"],
     "parameters" : [[], ["0.4", "0.51e12", "0.8", "1.15", "0.8", "-1.15", "1.0", "1.15", "1.0", "-1.15"], []],
-    "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+    "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
     "do_conjugate_decay" : [false, true, true],
     "events" : 10000,
     "histograms" : [
diff --git a/test/jsonFiles/VSS=BTO3PI_CP=ISGW2__Upsilon4S_BdBdbar_pipipi0,Deanti-nue.json b/test/jsonFiles/VSS=BTO3PI_CP=ISGW2__Upsilon4S_BdBdbar_pipipi0,Deanti-nue.json
--- a/test/jsonFiles/VSS=BTO3PI_CP=ISGW2__Upsilon4S_BdBdbar_pipipi0,Deanti-nue.json
+++ b/test/jsonFiles/VSS=BTO3PI_CP=ISGW2__Upsilon4S_BdBdbar_pipipi0,Deanti-nue.json
@@ -5,7 +5,7 @@
     "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},
diff --git a/test/jsonFiles/VSS=BTO4PI_CP=ISGW2__Upsilon4S_BdBdbar_pipipipi,D+enu.json b/test/jsonFiles/VSS=BTO4PI_CP=ISGW2__Upsilon4S_BdBdbar_pipipipi,D+enu.json
--- a/test/jsonFiles/VSS=BTO4PI_CP=ISGW2__Upsilon4S_BdBdbar_pipipipi,D+enu.json
+++ b/test/jsonFiles/VSS=BTO4PI_CP=ISGW2__Upsilon4S_BdBdbar_pipipipi,D+enu.json
@@ -5,7 +5,7 @@
     "models" : ["VSS", "BTO4PI_CP", "ISGW2"],
     "parameters" : [[], ["0.4", "0.51e12", "1.0", "0.0", "1.0", "0.0", "1.0", "0.0", "1.0", "0.0", "1.0", "0.0", "1.0", "0.0", "1.0", "0.0", "1.0", "0.0"], []],
     "do_conjugate_decay" : [false, true, true],
-    "extras" : ["noPhotos"],
+    "extras" : ["noFSR"],
     "events" : 10000,
     "histograms" : [
 	{"variable" : "prob_daug1", "title" : "Prob(BTO4PI_CP)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/VSS=BTOKPIPI_CP=ISGW2__Upsilon4S_BdBdbar_Kpipi0,Deanti-nue.json b/test/jsonFiles/VSS=BTOKPIPI_CP=ISGW2__Upsilon4S_BdBdbar_Kpipi0,Deanti-nue.json
--- a/test/jsonFiles/VSS=BTOKPIPI_CP=ISGW2__Upsilon4S_BdBdbar_Kpipi0,Deanti-nue.json
+++ b/test/jsonFiles/VSS=BTOKPIPI_CP=ISGW2__Upsilon4S_BdBdbar_Kpipi0,Deanti-nue.json
@@ -5,7 +5,7 @@
     "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},
diff --git a/test/jsonFiles/VSS=BTOKPI_CP_ISO=ISGW2__Upsilon4S_BdBdbar_Kpi,Denue.json b/test/jsonFiles/VSS=BTOKPI_CP_ISO=ISGW2__Upsilon4S_BdBdbar_Kpi,Denue.json
--- a/test/jsonFiles/VSS=BTOKPI_CP_ISO=ISGW2__Upsilon4S_BdBdbar_Kpi,Denue.json
+++ b/test/jsonFiles/VSS=BTOKPI_CP_ISO=ISGW2__Upsilon4S_BdBdbar_Kpi,Denue.json
@@ -4,7 +4,7 @@
     "grand_daughters" : [["K+", "pi-"], ["D+","e-","anti-nu_e"]],
     "models" : ["VSS", "BTOKPI_CP_ISO", "ISGW2"],
     "parameters" : [[], ["0.4", "0.51e12", "0.8", "1.48", "0.8", "-1.48", "0.8", "1.48", "0.8", "-1.48", "1.0", "1.48", "1.0", "-1.48"], []],
-    "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+    "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
     "do_conjugate_decay" : [false, true, true],
     "events" : 10000,
     "histograms" : [
diff --git a/test/jsonFiles/VSS=DMIX=DMIX__psi3770_D0D0bar_Kpi,Kpi.json b/test/jsonFiles/VSS=DMIX=DMIX__psi3770_D0D0bar_Kpi,Kpi.json
--- a/test/jsonFiles/VSS=DMIX=DMIX__psi3770_D0D0bar_Kpi,Kpi.json
+++ b/test/jsonFiles/VSS=DMIX=DMIX__psi3770_D0D0bar_Kpi,Kpi.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/VSS=SSD_CP=HQET__Upsilon4S_BdBdbar_Dpi,Dstenue.json b/test/jsonFiles/VSS=SSD_CP=HQET__Upsilon4S_BdBdbar_Dpi,Dstenue.json
--- a/test/jsonFiles/VSS=SSD_CP=HQET__Upsilon4S_BdBdbar_Dpi,Dstenue.json
+++ b/test/jsonFiles/VSS=SSD_CP=HQET__Upsilon4S_BdBdbar_Dpi,Dstenue.json
@@ -5,7 +5,7 @@
     "models" : ["VSS", "SSD_CP", "HQET"],
     "parameters" : [[], ["0.472e12", "0.0", "1.0", "-0.85", "1.0", "0.0", "0.6", "-0.5", "0.6", "1.5", "1.0", "0.0"], ["0.91", "1.18", "0.72"]],
     "do_conjugate_decay" : [false, true, true],
-    "extras" : ["noPhotos"],
+    "extras" : ["noFSR"],
     "events" : 10000,
     "histograms" : [
         {"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/VSS=SSS_CP=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.json b/test/jsonFiles/VSS=SSS_CP=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.json
--- a/test/jsonFiles/VSS=SSS_CP=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.json
+++ b/test/jsonFiles/VSS=SSS_CP=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.json
@@ -5,7 +5,7 @@
     "models" : ["VSS", "SSS_CP", "ISGW2"],
     "parameters" : [[], ["0.4", "0.51e12", "1.0", "1.0", "0.0", "1.0", "0.0"], []],
     "do_conjugate_decay" : [false, true, true],
-    "extras" : ["noPhotos"],
+    "extras" : ["noFSR"],
     "events" : 10000,
     "histograms" : [
         {"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/VSS=SSS_CPT=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.json b/test/jsonFiles/VSS=SSS_CPT=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.json
--- a/test/jsonFiles/VSS=SSS_CPT=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.json
+++ b/test/jsonFiles/VSS=SSS_CPT=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.json
@@ -5,7 +5,7 @@
     "models" : ["VSS", "SSS_CPT", "ISGW2"],
     "parameters" : [[], ["0.0", "0.51e12", "1.0", "0.0", "1.0", "0.0", "0.1", "-0.4"], []],
     "do_conjugate_decay" : [false, true, true],
-    "extras" : ["noPhotos"],
+    "extras" : ["noFSR"],
     "events" : 10000,
     "histograms" : [
         {"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/VSS=SSS_CP_PNG=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.json b/test/jsonFiles/VSS=SSS_CP_PNG=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.json
--- a/test/jsonFiles/VSS=SSS_CP_PNG=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.json
+++ b/test/jsonFiles/VSS=SSS_CP_PNG=ISGW2__Upsilon4S_BdBdbar_pipi,Dstenue.json
@@ -5,7 +5,7 @@
     "models" : ["VSS", "SSS_CP_PNG", "ISGW2"],
     "parameters" : [[], ["0.4", "1.2", "0.1", "0.51e12", "1.0", "1.0", "0.2"], []],
     "do_conjugate_decay" : [false, true, true],
-    "extras" : ["noPhotos"],
+    "extras" : ["noFSR"],
     "events" : 10000,
     "histograms" : [
         {"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/VSS=SVPHELCPMIX=ISGW2__Upsilon5S_BsBsbar_phigamma,Dsenue.json b/test/jsonFiles/VSS=SVPHELCPMIX=ISGW2__Upsilon5S_BsBsbar_phigamma,Dsenue.json
--- a/test/jsonFiles/VSS=SVPHELCPMIX=ISGW2__Upsilon5S_BsBsbar_phigamma,Dsenue.json
+++ b/test/jsonFiles/VSS=SVPHELCPMIX=ISGW2__Upsilon5S_BsBsbar_phigamma,Dsenue.json
@@ -5,7 +5,7 @@
     "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},
diff --git a/test/jsonFiles/VSS=SVS_CP=ISGW2__Upsilon4S_BdBdbar_JpsiK0,Dstenue.json b/test/jsonFiles/VSS=SVS_CP=ISGW2__Upsilon4S_BdBdbar_JpsiK0,Dstenue.json
--- a/test/jsonFiles/VSS=SVS_CP=ISGW2__Upsilon4S_BdBdbar_JpsiK0,Dstenue.json
+++ b/test/jsonFiles/VSS=SVS_CP=ISGW2__Upsilon4S_BdBdbar_JpsiK0,Dstenue.json
@@ -5,7 +5,7 @@
     "models" : ["VSS", "SVS_CP", "ISGW2"],
     "parameters" : [[], ["0.4", "0.51e12", "1.0", "1.0", "0.0", "1.0", "0.0"], []],
     "do_conjugate_decay" : [false, true, true],
-    "extras" : ["noPhotos"],
+    "extras" : ["noFSR"],
     "events" : 10000,
     "histograms" : [
         {"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/VSS=SVS_CPLH=ISGW2__Upsilon4S_BdBdbar_JpsiK0s,Denue.json b/test/jsonFiles/VSS=SVS_CPLH=ISGW2__Upsilon4S_BdBdbar_JpsiK0s,Denue.json
--- a/test/jsonFiles/VSS=SVS_CPLH=ISGW2__Upsilon4S_BdBdbar_JpsiK0s,Denue.json
+++ b/test/jsonFiles/VSS=SVS_CPLH=ISGW2__Upsilon4S_BdBdbar_JpsiK0s,Denue.json
@@ -5,7 +5,7 @@
     "models" : ["VSS", "SVS_CPLH", "ISGW2"],
     "parameters" : [[], ["0.472e12", "0.2", "1.0", "-0.77", "1.0", "0.0", "1.0", "0.0"], []],
     "do_conjugate_decay" : [false, true, true],
-    "extras" : ["noPhotos"],
+    "extras" : ["noFSR"],
     "events" : 10000,
     "histograms" : [
         {"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/VSS=SVS_CP_ISO=ISGW2__Upsilon4S_BdBdbar_a1pi,Dstenue.json b/test/jsonFiles/VSS=SVS_CP_ISO=ISGW2__Upsilon4S_BdBdbar_a1pi,Dstenue.json
--- a/test/jsonFiles/VSS=SVS_CP_ISO=ISGW2__Upsilon4S_BdBdbar_a1pi,Dstenue.json
+++ b/test/jsonFiles/VSS=SVS_CP_ISO=ISGW2__Upsilon4S_BdBdbar_a1pi,Dstenue.json
@@ -5,7 +5,7 @@
     "models" : ["VSS", "SVS_CP_ISO", "ISGW2"],
     "parameters" : [[], ["0.4", "0.51e12", "0.0", "1.0", "0.0", "1.0", "0.0", "1.0", "0.0", "1.0", "0.0", "1.0", "0.0", "1.0", "0.0", "1.0", "0.0", "1.0", "0.0", "1.0", "1.2", "3.0", "-1.2", "3.0", "1.2", "1.0", "-1.2"], []],
     "do_conjugate_decay" : [false, true, true],
-    "extras" : ["noPhotos"],
+    "extras" : ["noFSR"],
     "events" : 10000,
     "histograms" : [
         {"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/VSS=SVS_NONCPEIGEN=ISGW2__Upsilon4S_BdBdbar_a1pi,Dstenue.json b/test/jsonFiles/VSS=SVS_NONCPEIGEN=ISGW2__Upsilon4S_BdBdbar_a1pi,Dstenue.json
--- a/test/jsonFiles/VSS=SVS_NONCPEIGEN=ISGW2__Upsilon4S_BdBdbar_a1pi,Dstenue.json
+++ b/test/jsonFiles/VSS=SVS_NONCPEIGEN=ISGW2__Upsilon4S_BdBdbar_a1pi,Dstenue.json
@@ -5,7 +5,7 @@
     "models" : ["VSS", "SVS_NONCPEIGEN", "ISGW2"],
     "parameters" : [[], ["0.35", "0.51e12", "1.0", "1.0", "0.0", "3.0", "0.0", "3.0", "0.0", "1.0", "0.0"], []],
     "do_conjugate_decay" : [false, true, true],
-    "extras" : ["noPhotos"],
+    "extras" : ["noFSR"],
     "events" : 10000,
     "histograms" : [
         {"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/VSS=SVVHELCPMIX=ISGW2__Upsilon5S_BsBsbar_Jpsiphi,Dsenue.json b/test/jsonFiles/VSS=SVVHELCPMIX=ISGW2__Upsilon5S_BsBsbar_Jpsiphi,Dsenue.json
--- a/test/jsonFiles/VSS=SVVHELCPMIX=ISGW2__Upsilon5S_BsBsbar_Jpsiphi,Dsenue.json
+++ b/test/jsonFiles/VSS=SVVHELCPMIX=ISGW2__Upsilon5S_BsBsbar_Jpsiphi,Dsenue.json
@@ -5,7 +5,7 @@
     "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},
diff --git a/test/jsonFiles/VSS=SVV_CP=ISGW2__Upsilon4S_BdBdbar_JpsiKst,Denue.json b/test/jsonFiles/VSS=SVV_CP=ISGW2__Upsilon4S_BdBdbar_JpsiKst,Denue.json
--- a/test/jsonFiles/VSS=SVV_CP=ISGW2__Upsilon4S_BdBdbar_JpsiKst,Denue.json
+++ b/test/jsonFiles/VSS=SVV_CP=ISGW2__Upsilon4S_BdBdbar_JpsiKst,Denue.json
@@ -5,7 +5,7 @@
     "models" : ["VSS", "SVV_CP", "ISGW2"],
     "parameters" : [[], ["0.4", "0.51e12", "1.0", "1.0", "0.0", "1.0", "0.0", "1.0", "0.0"], []],
     "do_conjugate_decay" : [false, true, true],
-    "extras" : ["noPhotos"],
+    "extras" : ["noFSR"],
     "events" : 10000,
     "histograms" : [
         {"variable" : "prob", "title" : "Prob(VSS)", "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
diff --git a/test/jsonFiles/VSS=SVV_NONCPEIGEN=ISGW2__Upsilon4S_BdBdbar_Dstrho,Denue.json b/test/jsonFiles/VSS=SVV_NONCPEIGEN=ISGW2__Upsilon4S_BdBdbar_Dstrho,Denue.json
--- a/test/jsonFiles/VSS=SVV_NONCPEIGEN=ISGW2__Upsilon4S_BdBdbar_Dstrho,Denue.json
+++ b/test/jsonFiles/VSS=SVV_NONCPEIGEN=ISGW2__Upsilon4S_BdBdbar_Dstrho,Denue.json
@@ -4,7 +4,7 @@
     "grand_daughters" : [["D*-", "rho+"], ["D+","e-","anti-nu_e"]],
     "models" : ["VSS", "SVV_NONCPEIGEN", "ISGW2"],
     "parameters" : [[], ["0.51e12", "0.4", "1.15", "0.152", "1.48", "0.936", "0.0", "0.317", "0.19", "0.00152", "1.48", "0.00936", "0.0", "0.00317", "0.19"], []],
-    "extras" : ["Define dm_incohMix_B0 0", "noPhotos"],
+    "extras" : ["Define dm_incohMix_B0 0", "noFSR"],
     "do_conjugate_decay" : [false, true, true],
     "events" : 10000,
     "histograms" : [
diff --git a/test/jsonFiles/VSS_BMIX__Upsilon4S_BdBdbar.json b/test/jsonFiles/VSS_BMIX__Upsilon4S_BdBdbar.json
--- a/test/jsonFiles/VSS_BMIX__Upsilon4S_BdBdbar.json
+++ b/test/jsonFiles/VSS_BMIX__Upsilon4S_BdBdbar.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/VSS_MIX__Upsilon4S_BdBdbar.json b/test/jsonFiles/VSS_MIX__Upsilon4S_BdBdbar.json
--- a/test/jsonFiles/VSS_MIX__Upsilon4S_BdBdbar.json
+++ b/test/jsonFiles/VSS_MIX__Upsilon4S_BdBdbar.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/VSS__rho0_pipi_yesPhotos.json b/test/jsonFiles/VSS__rho0_pipi_yesFSR.json
rename from test/jsonFiles/VSS__rho0_pipi_yesPhotos.json
rename to test/jsonFiles/VSS__rho0_pipi_yesFSR.json
--- a/test/jsonFiles/VSS__rho0_pipi_yesPhotos.json
+++ b/test/jsonFiles/VSS__rho0_pipi_yesFSR.json
@@ -3,7 +3,7 @@
     "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 },
@@ -27,6 +27,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
rename from test/jsonFiles/VSS__rho_pipi0_yesPhotos.json
rename to test/jsonFiles/VSS__rho_pipi0_yesFSR.json
--- a/test/jsonFiles/VSS__rho_pipi0_yesPhotos.json
+++ b/test/jsonFiles/VSS__rho_pipi0_yesFSR.json
@@ -3,7 +3,7 @@
     "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 },
@@ -27,6 +27,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
--- a/test/jsonFiles/VTOSLL=PHSP__Dst0_D0ee_Kpi.json
+++ b/test/jsonFiles/VTOSLL=PHSP__Dst0_D0ee_Kpi.json
@@ -4,7 +4,7 @@
     "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},
diff --git a/test/jsonFiles/VTOSLL__Jpsi_pi0ee.json b/test/jsonFiles/VTOSLL__Jpsi_pi0ee.json
--- a/test/jsonFiles/VTOSLL__Jpsi_pi0ee.json
+++ b/test/jsonFiles/VTOSLL__Jpsi_pi0ee.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/VTOSLL__Jpsi_pi0mumu.json b/test/jsonFiles/VTOSLL__Jpsi_pi0mumu.json
--- a/test/jsonFiles/VTOSLL__Jpsi_pi0mumu.json
+++ b/test/jsonFiles/VTOSLL__Jpsi_pi0mumu.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/VUBHYBRID__Bd_Xumunu.json b/test/jsonFiles/VUBHYBRID__Bd_Xumunu.json
--- a/test/jsonFiles/VUBHYBRID__Bd_Xumunu.json
+++ b/test/jsonFiles/VUBHYBRID__Bd_Xumunu.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/VUB_BLNPHYBRID__Bd_Xumunu.json b/test/jsonFiles/VUB_BLNPHYBRID__Bd_Xumunu.json
--- a/test/jsonFiles/VUB_BLNPHYBRID__Bd_Xumunu.json
+++ b/test/jsonFiles/VUB_BLNPHYBRID__Bd_Xumunu.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/VUB_BLNP__Bd_Xumunu.json b/test/jsonFiles/VUB_BLNP__Bd_Xumunu.json
--- a/test/jsonFiles/VUB_BLNP__Bd_Xumunu.json
+++ b/test/jsonFiles/VUB_BLNP__Bd_Xumunu.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/VUB_NLO__Bd_Xumunu.json b/test/jsonFiles/VUB_NLO__Bd_Xumunu.json
--- a/test/jsonFiles/VUB_NLO__Bd_Xumunu.json
+++ b/test/jsonFiles/VUB_NLO__Bd_Xumunu.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/VUB__Bd_Xumunu.json b/test/jsonFiles/VUB__Bd_Xumunu.json
--- a/test/jsonFiles/VUB__Bd_Xumunu.json
+++ b/test/jsonFiles/VUB__Bd_Xumunu.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/X38722-+_PSI_GAMMA=VLL__X3872_gammaJpsi_mumu.json b/test/jsonFiles/X38722-+_PSI_GAMMA=VLL__X3872_gammaJpsi_mumu.json
--- a/test/jsonFiles/X38722-+_PSI_GAMMA=VLL__X3872_gammaJpsi_mumu.json
+++ b/test/jsonFiles/X38722-+_PSI_GAMMA=VLL__X3872_gammaJpsi_mumu.json
@@ -4,7 +4,7 @@
     "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 },
diff --git a/test/jsonFiles/X38722-+_PSI_GAMMA=VSS=VLL__X3872_omegaJpsi_pipi,mumu.json b/test/jsonFiles/X38722-+_PSI_GAMMA=VSS=VLL__X3872_omegaJpsi_pipi,mumu.json
--- a/test/jsonFiles/X38722-+_PSI_GAMMA=VSS=VLL__X3872_omegaJpsi_pipi,mumu.json
+++ b/test/jsonFiles/X38722-+_PSI_GAMMA=VSS=VLL__X3872_omegaJpsi_pipi,mumu.json
@@ -4,7 +4,7 @@
     "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 },
diff --git a/test/jsonFiles/X38722-+_PSI_GAMMA=VSS=VLL__X3872_rho0Jpsi_pipi,mumu.json b/test/jsonFiles/X38722-+_PSI_GAMMA=VSS=VLL__X3872_rho0Jpsi_pipi,mumu.json
--- a/test/jsonFiles/X38722-+_PSI_GAMMA=VSS=VLL__X3872_rho0Jpsi_pipi,mumu.json
+++ b/test/jsonFiles/X38722-+_PSI_GAMMA=VSS=VLL__X3872_rho0Jpsi_pipi,mumu.json
@@ -4,7 +4,7 @@
     "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 },
diff --git a/test/jsonFiles/Y3STOY1SPIPIMOXHAY__Upsilon3S_Upsilonpipi.json b/test/jsonFiles/Y3STOY1SPIPIMOXHAY__Upsilon3S_Upsilonpipi.json
--- a/test/jsonFiles/Y3STOY1SPIPIMOXHAY__Upsilon3S_Upsilonpipi.json
+++ b/test/jsonFiles/Y3STOY1SPIPIMOXHAY__Upsilon3S_Upsilonpipi.json
@@ -3,7 +3,7 @@
     "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},
diff --git a/test/jsonFiles/YMSTOYNSPIPICLEO__Upsilon3S_Upsilonpipi.json b/test/jsonFiles/YMSTOYNSPIPICLEO__Upsilon3S_Upsilonpipi.json
--- a/test/jsonFiles/YMSTOYNSPIPICLEO__Upsilon3S_Upsilonpipi.json
+++ b/test/jsonFiles/YMSTOYNSPIPICLEO__Upsilon3S_Upsilonpipi.json
@@ -3,7 +3,7 @@
     "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},