Skip to content
Snippets Groups Projects
Commit e5681843 authored by Markus Frank's avatar Markus Frank Committed by MarkusFrankATcernch
Browse files

Fix compiler error

parent 6be5ede5
No related branches found
No related tags found
No related merge requests found
...@@ -165,18 +165,21 @@ static long load_xml_dddb(Detector& description, int argc, char** argv) { ...@@ -165,18 +165,21 @@ static long load_xml_dddb(Detector& description, int argc, char** argv) {
Path path = sys_id; Path path = sys_id;
sys_id = path.normalize().c_str(); sys_id = path.normalize().c_str();
xml::UriReader* resolver = 0;
if ( !loader_name.empty() ) {
DDDBReader* rdr = (DDDBReader*)dd4hep::PluginService::Create<void*>(loader_name,(const char*)0);
rdr->setMatch(match);
rdr->setDirectory(path.parent_path().c_str());
if ( iov_start >= 0 && iov_end >= 0 ) {
rdr->property("ValidityLower").set(iov_start);
rdr->property("ValidityUpper").set(iov_end);
}
resolver = rdr;
}
/// Install helper /// Install helper
{ {
description.apply("DDDB_InstallHelper", 0, 0); const void *args[] = {resolver, 0};
} description.apply("DDDB_InstallHelper", 1, (char**)args);
DDDBHelper* helper = description.extension<DDDBHelper>();
DDDBReader* resolver = 0;
if ( !loader_name.empty() ) {
resolver = (DDDBReader*)dd4hep::PluginService::Create<void*>(loader_name,(const char*)0);
resolver->setMatch(match);
resolver->setDirectory(path.parent_path().c_str());
helper->setXmlReader(resolver);
} }
/// Execute config plugins without arguments /// Execute config plugins without arguments
...@@ -202,10 +205,6 @@ static long load_xml_dddb(Detector& description, int argc, char** argv) { ...@@ -202,10 +205,6 @@ static long load_xml_dddb(Detector& description, int argc, char** argv) {
/// Process XML /// Process XML
if ( !sys_id.empty() ) { if ( !sys_id.empty() ) {
printout(INFO,"DDDBExecutor","+++ Processing DDDB: %s", sys_id.c_str()); printout(INFO,"DDDBExecutor","+++ Processing DDDB: %s", sys_id.c_str());
if ( iov_start >= 0 && iov_end >= 0 ) {
resolver->property("ValidityLower").set(iov_start);
resolver->property("ValidityUpper").set(iov_end);
}
const void* args[] = {0, sys_id.c_str(), "/", &event_time, 0}; const void* args[] = {0, sys_id.c_str(), "/", &event_time, 0};
result = description.apply("DDDB_Loader", 4, (char**)args); result = description.apply("DDDB_Loader", 4, (char**)args);
check_result(result); check_result(result);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment