MCA run time is now correct

Performing an MCA run no longer locks up poll2's
RunControl thread. Added a ::Step method to MCA
class which allows doing an MCA run from a loop
which is external to the MCA class.

The MCA time for a run is now correct. MCA now keeps
track of the time for a MCA run using time_t instead
of usGetDTime. The start time is reset for each run
and now starts from zero each time it is run.

Author: cthornsb

MCA/include/MCA.h

@@ -1,13 +1,19 @@
 #ifndef MCA_H
 #define MCA_H
 
+#include <ctime>
+
 #include "PixieSupport.h"
 
 class PixieInterface;
 
 ///Abstract MCA class
 class MCA {
 	protected:
+		/// Timers for the MCA object
+		time_t start_time;
+		time_t stop_time;
+	
 		///Default number of bins in histogram.
 		static const size_t HIS_SIZE = 16384;
 		///Default number of channels in ADC.
@@ -19,9 +25,11 @@ class MCA {
 		PixieInterface *_pif;
 	public:
 		///Default constructor.
-		MCA(PixieInterface *pif) : _pif(pif) {};
+		MCA(PixieInterface *pif);
 		///Default destructor.
 		virtual ~MCA() {};
+		///Return the length of time the MCA has been running.
+		double GetRunTime();
 		///Abstract method describing how the MCA data is stored.
 		virtual bool StoreData(int mod, int ch) = 0;
 		///Abstract method to open a storage file.
@@ -32,6 +40,8 @@ class MCA {
 		virtual bool IsOpen() {return _isOpen;};
 		///Start the MCA running.
 		virtual void Run(float duration, bool *stop=NULL);
+		///Update the MCA histograms.
+		virtual bool Step();
 };
 
 #endif 

MCA/source/MCA.cpp

@@ -8,6 +8,17 @@
 #include "Display.h"
 #include "Utility.h"
 
+///Default constructor
+MCA::MCA(PixieInterface *pif) : _pif(pif){
+	time(&start_time);
+}
+
+///Return the length of time the MCA has been running.
+double MCA::GetRunTime(){ 
+	time(&stop_time);
+	return difftime(stop_time, start_time); 
+}
+
 /**The MCA is initialized and run for the specified duration or until a
  * stop command is received. At specific intervals the MCA output is
  * updated via MCA::StoreData(). Will continue until external bool (stop)
@@ -20,17 +31,17 @@ void MCA::Run(float duration, bool *stop) {
 	//Start the pixie histogram
 	_pif->StartHistogramRun();
 
-	float runTime = 0;
+	time(&start_time);
 
 	//Loop until we reach the run duration or a stop is received.
 	while (true) {
 		if(stop != NULL && *stop){ break; }
-		else if(duration > 0.0 && (runTime >= duration)){ break; } // Adds support for infinite MCA runs
+		else if(duration > 0.0 && (difftime(stop_time, start_time) >= duration)){ break; } // Adds support for infinite MCA runs
 
 		sleep(2);
+		
 		//Update run time
-		runTime += usGetDTime() / 1.0e6;
-		std::cout << "|" << std::fixed << std::setprecision(2) << runTime  << " s |\r" << std::flush; 
+		std::cout << "|" << std::fixed << std::setprecision(2) << GetRunTime()  << " s |\r" << std::flush; 
 
 		//Check if run is still ok
 		if (!_pif->CheckRunStatus()) {
@@ -44,23 +55,43 @@ void MCA::Run(float duration, bool *stop) {
 				StoreData(mod, ch);
 			}
 		}
+		
 		//Flush the data to disk.
 		Flush();
+		
+		//Update the timer.
+		time(&stop_time);
 	}
 
 	//End the run
 	_pif->EndRun();
 
 	//Display run completion information.
-	runTime += usGetDTime() / 1.0e6;
 	std::cout << std::endl;
 	Display::LeaderPrint("Run finished");
 	std::cout << Display::OkayStr() << std::endl;
 	Display::LeaderPrint("Total running time:");
-	std::cout << std::fixed << std::setprecision(2) << runTime << " s" << std::endl; 
+	std::cout << std::fixed << std::setprecision(2) << GetRunTime() << " s" << std::endl; 
 
 	//Uset cout flags
 	std::cout.unsetf(std::ios_base::floatfield);
 	std::cout.precision(6);
+}
+
+bool MCA::Step(){
+	if(!_pif || !_pif->CheckRunStatus()){ return false; }
 
+	//Store the MCA data via the inherited method StoreData()
+	for (int mod = 0; mod < _pif->GetNumberCards(); mod++) {
+		for (unsigned int ch = 0; ch < _pif->GetNumberChannels(); ch++) {
+			StoreData(mod, ch);
+		}
+	}
+	
+	//Flush the data to disk.
+	Flush();
+	
+	time(&stop_time);
+	
+	return true;
 }

MCA/source/MCA_DAMM.cpp

@@ -26,7 +26,7 @@ bool MCA_DAMM::OpenFile(const char* basename) {
 	_histogram = new HisDrr(drr, his, input);
 	cout << Display::OkayStr() << endl;
 
-	return true;
+	return (_isOpen = true);
 }
 
 bool MCA_DAMM::StoreData(int mod, int ch) {

Poll/include/poll2_core.h

@@ -33,15 +33,49 @@
 typedef PixieInterface::word_t word_t;
 typedef word_t eventdata_t[maxEventSize];
 
-struct MCA_args{
+class MCA;
+
+class MCA_args{
+  private:
+	bool running;
 	bool useRoot;
 	int totalTime;
 	std::string basename;
 
+	MCA *mca;
+
+  public:	
 	MCA_args();
+	
 	MCA_args(bool useRoot_, int totalTime_, std::string basename_);
 
+	~MCA_args();
+	
+	bool IsRunning(){ return running; }
+	
+	bool UseRoot(){ return useRoot; }
+	
+	int GetTotalTime(){ return totalTime; }
+	
+	std::string GetBasename(){ return basename; }
+	
+	MCA *GetMCA(){ return mca; }
+	
+	void SetUseRoot(bool state_=true){ useRoot = state_; }
+	
+	void SetTotalTime(int totalTime_){ totalTime = totalTime_; }
+	
+	void SetBasename(std::string basename_){ basename = basename_; }
+
+	bool Initialize(PixieInterface *pif_);
+	
+	bool Step();
+	
+	bool CheckTime();
+	
 	void Zero();
+	
+	void Close(PixieInterface *pif_);
 };
 
 struct UDP_Packet {

Poll/source/poll2.cpp

@@ -166,6 +166,9 @@ int main(int argc, char *argv[]){
 	// Close the output file, if one is open
 	poll.Close();
 
+	// Close the terminal.
+	poll_term.Close();
+
 	//Reprint the leader as the carriage was returned
 	Display::LeaderPrint(std::string("Running poll2 v").append(POLL2_CORE_VERSION));
 	std::cout << Display::OkayStr("[Done]") << std::endl;