Channged forChannel and forModule to better handle ranges.

The ranges specifed with a colon are now passed to dedicated functions.
This resolves a sorting issue and reduces code bloat.

Author: Karl Smith

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>

Acquisition/Poll/source/poll2_core.cpp

@@ -1093,12 +1093,8 @@ void Poll::CommandControl(){
 
 					ParameterChannelWriter writer;
 					bool error = false;
-					for (int mod = modStart; mod <= modStop; mod++) {
-						for (int ch = chStart; ch <= chStop; ch++) {
-							if(forChannel(pif, mod, ch, writer, make_pair(arguments.at(2), value))){ 
-								error = true;
-							}
-						}
+					if(forChannel(pif, modStart, modStop, chStart, chStop, writer, make_pair(arguments.at(2), value))){ 
+						error = true;
 					}
 					if (!error) pif->SaveDSPParameters();
 				}
@@ -1135,13 +1131,9 @@ void Poll::CommandControl(){
 					}
 
 					ParameterModuleWriter writer;
-					bool error = false;
-					for (int mod = modStart; mod <= modStop; mod++) {
-						if(!forModule(pif, mod, writer, make_pair(arguments.at(1), value))){
-							error = true;
-						}
+					if(!forModule(pif, modStart, modStop, writer, make_pair(arguments.at(1), value))){
+						pif->SaveDSPParameters();
 					}
-					if (!error) pif->SaveDSPParameters();
 				}
 				else{
 					std::cout << sys_message_head << "Invalid number of parameters to pmwrite\n";
@@ -1170,11 +1162,7 @@ void Poll::CommandControl(){
 					}
 
 					ParameterChannelReader reader;
-					for (int mod = modStart; mod <= modStop; mod++) { 
-						for (int ch = chStart; ch <= chStop; ch++) { 
-							forChannel(pif, mod, ch, reader, arguments.at(2));
-						}
-					}
+					forChannel(pif, modStart, modStop, chStart, chStop, reader, arguments.at(2));
 				}
 				else{
 					std::cout << sys_message_head << "Invalid number of parameters to pread\n";
@@ -1191,9 +1179,7 @@ void Poll::CommandControl(){
 					}
 
 					ParameterModuleReader reader;
-					for (int mod = modStart; mod <= modStop; mod++) {
-						forModule(pif, mod, reader, arguments.at(1));
-					}
+					forModule(pif, modStart, modStop, reader, arguments.at(1));
 				}
 				else{
 					std::cout << sys_message_head << "Invalid number of parameters to pmread\n";
@@ -1215,11 +1201,9 @@ void Poll::CommandControl(){
 				}
 
 				OffsetAdjuster adjuster;
-				bool error = false;
-				for (int mod = modStart; mod <= modStop; mod++) {
-					if(!forModule(pif, mod, adjuster, 0)){ error = true; }
+				if(!forModule(pif, modStart, modStop, adjuster, 0)) { 
+					pif->SaveDSPParameters();
 				}
-				if (!error) pif->SaveDSPParameters();
 			}
 			else{
 				std::cout << sys_message_head << "Invalid number of parameters to adjust_offsets\n";
@@ -1269,12 +1253,8 @@ void Poll::CommandControl(){
 
 				std::string dum_str = "CHANNEL_CSRA";
 				bool error = false;
-				for (int mod = modStart; mod <= modStop; mod++) {
-					for (int ch = chStart; ch <= chStop; ch++) {
-						if(!forChannel(pif, mod, ch, flipper, dum_str)){
-							error = true;
-						}
-					}
+				if(!forChannel(pif, modStart, modStop, chStart, chStop, flipper, dum_str)){
+					error = true;
 				}
 				if (!error) pif->SaveDSPParameters();
 			}