diff --git a/EvtGenModels/EvtVPHOtoV.hh b/EvtGenModels/EvtVPHOtoV.hh
deleted file mode 100644
index b954005..0000000
--- a/EvtGenModels/EvtVPHOtoV.hh
+++ /dev/null
@@ -1,38 +0,0 @@
-
-/***********************************************************************
-* Copyright 1998-2020 CERN for the benefit of the EvtGen authors *
-* *
-* This file is part of EvtGen. *
-* *
-* EvtGen is free software: you can redistribute it and/or modify *
-* it under the terms of the GNU General Public License as published by *
-* the Free Software Foundation, either version 3 of the License, or *
-* (at your option) any later version. *
-* *
-* EvtGen is distributed in the hope that it will be useful, *
-* but WITHOUT ANY WARRANTY; without even the implied warranty of *
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
-* GNU General Public License for more details. *
-* *
-* You should have received a copy of the GNU General Public License *
-* along with EvtGen. If not, see . *
-***********************************************************************/
-
-#ifndef EVTVPHOTOV_HH
-#define EVTVPHOTOV_HH
-
-#include "EvtGenBase/EvtDecayAmp.hh"
-
-class EvtParticle;
-
-class EvtVPHOtoV : public EvtDecayAmp {
- public:
- std::string getName() override;
- EvtDecayBase* clone() override;
-
- void decay( EvtParticle* p ) override;
- void init() override;
- void initProbMax() override;
-};
-
-#endif
diff --git a/EvtGenModels/EvtVPHOtoVISR.hh b/EvtGenModels/EvtVPHOtoVISR.hh
deleted file mode 100644
index 4f53eb3..0000000
--- a/EvtGenModels/EvtVPHOtoVISR.hh
+++ /dev/null
@@ -1,38 +0,0 @@
-
-/***********************************************************************
-* Copyright 1998-2020 CERN for the benefit of the EvtGen authors *
-* *
-* This file is part of EvtGen. *
-* *
-* EvtGen is free software: you can redistribute it and/or modify *
-* it under the terms of the GNU General Public License as published by *
-* the Free Software Foundation, either version 3 of the License, or *
-* (at your option) any later version. *
-* *
-* EvtGen is distributed in the hope that it will be useful, *
-* but WITHOUT ANY WARRANTY; without even the implied warranty of *
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
-* GNU General Public License for more details. *
-* *
-* You should have received a copy of the GNU General Public License *
-* along with EvtGen. If not, see . *
-***********************************************************************/
-
-#ifndef EVTVPHOTOVISR_HH
-#define EVTVPHOTOVISR_HH
-
-#include "EvtGenBase/EvtDecayAmp.hh"
-
-class EvtParticle;
-
-class EvtVPHOtoVISR : public EvtDecayAmp {
- public:
- std::string getName() override;
- EvtDecayBase* clone() override;
-
- void decay( EvtParticle* p ) override;
- void init() override;
- void initProbMax() override;
-};
-
-#endif
diff --git a/src/EvtGenModels/EvtVPHOtoV.cpp b/src/EvtGenModels/EvtVPHOtoV.cpp
deleted file mode 100644
index 62c2e30..0000000
--- a/src/EvtGenModels/EvtVPHOtoV.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-
-/***********************************************************************
-* Copyright 1998-2020 CERN for the benefit of the EvtGen authors *
-* *
-* This file is part of EvtGen. *
-* *
-* EvtGen is free software: you can redistribute it and/or modify *
-* it under the terms of the GNU General Public License as published by *
-* the Free Software Foundation, either version 3 of the License, or *
-* (at your option) any later version. *
-* *
-* EvtGen is distributed in the hope that it will be useful, *
-* but WITHOUT ANY WARRANTY; without even the implied warranty of *
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
-* GNU General Public License for more details. *
-* *
-* You should have received a copy of the GNU General Public License *
-* along with EvtGen. If not, see . *
-***********************************************************************/
-
-#include "EvtGenModels/EvtVPHOtoV.hh"
-
-#include "EvtGenBase/EvtGenKine.hh"
-#include "EvtGenBase/EvtPDL.hh"
-#include "EvtGenBase/EvtParticle.hh"
-#include "EvtGenBase/EvtReport.hh"
-#include "EvtGenBase/EvtVector4C.hh"
-#include "EvtGenBase/EvtVector4R.hh"
-
-#include
-#include
-
-std::string EvtVPHOtoV::getName()
-{
- return "VPHOTOV";
-}
-
-EvtDecayBase* EvtVPHOtoV::clone()
-{
- return new EvtVPHOtoV;
-}
-
-void EvtVPHOtoV::init()
-{
- // check that there are 0 arguments
- checkNArg( 0 );
-
- // check that there are 1 daughters
- checkNDaug( 1 );
-
- // check the parent and daughter spins
- checkSpinParent( EvtSpinType::VECTOR );
- checkSpinDaughter( 0, EvtSpinType::VECTOR );
-}
-
-void EvtVPHOtoV::initProbMax()
-{
- setProbMax( 1.0 );
-}
-
-void EvtVPHOtoV::decay( EvtParticle* p )
-{
- p->initializePhaseSpace( getNDaug(), getDaugs() );
-
- EvtParticle* d = p->getDaug( 0 );
-
- d->setP4( p->getP4Restframe() );
-
- vertex( 0, 0, p->eps( 0 ) * p->epsParent( 0 ).conj() );
- vertex( 1, 0, p->eps( 1 ) * p->epsParent( 0 ).conj() );
- vertex( 2, 0, p->eps( 2 ) * p->epsParent( 0 ).conj() );
-
- vertex( 0, 1, p->eps( 0 ) * p->epsParent( 1 ).conj() );
- vertex( 1, 1, p->eps( 1 ) * p->epsParent( 1 ).conj() );
- vertex( 2, 1, p->eps( 2 ) * p->epsParent( 1 ).conj() );
-
- vertex( 0, 2, p->eps( 0 ) * p->epsParent( 2 ).conj() );
- vertex( 1, 2, p->eps( 1 ) * p->epsParent( 2 ).conj() );
- vertex( 2, 2, p->eps( 2 ) * p->epsParent( 2 ).conj() );
-
- return;
-}
diff --git a/src/EvtGenModels/EvtVPHOtoVISR.cpp b/src/EvtGenModels/EvtVPHOtoVISR.cpp
deleted file mode 100644
index 93464f5..0000000
--- a/src/EvtGenModels/EvtVPHOtoVISR.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-
-/***********************************************************************
-* Copyright 1998-2020 CERN for the benefit of the EvtGen authors *
-* *
-* This file is part of EvtGen. *
-* *
-* EvtGen is free software: you can redistribute it and/or modify *
-* it under the terms of the GNU General Public License as published by *
-* the Free Software Foundation, either version 3 of the License, or *
-* (at your option) any later version. *
-* *
-* EvtGen is distributed in the hope that it will be useful, *
-* but WITHOUT ANY WARRANTY; without even the implied warranty of *
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
-* GNU General Public License for more details. *
-* *
-* You should have received a copy of the GNU General Public License *
-* along with EvtGen. If not, see . *
-***********************************************************************/
-
-#include "EvtGenModels/EvtVPHOtoVISR.hh"
-
-#include "EvtGenBase/EvtGenKine.hh"
-#include "EvtGenBase/EvtPDL.hh"
-#include "EvtGenBase/EvtParticle.hh"
-#include "EvtGenBase/EvtRandom.hh"
-#include "EvtGenBase/EvtReport.hh"
-#include "EvtGenBase/EvtVector4C.hh"
-#include "EvtGenBase/EvtVector4R.hh"
-
-#include
-#include
-
-std::string EvtVPHOtoVISR::getName()
-{
- return "VPHOTOVISR";
-}
-
-EvtDecayBase* EvtVPHOtoVISR::clone()
-{
- return new EvtVPHOtoVISR;
-}
-
-void EvtVPHOtoVISR::init()
-{
- // check that there are 0 or 2 arguments
- checkNArg( 0, 2 );
-
- // check that there are 2 daughters
- checkNDaug( 2 );
-
- // check the parent and daughter spins
- checkSpinParent( EvtSpinType::VECTOR );
- checkSpinDaughter( 0, EvtSpinType::VECTOR );
- checkSpinDaughter( 1, EvtSpinType::PHOTON );
-}
-
-void EvtVPHOtoVISR::initProbMax()
-{
- //setProbMax(100000.0);
-}
-
-void EvtVPHOtoVISR::decay( EvtParticle* p )
-{
- //take photon along z-axis, either forward or backward.
- //Implement this as generating the photon momentum along
- //the z-axis uniformly
-
- double w = p->mass();
- double s = w * w;
-
- double L = 2.0 * log( w / 0.000511 );
- double alpha = 1 / 137.0;
- double beta = ( L - 1 ) * 2.0 * alpha / EvtConst::pi;
-
- //This uses the fact that there is a daughter of the
- //psi(3770)
- assert( p->getDaug( 0 )->getDaug( 0 ) != 0 );
- double md = EvtPDL::getMeanMass( p->getDaug( 0 )->getDaug( 0 )->getId() );
-
- static double mD0 = EvtPDL::getMeanMass( EvtPDL::getId( "D0" ) );
- static double mDp = EvtPDL::getMeanMass( EvtPDL::getId( "D+" ) );
-
- double pgmax = ( s - 4.0 * md * md ) / ( 2.0 * w );
-
- assert( pgmax > 0.0 );
-
- double pgz = 0.99 * pgmax * exp( log( EvtRandom::Flat( 1.0 ) ) / beta );
-
- if ( EvtRandom::Flat( 1.0 ) < 0.5 )
- pgz = -pgz;
-
- double k = fabs( pgz );
-
- EvtVector4R p4g( k, 0.0, 0.0, pgz );
-
- EvtVector4R p4res = p->getP4Restframe() - p4g;
-
- double mres = p4res.mass();
-
- double ed = mres / 2.0;
-
- assert( ed > md );
-
- double pd = sqrt( ed * ed - md * md );
-
- //std::cout << "k, mres, w, md, ed, pd:"<getDaug( 0 )->init( getDaug( 0 ), p4res );
- p->getDaug( 1 )->init( getDaug( 1 ), p4g );
-
- double sigma =
- beta * pow( 2 / w, beta ) *
- ( 1 + alpha * ( 1.5 * L - 2.0 + EvtConst::pi * EvtConst::pi / 3.0 ) /
- EvtConst::pi );
-
- double m = EvtPDL::getMeanMass( p->getDaug( 0 )->getId() );
- double Gamma = EvtPDL::getWidth( p->getDaug( 0 )->getId() );
-
- //mres is the energy of the psi(3770)
-
- double p0 = 0.0;
- if ( ed > mD0 )
- p0 = sqrt( ed * ed - mD0 * mD0 );
- double pp = 0.0;
- if ( ed > mDp )
- pp = sqrt( ed * ed - mDp * mDp );
-
- double p0norm = sqrt( 0.25 * m * m - mD0 * mD0 );
- double ppnorm = sqrt( 0.25 * m * m - mDp * mDp );
-
- double r0 = 12.7;
- double rp = 12.7;
-
- if ( getNArg() == 2 ) {
- r0 = getArg( 0 );
- rp = getArg( 1 );
- }
-
- double GammaTot =
- Gamma *
- ( pp * pp * pp / ( 1 + pp * pp * rp * rp ) +
- p0 * p0 * p0 / ( 1 + p0 * p0 * r0 * r0 ) ) /
- ( ppnorm * ppnorm * ppnorm / ( 1 + ppnorm * ppnorm * rp * rp ) +
- p0norm * p0norm * p0norm / ( 1 + p0norm * p0norm * r0 * r0 ) );
-
- sigma *= pd * pd * pd /
- ( ( mres - m ) * ( mres - m ) + 0.25 * GammaTot * GammaTot );
-
- assert( sigma > 0.0 );
-
- static double sigmax = sigma;
-
- if ( sigma > sigmax ) {
- sigmax = sigma;
- }
-
- static int count = 0;
-
- count++;
-
- //if (count%10000==0){
- // std::cout << "sigma :"<eps( 0 ) * p->epsParent( 0 ).conj() );
- vertex( 1, 0, 0, norm * p->eps( 1 ) * p->epsParent( 0 ).conj() );
- vertex( 2, 0, 0, norm * p->eps( 2 ) * p->epsParent( 0 ).conj() );
-
- vertex( 0, 1, 0, norm * p->eps( 0 ) * p->epsParent( 1 ).conj() );
- vertex( 1, 1, 0, norm * p->eps( 1 ) * p->epsParent( 1 ).conj() );
- vertex( 2, 1, 0, norm * p->eps( 2 ) * p->epsParent( 1 ).conj() );
-
- vertex( 0, 2, 0, norm * p->eps( 0 ) * p->epsParent( 2 ).conj() );
- vertex( 1, 2, 0, norm * p->eps( 1 ) * p->epsParent( 2 ).conj() );
- vertex( 2, 2, 0, norm * p->eps( 2 ) * p->epsParent( 2 ).conj() );
-
- vertex( 0, 0, 1, norm * p->eps( 0 ) * p->epsParent( 0 ).conj() );
- vertex( 1, 0, 1, norm * p->eps( 1 ) * p->epsParent( 0 ).conj() );
- vertex( 2, 0, 1, norm * p->eps( 2 ) * p->epsParent( 0 ).conj() );
-
- vertex( 0, 1, 1, norm * p->eps( 0 ) * p->epsParent( 1 ).conj() );
- vertex( 1, 1, 1, norm * p->eps( 1 ) * p->epsParent( 1 ).conj() );
- vertex( 2, 1, 1, norm * p->eps( 2 ) * p->epsParent( 1 ).conj() );
-
- vertex( 0, 2, 1, norm * p->eps( 0 ) * p->epsParent( 2 ).conj() );
- vertex( 1, 2, 1, norm * p->eps( 1 ) * p->epsParent( 2 ).conj() );
- vertex( 2, 2, 1, norm * p->eps( 2 ) * p->epsParent( 2 ).conj() );
-
- return;
-}