|
[Rivet-svn] r1932 - trunk/include/Rivetblackhole at projects.hepforge.org blackhole at projects.hepforge.orgMon Oct 19 12:31:37 BST 2009
Author: hoeth Date: Mon Oct 19 12:31:37 2009 New Revision: 1932 Log: add K0S/K0L to the list of ParticleNames and remove trailing whitespaces from header file. Modified: trunk/include/Rivet/ParticleName.hh Modified: trunk/include/Rivet/ParticleName.hh ============================================================================== --- trunk/include/Rivet/ParticleName.hh Mon Oct 19 12:12:47 2009 (r1931) +++ trunk/include/Rivet/ParticleName.hh Mon Oct 19 12:31:37 2009 (r1932) @@ -1,4 +1,4 @@ -#ifndef RIVET_PARTICLENAME_HH +#ifndef RIVET_PARTICLENAME_HH #define RIVET_PARTICLENAME_HH #include "Rivet/Rivet.hh" @@ -6,29 +6,33 @@ namespace Rivet { /// Enumeration of available beam particles (using PDG IDs where available) - enum ParticleName { - ELECTRON = 11, - POSITRON = -11, - PROTON = 2212, - ANTIPROTON = -2212, - PHOTON = 22, - NEUTRON = 2112, - ANTINEUTRON = 2112, - MUON = 13, + enum ParticleName { + ELECTRON = 11, + POSITRON = -11, + PROTON = 2212, + ANTIPROTON = -2212, + PHOTON = 22, + NEUTRON = 2112, + ANTINEUTRON = 2112, + MUON = 13, ANTIMUON = -13, - NU_E = 12, + NU_E = 12, NU_EBAR = -12, - NU_MU = 14, + NU_MU = 14, NU_MUBAR = -14, - NU_TAU = 16, - NU_TAUBAR = -16, - PIPLUS = 211, + NU_TAU = 16, + NU_TAUBAR = -16, + PIPLUS = 211, PIMINUS = -211, - TAU = 15, + K0L = 130, + K0LBAR = -130, + K0S = 310, + K0SBAR = -310, + TAU = 15, ANTITAU = -15, - EMINUS = 11, - EPLUS = -11, - P = 2212, + EMINUS = 11, + EPLUS = -11, + P = 2212, PBAR = -2212, GLUON = 21, GAMMA = 22, @@ -45,9 +49,9 @@ ANY = 10000, PHOTOELECTRON, PHOTOPOSITRON, - PHOTOMUON, + PHOTOMUON, PHOTOANTIMUON, - PHOTOTAU, + PHOTOTAU, PHOTOANTITAU }; @@ -90,9 +94,9 @@ bpmap[NU_MUBAR] = "NU_MUBAR"; bpmap[NU_TAU] = "NU_TAU"; bpmap[NU_TAUBAR] = "NU_TAUBAR"; - bpmap[PIPLUS] = "PIPLUS"; + bpmap[PIPLUS] = "PIPLUS"; bpmap[PIMINUS] = "PIMINUS"; - bpmap[TAU] = "TAU"; + bpmap[TAU] = "TAU"; bpmap[WPLUSBOSON] = "WPLUSBOSON"; bpmap[WMINUSBOSON] = "WMINUSBOSON"; bpmap[ZBOSON] = "ZBOSON"; @@ -102,7 +106,7 @@ bpmap[PHOTOPOSITRON] = "PHOTOPOSITRON"; bpmap[PHOTOMUON] = "PHOTOMUON"; bpmap[PHOTOANTIMUON] = "PHOTOANTIMUON"; - bpmap[PHOTOTAU] = "PHOTOTAU"; + bpmap[PHOTOTAU] = "PHOTOTAU"; bpmap[PHOTOANTITAU] = "PHOTOANTITAU"; bpmap[ANY] = "*"; return bpmap; @@ -123,7 +127,7 @@ typedef std::vector<PdgId> ParticleNameList; - /// Function which returns a vector of all the beam particle values in + /// Function which returns a vector of all the beam particle values in /// the ParticleName enum. inline ParticleNameList getParticleNameEnums() { ParticleNameList names; @@ -135,7 +139,7 @@ } - /// Function which returns a vector of all the beam particle values in + /// Function which returns a vector of all the beam particle values in /// the ParticleName enum. inline ParticleName getParticleNameEnum(const std::string& pname) { return (ParticleName) Rivet::getParticleNamesRMap()[pname]; @@ -178,7 +182,7 @@ } ///////////////////////////////////////////////// - // Beams + // Beams /// Typedef for a pair of beam particle names. @@ -187,8 +191,8 @@ /// Print a BeamPair as a string. inline std::string toString(const BeamPair& pair) { - string out = "[" + - toParticleName(pair.first) + ", " + + string out = "[" + + toParticleName(pair.first) + ", " + toParticleName(pair.second) + "]"; return out; } @@ -199,7 +203,7 @@ return os; } - + }
More information about the Rivet-svn mailing list |