parsing of setup xml files: renamed top level node <DetectorSetup> to <setup> to...

diff --git a/tools/run.pl b/tools/run.pl
index a1f6b4c158d76b8aaf174328bf1372a8494e82ca..24e3e23f8b40346a6140167e1b0d16cd6603b3ed 100755 (executable)
--- a/tools/run.pl
+++ b/tools/run.pl
@@ -30,7 +30,7 @@ if( $q->param('runtime') ) {
 #print "Loading detector setup from $setupFile\n";
 my $parser = XML::LibXML->new(line_numbers => 1);
 my $db = $parser->parse_file($setupFile);
-my $systemName = $db->findvalue("/DetectorSetup/system/\@name");
+my $systemName = $db->findvalue("/setup/system/\@name");
 #print "Loading system description from $systemName\n";
 my $systemFile = SYSTEMDIR."/".$systemName.".xml";
 $db = $parser->parse_file($systemFile);

diff --git a/tools/testgui.pl b/tools/testgui.pl
index 89f2ae04bb90869e1c234cff5ae0d52992098880..5ce867a3de2dc5e9bebbdf0cc764c672079bda5d 100755 (executable)
--- a/tools/testgui.pl
+++ b/tools/testgui.pl
@@ -233,11 +233,11 @@ sub print_setupStructure {
   unless(defined($setupTree)) {
     parse_setupFile();
   }
-  my $setup = $setupTree->findnodes("/DetectorSetup")->shift();
-  unless(defined($setup)) { die "did not find DetectorSetup node in setup file!\n";}
+  my $setup = $setupTree->findnodes("/setup")->shift();
+  unless(defined($setup)) { die "did not find setup node in setup file!\n";}
   my $setupDesc = $setup->findvalue("./description");
   my $setupName = $setup->findvalue("./\@name");
-     $systemName = $setup->findvalue("/DetectorSetup/system/\@name");
+     $systemName = $setup->findvalue("/setup/system/\@name");
   print h2("Setup: $setupName");
   print "<p>description: $setupDesc</p>";