Merge branch 'develop' of github.com:art-daq/otsdaq into develop

art-daq · Mar 17, 2023 · 6f303ad · 6f303ad
2 parents 9f3c4e9 + 895e198
commit 6f303ad
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 29 deletions.
diff --git a/otsdaq/TablePlugins/ARTDAQBoardReaderTable_table.cc b/otsdaq/TablePlugins/ARTDAQBoardReaderTable_table.cc
@@ -90,7 +90,6 @@ unsigned int ARTDAQBoardReaderTable::slowControlsHandlerConfig(
 	// loop through ARTDAQ BoardReader records starting at ARTDAQSupervisorTable
 	std::vector<std::pair<std::string, ConfigurationTree>> artdaqRecords = configManager->getNode("ARTDAQSupervisorTable").getChildren();
 
-	unsigned int numberOfBoardReaders                = 0;
 	unsigned int numberOfBoardReaderMetricParameters = 0;
 
 	for(auto& artdaqPair : artdaqRecords)  // start main artdaq record loop
@@ -106,8 +105,6 @@ unsigned int ARTDAQBoardReaderTable::slowControlsHandlerConfig(
 			if(!boardReaderPair.second.status())
 				continue;
 
-			numberOfBoardReaders++;
-
 			try
 			{
 				if(boardReaderPair.second.getNode("daqMetricsLink").isDisconnected())

diff --git a/otsdaq/TablePlugins/ARTDAQDataLoggerTable_table.cc b/otsdaq/TablePlugins/ARTDAQDataLoggerTable_table.cc
@@ -89,7 +89,6 @@ unsigned int ARTDAQDataLoggerTable::slowControlsHandlerConfig(std::stringstream&
 	// loop through ARTDAQ DataLogger records starting at ARTDAQSupervisorTable
 	std::vector<std::pair<std::string, ConfigurationTree>> artdaqRecords = configManager->getNode("ARTDAQSupervisorTable").getChildren();
 
-	unsigned int numberOfDataLoggers                = 0;
 	unsigned int numberOfDataLoggerMetricParameters = 0;
 
 	for(auto& artdaqPair : artdaqRecords)  // start main artdaq record loop
@@ -105,8 +104,6 @@ unsigned int ARTDAQDataLoggerTable::slowControlsHandlerConfig(std::stringstream&
 			if(!dataLoggerPair.second.status())
 				continue;
 
-			numberOfDataLoggers++;
-
 			try
 			{
 				if(dataLoggerPair.second.getNode("daqLink").isDisconnected())

diff --git a/otsdaq/TablePlugins/ARTDAQDispatcherTable_table.cc b/otsdaq/TablePlugins/ARTDAQDispatcherTable_table.cc
@@ -76,7 +76,6 @@ unsigned int ARTDAQDispatcherTable::slowControlsHandlerConfig(std::stringstream&
 	// loop through ARTDAQ Dispatcher records starting at ARTDAQSupervisorTable
 	std::vector<std::pair<std::string, ConfigurationTree>> artdaqRecords = configManager->getNode("ARTDAQSupervisorTable").getChildren();
 
-	unsigned int numberOfDispatchers                = 0;
 	unsigned int numberOfDispatcherMetricParameters = 0;
 
 	for(auto& artdaqPair : artdaqRecords)  // start main artdaq record loop
@@ -92,8 +91,6 @@ unsigned int ARTDAQDispatcherTable::slowControlsHandlerConfig(std::stringstream&
 			if(!dispatcherPair.second.status())
 				continue;
 
-			numberOfDispatchers++;
-
 			try
 			{
 				if(dispatcherPair.second.getNode("daqLink").isDisconnected())

diff --git a/otsdaq/TablePlugins/ARTDAQEventBuilderTable_table.cc b/otsdaq/TablePlugins/ARTDAQEventBuilderTable_table.cc
@@ -76,7 +76,6 @@ unsigned int ARTDAQEventBuilderTable::slowControlsHandlerConfig(
 	// loop through ARTDAQ EventBuilder records starting at ARTDAQSupervisorTable
 	std::vector<std::pair<std::string, ConfigurationTree>> artdaqRecords = configManager->getNode("ARTDAQSupervisorTable").getChildren();
 
-	unsigned int numberOfEventBuilders               = 0;
 	unsigned int numberOfEventBuiderMetricParameters = 0;
 
 	for(auto& artdaqPair : artdaqRecords)  // start main artdaq record loop
@@ -92,8 +91,6 @@ unsigned int ARTDAQEventBuilderTable::slowControlsHandlerConfig(
 			if(!eventBuilderPair.second.status())
 				continue;
 
-			numberOfEventBuilders++;
-
 			try
 			{
 				if(eventBuilderPair.second.getNode("daqLink").isDisconnected())

diff --git a/otsdaq/TablePlugins/ARTDAQRoutingManagerTable_table.cc b/otsdaq/TablePlugins/ARTDAQRoutingManagerTable_table.cc
@@ -76,7 +76,6 @@ unsigned int ARTDAQRoutingManagerTable::slowControlsHandlerConfig(
 	// loop through ARTDAQ RoutingManager records starting at ARTDAQSupervisorTable
 	std::vector<std::pair<std::string, ConfigurationTree>> artdaqRecords = configManager->getNode("ARTDAQSupervisorTable").getChildren();
 
-	unsigned int numberOfRoutingManagers                = 0;
 	unsigned int numberOfRoutingManagerMetricParameters = 0;
 
 	for(auto& artdaqPair : artdaqRecords)  // start main artdaq record loop
@@ -92,8 +91,6 @@ unsigned int ARTDAQRoutingManagerTable::slowControlsHandlerConfig(
 			if(!routingManagerPair.second.status())
 				continue;
 
-			numberOfRoutingManagers++;
-
 			try
 			{
 				if(routingManagerPair.second.getNode("daqMetricsLink").isDisconnected())

diff --git a/otsdaq/TablePlugins/ARTDAQTableBase/ARTDAQTableBase.cc b/otsdaq/TablePlugins/ARTDAQTableBase/ARTDAQTableBase.cc
@@ -2142,9 +2142,7 @@ const ARTDAQTableBase::ARTDAQInfo& ARTDAQTableBase::getARTDAQSystem(
 						// check for alpha-based similarity groupings (ignore numbers and special characters)
 						unsigned int              maxScore = 0;
 						unsigned int              score;
-						unsigned int              numberAtMaxScore = 0;
 						unsigned int              minScore         = -1;
-						unsigned int              numberAtMinScore = 0;
 						std::vector<unsigned int> scoreVector;
 						scoreVector.push_back(-1);  // for 0 index (it's perfect)
 						for(unsigned int i = 1; i < multiNodeNames.size(); ++i)
@@ -2206,25 +2204,17 @@ const ARTDAQTableBase::ARTDAQInfo& ARTDAQTableBase::getARTDAQSystem(
 							if(score > maxScore)
 							{
 								maxScore         = score;
-								numberAtMaxScore = 1;
 							}
-							else if(score == maxScore)
-								++numberAtMaxScore;
 
 							if(score < minScore)
 							{
 								minScore         = score;
-								numberAtMinScore = 1;
 							}
-							else if(score == minScore)
-								++numberAtMinScore;
 
 						}  // end multi-node member scoring loop
 
 						//__COUTV__(minScore);
 						//__COUTV__(maxScore);
-						//__COUTV__(numberAtMaxScore);
-						//__COUTV__(numberAtMinScore);
 
 						__COUT__ << "Trimming multi-node members with low match score..." << __E__;
 

diff --git a/otsdaq/WebUsersUtilities/WebUsers.cc b/otsdaq/WebUsersUtilities/WebUsers.cc
@@ -417,7 +417,6 @@ void WebUsers::loadActiveSessions()
 	{
 		__COUT__ << "Extracting active sessions..." << __E__;
 	}
-	unsigned int i = 0;
 	while(fgets(line, LINELEN, fp))
 	{
 		if(strlen(line))
@@ -446,7 +445,6 @@ void WebUsers::loadActiveSessions()
 		fgets(line, LINELEN, fp);
 		sscanf(line, "%ld", &(ActiveSessions_.back().startTime_));
 
-		++i;
 	}
 
 	__COUT__ << "Active Sessions loaded with size " << ActiveSessions_.size() << __E__;

diff --git a/tools/otsdaq_fix_new_table_fields_tool.cc b/tools/otsdaq_fix_new_table_fields_tool.cc
@@ -265,7 +265,6 @@ void FixNewTableFields(int argc, char* argv[])
 
 	bool        errDetected      = false;
 	std::string accumulateErrors = "";
-	int         count            = 0;  // for number of groups converted successfully
 
 	std::map<std::string /*name*/, TableVersion>          memberMap;
 	std::map<std::string /*name*/, std::string /*alias*/> groupAliases;
@@ -466,7 +465,6 @@ void FixNewTableFields(int argc, char* argv[])
 		}
 		//=========================
 
-		++count;
 	}  // end group loop
 
 	// record in readme of moveToDir