Adding a default configuration to tracking and installation

Author: spaulaus

CMakeLists.txt

@@ -89,6 +89,7 @@ if (NOT ${CORE_ONLY})
 	link_directories(${PXI_LIBRARY_DIR})
 	#The following configuration file path is hardcoded into the PXI software :-(
 	install(FILES ${PXI_ROOT_DIR}/test/pxisys.ini DESTINATION ${CMAKE_INSTALL_PREFIX})
+        install(FILES Setup/source/pixie.cfg DESTINATION ${CMAKE_INSTALL_PREFIX})
 endif()
 
 add_subdirectory(Core)

README.md

@@ -35,6 +35,14 @@ is `PixieSuite2/exec`
 
 *You should ensure that the PLX version and PXI firmware versions are compatable!*
 
+###Options for CMAKE Compilation
+* -DCMAKE\_INSTALL\_PREFIX (default PixieSuite2/exec)
+* -DUSE_ROOT (default ON)
+* -DUSE_DAMM (default ON)
+* -DUSE_SETUP (default OFF)
+* -DUSE_NCURSES (default ON; required for poll2)
+* -DCORE_ONLY (default OFF)
+
 ##Tested Systems
 The softare has been compiled and tested on the following Setups
 

Setup/source/CMakeLists.txt

@@ -1,9 +1,4 @@
-#Build and installs etup utilities.
-#set(SETUP_UTILS adjust_offsets find_tau copy_params pread pwrite pmread pmwrite
-#	rate boot trace get_traces csr_test toggle_gain toggle_good toggle_polarity
-#	toggle_trace toggle_pileup toggle_catcher set_standard set_pileups_only 
-#	set_pileups_reject set_hybrid)
-
+#Build and install setup utilities, and configuration file
 set(SETUP_UTILS adjust_offsets find_tau copy_params pread pwrite pmread pmwrite
 	rate boot trace get_traces csr_test toggle set_standard set_pileups_only 
 	set_pileups_reject set_hybrid)
@@ -15,7 +10,6 @@ endforeach(UTIL)
 
 install(TARGETS ${SETUP_UTILS} DESTINATION ${CMAKE_INSTALL_PREFIX})
 
-
 if(${USE_ROOT})
 	add_executable(paramScan paramScan.cpp)
 	target_link_libraries(paramScan PixieInterface MCA_LIBRARY ${ROOT_LIBRARIES}

Setup/source/pixie.cfg

@@ -0,0 +1,8 @@
+PixieBaseDir      /opt/xia/current
+SpFpgaFile        firmware/fippixie16_revfvandle_r23016.bin
+ComFpgaFile       firmware/syspixie16_revfvandle_r23047.bin
+DspConfFile       dsp/Pixie16DSP_revfvandle_r23011.ldr
+DspVarFile        dsp/Pixie16DSP_revfvandle_r23011.var
+DspSetFile        configuration/default.set
+DspWorkingSetFile configuration/default.set
+SlotFile          configuration/slot_def.set