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

Jump to bottom

XMLConfigReader and XmlConfigReader cleanup in L1T #16194

Merged
merged 2 commits into from Oct 13, 2016
Merged

XMLConfigReader and XmlConfigReader cleanup in L1T #16194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
529c121
localize xerces stuff
davidlange6 Oct 12, 2016
8856a08
manage scopes correctly
davidlange6 Oct 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion L1Trigger/L1TCommon/interface/TrigSystem.h
View file
Open in desktop
Expand Up @@ -57,7 +57,7 @@ class TrigSystem

std::string* logText_;

XmlConfigReader _xmlRdr;
//XmlConfigReader _xmlRdr;

bool checkIdExistsAndSetSetting_(std::vector<Setting>& vec, const std::string& id, const std::string& value, const std::string& procRole);
bool checkIdExistsAndSetSetting_(std::vector<Setting>& vec, const std::string& id, const std::string& columns, const std::string& types, const std::vector<std::string>& rows, const std::string& procRole, const std::string& delim);
Expand Down
22 changes: 13 additions & 9 deletions L1Trigger/L1TCommon/src/TrigSystem.cc
View file
Open in desktop
Expand Up @@ -20,15 +20,19 @@ void TrigSystem::configureSystemFromFiles(const std::string& hwCfgFile, const st
{
// read hw description xml
// this will set the sysId
_xmlRdr.readDOMFromFile(hwCfgFile);
_xmlRdr.readRootElement(*this);

// read configuration xml files
_xmlRdr.readDOMFromFile(topCfgFile);
_xmlRdr.buildGlobalDoc(key, topCfgFile);
_xmlRdr.readContexts(key, sysId_, *this);

isConfigured_ = true;
{
XmlConfigReader xmlRdr;
xmlRdr.readDOMFromFile(hwCfgFile);
xmlRdr.readRootElement(*this);
}
// read configuration xml files
{
XmlConfigReader xmlRdr;
xmlRdr.readDOMFromFile(topCfgFile);
xmlRdr.buildGlobalDoc(key, topCfgFile);
xmlRdr.readContexts(key, sysId_, *this);
}
isConfigured_ = true;
}


Expand Down
4 changes: 2 additions & 2 deletions L1Trigger/L1TMuonOverlap/interface/XMLConfigReader.h
View file
Open in desktop
Expand Up @@ -61,8 +61,8 @@ class XMLConfigReader{
unsigned int index=0,
unsigned int aGPNumber=999);

xercesc::XercesDOMParser *parser;
xercesc::DOMDocument* doc;
// xercesc::XercesDOMParser *parser;
// xercesc::DOMDocument* doc;

///Cache with GPs read.
std::vector<GoldenPattern*> aGPs;
Expand Down