diff --git a/libnnpdf/CMakeLists.txt b/libnnpdf/CMakeLists.txt index ac5c38c4de..27200b82bd 100644 --- a/libnnpdf/CMakeLists.txt +++ b/libnnpdf/CMakeLists.txt @@ -56,15 +56,6 @@ add_library(nnpdf SHARED src/common.cc target_link_libraries(nnpdf ${LHAPDF_LIBRARIES} ${GSL_LDFLAGS} ${SQLITE3_LDFLAGS} ${LIBARCHIVE_LDFLAGS} ${YAML_LDFLAGS}) -add_executable(FKconvolute src/fkconvolute.cc) -target_link_libraries(FKconvolute nnpdf ${LibArchive_LIBRARIES}) - -add_executable(FKmerge2 src/fkmerge2.cc) -target_link_libraries(FKmerge2 nnpdf ${LibArchive_LIBRARIES}) - -install(FILES ${CMAKE_BINARY_DIR}/libnnpdf/FKconvolute - ${CMAKE_BINARY_DIR}/libnnpdf/FKmerge2 - DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) install(FILES ${PROJECT_SOURCE_DIR}/libnnpdf/scripts/nnpdf.pc DESTINATION lib/pkgconfig) install(DIRECTORY src/NNPDF DESTINATION include) install(FILES ${PROJECT_SOURCE_DIR}/libnnpdf/nnprofile.yaml DESTINATION share/NNPDF) diff --git a/libnnpdf/src/fkconvolute.cc b/libnnpdf/src/fkconvolute.cc deleted file mode 100644 index 211afa946e..0000000000 --- a/libnnpdf/src/fkconvolute.cc +++ /dev/null @@ -1,48 +0,0 @@ -// fkconvolute.cc : Predictions for FKTable -// Author: Nathan Hartland, nathan.hartland@physics.ox.ac.uk - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "NNPDF/lhapdfset.h" -#include "NNPDF/fastkernel.h" -#include "NNPDF/thpredictions.h" - -using namespace std; - -/** - * \param argv the filename containing the configuration - */ -int main(int argc, char **argv) -{ - if (argc < 3) - { - std::cout << "Usage: "<< argv[0] - << " [Path to C-factor 1] .. [Path to C-factor N]"< cfactors(argv+3, argv+argc); - NNPDF::FKTable sig1(argv[2], cfactors); - - // Make predictions - NNPDF::ThPredictions pred = NNPDF::ThPredictions(&f, &sig1); - pred.Print(std::cout); - - return 0; -} diff --git a/libnnpdf/src/fkmerge2.cc b/libnnpdf/src/fkmerge2.cc deleted file mode 100644 index cf85dc8d6f..0000000000 --- a/libnnpdf/src/fkmerge2.cc +++ /dev/null @@ -1,80 +0,0 @@ -// fkmerge2: Merge FK tables -// Author: Nathan Hartland, n.p.hartland@vu.nl - -#include -#include -#include -#include -#include -#include -#include - -#include "NNPDF/fastkernel.h" -#include "NNPDF/fkgenerator.h" -#include "NNPDF/exceptions.h" - -using namespace std; -using NNPDF::FKHeader; - -/** - * \param argv the filename containing the configuration - */ -int main(int argc, char **argv) -{ - if (argc < 3) - { - std::cout << "Usage: "<< argv[0]<<" [TargetFK] [FK table 1] ... [FK table N]"< 1E-8 ) - throw NNPDF::RuntimeException("FKmerge2","x-grids disagree in merge target and constituent FK table" ); - - // Merge grids - if (header.GetTag(FKHeader::GRIDINFO, "HADRONIC")) - { - for (int d=0; d