IAP GITLAB

Commit b7c6dee4 authored by Colin Baus's avatar Colin Baus

-updated FindBoost to latest CMake version

-"system" requires at least boost version 1.35
-boost doesn't seem to understand a "+" in the filename. renamed -> particle and antiparticle


git-svn-id: https://devel-ik.fzk.de/svn/mc/crmc/trunk@2891 c7a5e08c-de06-0410-9364-b41cf42a0b17
parent 36ee2f79
......@@ -48,7 +48,7 @@ ENDIF("${isSystemDir}" STREQUAL "-1")
SET (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules" CACHE PATH "Module Path" FORCE)
# TODO ROOT NOT REQUIRED
FIND_PACKAGE (Root REQUIRED)
FIND_PACKAGE (Boost REQUIRED COMPONENTS filesystem iostreams system program_options)
FIND_PACKAGE (Boost 1.35 REQUIRED COMPONENTS filesystem iostreams system program_options)
# TODO HepMC NOT REQUIRED
FIND_PACKAGE (HepMC REQUIRED COMPONENTS HepMC HepMCfio)
......@@ -130,8 +130,8 @@ INSTALL (PROGRAMS ${PROJECT_BINARY_DIR}/crmc DESTINATION bin)
# enable dashboard scripting
include (CTest)
ADD_TEST (crmcRuns bin/crmc -s 123 -f ctest)
ADD_TEST (crmcCheckFile md5sum "ctest")
SET_TESTS_PROPERTIES (crmcCheckFile PROPERTIES PASS_REGULAR_EXPRESSION ".*13a1067a443279b3e397eab0e58e2e4e ctest")
ADD_TEST (crmcRemoveFile rm "ctest")
ADD_TEST (crmcRuns bin/crmc -o hepmc -p3500 -P-3500 -i1 -I1 -s 123 -x ctest)
ADD_TEST (crmcCheckFile md5sum "ctest_eposlhc_123_pp_3500.hepmc")
SET_TESTS_PROPERTIES (crmcCheckFile PROPERTIES PASS_REGULAR_EXPRESSION ".*777cb7e60b7c8104393a4fb22b137538 ctest_eposlhc_123_pp_3500.hepmc")
ADD_TEST (crmcRemoveFile rm "ctest_eposlhc_123_pp_3500.hepmc")
This diff is collapsed.
......@@ -78,7 +78,7 @@ CRMCoptions::ParseOptions(int argc, char** argv)
desc.add_options()
("help,h", "description of options")
("version,v", "show version and exis")
("version,v", "show version and exits")
("output,o", po::value<string>(), "output mode: hepmc, hepmcgz, root, lhe, lhegz, ndst")
// ("verbosity,v", po::value<int>(), "verbosity (default: 0)")
("seed,s", po::value<int>(), "random seed (default: random)")
......@@ -268,10 +268,10 @@ CRMCoptions::GetOutputFileName() const
rootFileName << "_" << fSeed << "_";
switch (fProjectileId) {
case 120 : rootFileName << "pi+"; break;
case -120 : rootFileName << "pi+"; break;
case 1 : rootFileName << "p+"; break;
case -1 : rootFileName << "p-"; break;
case 120 : rootFileName << "pi"; break;
case -120 : rootFileName << "antipi"; break;
case 1 : rootFileName << "p"; break;
case -1 : rootFileName << "antip"; break;
case 12 : rootFileName << "C"; break;
case 207 : rootFileName << "Pb"; break;
default:
......@@ -282,8 +282,8 @@ CRMCoptions::GetOutputFileName() const
}
switch (fTargetId) {
case 1 : rootFileName << "p+"; break;
case -1 : rootFileName << "p-"; break;
case 1 : rootFileName << "p"; break;
case -1 : rootFileName << "antip"; break;
case 12 : rootFileName << "C"; break;
case 207 : rootFileName << "Pb"; break;
default:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment