Merge branch 'dev' into prange

Author: ksmith0

Acquisition/CMakeLists.txt

@@ -16,6 +16,6 @@ add_subdirectory(PxiDump)
 add_subdirectory(Poll)
 
 #Build the setup tools
-if (BUILD_SETUP)
+if (PAASS_BUILD_SETUP)
     add_subdirectory(Setup)
-endif()
+endif(PAASS_BUILD_SETUP)

Acquisition/Interface/source/CMakeLists.txt

@@ -2,8 +2,8 @@ set(Interface_SOURCES PixieInterface.cpp Lock.cpp)
 
 add_library(PixieInterface STATIC ${Interface_SOURCES})
 
-#Order is important, PXI before PLX
-target_link_libraries(PixieInterface PaassCoreStatic ${PXI_LIBRARIES}
+#Order is important, XIA before PLX
+target_link_libraries(PixieInterface PaassCoreStatic ${XIA_LIBRARIES}
         ${PLX_LIBRARIES})
 
 set(Support_SOURCES PixieSupport.cpp)

Acquisition/MCA/source/CMakeLists.txt

@@ -1,21 +1,23 @@
 #Determine the sources based on use flags
 set (MCA_LIB_SOURCES MCA.cpp)
-if (${USE_ROOT}) 
+
+if (PAASS_USE_ROOT)
 	set (MCA_LIB_SOURCES ${MCA_LIB_SOURCES} MCA_ROOT.cpp)
-endif()
-if (${USE_DAMM}) 
+endif(PAASS_USE_ROOT)
+
+if (PAASS_USE_DAMM)
 	set (MCA_LIB_SOURCES ${MCA_LIB_SOURCES} MCA_DAMM.cpp HisDrr.cpp)
-endif()
+endif(PAASS_USE_DAMM)
 
 #build the MCA library
 add_library(MCA_LIBRARY STATIC ${MCA_LIB_SOURCES})
 target_link_libraries(MCA_LIBRARY PixieInterface Utility)
-if (${USE_ROOT}) 
+if (PAASS_USE_ROOT)
 	target_link_libraries(MCA_LIBRARY ${ROOT_LIBRARIES})
-endif()
+endif(PAASS_USE_ROOT)
 
 #If we can we build the MCA program
-if (${USE_DAMM} OR ${USE_ROOT})
+if (PAASS_USE_DAMM OR PAASS_USE_ROOT)
 	add_executable(MCA MCA_exec.cpp)
 	target_link_libraries(MCA MCA_LIBRARY)
 	install(TARGETS MCA DESTINATION bin)

Acquisition/Poll/include/poll2_core.h

@@ -187,6 +187,9 @@ class Poll{
 	/// Print help dialogue for reading/writing pixie module parameters.
 	void pmod_help();
 
+	/// Print help dialogue for writing pixie DSP parameters.
+	void save_help();
+
 	/// Start a data recording run.
 	bool start_run(const bool &record_=true, const double &time_=-1.0);
 

Acquisition/Poll/source/CMakeLists.txt

@@ -1,11 +1,11 @@
-if(USE_NCURSES) 
+if(PAASS_USE_NCURSES)
 	set(POLL2_SOURCES poll2.cpp poll2_core.cpp poll2_stats.cpp)
 	add_executable(poll2 ${POLL2_SOURCES})
 	target_link_libraries(poll2 PixieInterface PixieSupport Utility MCA_LIBRARY ${CMAKE_THREAD_LIBS_INIT})
 	install(TARGETS poll2 DESTINATION bin)
 else()
 	message(WARNING "Cannot build poll2 without ncurses!")
-endif()
+endif(PAASS_USE_NCURSES)
 
 set(LISTENER_SOURCES listener.cpp)
 add_executable(listener ${LISTENER_SOURCES})

Acquisition/Poll/source/monitor.cpp

@@ -214,7 +214,17 @@ int main(){
 				      << std::setfill('-') << "";
 			}
 			std::cout << "|\n";
+
+			std::cout << "   | ";
+			for(unsigned int j = 0; j < (unsigned int)num_modules; j++){
 
+				std::cout << "ICR  ";
+				std::cout << " OCR ";
+				std::cout << " Data ";
+				std::cout << "  Total | ";
+			}
+			std::cout << "\n";			
+	
 			for(unsigned int i = 0; i < 16; i++){
 			    std::cout << "C" << std::setw(2) << std:: setfill('0') << i << "|";
 			    for(unsigned int j = 0; j < (unsigned int)num_modules; j++){

Acquisition/Poll/source/poll2_core.cpp

@@ -8,11 +8,11 @@
   * CTerminal. Pixie16 data acquisition is handled by interfacing
   * with the PixieInterface library.
   *
-  * \author Cory R. Thornsberry
+  * \author Karl Smith, Robert Grzywacz, David Miller, and Cory R. Thornsberry
   * 
-  * \date Oct. 6th, 2015
+  * \date Apr. 25th, 2017
   * 
-  * \version 1.3.10
+  * \version 1.3.11
 */
 
 #include <algorithm>
@@ -51,8 +51,8 @@
 // Adjusted to help alleviate the issue with data corruption
 #define POLL_TRIES 100
 
-// 4 GB. Maximum allowable .ldf file size in bytes
-#define MAX_FILE_SIZE 4294967296ll
+// 2 GB. Maximum allowable .ldf file size in bytes
+#define MAX_FILE_SIZE 2147483648ll
 
 // Length of shm packet header (in bytes)
 #define PKT_HEAD_LEN 8
@@ -90,7 +90,7 @@ const std::vector<std::string> Poll::runControlCommands_ ({"run", "stop",
 
 const std::vector<std::string> Poll::paramControlCommands_ ({"dump", "pread", 
 	"pmread", "pwrite", "pmwrite", "adjust_offsets", "find_tau", "toggle", 
-	"toggle_bit", "csr_test", "bit_test", "get_traces"});
+	"toggle_bit", "csr_test", "bit_test", "get_traces", "save"});
 
 const std::vector<std::string> Poll::pollStatusCommands_ ({"status", "thresh", 
 	"debug", "quiet", "quit", "help", "version"});
@@ -466,6 +466,7 @@ int Poll::write_data(word_t *data, unsigned int nWords){
 	}
 
 	// Handle the writing of buffers to the file
+	//65552 = 8194 * 4 * 2 , 2 EOF buffers are need 8194 words at 4 bytes per word
 	std::streampos current_filesize = output_file.GetFilesize();
 	if(current_filesize + (std::streampos)(4*nWords + 65552) > MAX_FILE_SIZE){
 		// Adding nWords plus 2 EOF buffers to the file will push it over MAX_FILE_SIZE.
@@ -657,6 +658,7 @@ void Poll::help(){
 	std::cout << "   toggle_bit <mod> <chan> <param> <bit> - Toggle any bit of any parameter of 32 bits or less\n";
 	std::cout << "   csr_test <number>                     - Output the CSRA parameters for a given integer\n";
 	std::cout << "   bit_test <num_bits> <number>          - Display active bits in a given integer up to 32 bits long\n";
+	std::cout << "   save [setFilename]                    - Writes the DSP Parameters to [setFileName] (default='active .set from pixie_cfg')\n";
 	std::cout << "   get_traces <mod> <chan> [threshold]   - Get traces for all channels in a specified module\n";
 	std::cout << "   status              - Display system status information\n";
 	std::cout << "   thresh [threshold]  - Modify or display the current polling threshold.\n";
@@ -667,6 +669,11 @@ void Poll::help(){
 	std::cout << "   version (v)         - Display Poll2 version information\n";
 }
 
+void Poll::save_help() {
+	std::cout << "  Saves the DSP parameters to disk. Optionally, a file can be"
+		"provided, otherwise the file set file from pixie.cfg is used.\n";
+}
+
 /* Print help dialogue for reading/writing pixie channel parameters. */
 void Poll::pchan_help(){
 	std::cout << "  Valid Pixie16 channel parameters:\n";
@@ -1092,11 +1099,10 @@ void Poll::CommandControl(){
 					}
 
 					ParameterChannelWriter writer;
-					bool error = false;
+					
 					if(forChannel(pif, modStart, modStop, chStart, chStop, writer, make_pair(arguments.at(2), value))){ 
-						error = true;
-					}
-					if (!error) pif->SaveDSPParameters();
+            pif->SaveDSPParameters();
+          }
 				}
 				else{
 					std::cout << sys_message_head << "Invalid number of parameters to pwrite\n";
@@ -1141,6 +1147,27 @@ void Poll::CommandControl(){
 				}
 			}
 		}
+		else if (cmd == "save") {
+			if(acq_running || do_MCA_run){
+				std::cout << sys_message_head << "Warning! Cannot view pixie parameters while acquisition is running\n\n";
+				continue;
+			}
+			if(p_args > 0 && arguments.at(0) == "help"){
+				save_help();
+				continue;
+			}
+			if(p_args == 0) {
+				pif->SaveDSPParameters();
+			}
+			else if (p_args == 1) {
+				pif->SaveDSPParameters(arguments.at(0).c_str());
+			}
+			else {
+				std::cout << sys_message_head << "Invalid number of parameters to save\n";
+				std::cout << sys_message_head << " -SYNTAX- save [setFilename]\n";
+				continue;
+			}
+		}
 		else if(cmd == "pread" || cmd == "pmread"){ // Read pixie parameters
 			if(acq_running || do_MCA_run){ 
 				std::cout << sys_message_head << "Warning! Cannot view pixie parameters while acquisition is running\n\n"; 

Acquisition/PxiDump/source/CMakeLists.txt

@@ -4,9 +4,9 @@ add_executable(set2ascii ${SET2ROOT_SOURCES})
 target_link_libraries(set2ascii)
 install(TARGETS set2ascii DESTINATION bin)
 
-if(USE_ROOT)
+if(PAASS_USE_ROOT)
 	add_executable(set2root ${SET2ROOT_SOURCES})
 	set_target_properties(set2root PROPERTIES COMPILE_FLAGS "-DUSE_ROOT_OUTPUT")
 	target_link_libraries(set2root ${ROOT_LIBRARIES})
 	install(TARGETS set2root DESTINATION bin)
-endif()
+endif(PAASS_USE_ROOT)

Acquisition/Setup/source/CMakeLists.txt

@@ -10,9 +10,9 @@ endforeach(UTIL)
 
 install(TARGETS ${SETUP_UTILS} DESTINATION bin)
 
-if(${USE_ROOT})
+if(PAASS_USE_ROOT)
 	add_executable(paramScan paramScan.cpp)
 	target_link_libraries(paramScan PixieInterface MCA_LIBRARY ${ROOT_LIBRARIES}
 		"-lSpectrum")
 	install(TARGETS paramScan DESTINATION bin)
-endif()
+endif(PAASS_USE_ROOT)

Analysis/CMakeLists.txt

@@ -1,18 +1,20 @@
-option(USE_HRIBF "Use HRIBF library for scan base." OFF)
-option(USE_GSL "Use GSL for Pulse Fitting" OFF)
+option(PAASS_USE_HRIBF "Use HRIBF library for scan base." OFF)
+CMAKE_DEPENDENT_OPTION(PAASS_USE_GSL "Compile with GSL" ON
+        "PAASS_BUILD_UTKSCAN" OFF)
+mark_as_advanced(PAASS_USE_GSL)
 
 #Check if GSL is installed
-if(USE_GSL)
+if(PAASS_USE_GSL)
    find_package(GSL REQUIRED)
    add_definitions("-D usegsl")
-endif(USE_GSL)
+endif(PAASS_USE_GSL)
 
 #Everything below is dependent on these two sets of libaries so we include the
 #headers.
 include_directories(Resources/include)
 include_directories(ScanLibraries/include)
 
-if(USE_HRIBF)
+if(PAASS_USE_HRIBF)
    #Find HRIBF Libraries
    find_package(HRIBF REQUIRED)
    add_definitions("-D USE_HRIBF")
@@ -21,7 +23,7 @@ if(USE_HRIBF)
 	#	for the following code.
    include_directories(Scanor/include)
    add_subdirectory(Scanor)
-endif(USE_HRIBF)
+endif(PAASS_USE_HRIBF)
 
 #We will always build these two since they include static lib for the rest
 add_subdirectory(ScanLibraries)
@@ -30,6 +32,6 @@ add_subdirectory(Resources)
 #Build utilities.
 add_subdirectory(Utilities)
 
-if(BUILD_UTKSCAN)
+if(PAASS_BUILD_UTKSCAN)
     add_subdirectory(Utkscan)
-endif(BUILD_UTKSCAN)
+endif(PAASS_BUILD_UTKSCAN)