Skip to content

GitLab

Commit c8457099 authored by Lynn Garren's avatar Lynn Garren
Browse files

fix and fix a bug in the PDG translations 

Pythia translations now use static maps
use 2004 PDG numbering
parent 3a3e2941
Expand all Hide whitespace changes
Inline Side-by-side
HepPDT/ChangeLog
View file @ c8457099
2005-03-16 Lynn Garren <garren@fnal.gov>
* fix a bug in the translation for the PDG tables
* use PDG 2004 numbering (only a few changes)
2005-03-15 Lynn Garren <garren@fnal.gov>
* ParticleID: The isNucleus method will recognize a proton (2212)
......
HepPDT/HepPDT/ParticleIDTranslations.hh
View file @ c8457099
......@@ -14,13 +14,11 @@
namespace HepPDT {
// translate between generator ID's and standard numbering scheme
int translatePythiatoPDT( const int pythiaID );
int translateQQtoPDT( const int qqID);
int translateGeanttoPDT( const int geantID);
int translatePDGtabletoPDT( const int pdgID);
int translateEvtGentoPDT( const int evtGenID );
int translatePDTtoPythia( const int pid );
int translatePDTtoQQ( const int pid );
int translatePDTtoGeant( const int pid );
int translatePDTtoPDGtable( const int pid );
......@@ -42,6 +40,14 @@ PDTIsajetMap const & getPDTIsajetMap();
int translateIsajettoPDT( const int isajetID );
int translatePDTtoIsajet( const int pid );
// Pythia translations
typedef std::map< int, int > PythiaPDTMap;
typedef std::map< int, int > PDTPythiaMap;
PythiaPDTMap const & getPythiaPDTMap();
PDTPythiaMap const & getPDTPythiaMap();
int translatePythiatoPDT( const int pythiaID );
int translatePDTtoPythia( const int pid );
} // namespace HepPDT
#endif // PARTICLE_ID_TRANSLATIONS_HH
HepPDT/data/Makefile.am
View file @ c8457099
......@@ -4,7 +4,8 @@ PDG_TABLES = PDG_mass_width_1998.mc \
PDG_mass_width_1998_withSusy.mc \
PDG_mass_width_2000.mc \
PDG_mass_width_2001.mc \
PDG_mass_width_2002.mc
PDG_mass_width_2002.mc \
PDG_mass_width_2004.mc
EXTRA_DIST = $(PDG_TABLES)
......
HepPDT/data/PDG_mass_width_2004.mc 0 → 100644
View file @ c8457099
This diff is collapsed.
HepPDT/examples/GNUmakefile.example.in
View file @ c8457099
# $Id: GNUmakefile.example.in,v 1.1.2.2 2005/03/15 23:57:31 garren Exp $
# $Id: GNUmakefile.example.in,v 1.1.2.3 2005/03/17 01:07:01 garren Exp $
################################################################################
#
# makefile for HepPDT examples
......@@ -10,6 +10,12 @@
# [CLHEP_BASE= ]
# [HerwigLIB= ]
# [IsajetLIB= ]
# [PythiaLIB= ]
#
################################################################################
#
# The examList executables are saved here to make it easy to verify
# particle numbering translations.
#
################################################################################
......@@ -18,6 +24,7 @@
LIBNAME = -L$(CLHEP_BASE)/lib -lCLHEP-@VERSION@
HerwigLIB = $(HERWIG_DIR)/lib/libherwig.a $(HERWIG_DIR)/lib/libherdum.a $(HERWIG_DIR)/lib/timel.o
IsajetLIB = $(ISAJET_DIR)/isajet.a
PythiaLIB = $(LULIB)/pydata.o $(LULIB)/pyr.o $(LULIB)/liblund.a $(LULIB)/libpydum.a
INCDIR = -I$(CLHEP_BASE)/include
LIBS = @AM_LDFLAGS@
......@@ -36,6 +43,10 @@ ifdef HERWIG_DIR
INCDIR += -I$(HERWIG_DIR)/src
endif
ifdef LUND_DIR
INCDIR += -I$(LUND_DIR)/src/inc
endif
ifeq "$(CXX)" "g++"
F77 = g77
FFLAGS = $(DFLG) -fno-second-underscore $(INCDIR)
......@@ -59,7 +70,7 @@ include $(SOURCE:.cc=.d)
all: examReadPDG examReadPythia examReadEvtGen examReadQQ examMyPDT examDMF
list: examListHerwig examListIsajet
list: examListHerwig examListIsajet examListPythia
run: run_test
......@@ -88,6 +99,13 @@ examReadEvtGen: examReadEvtGen.o
$(CXX) $(CXXFLAGS) -o $@ examReadEvtGen.o \
$(LIBNAME) $(LIBS)
examListPythia: examListPythia.o examListPythiaInterface.o
$(CXX) $(CXXFLAGS) -o $@ \
examListPythia.o examListPythiaInterface.o \
$(PythiaLIB) \
$(LIBNAME) $(LIBS) -lg2c
rm -f examListPythia.lpt
examListHerwig: examListHerwig.o examListHerwigInterface.o
$(CXX) $(CXXFLAGS) -o $@ \
examListHerwig.o examListHerwigInterface.o \
......@@ -120,7 +138,8 @@ clean:
rm -f *.o
rm -f *.d
rm -f examReadPDG examReadPythia examReadEvtGen
rm -f examMyPDT examDMF examReadQQ examListHerwig examListIsajet
rm -f examMyPDT examDMF examReadQQ
rm -f examListPythia examListHerwig examListIsajet
rm -f *.out *.log
rm -f fort.*
......
HepPDT/examples/Makefile.am
View file @ c8457099
......@@ -9,6 +9,10 @@ EXTRA_DIST = \
examListIsajet.cc \
examListIsajetInterface.F \
examListIsajet.out.save \
examListPythia.cc \
examListPythiaInterface.F \
examListPythia.out.save \
examListPythia.lpt.save \
examMyPDT.cc \
examMyPDT.out.save \
examReadEvtGen.cc \
......
HepPDT/examples/data/pythia.tbl
View file @ c8457099
This diff is collapsed.
HepPDT/examples/examListPythia.cc 0 → 100644
View file @ c8457099
// ----------------------------------------------------------------------
// examListPythia.cc
//
// list Pythia particle ID translations
//
// ----------------------------------------------------------------------
#include "CLHEP/HepPDT/defs.h"
#include <fstream>
#include "CLHEP/HepPDT/TranslationList.hh"
extern "C" {
void list_pythia_ ( );
}
int main()
{
const char infile[] = "data/pythia.tbl";
const char outfile[] = "examListPythia.out";
// open input file
std::ifstream pdfile( infile );
if( !pdfile ) {
std::cerr << "cannot open " << infile << std::endl;
exit(-1);
}
// open the output file
std::ofstream os( outfile );
if( !os ) {
std::cerr << "cannot open " << outfile << std::endl;
exit(-1);
}
// get Pythia listing using the fortran pylist function
// write the output of pylist to examListPythia.lpt
list_pythia_();
// just call the list function, which returns a bool
return HepPDT::listPythiaTranslation( pdfile, os);
}
HepPDT/examples/examListPythia.out.save 0 → 100644
View file @ c8457099
This diff is collapsed.
HepPDT/examples/examReadPythia.out.save
View file @ c8457099
This diff is collapsed.
HepPDT/examples/examReadQQ.out.save
View file @ c8457099
......@@ -231,7 +231,7 @@
index 230 PDT number 9010553 QQ number 217 PDT name: upsilon(11020)
index 231 PDT number 10553 QQ number 218 PDT name: h_b(1P)
index 232 PDT number 100443 QQ number 219 PDT name: psi(2S)
index 233 PDT number 9020553 QQ number 220 PDT name: not defined
index 233 PDT number 9020553 QQ number 220 PDT name: upsilon(7S)
index 234 PDT number 10411 QQ number 221 PDT name: D*_0+
index 235 PDT number 20413 QQ number 222 PDT name: D_1(H)+
index 236 PDT number 10413 QQ number 223 PDT name: D_1(2420)+
......
HepPDT/src/Makefile.am
View file @ c8457099
......@@ -51,13 +51,12 @@ libCLHEP_HepPDT_@VERSION@_a_SOURCES = \
translateGeanttoPDT.cc \
translateHerwig.cc \
translateIsajet.cc \
translatePythia.cc \
translatePDGtabletoPDT.cc \
translatePDTtoEvtGen.cc \
translatePDTtoGeant.cc \
translatePDTtoPDGtable.cc \
translatePDTtoPythia.cc \
translatePDTtoQQ.cc \
translatePythiatoPDT.cc \
translateQQtoPDT.cc \
version.cc \
write.cc \
......
HepPDT/src/ParticleName.cc
View file @ c8457099
// $Id: ParticleName.cc,v 1.1.4.2 2004/11/04 18:05:04 garren Exp $
// $Id: ParticleName.cc,v 1.1.4.3 2005/03/17 01:07:01 garren Exp $
// ----------------------------------------------------------------------
//
// ParticleName.cc
......@@ -77,6 +77,8 @@ ParticleNameMap const & ParticleNameInit()
{ -18, "nu_tau'~" },
{ 21, "g" },
{ 22, "gamma" },
{ 10022, "virtual photon" },
{ 20022, "Cerenkov radiation" },
{ 23, "Z0" },
{ 24, "W+" },
{ -24, "W-" },
......@@ -89,7 +91,7 @@ ParticleNameMap const & ParticleNameInit()
{ 36, "H_30" },
{ 37, "H+" },
{ -37, "H-" },
{ 39, "G" },
{ 39, "G" },
{ 41, "R0" },
{ -41, "R~0" },
{ 42, "LQ_c" },
......@@ -203,10 +205,10 @@ ParticleNameMap const & ParticleNameInit()
{ -9900023, "Z_R~0" },
{ 9900024, "W_R+" },
{ -9900024, "W_R-" },
{ 9900041, "H_L++" },
{ -9900041, "H_L--" },
{ 9900042, "H_R++" },
{ -9900042, "H_R--" },
{ 9900061, "H_L++" },
{ -9900061, "H_L--" },
{ 9900062, "H_R++" },
{ -9900062, "H_R--" },
{ 9910113, "rho_diffr0" },
{ 9910211, "pi_diffr+" },
{ -9910211, "pi_diffr-" },
......@@ -352,23 +354,21 @@ ParticleNameMap const & ParticleNameInit()
{ 9000111, "a_0(980)0" },
{ 10111, "a_0(1450)0" },
{ 100111, "pi(1300)0" },
{ 200111, "pi(1800)0" },
{ 9010111, "pi(1800)0" },
{ 113, "rho(770)0" },
{ 9000113, "pi_1(1400)0" },
{ 10113, "b_1(1235)0" },
{ 9010113, "pi_1(1600)0" },
{ 20113, "a_1(1260)0" },
{ 9020113, "a_1(1640)0" },
{ 9020113, "rho(1900)0" },
{ 30113, "rho(1700)0" },
{ 9030113, "rho_0(1900)0" },
{ 9040113, "rho_0(2150)0" },
{ 9030113, "rho(2150)0" },
{ 100113, "rho(1450)0" },
{ 115, "a_2(1320)0" },
{ 9000115, "pi_2(2100)0" },
{ 10115, "pi_2(1670)0" },
{ 100115, "a_2(1700)0" },
{ 117, "rho_3(1690)0" },
{ 9000117, "rho_3(1900)0" },
{ 9000117, "rho_3(1990)0" },
{ 9010117, "rho_3(2250)0" },
{ 119, "a_4(2040)0" },
{ 211, "pi+" },
......@@ -379,8 +379,8 @@ ParticleNameMap const & ParticleNameInit()
{ -10211, "a_0(1450)-" },
{ 100211, "pi(1300)+" },
{ -100211, "pi(1300)-" },
{ 200211, "pi(1800)+" },
{ -200211, "pi(1800)-" },
{ 9010211, "pi(1800)+" },
{ -9010211, "pi(1800)-" },
{ 213, "rho(770)+" },
{ -213, "rho(770)-" },
{ 9000213, "pi_1(1400)+" },
......@@ -391,14 +391,12 @@ ParticleNameMap const & ParticleNameInit()
{ -9010213, "pi_1(1600)-" },
{ 20213, "a_1(1260)+" },
{ -20213, "a_1(1260)-" },
{ 9020213, "a_1(1640)+" },
{ -9020213, "a_1(1640)-" },
{ 9020213, "rho(1900)+" },
{ -9020213, "rho(1900)-" },
{ 30213, "rho(1700)+" },
{ -30213, "rho(1700)-" },
{ 9030213, "rho_0(1900)+" },
{ -9030213, "rho_0(1900)-" },
{ 9040213, "rho_0(2150)+" },
{ -9040213, "rho_0(2150)-" },
{ 9030213, "rho(2150)+" },
{ -9030213, "rho(2150)-" },
{ 100213, "rho(1450)+" },
{ -100213, "rho(1450)-" },
{ 215, "a_2(1320)+" },
......@@ -407,12 +405,10 @@ ParticleNameMap const & ParticleNameInit()
{ -9000215, "pi_2(2100)-" },
{ 10215, "pi_2(1670)+" },
{ -10215, "pi_2(1670)-" },
{ 100215, "a_2(1700)+" },
{ -100215, "a_2(1700)-" },
{ 217, "rho_3(1690)+" },
{ -217, "rho_3(1690)-" },
{ 9000217, "rho_3(1900)+" },
{ -9000217, "rho_3(1900)-" },
{ 9000217, "rho_3(1990)+" },
{ -9000217, "rho_3(1990)-" },
{ 9010217, "rho_3(2250)+" },
{ -9010217, "rho_3(2250)-" },
{ 219, "a_4(2040)+" },
......@@ -421,21 +417,26 @@ ParticleNameMap const & ParticleNameInit()
{ 9000221, "f_0(600)" },
{ 10221, "f_0(1370)" },
{ 9010221, "f_0(980)" },
{ 9020221, "f_0(1500)" },
{ 9030221, "f_0(2020)" },
{ 9040221, "f_0(2100)" },
{ 9050221, "f_0(2200)" },
{ 9060221, "eta(2225)" },
{ 9020221, "eta(1405)" },
{ 9030221, "f_0(1500)" },
{ 9040221, "f_0(2020)" },
{ 9050221, "f_0(2100)" },
{ 9060221, "f_0(2200)" },
{ 9070221, "f_0(2330)" },
{ 100221, "eta(1295)" },
{ 200221, "eta(1760)" },
{ 331, "eta'(958)" },
{ 10331, "f_0(1710)" },
{ 100331, "eta(1475)" },
{ 223, "omega(782)" },
{ 9000223, "f_1(1510)" },
{ 10223, "h_1(1170)" },
{ 9010223, "h_1(1595)" },
{ 20223, "f_1(1285)" },
{ 30223, "omega(1650)" },
{ 100223, "omega(1420)" },
{ 333, "phi(1020)" },
{ 10333, "h_1(1380)" },
{ 20333, "f_1(1420)" },
{ 100333, "phi(1680)" },
{ 225, "f_2(1270)" },
{ 9000225, "f_2(1430)" },
{ 10225, "eta_2(1645)" },
......@@ -443,27 +444,40 @@ ParticleNameMap const & ParticleNameInit()
{ 9020225, "f_2(1640)" },
{ 9030225, "f_2(1810)" },
{ 9040225, "f_2(1910)" },
{ 9050225, "f_2(2150)" },
{ 9060225, "f_2(2300)" },
{ 9070225, "f_2(2340)" },
{ 100225, "f_2(1950)" },
{ 9050225, "f_2(1950)" },
{ 9060225, "f_2(2010)" },
{ 9070225, "f_2(2150)" },
{ 9080225, "f_2(2300)" },
{ 9090225, "f_2(2340)" },
{ 335, "f'_2(1525)" },
{ 10335, "eta_2(1870)" },
{ 227, "omega_3(1670)" },
{ 337, "phi_3(1850)" },
{ 229, "f_4(2050)" },
{ 9000229, "f_4(2300)" },
{ 9000229, "f_J(2220)" },
{ 9010229, "f_4(2300)" },
{ 311, "K0" },
{ -311, "K~0" },
{ 9000311, "K*_0(1950)0" },
{ -9000311, "K*_0(1950)~0" },
{ 9000311, "K*_0(800)0" },
{ -9000311, "K*_0(800)~0" },
{ 10311, "K*_0(1430)0" },
{ -10311, "K*_0(1430)~0" },
{ 100311, "K(1460)0" },
{ -100311, "K(1460)~0" },
{ 200311, "K(1830)0" },
{ -200311, "K(1830)~0" },
{ 9010311, "K*_0(1950)0" },
{ -9010311, "K*_0(1950)0" },
{ 321, "K+" },
{ -321, "K-" },
{ 9000321, "K*_0(800)+" },
{ -9000321, "K*_0(800)-" },
{ 10321, "K*_0(1430)+" },
{ -10321, "K*_0(1430)-" },
{ 100321, "K(1460)+" },
{ -100321, "K(1460)-" },
{ 9010321, "K*_0(1950)+" },
{ -9010321, "K*_0(1950)-" },
{ 313, "K*(892)0" },
{ -313, "K*(892)~0" },
{ 9000313, "K_1(1650)0" },
{ -9000313, "K_1(1650)~0" },
{ 10313, "K_1(1270)0" },
{ -10313, "K_1(1270)~0" },
{ 20313, "K_1(1400)0" },
......@@ -472,40 +486,8 @@ ParticleNameMap const & ParticleNameInit()
{ -30313, "K*(1680)~0" },
{ 100313, "K*(1410)0" },
{ -100313, "K*(1410)~0" },
{ 315, "K*_2(1430)0" },
{ -315, "K*_2(1430)~0" },
{ 9000315, "K_2(1580)0" },
{ -9000315, "K_2(1580)~0" },
{ 10315, "K_2(1770)0" },
{ -10315, "K_2(1770)~0" },
{ 9010315, "K_2(2250)0" },
{ -9010315, "K_2(2250)~0" },
{ 20315, "K_2(1820)0" },
{ -20315, "K_2(1820)~0" },
{ 100315, "K*_2(1980)0" },
{ -100315, "K*_2(1980)~0" },
{ 317, "K*_3(1780)0" },
{ -317, "K*_3(1780)~0" },
{ 9010317, "K_3(2320)0" },
{ -9010317, "K_3(2320)~0" },
{ 319, "K*_4(2045)0" },
{ -319, "K*_4(2045)~0" },
{ 9000319, "K_4(2500)0" },
{ -9000319, "K_4(2500)~0" },
{ 321, "K+" },
{ -321, "K-" },
{ 9000321, "K*_0(1950)+" },
{ -9000321, "K*_0(1950)-" },
{ 10321, "K*_0(1430)+" },
{ -10321, "K*_0(1430)-" },
{ 100321, "K(1460)+" },
{ -100321, "K(1460)-" },
{ 200321, "K(1830)+" },
{ -200321, "K(1830)-" },
{ 323, "K*(892)+" },
{ -323, "K*(892)-" },
{ 9000323, "K_1(1650)+" },
{ -9000323, "K_1(1650)-" },
{ 10323, "K_1(1270)+" },
{ -10323, "K_1(1270)-" },
{ 20323, "K_1(1400)+" },
......@@ -514,6 +496,16 @@ ParticleNameMap const & ParticleNameInit()
{ -30323, "K*(1680)-" },
{ 100323, "K*(1410)+" },
{ -100323, "K*(1410)-" },
{ 315, "K*_2(1430)0" },
{ -315, "K*_2(1430)~0" },
{ 9000315, "K_2(1580)0" },
{ -9000315, "K_2(1580)~0" },
{ 10315, "K_2(1770)0" },
{ -10315, "K_2(1770)~0" },
{ 9010315, "K_2(2250)0" },
{ -9010315, "K_2(2250)~0" },
{ 20315, "K_2(1820)0" },
{ -20315, "K_2(1820)~0" },
{ 325, "K*_2(1430)+" },
{ -325, "K*_2(1430)-" },
{ 9000325, "K_2(1580)+" },
......@@ -526,48 +518,52 @@ ParticleNameMap const & ParticleNameInit()
{ -20325, "K_2(1820)-" },
{ 100325, "K_2(1980)+" },
{ -100325, "K_2(1980)-" },
{ 317, "K*_3(1780)0" },
{ -317, "K*_3(1780)~0" },
{ 9010317, "K_3(2320)0" },
{ -9010317, "K_3(2320)~0" },
{ 327, "K*_3(1780)+" },
{ -327, "K*_3(1780)-" },
{ 9010327, "K_3(2320)+" },
{ -9010327, "K_3(2320)-" },
{ 319, "K*_4(2045)0" },
{ -319, "K*_4(2045)~0" },
{ 9000319, "K_4(2500)0" },
{ -9000319, "K_4(2500)~0" },
{ 329, "K*_4(2045)+" },
{ -329, "K*_4(2045)-" },
{ 9000329, "K_4(2500)+" },
{ -9000329, "K_4(2500)-" },
{ 331, "eta'(958)" },
{ 10331, "f_0(1710)" },
{ 100331, "eta(1440)" },
{ 333, "phi(1020)" },
{ 10333, "h_1(1380)" },
{ 20333, "f_1(1420)" },
{ 100333, "phi(1680)" },
{ 335, "f'_2(1525)" },
{ 10335, "eta_2(1870)" },
{ 100335, "f_2(2010)" },
{ 337, "phi_3(1850)" },
{ 9000339, "f_J(2220)" },
{ 411, "D+" },
{ -411, "D-" },
{ 10411, "D*_0+" },
{ -10411, "D*_0-" },
{ 100411, "D(2S)+" },
{ -100411, "D(2S)-" },
{ 413, "D*(2010)+" },
{ -413, "D*(2010)-" },
{ 10413, "D_1(2420)+" },
{ -10413, "D_1(2420)-" },
{ 20413, "D_1(H)+" },
{ -20413, "D_1(H)-" },
{ 100413, "D*(2S)+" },
{ -100413, "D*(2S)+" },
{ 415, "D*_2(2460)+" },
{ -415, "D*_2(2460)-" },
{ 421, "D0" },
{ -421, "D~0" },
{ 10421, "D*_00" },
{ -10421, "D*_0~0" },
{ 100421, "D(2S)0" },
{ -100421, "D(2S)~0" },
{ 423, "D*(2007)0" },
{ -423, "D*(2007)~0" },
{ 10423, "D_1(2420)0" },
{ -10423, "D_1(2420)~0" },
{ 20423, "D_1(H)0" },
{ -20423, "D_1(H)~0" },
{ 100423, "D*(2S)0" },
{ -100423, "D*(2S)~0" },
{ 425, "D*_2(2460)0" },
{ -425, "D*_2(2460)~0" },
{ 431, "D_s+" },
......@@ -654,6 +650,7 @@ ParticleNameMap const & ParticleNameInit()
{ 10553, "h_b(1P)" },
{ 9010553, "upsilon(11020)" },
{ 20553, "chi_b1(1P)" },
{ 9020553, "upsilon(7S)" },
{ 30553, "upsilon_1(1D)" },
{ 100553, "upsilon(2S)" },
{ 110553, "h_b(2P)" },
......@@ -1330,7 +1327,7 @@ ParticleNameMap const & ParticleNameInit()
{ 1002001002, "Deuteron" },
{ 1003001002, "Tritium" },
{ 1003002001, "He3" },
{ 1004002001, "Alpha" }
{ 1004002001, "Alpha (He4)" }
};
int lnames = sizeof(SNames)/sizeof(SNames[0]);
......
HepPDT/src/translatePDGtabletoPDT.cc
View file @ c8457099
// $Id: translatePDGtabletoPDT.cc,v 1.1.1.1 2003/07/15 20:15:05 garren Exp $
// $Id: translatePDGtabletoPDT.cc,v 1.1.1.1.2.1 2005/03/17 01:07:01 garren Exp $
// ----------------------------------------------------------------------
//
// translatePDGtabletoPDT.cc
......@@ -54,7 +54,7 @@ int translatePDGtabletoPDT( const int id )
// excited quarks and leptons
} else if(ida <= 100) {
// Higgs, etc.
pdgtran=itabj[ida];
pdgtran=itabj[ida-1];
if(id < 0) {
pdgtran = -pdgtran;
// check for illegal antiparticles
......@@ -82,12 +82,6 @@ int translatePDGtabletoPDT( const int id )
if(i3 == 2 && i2 == 1 && i1 == 2) { pdgtran = 0; }
} else if(i1 != 0 && i2 != 0 && i3 == 0) {
// mesons
if(id == 30223) { pdgtran = 20333; }
if(id == 60223) { pdgtran = 30223; }
if(id == 40313) { pdgtran = 30313; }
if(id == 40323) { pdgtran = 30323; }
if(id == -40313) { pdgtran = -30313; }
if(id == -40323) { pdgtran = -30323; }
// check for illegal antiparticles
if(i1 == i2 && id < 0) { pdgtran = 0; }
} else if(i2 != 0 && i3 != 0 && i1 == 0) {
......
HepPDT/src/translatePDTtoPDGtable.cc
View file @ c8457099
// $Id: translatePDTtoPDGtable.cc,v 1.1.1.1 2003/07/15 20:15:05 garren Exp $
// $Id: translatePDTtoPDGtable.cc,v 1.1.1.1.2.1 2005/03/17 01:07:01 garren Exp $
// ----------------------------------------------------------------------
//
// translatePDTtoPDGtable.cc
......@@ -55,7 +55,7 @@ int translatePDTtoPDGtable( const int id )
// excited quarks and leptons
} else if(ida <= 100) {
// Higgs, etc.
pdgtran=itabj[ida];
pdgtran=itabj[ida-1];
if(id < 0) {
pdgtran = -pdgtran;
// check for illegal antiparticles
......@@ -77,13 +77,6 @@ int translatePDTtoPDGtable( const int id )
if(i3 >= 6) { pdgtran = 0; }
} else if(i1 != 0 && i2 != 0 && i3 == 0) {
// mesons
if(id == 20333) { pdgtran = 30223; }
if(id == 30223) { pdgtran = 60223; }
if(id == 30313) { pdgtran = 40313; }
if(id == 30323) { pdgtran = 40323; }
if(id == -30313) { pdgtran = -40313; }
if(id == -30323) { pdgtran = -40323; }
if(ida == 9020553) { pdgtran = 0; }
if(i2 >= 6) { pdgtran = 0; }
// check for illegal antiparticles
if(i1 == i2 && id < 0) { pdgtran = 0; }
......
HepPDT/src/translatePDTtoPythia.cc deleted 100755 → 0
View file @ 3a3e2941
// $Id: translatePDTtoPythia.cc,v 1.1.1.1.2.1 2004/04/21 23:06:33 garren Exp $
// --------------------------
//
// translatePDTtoPythia.cc
//
// --------------------------
#include <iostream>
#include "CLHEP/HepPDT/ParticleID.hh"
namespace HepPDT {
int translatePDTtoPythia( const int id )
{
static int itabj[100] = { 1,2,3,4,5,6,7,8,0,51,
11,12,13,14,15,16,17,18,28,29,
21,22,23,24,25,0,0,0,0,0,
0,32,33,34,35,36,37,0,0,0,