Commit f24befcc authored by Dainius Simelevicius's avatar Dainius Simelevicius
Browse files

references #284: porting amc13controller to amc13 v1.3

parent 9a7088a1
......@@ -233,7 +233,7 @@ void amc13controller::AMC13::mapNames()
for (uhal::Node::const_iterator iNode = baseNode.begin(); iNode != baseNode.end();
iNode++)
{
boost::unordered_map<std::string,std::string> parameters = iNode->getParameters();
std::unordered_map<std::string,std::string> parameters = iNode->getParameters();
if(parameters.find("Status") == parameters.end()) continue;
......@@ -442,7 +442,7 @@ void amc13controller::AMC13::printMap()
std::string desc = isSplit ? loWords_[addr.substr(0,addr.size()-3)]
->getDescription() :
iNode->getDescription() ;
boost::unordered_map<std::string,std::string> parameters = iNode->getParameters();
std::unordered_map<std::string,std::string> parameters = iNode->getParameters();
outFile << std::left << std::setw(30) << it->first << std::setw(40)
<< getAddress(*iNode,&intNull)
<< std::string(isSplit ? "\t(64)":"\t(32)")
......@@ -461,7 +461,7 @@ void amc13controller::AMC13::printOrderedMap()
it = uiMap_.begin(); it != uiMap_.end(); it++)
{
const uhal::Node *iNode = it->second.second;
boost::unordered_map<std::string,std::string> parameters = iNode->getParameters();
std::unordered_map<std::string,std::string> parameters = iNode->getParameters();
std::string tableName = parameters["Table"];
int statusLevel;
......@@ -496,8 +496,7 @@ void amc13controller::AMC13::printOrderedMap()
it2 != iTable.end(); it2++)
{
const uhal::Node *iNode = it2->second;
boost::unordered_map<std::string,std::string>
parameters = iNode->getParameters();
std::unordered_map<std::string,std::string> parameters = iNode->getParameters();
std::string column = parameters["Column"];
std::string row = parameters["Row"];
......@@ -540,8 +539,7 @@ void amc13controller::AMC13::printOrderedMap()
->getDescription() :
iNode->getDescription() ;
std::string size = isSplit ? "(64)":"(32)";
boost::unordered_map<std::string,std::string>
parameters = iNode->getParameters();
std::unordered_map<std::string,std::string> parameters = iNode->getParameters();
std::string line = row + "_" + column + " -- " + desc;
outFile << std::left << std::setw(100) << line
......@@ -576,8 +574,7 @@ void amc13controller::AMC13::generateNodeCode()
std::string uiName = it->first;
const uhal::Node *iNode = it->second.second;
boost::unordered_map<std::string,std::string>
parameters = iNode->getParameters();
std::unordered_map<std::string,std::string> parameters = iNode->getParameters();
std::string tableName = parameters["Table"];
......@@ -649,8 +646,7 @@ void amc13controller::AMC13::generateNodeCode()
if (node->getPermission() == uhal::defs::WRITE) continue;
//Get status level:
boost::unordered_map<std::string,std::string>
params = node->getParameters();
std::unordered_map<std::string,std::string> params = node->getParameters();
int statusLevel;
sscanf(params["Status"].c_str(),"%d",&statusLevel);
......@@ -901,7 +897,7 @@ void amc13controller::AMC13::printStatus()
for (uhal::Node::const_iterator iNode = baseNode.begin(); iNode != baseNode.end();
iNode++)
{
boost::unordered_map<std::string,std::string> parameters = iNode->getParameters();
std::unordered_map<std::string,std::string> parameters = iNode->getParameters();
if(parameters.find("Status") == parameters.end()) continue;
//for (boost::unordered_map<std::string,std::string>::iterator
// iMap = parameters.begin(); iMap != parameters.end(); iMap++)
......@@ -2927,8 +2923,7 @@ amc13controller::AMC13::getDebugNodeMap()
//------------------------------------------------------------------
//Get UI name for current node, but with numbers appended if it
//is a generically named stream quantity:
boost::unordered_map<std::string,std::string>
parameters = iNode->getParameters();
std::unordered_map<std::string,std::string> parameters = iNode->getParameters();
//create UI name for given monitorable, as done in mapNames
std::string parRow(parameters["Row"]), parCol(parameters["Column"]);
if ( parRow.substr(0,1) == "_" ) parRow = "";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment