Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: rm references to $DETECTOR in DD4hep_service.cc #1232

Merged
merged 1 commit into from
Jan 14, 2024
Merged

fix: rm references to $DETECTOR in DD4hep_service.cc #1232

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/services/geometry/dd4hep/DD4hep_service.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ void DD4hep_service::Initialize() {
}

// The current recommended way of getting the XML file is to use the environment variables
// DETECTOR_PATH and DETECTOR_CONFIG or DETECTOR(deprecated).
// DETECTOR_PATH and DETECTOR_CONFIG.
// Look for those first, so we can use it for the default
// config parameter. (see https://github.com/eic/EICrecon/issues/22)
// config parameter.
auto *detector_config_env = std::getenv("DETECTOR_CONFIG");
auto *detector_path_env = std::getenv("DETECTOR_PATH");

Expand Down Expand Up @@ -175,7 +175,7 @@ std::string DD4hep_service::resolveFileName(const std::string &filename, char *d
// on the screen to be that this file doesn't exist.
auto mess = fmt::format(fmt::emphasis::bold | fg(fmt::color::red), "ERROR: ");
mess += fmt::format(fmt::emphasis::bold, "file: {} does not exist!", filename);
mess += "\nCheck that your DETECTOR and DETECTOR_CONFIG environment variables are set correctly.";
mess += "\nCheck that your DETECTOR_PATH and DETECTOR_CONFIG environment variables are set correctly.";
std::cerr << std::endl << std::endl << mess << std::endl << std::endl; // TODO standard log here!
std::_Exit(EXIT_FAILURE);
}
Expand Down
Loading