Moved ReadScaler to align better with statsHandler.

The scalers are now read out when the statsHandler indicates it has
surpassed the statsInterval. This should bring the values between OCR
and parsing rate into closer agreement. It also reduces some of the code
complexity.

Author: Karl Smith

Poll/include/poll2_core.h

@@ -137,7 +137,6 @@ class Poll{
 	StatsHandler *statsHandler;
 	static const int statsInterval_ = 3; ///<The amount time between scaler reads in seconds.
 
-
 	const static std::vector<std::string> runControlCommands_;
 	const static std::vector<std::string> paramControlCommands_;
 	const static std::vector<std::string> pollStatusCommands_; 
@@ -234,9 +233,6 @@ class Poll{
 
 	void SetThreshWords(const size_t &thresh_){ threshWords = thresh_; }
 
-	/// Set the external poll stats handler
-	void SetStatsHandler(StatsHandler *handler){ statsHandler = handler; }
-
 	///Set the terminal pointer.
 	void SetTerminal(Terminal *term){ poll_term_ = term; };
 

Poll/include/poll2_stats.h

@@ -15,7 +15,10 @@ class StatsHandler{
 
     void AddEvent(unsigned int mod, unsigned int ch, size_t size, int delta_=1);
 
-    void AddTime(double dtime);
+    bool AddTime(double dtime);
+
+	///Set the amount of time between scalers dumps in seconds.
+	void SetDumpInterval(double interval) {dumpTime = interval;};
 
     double GetDataRate(size_t mod);
 

Poll/source/poll2.cpp

@@ -17,7 +17,6 @@
 
 #include "poll2_core.h"
 #include "Display.h"
-#include "StatsHandler.hpp"
 #include "CTerminal.h"
 
 /* Print help dialogue for command line options. */
@@ -141,8 +140,6 @@ int main(int argc, char *argv[]){
 	if(poll.GetPacmanMode()){ std::cout << "Using pacman mode!\n"; }
 	std::cout << std::endl;
 
-  	StatsHandler handler(poll.GetNcards());
-  	poll.SetStatsHandler(&handler);
 	poll.SetTerminal(&poll_term);
 
 	if(poll.GetSendAlarm()){

Poll/source/poll2_core.cpp

@@ -134,8 +134,6 @@ Poll::Poll(){
 	udp_sequence = 0; 
 	total_spill_chunks = 0; 
 
-	statsHandler = NULL;
-	
 	client = new Client();
 }
 
@@ -200,6 +198,9 @@ bool Poll::Initialize(){
 		commands_.insert(commands_.begin(), runControlCommands_.begin(), runControlCommands_.end());
 	}
 
+	statsHandler = new StatsHandler(n_cards);
+	statsHandler->SetDumpInterval(statsInterval_);
+	
 	return init = true;
 }
 
@@ -1292,7 +1293,6 @@ void Poll::RunControl(){
 		}
 
 		if(acq_running){
-			ReadScalers();
 			ReadFIFO();
 
 			//Handle a stop signal
@@ -1386,11 +1386,6 @@ void Poll::RunControl(){
 }
 
 void Poll::ReadScalers() {
-	//Check if enough time has passed since last scaler read.
-	static long long previousReadTime = 0;
-	//The stats interval has not passed so we return without doing anything.
-	if (statsHandler->GetTotalTime() < previousReadTime + statsInterval_) return;
-
 	static std::vector< std::pair<double, double> > xiaRates(16, std::make_pair<double, double>(0,0));
 	static int numChPerMod = pif->GetNumberChannels();
 
@@ -1568,17 +1563,24 @@ bool Poll::ReadFIFO() {
 			dataWords += nWords[mod];
 		} //End loop over modules for reading FIFO
 
+		//Get the length of the spill
+		double spillTime = usGetTime(startTime);
+		double durSpill = spillTime - lastSpillTime;
+		lastSpillTime = spillTime;
+
+		// Add time to the statsHandler and check if interval has been exceeded.
+		//If exceed interval we read the scalers from the modules and dump the stats.
+		if (statsHandler->AddTime(durSpill * 1e-6)) {
+			ReadScalers();
+			statsHandler->Dump();
+			statsHandler->ClearRates();
+		}
+
 		if (!is_quiet) std::cout << "Writing/Broadcasting " << dataWords << " words.\n";
 		//We have read the FIFO now we write the data	
 		if (record_data && !pac_mode) write_data(fifoData, dataWords); 
 		broadcast_data(fifoData, dataWords);
 
-		//Get the length of the spill
-		double spillTime = usGetTime(startTime);
-		double durSpill = spillTime - lastSpillTime;
-		lastSpillTime = spillTime;
-		// Add time to the statsHandler (for monitor.bash)
-		if(statsHandler){ statsHandler->AddTime(durSpill * 1e-6); }
 	} //If we had exceeded the threshold or forced a flush
 
 	return true;

Poll/source/poll2_stats.cpp

@@ -92,20 +92,15 @@ void StatsHandler::AddEvent(unsigned int mod, unsigned int ch, size_t size, int
 	dataTotal[mod] += size;
 }
 
-void StatsHandler::AddTime(double dtime) {
+/**
+ *	\return Returns true if the dump interval is exceeded.
+ */
+bool StatsHandler::AddTime(double dtime) {
 	timeElapsed += dtime;
 	totalTime   += dtime;
+
+	return (timeElapsed >= dumpTime);
 
-	if (timeElapsed >= dumpTime) {
-		Dump();
-		timeElapsed = 0;
-		for(size_t i = 0; i < numCards; i++){
-			for(size_t j = 0; j < NUM_CHAN_PER_MOD; j++){
-				nEventsDelta[i][j] = 0;
-			}
-			dataDelta[i] = 0;
-		}
-	}
 }
 
 void StatsHandler::Dump(void){