diff --git a/src/FieldMapBrBz.cpp b/src/FieldMapBrBz.cpp
index e0f8f4ecfc5e9826fab18e78a43e3867ac3fd92b..b3c5af11cfb73aed5775ab89838c0c29e7978253 100644
--- a/src/FieldMapBrBz.cpp
+++ b/src/FieldMapBrBz.cpp
@@ -1,5 +1,6 @@
#include <DD4hep/DetFactoryHelper.h>
#include <DD4hep/FieldTypes.h>
+#include <DD4hep/Printout.h>
#include <XML/Utilities.h>
#include <cstdlib>
@@ -12,6 +13,8 @@
#include <tuple>
namespace fs = std::filesystem;
+#include "FileLoaderHelper.h"
+
using namespace dd4hep;
@@ -185,20 +188,16 @@ static Ref_t create_field_map_brbz(Detector & /*lcdd*/, xml::Handle_t handle)
std::string field_map_file = x_par.attr<std::string>(_Unicode(field_map));
std::string field_map_url = x_par.attr<std::string>(_Unicode(url));
+ EnsureFileFromURLExists(field_map_url,field_map_file);
+
double field_map_scale = x_par.attr<double>(_Unicode(scale));
if( !fs::exists(fs::path(field_map_file)) ) {
- auto ret = std::system(("mkdir -p fieldmaps && "
- "curl --retry 5 -f " +
- field_map_url + " -o " + field_map_file).c_str());
-
- if (!fs::exists(fs::path(field_map_file))) {
- std::cerr << "ERROR: file, " << field_map_file << ", does not exist\n";
+ printout(ERROR, "FieldMapBrBz", "file " + field_map_file + " does not exist");
+ printout(ERROR, "FieldMapBrBz", "use a FileLoader plugin before the field element");
std::quick_exit(1);
- }
}
-
auto map = new FieldMapBrBz(field_type);
map->Configure(r_dim.rmin(), r_dim.rmax(), r_dim.step(), z_dim.zmin(), z_dim.zmax(), z_dim.step());
diff --git a/src/FileLoader.cpp b/src/FileLoader.cpp
index 25a5c7e5d019a381b5831958b979edf18927e980..5ec0a922e78995f720e4d636d081e491a9a6f704 100644
--- a/src/FileLoader.cpp
+++ b/src/FileLoader.cpp
@@ -11,7 +11,7 @@
#include <cstdlib>
#include <string>
-namespace fs = std::filesystem;
+#include "FileLoaderHelper.h"
using namespace dd4hep;
@@ -58,122 +58,7 @@ long load_file(
return 0;
}
- // parse cache for environment variables
- auto pos = std::string::npos;
- while ((pos = cache.find('$')) != std::string::npos) {
- auto after = cache.find_first_not_of(
- "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
- "abcdefghijklmnopqrstuvwxyz"
- "0123456789"
- "_",
- pos + 1);
- if (after == std::string::npos) after = cache.size(); // cache ends on env var
- const std::string env_name(cache.substr(pos + 1, after - pos - 1));
- auto env_ptr = std::getenv(env_name.c_str());
- const std::string env_value(env_ptr != nullptr ? env_ptr : "");
- cache.erase(pos, after - pos);
- cache.insert(pos, env_value);
- printout(INFO, "FileLoader", "$" + env_name + " -> " + env_value);
- }
-
- // create file path
- fs::path file_path(file);
-
- // create hash from url, hex of unsigned long long
- std::string hash = fmt::format("{:016x}", dd4hep::detail::hash64(url)); // TODO: Use c++20 std::fmt
-
- // create file parent path, if not exists
- fs::path parent_path = file_path.parent_path();
- if (!fs::exists(parent_path)) {
- if (fs::create_directories(parent_path) == false) {
- printout(ERROR, "FileLoader", "parent path " + parent_path.string() + " cannot be created");
- printout(ERROR, "FileLoader", "check permissions and retry");
- std::quick_exit(1);
- }
- }
-
- // if file exists and is symlink to correct hash
- fs::path hash_path(parent_path / hash);
- if (fs::exists(file_path)
- && fs::equivalent(file_path, hash_path)) {
- printout(INFO, "FileLoader", "Link " + file + " -> hash " + hash + " already exists");
- return 0;
- }
-
- // if hash does not exist, we try to retrieve file from cache
- if (!fs::exists(hash_path)) {
- // recursive loop into cache directory
- fs::path cache_path(cache);
- printout(INFO, "FileLoader", "Cache " + cache_path.string());
- if (fs::exists(cache_path)) {
- for (auto const& dir_entry: fs::recursive_directory_iterator(cache_path)) {
- if (!dir_entry.is_directory()) continue;
- fs::path cache_dir_path = cache_path / dir_entry;
- printout(INFO, "FileLoader", "Checking " + cache_dir_path.string());
- fs::path cache_hash_path = cache_dir_path / hash;
- if (fs::exists(cache_hash_path)) {
- // symlink hash to cache/.../hash
- printout(INFO, "FileLoader", "File " + file + " with hash " + hash + " found in " + cache_hash_path.string());
- try {
- fs::create_symlink(cache_hash_path, hash_path);
- } catch (const fs::filesystem_error&) {
- printout(ERROR, "FileLoader", "unable to link from " + hash_path.string() + " to " + cache_hash_path.string());
- printout(ERROR, "FileLoader", "check permissions and retry");
- std::quick_exit(1);
- }
- break;
- }
- }
- }
- }
-
- // if hash does not exist, we try to retrieve file from url
- if (!fs::exists(hash_path)) {
- cmd = fmt::format(cmd, url, hash_path.c_str()); // TODO: Use c++20 std::fmt
- printout(INFO, "FileLoader", "Downloading " + file + " as hash " + hash + " with " + cmd);
- // run cmd
- auto ret = std::system(cmd.c_str());
- if (!fs::exists(hash_path)) {
- printout(ERROR, "FileLoader", "unable to run cmd " + cmd);
- printout(ERROR, "FileLoader", "check command and retry");
- std::quick_exit(1);
- }
- }
-
- // check if file already exists
- if (fs::exists(file_path)) {
- // file already exists
- if (fs::is_symlink(file_path)) {
- // file is symlink
- if (fs::equivalent(hash_path, fs::read_symlink(file_path))) {
- // link points to correct path
- return 0;
- } else {
- // link points to incorrect path
- if (fs::remove(file_path) == false) {
- printout(ERROR, "FileLoader", "unable to remove symlink " + file_path.string());
- printout(ERROR, "FileLoader", "check permissions or remove manually");
- std::quick_exit(1);
- }
- }
- } else {
- // file exists but not symlink
- printout(ERROR, "FileLoader", "will not remove actual file " + file_path.string());
- printout(ERROR, "FileLoader", "check content, remove manually, and retry");
- std::quick_exit(1);
- }
- }
- // file_path now does not exist
-
- // symlink file_path to hash_path
- try {
- // use new path from hash so file link is local
- fs::create_symlink(fs::path(hash), file_path);
- } catch (const fs::filesystem_error&) {
- printout(ERROR, "FileLoader", "unable to link from " + file_path.string() + " to " + hash_path.string());
- printout(ERROR, "FileLoader", "check permissions and retry");
- std::quick_exit(1);
- }
+ EnsureFileFromURLExists(url, file, cache, cmd);
return 0;
}
diff --git a/src/FileLoaderHelper.h b/src/FileLoaderHelper.h
new file mode 100644
index 0000000000000000000000000000000000000000..0d84d2cb10d35b134c15506da4db327e1ab3da60
--- /dev/null
+++ b/src/FileLoaderHelper.h
@@ -0,0 +1,143 @@
+#pragma once
+
+#include <DD4hep/DetFactoryHelper.h>
+#include <DD4hep/Primitives.h>
+#include <DD4hep/Factories.h>
+#include <DD4hep/Printout.h>
+
+#include <fmt/core.h>
+
+#include <filesystem>
+#include <iostream>
+#include <cstdlib>
+#include <string>
+
+namespace fs = std::filesystem;
+
+using namespace dd4hep;
+
+// Function to download files
+inline void
+EnsureFileFromURLExists(
+ std::string url,
+ std::string file,
+ std::string cache = "",
+ std::string cmd = "curl --retry 5 -f {0} -o {1}"
+) {
+ // parse cache for environment variables
+ auto pos = std::string::npos;
+ while ((pos = cache.find('$')) != std::string::npos) {
+ auto after = cache.find_first_not_of(
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+ "abcdefghijklmnopqrstuvwxyz"
+ "0123456789"
+ "_",
+ pos + 1);
+ if (after == std::string::npos) after = cache.size(); // cache ends on env var
+ const std::string env_name(cache.substr(pos + 1, after - pos - 1));
+ auto env_ptr = std::getenv(env_name.c_str());
+ const std::string env_value(env_ptr != nullptr ? env_ptr : "");
+ cache.erase(pos, after - pos);
+ cache.insert(pos, env_value);
+ printout(INFO, "FileLoader", "$" + env_name + " -> " + env_value);
+ }
+
+ // create file path
+ fs::path file_path(file);
+
+ // create hash from url, hex of unsigned long long
+ std::string hash = fmt::format("{:016x}", dd4hep::detail::hash64(url)); // TODO: Use c++20 std::fmt
+
+ // create file parent path, if not exists
+ fs::path parent_path = file_path.parent_path();
+ if (!fs::exists(parent_path)) {
+ if (fs::create_directories(parent_path) == false) {
+ printout(ERROR, "FileLoader", "parent path " + parent_path.string() + " cannot be created");
+ printout(ERROR, "FileLoader", "check permissions and retry");
+ std::quick_exit(1);
+ }
+ }
+
+ // if file exists and is symlink to correct hash
+ fs::path hash_path(parent_path / hash);
+ if (fs::exists(file_path)
+ && fs::equivalent(file_path, hash_path)) {
+ printout(INFO, "FileLoader", "Link " + file + " -> hash " + hash + " already exists");
+ return;
+ }
+
+ // if hash does not exist, we try to retrieve file from cache
+ if (!fs::exists(hash_path)) {
+ // recursive loop into cache directory
+ fs::path cache_path(cache);
+ printout(INFO, "FileLoader", "Cache " + cache_path.string());
+ if (fs::exists(cache_path)) {
+ for (auto const& dir_entry: fs::recursive_directory_iterator(cache_path)) {
+ if (!dir_entry.is_directory()) continue;
+ fs::path cache_dir_path = cache_path / dir_entry;
+ printout(INFO, "FileLoader", "Checking " + cache_dir_path.string());
+ fs::path cache_hash_path = cache_dir_path / hash;
+ if (fs::exists(cache_hash_path)) {
+ // symlink hash to cache/.../hash
+ printout(INFO, "FileLoader", "File " + file + " with hash " + hash + " found in " + cache_hash_path.string());
+ try {
+ fs::create_symlink(cache_hash_path, hash_path);
+ } catch (const fs::filesystem_error&) {
+ printout(ERROR, "FileLoader", "unable to link from " + hash_path.string() + " to " + cache_hash_path.string());
+ printout(ERROR, "FileLoader", "check permissions and retry");
+ std::quick_exit(1);
+ }
+ break;
+ }
+ }
+ }
+ }
+
+ // if hash does not exist, we try to retrieve file from url
+ if (!fs::exists(hash_path)) {
+ cmd = fmt::format(cmd, url, hash_path.c_str()); // TODO: Use c++20 std::fmt
+ printout(INFO, "FileLoader", "Downloading " + file + " as hash " + hash + " with " + cmd);
+ // run cmd
+ auto ret = std::system(cmd.c_str());
+ if (!fs::exists(hash_path)) {
+ printout(ERROR, "FileLoader", "unable to run cmd " + cmd);
+ printout(ERROR, "FileLoader", "check command and retry");
+ std::quick_exit(1);
+ }
+ }
+
+ // check if file already exists
+ if (fs::exists(file_path)) {
+ // file already exists
+ if (fs::is_symlink(file_path)) {
+ // file is symlink
+ if (fs::equivalent(hash_path, fs::read_symlink(file_path))) {
+ // link points to correct path
+ return;
+ } else {
+ // link points to incorrect path
+ if (fs::remove(file_path) == false) {
+ printout(ERROR, "FileLoader", "unable to remove symlink " + file_path.string());
+ printout(ERROR, "FileLoader", "check permissions or remove manually");
+ std::quick_exit(1);
+ }
+ }
+ } else {
+ // file exists but not symlink
+ printout(ERROR, "FileLoader", "will not remove actual file " + file_path.string());
+ printout(ERROR, "FileLoader", "check content, remove manually, and retry");
+ std::quick_exit(1);
+ }
+ }
+ // file_path now does not exist
+
+ // symlink file_path to hash_path
+ try {
+ // use new path from hash so file link is local
+ fs::create_symlink(fs::path(hash), file_path);
+ } catch (const fs::filesystem_error&) {
+ printout(ERROR, "FileLoader", "unable to link from " + file_path.string() + " to " + hash_path.string());
+ printout(ERROR, "FileLoader", "check permissions and retry");
+ std::quick_exit(1);
+ }
+}