diff --git a/Generators/EvtGen_i/EvtGen_i/EvtInclusiveDecay.h b/Generators/EvtGen_i/EvtGen_i/EvtInclusiveDecay.h index 8b614cc57e5d3584cd31a04484ee0359e7abec81..0afe61a2cc10819b09bf6f7486feaf66d549b346 100644 --- a/Generators/EvtGen_i/EvtGen_i/EvtInclusiveDecay.h +++ b/Generators/EvtGen_i/EvtGen_i/EvtInclusiveDecay.h @@ -24,7 +24,6 @@ #define GENERATORMODULESEVTDECAYINCLUSIVE_H #include <boost/algorithm/string.hpp> -#include <boost/lexical_cast.hpp> #include "AtlasHepMC/GenEvent.h" #include "AtlasHepMC/GenParticle.h" diff --git a/Generators/MadGraphControl/share/lhapdf-config b/Generators/MadGraphControl/share/lhapdf-config index 740cb32bb2485d97272c2e79baad329ecad57aca..1654b21d4f78a19de1f71ccba5129c8494352d96 100755 --- a/Generators/MadGraphControl/share/lhapdf-config +++ b/Generators/MadGraphControl/share/lhapdf-config @@ -46,12 +46,6 @@ then version=$(echo "$prefix" | awk '{split($1,a,"lhapdf/"); split(a[2],b,"/");print b[1];}') fi -#find boost -boost=$(find /cvmfs/atlas.cern.ch/repo/sw/software/21.6/sw/lcg/releases/Boost/*/*/* -type d -name "boost-*") -if [ -z $boost ] -then - echo "WARNING: lhapdf-config could not find boost headers" -fi if [[ $# -eq 0 || -n $( echo $* | egrep -- "--help|-h" ) ]]; then echo "lhapdf-config: configuration tool for the LHAPDF" @@ -81,7 +75,7 @@ tmp=$( echo "$*" | egrep -- '--\<incdir\>') test -n "$tmp" && OUT="$OUT ${prefix}/include" tmp=$( echo "$*" | egrep -- '--\<cflags|cppflags|cxxflags\>') -test -n "$tmp" && OUT="$OUT -I${prefix}/include -I$boost" +test -n "$tmp" && OUT="$OUT -I${prefix}/include " tmp=$( echo "$*" | egrep -- '--\<libdir\>') test -n "$tmp" && OUT="$OUT ${exec_prefix}/lib" diff --git a/Generators/Pythia8B_i/src/Pythia8B_i.cxx b/Generators/Pythia8B_i/src/Pythia8B_i.cxx index f980808d7b046953f8fdf8fc336eefd9dc54b49e..2bd6e626376e7c786f0ef2cc95eae871fa586f3a 100644 --- a/Generators/Pythia8B_i/src/Pythia8B_i.cxx +++ b/Generators/Pythia8B_i/src/Pythia8B_i.cxx @@ -16,7 +16,6 @@ #include "GeneratorObjects/McEventCollection.h" #include "AtlasHepMC/GenEvent.h" #include <boost/algorithm/string.hpp> -#include <boost/lexical_cast.hpp> // Pointer On AtRndmGenSvc IAtRndmGenSvc* Pythia8B_i::p_AtRndmGenSvc = 0; diff --git a/Generators/Pythia8_i/Pythia8_i/UserProcessFactory.h b/Generators/Pythia8_i/Pythia8_i/UserProcessFactory.h index 3de2590d9a1eb4ea97c35a6e6620c2ae0bf0d7a3..87c1a4bf9e9537c18e434c8febadf5bd8a3724b8 100644 --- a/Generators/Pythia8_i/Pythia8_i/UserProcessFactory.h +++ b/Generators/Pythia8_i/Pythia8_i/UserProcessFactory.h @@ -7,7 +7,6 @@ #include "Pythia8/SigmaProcess.h" -#include <boost/smart_ptr.hpp> #include <map> #include <string> diff --git a/Generators/Pythia8_i/src/Pythia8_i.cxx b/Generators/Pythia8_i/src/Pythia8_i.cxx index 2dbfd77f61333a7378c1cb2ef643839cf2859354..d42e669c477941ce363253850324bf7de7afe128 100644 --- a/Generators/Pythia8_i/src/Pythia8_i.cxx +++ b/Generators/Pythia8_i/src/Pythia8_i.cxx @@ -11,7 +11,6 @@ #include "GeneratorObjects/McEventCollection.h" #include <boost/algorithm/string.hpp> #include <boost/lexical_cast.hpp> -#include <boost/assign/std/vector.hpp> // calls to fortran routines #include "CLHEP/Random/RandFlat.h" @@ -22,7 +21,6 @@ // Name of AtRndmGenSvc stream std::string Pythia8_i::pythia_stream = "PYTHIA8_INIT"; -using boost::assign::operator+=; /* Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration */ @@ -147,7 +145,7 @@ StatusCode Pythia8_i::genInitialize() { val = findValue(cmd, "BeamRemnants:reconnectRange"); if(val != ""){ cmd = "ColourReconnection:range = " + val; - m_commands += "ColourReconnection:mode = 0"; + m_commands.push_back( "ColourReconnection:mode = 0"); } } @@ -172,7 +170,7 @@ StatusCode Pythia8_i::genInitialize() { boost::erase_all(splits[0], " "); m_pythia->settings.addParm(splits[0], 0., false, false, 0., 0.); - m_commands+=param; + m_commands.push_back( param); } for(const std::string &mode : m_userModes){ @@ -185,7 +183,7 @@ StatusCode Pythia8_i::genInitialize() { boost::erase_all(splits[0], " "); m_pythia->settings.addMode(splits[0], 0, false, false, 0, 0); - m_commands+=mode; + m_commands.push_back(mode); } // Now apply the settings from the JO @@ -330,9 +328,9 @@ StatusCode Pythia8_i::genInitialize() { } }else{ canInit = canInit && m_pythia->readString("Beams:frameType = 1"); - canInit = canInit && m_pythia->readString("Beams:idA = " + boost::lexical_cast<std::string>(beam1)); - canInit = canInit && m_pythia->readString("Beams:idB = " + boost::lexical_cast<std::string>(beam2)); - canInit = canInit && m_pythia->readString("Beams:eCM = " + boost::lexical_cast<std::string>(m_collisionEnergy)); + canInit = canInit && m_pythia->readString("Beams:idA = " + std::to_string(beam1)); + canInit = canInit && m_pythia->readString("Beams:idB = " + std::to_string(beam2)); + canInit = canInit && m_pythia->readString("Beams:eCM = " + std::to_string(m_collisionEnergy)); } if(m_procPtr != 0){ diff --git a/Generators/Pythia8_i/src/UserHooks/EnhanceMPI.cxx b/Generators/Pythia8_i/src/UserHooks/EnhanceMPI.cxx index 74a099d6dbbaab0d9021d7e3329a694a724067db..e73e66f84732a14c8f4fa18a24bf0bbb29afeeca 100644 --- a/Generators/Pythia8_i/src/UserHooks/EnhanceMPI.cxx +++ b/Generators/Pythia8_i/src/UserHooks/EnhanceMPI.cxx @@ -5,7 +5,6 @@ #include "UserHooksUtils.h" #include "UserSetting.h" #include "Pythia8_i/UserHooksFactory.h" -#include "boost/lexical_cast.hpp" #include <stdexcept> #include <iostream> diff --git a/Generators/Pythia8_i/src/UserHooks/PTRelVetoedShower.cxx b/Generators/Pythia8_i/src/UserHooks/PTRelVetoedShower.cxx index be1e8dd5b049f19d0e6cc8297cdfc8709baf7602..a05437ef67ca052f3188d763e6d42ca2cb8f4ee5 100644 --- a/Generators/Pythia8_i/src/UserHooks/PTRelVetoedShower.cxx +++ b/Generators/Pythia8_i/src/UserHooks/PTRelVetoedShower.cxx @@ -4,7 +4,6 @@ #include "UserHooksUtils.h" #include "Pythia8_i/UserHooksFactory.h" -#include "boost/lexical_cast.hpp" #include <stdexcept> #include <iostream> @@ -76,7 +75,7 @@ namespace Pythia8{ if(nPwgOutgoing == m_nPoWHEGFinal) return false; if(nPwgOutgoing != m_nPoWHEGFinal + 1){ - throw std::runtime_error("Wrong number of final state PoWHEG legs: " + boost::lexical_cast<std::string>(nPwgOutgoing)); + throw std::runtime_error("Wrong number of final state PoWHEG legs: " + std::to_string(nPwgOutgoing)); } // momentum components to boost to CMS frame diff --git a/Generators/Pythia8_i/src/UserHooks/SuppressMPI.cxx b/Generators/Pythia8_i/src/UserHooks/SuppressMPI.cxx index 86e1aad223307b48db590f61608731c366bc2666..ad2fb0898b7a3c42e4dd46ad2386ad1ea6b0f567 100644 --- a/Generators/Pythia8_i/src/UserHooks/SuppressMPI.cxx +++ b/Generators/Pythia8_i/src/UserHooks/SuppressMPI.cxx @@ -5,7 +5,6 @@ #include "UserHooksUtils.h" #include "UserSetting.h" #include "Pythia8_i/UserHooksFactory.h" -#include "boost/lexical_cast.hpp" #include <stdexcept> #include <iostream> diff --git a/Generators/Pythia8_i/src/UserResonanceFactory.cxx b/Generators/Pythia8_i/src/UserResonanceFactory.cxx index b0c784cdb251c1607ada774225071c379972b65e..0c74a9f44c70e42060eb4afdbb9b27298b8c3f28 100644 --- a/Generators/Pythia8_i/src/UserResonanceFactory.cxx +++ b/Generators/Pythia8_i/src/UserResonanceFactory.cxx @@ -4,8 +4,6 @@ #include "Pythia8_i/UserResonanceFactory.h" -#include <boost/lexical_cast.hpp> -#include <boost/algorithm/string.hpp> #include <vector> #include <stdexcept>