Skip to content

Commit

Permalink
remove more seemingly unused stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
scarlehoff committed Nov 24, 2023
1 parent 01137a2 commit 2e25e9a
Show file tree
Hide file tree
Showing 19 changed files with 9 additions and 15,317 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -141,3 +141,5 @@ add_subdirectory(libnnpdf)

# evolven3fit
add_subdirectory(evolven3fit)
# which needs the theorydb
install(FILES ${PROJECT_SOURCE_DIR}/validphys2/src/validphys/datafiles/theory.db DESTINATION share/NNPDF)
6 changes: 3 additions & 3 deletions evolven3fit/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ include_directories(${PROJECT_SOURCE_DIR}/libnnpdf/src/)
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/binaries)

configure_file(
"${PROJECT_SOURCE_DIR}/libnnpdf/src/NNPDF/common.h.in"
"${PROJECT_SOURCE_DIR}/libnnpdf/src/NNPDF/common.h"
)
"${PROJECT_SOURCE_DIR}/evolven3fit/evolven3fit.cc.in"
"${PROJECT_SOURCE_DIR}/evolven3fit/evolven3fit.cc"
)

# Add files to the make
add_executable(evolven3fit ${PROJECT_SOURCE_DIR}/evolven3fit/evolven3fit.cc
Expand Down
5 changes: 3 additions & 2 deletions evolven3fit/evolven3fit.cc → evolven3fit/evolven3fit.cc.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#include <NNPDF/exceptions.h>
#include <NNPDF/nnpdfdb.h>
#include <NNPDF/utils.h>
#include <NNPDF/pathlib.h>
#include <APFEL/APFELdev.h>

#include "exportgrid.h"
Expand All @@ -27,6 +26,8 @@ using std::string;
using std::stringstream;
using std::stoi;

#define DBPATH "@PROFILE_PREFIX@/theory.db"

// Check if folder exists
bool CheckConsistency(string const& folder, string const& exportfile)
{
Expand Down Expand Up @@ -96,7 +97,7 @@ int main(int argc, char **argv)

// load theory from db
std::map<string,string> theory_map;
NNPDF::IndexDB db(get_data_path() + "/theory.db", "theoryIndex");
NNPDF::IndexDB db(DBPATH, "theoryIndex");
auto keys = APFEL::kValues;
keys.push_back("EScaleVar");
db.ExtractMap(theory_id, keys, theory_map);
Expand Down
1 change: 0 additions & 1 deletion evolven3fit/version.h

This file was deleted.

17 changes: 0 additions & 17 deletions libnnpdf/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,6 @@ set(exec_prefix "${prefix}")
set(includedir "${prefix}/include")
set(libdir "${prefix}/lib")

configure_file(
"${PROJECT_SOURCE_DIR}/libnnpdf/nnprofile.yaml.in"
"${PROJECT_SOURCE_DIR}/libnnpdf/nnprofile.yaml"
)

configure_file(
"${PROJECT_SOURCE_DIR}/libnnpdf/src/NNPDF/config.h.in"
"${PROJECT_SOURCE_DIR}/libnnpdf/src/NNPDF/config.h"
)

configure_file(
"${PROJECT_SOURCE_DIR}/libnnpdf/scripts/nnpdf.pc.in"
"${PROJECT_SOURCE_DIR}/libnnpdf/scripts/nnpdf.pc"
Expand Down Expand Up @@ -58,11 +48,4 @@ target_link_libraries(nnpdf ${LHAPDF_LIBRARIES} ${GSL_LDFLAGS} ${SQLITE3_LDFLAGS

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)
install(TARGETS nnpdf DESTINATION lib)

add_subdirectory(wrapper)

if(ENABLE_TESTS)
add_subdirectory(tests)
endif()
6 changes: 1 addition & 5 deletions libnnpdf/nnprofile.yaml.in
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
# Local resource locations
data_path: '@PROFILE_PREFIX@/data/'
results_path: '@PROFILE_PREFIX@/results/'
hyperscan_path: '@PROFILE_PREFIX@/hyperscan_results/'
validphys_cache_path: '@PROFILE_PREFIX@/vp-cache/'
config_path: '@PROFILE_PREFIX@/config/'
data_path: '@PROFILE_PREFIX@'

# Remote resource locations
fit_urls:
Expand Down
2 changes: 0 additions & 2 deletions libnnpdf/tests/CMakeLists.txt

This file was deleted.

Loading

0 comments on commit 2e25e9a

Please sign in to comment.