Changed forChannel and forModule to better handle ranges.

.gitignore

@@ -1,6 +1,5 @@
 #Build files
 *.o
-build/
 
 #Backup files 
 *~
@@ -16,6 +15,8 @@ latex/
 tmp/
 doc/classdiagramRawEvent.svg
 ValgrindOut.xml
+doc/
+doxywarning.txt
 
 #Compressed Files
 *.bz2
@@ -24,8 +25,9 @@ ValgrindOut.xml
 
 #Ignore the build and exec directory
 build/
+*build-*/
 install/
-doc/
+
 
 #Ignore IDE files
 *.cbp
@@ -44,4 +46,4 @@ HIS
 LDF
 HIS/*
 LDF/*
-data
+data

Acquisition/CMakeLists.txt

@@ -0,0 +1,21 @@
+#Adds the install prefix for referencing in the source code
+add_definitions(-D INSTALL_PREFIX="\\"${CMAKE_INSTALL_PREFIX}\\"")
+
+#Build the pixie interface
+include_directories(Interface/include)
+add_subdirectory(Interface/source)
+
+#Build the MCA objects
+include_directories(MCA/include)
+add_subdirectory(MCA)
+
+#Build PxiDump
+add_subdirectory(PxiDump)
+
+#Build poll
+add_subdirectory(Poll)
+
+#Build the setup tools
+if (PAASS_BUILD_SETUP)
+    add_subdirectory(Setup)
+endif(PAASS_BUILD_SETUP)

Interface/include/PixieInterface.h → Acquisition/Interface/include/PixieInterface.h

@@ -91,6 +91,8 @@ class PixieInterface
 
 
   bool ReadConfigurationFile(const char *fn);
+  /// @brief Parses the input from configuration file for the ModuleType tag.
+  std::string ParseModuleTypeTag(std::string value);
   bool GetSlots(const char *slotF = NULL);
   // wrappers to the pixie-16 app functions
   bool Init(bool offlineMode = false);
@@ -119,7 +121,7 @@ class PixieInterface
   double GetLiveTime(int mod, int chan);
   double GetRealTime(int mod);
   double GetProcessedEvents(int mod);
-	bool GetModuleInfo(unsigned short mod, unsigned short *rev, unsigned int *serNum, unsigned short *adcBits, unsigned short *adcMsps); 
+	bool GetModuleInfo(const unsigned short &mod, unsigned short *rev, unsigned int *serNum, unsigned short *adcBits, unsigned short *adcMsps); 
   // # #
   bool StartHistogramRun(unsigned short mode = NEW_RUN);
   bool StartHistogramRun(unsigned short mod, unsigned short mode);
@@ -180,19 +182,17 @@ class PixieInterface
 #endif
 
   static std::set<std::string> validConfigKeys;
-  std::map<std::string, std::string> configStrings;
+  std::map<std::string, std::map<std::string, std::string>> configStrings;
 
   bool doneInit;
 
-  // convert a configuration string to be relative to pixieBaseDir unless it begins with a . 
-  std::string ConfigFileName(const std::string &str);
+  /// @brief Convert a configuration string to be relative to PixieBaseDir unless it begins with a . 
+  std::string ConfigFileName(const std::string &type, const std::string &str);
   // checks retval and outputs default OK/ERROR message
   bool CheckError(bool exitOnError = false) const;
 
   unsigned short numberCards;
   unsigned short slotMap[MAX_MODULES];
-  unsigned short firmwareConfig[MAX_MODULES];
-  bool hasAlternativeConfig;
 
   stats_t statistics;
 

Interface/include/PixieSupport.h → Acquisition/Interface/include/PixieSupport.h

@@ -28,60 +28,58 @@ class PixieFunction : public std::unary_function<bool, struct PixieFunctionParms
 };
 
 template<typename T>
-bool forChannel(PixieInterface *pif, int mod, int ch, PixieFunction<T> &f, T par){
+bool forChannel(PixieInterface *pif, int modStart, int modStop, int chStart, int chStop, PixieFunction<T> &f, T par){
 	PixieFunctionParms<T> parms(pif, par);
 
 	bool hadError = false;
 
-	if (mod < 0) {
-		for (parms.mod = 0; parms.mod < pif->GetNumberCards(); parms.mod++) {
-			if (ch < 0) {
-				for (parms.ch = 0; parms.ch < pif->GetNumberChannels(); parms.ch++) {
-					if (!f(parms)){ hadError = true; }
-				}
-			} 
-			else {
-				parms.ch = ch;
-				if (!f(parms))
-					hadError = true;
-			}
+	if (modStart < 0) {
+		modStart = 0;
+		modStop = pif->GetNumberCards() - 1;
+	}
+	if (chStart < 0) {
+		chStart = 0;
+		chStop = pif->GetNumberChannels() - 1;
+	}
+
+	for (parms.mod = modStart; parms.mod <= modStop; parms.mod++) {
+		for (parms.ch = chStart; parms.ch <= chStop; parms.ch++) {
+			if (!f(parms)){ hadError = true; }
 		}
 	} 
-	else {
-		parms.mod = mod;
-		if (ch < 0) {
-			for (parms.ch = 0; parms.ch < pif->GetNumberChannels(); parms.ch++) {
-				if (!f(parms)){ hadError = true; }
-			}
-		} 
-		else {
-			parms.ch = ch;
-			hadError = !f(parms);
-		}
-	}
 
 	return !hadError;
 }
 
 template<typename T>
-bool forModule(PixieInterface *pif, int mod, PixieFunction<T> &f, T par)
+bool forChannel(PixieInterface *pif, int mod, int ch, PixieFunction<T> &f, T par){
+	return forChannel(pif, mod, mod, ch, ch, f, par);
+}
+
+template<typename T>
+bool forModule(PixieInterface *pif, int modStart, int modStop, PixieFunction<T> &f, T par)
 {
 	PixieFunctionParms<T> parms(pif, par);
 	bool hadError = false;
 
-	if (mod < 0) {
-		for (parms.mod = 0; parms.mod < pif->GetNumberCards(); parms.mod++) {
-			if (!f(parms)){ hadError = true; }
-		}
-	} 
-	else {
-		parms.mod = mod;
-		hadError = !f(parms);
+	if (modStart < 0) {
+		modStart = 0;
+		modStop = pif->GetNumberCards() -1;
+	}
+	for (parms.mod = modStart; parms.mod <= modStop; parms.mod++) {
+		if (!f(parms)){ hadError = true; }
 	}
 
 	return !hadError;
 }
 
+template<typename T>
+bool forModule(PixieInterface *pif, int mod, PixieFunction<T> &f, T par)
+{
+	return forModule(pif, mod, mod, f, par);
+}
+
+
 std::string PadStr(const std::string &input_, int width_);
 
 template<typename T>

Interface/source/CMakeLists.txt → Acquisition/Interface/source/CMakeLists.txt

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