Merge pull request #16194 from davidlange6/l1txerc

XMLConfigReader and XmlConfigReader cleanup in L1T
cms-sw · Oct 13, 2016 · c74deff · c74deff
2 parents 650bd12 + 8856a08
commit c74deff
Show file tree

Hide file tree

Showing 4 changed files with 282 additions and 246 deletions.
diff --git a/L1Trigger/L1TCommon/interface/TrigSystem.h b/L1Trigger/L1TCommon/interface/TrigSystem.h
@@ -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);

diff --git a/L1Trigger/L1TCommon/src/TrigSystem.cc b/L1Trigger/L1TCommon/src/TrigSystem.cc
@@ -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;
 }
 
 

diff --git a/L1Trigger/L1TMuonOverlap/interface/XMLConfigReader.h b/L1Trigger/L1TMuonOverlap/interface/XMLConfigReader.h
@@ -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;