From: hades <hades>
Date: Sun, 10 Sep 2000 10:11:46 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=340d15d3ab472957d30abdaee4f161afa11f9456;p=daqdata.git

*** empty log message ***
---

diff --git a/allParam/README b/allParam/README
index 0038c71..9153c1d 100644
--- a/allParam/README
+++ b/allParam/README
@@ -2,7 +2,7 @@ Author:  Benjamin Sailer
          TUM/E12
          Benjamin.Sailer@ph.tum.de
 Version: 0.1
-Date:    2000-09-09
+Date:    2000-09-10
 
 Param libraries
 ===============
diff --git a/allParam/test/test1.c b/allParam/test/test1.c
index 8b0360f..b1600f9 100644
--- a/allParam/test/test1.c
+++ b/allParam/test/test1.c
@@ -6,8 +6,8 @@
 #include "test1.h"
 
 int test1(const char *testid, const Param *param) {
-	char *name = "crate_id";
-	char *idx = "herakles";
+	char *name = "tname";
+	char *idx = "tstring";
 	char result[PARAM_MAX_VALUE_LEN];
 	int rows;
 	int retVal;
@@ -16,7 +16,7 @@ int test1(const char *testid, const Param *param) {
 	printf("%s : Param_getString: Lowercase input on correct statements.\n", testid);
 
 	retVal = Param_getString(param, name, idx, &rows, result);
-	if ((rows == 1) && result && (strcmp(result, "test0") == 0) && (retVal == 0)) {
+	if ((rows == 1) && result && (strcmp(result, "test100") == 0) && (retVal == 0)) {
 		myRetVal = 0;
 		printf("%s : Passed.\n", testid);
 	} else {
diff --git a/allParam/test/test10.c b/allParam/test/test10.c
index 1da27cd..ee67044 100644
--- a/allParam/test/test10.c
+++ b/allParam/test/test10.c
@@ -6,7 +6,7 @@
 #include "test10.h"
 
 int test10(const char *testid, const Param *param) {
-	char *name = "race0";
+	char *name = "tname";
 	char *idx = "bla";
 	unsigned long int result;
 	int rows;
diff --git a/allParam/test/test11.c b/allParam/test/test11.c
index d8d780b..ba8ec23 100644
--- a/allParam/test/test11.c
+++ b/allParam/test/test11.c
@@ -6,8 +6,8 @@
 #include "test11.h"
 
 int test11(const char *testid, const Param *param) {
-	char *name = "race0";
-	char *idx = "se_id";
+	char *name = "tname";
+	char *idx = "tint";
 	char result[PARAM_MAX_VALUE_LEN];
 	int rows;
 	int retVal;
diff --git a/allParam/test/test12.c b/allParam/test/test12.c
index b998a6d..75b2b6a 100644
--- a/allParam/test/test12.c
+++ b/allParam/test/test12.c
@@ -6,8 +6,8 @@
 #include "test12.h"
 
 int test12(const char *testid, const Param *param) {
-	char *name = "crate_id";
-	char *idx = "herakles";
+	char *name = "tname";
+	char *idx = "tstring";
 	unsigned long int result;
 	int rows;
 	int retVal;
diff --git a/allParam/test/test13.c b/allParam/test/test13.c
index 8339126..508b8bf 100644
--- a/allParam/test/test13.c
+++ b/allParam/test/test13.c
@@ -7,8 +7,8 @@
 #include "test13.h"
 
 int test13(const char *testid, const Param *param) {
-	char *name = "race0";
-	char *idx = "blub";
+	char *name = "tname";
+	char *idx = "bla";
 	char *result[NUM1];
 	int rows;
 	int retVal;
diff --git a/allParam/test/test14.c b/allParam/test/test14.c
index 704bdcd..9469d43 100644
--- a/allParam/test/test14.c
+++ b/allParam/test/test14.c
@@ -6,8 +6,8 @@
 #include "test14.h"
 
 int test14(const char *testid, const Param *param) {
-	char *name = "tof_tdc0";
-	char *idx = "blub";
+	char *name = "tname";
+	char *idx = "bla";
 	unsigned long int result[NUM2];
 	int rows;
 	int retVal;
diff --git a/allParam/test/test15.c b/allParam/test/test15.c
index 2e09c66..cff7481 100644
--- a/allParam/test/test15.c
+++ b/allParam/test/test15.c
@@ -7,8 +7,8 @@
 #include "test15.h"
 
 int test15(const char *testid, const Param *param) {
-	char *name = "race0";
-	char *idx = "fefpgafile";
+	char *name = "tname";
+	char *idx = "tstringa";
 	char *result[NUM3];
 	int rows;
 	int retVal;
@@ -22,14 +22,14 @@ int test15(const char *testid, const Param *param) {
 
 	retVal = Param_getStringArray(param, name, idx, NUM3, &rows, result);
 	if ((rows == NUM1) &&
-		result[0] && (strcmp(result[0], "daq_cas/vme/race/conf/5frontend.rbt") == 0) &&
-		result[1] && (strcmp(result[1], "daq_cas/vme/race/conf/5frontend.rbt") == 0) &&
-		result[2] && (strcmp(result[2], "daq_cas/vme/race/conf/5frontend.rbt") == 0) &&
-		result[3] && (strcmp(result[3], "daq_cas/vme/race/conf/5frontend.rbt") == 0) &&
-		result[4] && (strcmp(result[4], "daq_cas/vme/race/conf/4frontend.rbt") == 0) &&
-		result[5] && (strcmp(result[5], "daq_cas/vme/race/conf/4frontend.rbt") == 0) &&
-		result[6] && (strcmp(result[6], "daq_cas/vme/race/conf/4frontend.rbt") == 0) &&
-		result[7] && (strcmp(result[7], "daq_cas/vme/race/conf/5frontend.rbt") == 0) &&
+		result[0] && (strcmp(result[0], "test1") == 0) &&
+		result[1] && (strcmp(result[1], "test0") == 0) &&
+		result[2] && (strcmp(result[2], "test3") == 0) &&
+		result[3] && (strcmp(result[3], "test2") == 0) &&
+		result[4] && (strcmp(result[4], "test5") == 0) &&
+		result[5] && (strcmp(result[5], "test4") == 0) &&
+		result[6] && (strcmp(result[6], "test7") == 0) &&
+		result[7] && (strcmp(result[7], "test6") == 0) &&
 		(retVal == 0)) {
 		myRetVal = 0;
 		printf("%s : Passed.\n", testid);
diff --git a/allParam/test/test16.c b/allParam/test/test16.c
index 9e63502..354a39a 100644
--- a/allParam/test/test16.c
+++ b/allParam/test/test16.c
@@ -6,8 +6,8 @@
 #include "test16.h"
 
 int test16(const char *testid, const Param *param) {
-	char *name = "tof_tdc0";
-	char *idx = "threshold";
+	char *name = "tname";
+	char *idx = "tinta";
 	unsigned long int result[NUM4];
 	int rows;
 	int resultsum = 1;
diff --git a/allParam/test/test17.c b/allParam/test/test17.c
index 6d0089d..d188443 100644
--- a/allParam/test/test17.c
+++ b/allParam/test/test17.c
@@ -7,8 +7,8 @@
 #include "test17.h"
 
 int test17(const char *testid, const Param *param) {
-	char *name = "race0";
-	char *idx = "fefpgafile";
+	char *name = "tname";
+	char *idx = "tstringa";
 	char *result[NUM5];
 	int rows;
 	int retVal;
@@ -22,10 +22,10 @@ int test17(const char *testid, const Param *param) {
 
 	retVal = Param_getStringArray(param, name, idx, NUM5, &rows, result);
 	if ((rows == NUM5) &&
-		result[0] && (strcmp(result[0], "daq_cas/vme/race/conf/5frontend.rbt") == 0) &&
-		result[1] && (strcmp(result[1], "daq_cas/vme/race/conf/5frontend.rbt") == 0) &&
-		result[2] && (strcmp(result[2], "daq_cas/vme/race/conf/5frontend.rbt") == 0) &&
-		result[3] && (strcmp(result[3], "daq_cas/vme/race/conf/5frontend.rbt") == 0) &&
+		result[0] && (strcmp(result[0], "test1") == 0) &&
+		result[1] && (strcmp(result[1], "test0") == 0) &&
+		result[2] && (strcmp(result[2], "test3") == 0) &&
+		result[3] && (strcmp(result[3], "test2") == 0) &&
 		(retVal == 0)) {
 		myRetVal = 0;
 		printf("%s : Passed.\n", testid);
diff --git a/allParam/test/test18.c b/allParam/test/test18.c
index f7b7d7e..4fb49e3 100644
--- a/allParam/test/test18.c
+++ b/allParam/test/test18.c
@@ -6,8 +6,8 @@
 #include "test18.h"
 
 int test18(const char *testid, const Param *param) {
-	char *name = "tof_tdc0";
-	char *idx = "threshold";
+	char *name = "tname";
+	char *idx = "tinta";
 	unsigned long int result[NUM6];
 	int rows;
 	int resultsum = 1;
diff --git a/allParam/test/test19.c b/allParam/test/test19.c
index 29deeef..ab2c4dc 100644
--- a/allParam/test/test19.c
+++ b/allParam/test/test19.c
@@ -7,8 +7,8 @@
 #include "test19.h"
 
 int test19(const char *testid, const Param *param) {
-	char *name = "tof_tdc0";
-	char *idx = "threshold";
+	char *name = "tname";
+	char *idx = "tinta";
 	char *result[NUM2];
 	int rows;
 	int retVal;
diff --git a/allParam/test/test2.c b/allParam/test/test2.c
index 224a4bc..92a76bc 100644
--- a/allParam/test/test2.c
+++ b/allParam/test/test2.c
@@ -6,8 +6,8 @@
 #include "test2.h"
 
 int test2(const char *testid, const Param *param) {
-	char *name = "race0";
-	char *idx = "se_id";
+	char *name = "tname";
+	char *idx = "tint";
 	unsigned long int result;
 	int rows;
 	int retVal;
diff --git a/allParam/test/test20.c b/allParam/test/test20.c
index 816b108..1c4484c 100644
--- a/allParam/test/test20.c
+++ b/allParam/test/test20.c
@@ -6,8 +6,8 @@
 #include "test20.h"
 
 int test20(const char *testid, const Param *param) {
-	char *name = "race0";
-	char *idx = "fefpgafile";
+	char *name = "tname";
+	char *idx = "tstringa";
 	unsigned long int result[NUM1];
 	int rows;
 	int retVal;
diff --git a/allParam/test/test21.c b/allParam/test/test21.c
index f9d4860..9c13331 100644
--- a/allParam/test/test21.c
+++ b/allParam/test/test21.c
@@ -7,8 +7,8 @@
 #include "test21.h"
 
 int test21(const char *testid, const Param *param) {
-	char *name = "crate_id";
-	char *idx = "herakles";
+	char *name = "tname";
+	char *idx = "tstring";
 	char *result[NUM1];
 	int i;
 	int rows;
@@ -21,7 +21,7 @@ int test21(const char *testid, const Param *param) {
 	printf("%s : Param_getStringArray: Request for a scalar value.\n", testid);
 
 	retVal = Param_getStringArray(param, name, idx, NUM1, &rows, result);
-	if ((rows == 1) && result && (strcmp(result[0], "test0") == 0) && (retVal == 0)) {
+	if ((rows == 1) && result && (strcmp(result[0], "test100") == 0) && (retVal == 0)) {
 		myRetVal = 0;
 		printf("%s : Passed.\n", testid);
 	} else {
diff --git a/allParam/test/test22.c b/allParam/test/test22.c
index 274db84..7d4d7f8 100644
--- a/allParam/test/test22.c
+++ b/allParam/test/test22.c
@@ -6,8 +6,8 @@
 #include "test22.h"
 
 int test22(const char *testid, const Param *param) {
-	char *name = "race0";
-	char *idx = "fefpgafile";
+	char *name = "tname";
+	char *idx = "tstringa";
 	char result[PARAM_MAX_VALUE_LEN];
 	int rows;
 	int retVal;
@@ -17,7 +17,7 @@ int test22(const char *testid, const Param *param) {
 
 	retVal = Param_getString(param, name, idx, &rows, result);
 	if ((rows == 1) &&
-		result && (strcmp(result, "daq_cas/vme/race/conf/5frontend.rbt") == 0) &&
+		result && (strcmp(result, "test1") == 0) &&
 		(retVal == 0)) {
 		myRetVal = 0;
 		printf("%s : Passed.\n", testid);
diff --git a/allParam/test/test3.c b/allParam/test/test3.c
index fff0c2e..340d053 100644
--- a/allParam/test/test3.c
+++ b/allParam/test/test3.c
@@ -7,8 +7,8 @@
 #include "test3.h"
 
 int test3(const char *testid, const Param *param) {
-	char *name = "race0";
-	char *idx = "fefpgafile";
+	char *name = "tname";
+	char *idx = "tstringa";
 	char *result[NUM1];
 	int rows;
 	int retVal;
@@ -22,14 +22,14 @@ int test3(const char *testid, const Param *param) {
 
 	retVal = Param_getStringArray(param, name, idx, NUM1, &rows, result);
 	if ((rows == NUM1) &&
-		result[0] && (strcmp(result[0], "daq_cas/vme/race/conf/5frontend.rbt") == 0) &&
-		result[1] && (strcmp(result[1], "daq_cas/vme/race/conf/5frontend.rbt") == 0) &&
-		result[2] && (strcmp(result[2], "daq_cas/vme/race/conf/5frontend.rbt") == 0) &&
-		result[3] && (strcmp(result[3], "daq_cas/vme/race/conf/5frontend.rbt") == 0) &&
-		result[4] && (strcmp(result[4], "daq_cas/vme/race/conf/4frontend.rbt") == 0) &&
-		result[5] && (strcmp(result[5], "daq_cas/vme/race/conf/4frontend.rbt") == 0) &&
-		result[6] && (strcmp(result[6], "daq_cas/vme/race/conf/4frontend.rbt") == 0) &&
-		result[7] && (strcmp(result[7], "daq_cas/vme/race/conf/5frontend.rbt") == 0) &&
+		result[0] && (strcmp(result[0], "test1") == 0) &&
+		result[1] && (strcmp(result[1], "test0") == 0) &&
+		result[2] && (strcmp(result[2], "test3") == 0) &&
+		result[3] && (strcmp(result[3], "test2") == 0) &&
+		result[4] && (strcmp(result[4], "test5") == 0) &&
+		result[5] && (strcmp(result[5], "test4") == 0) &&
+		result[6] && (strcmp(result[6], "test7") == 0) &&
+		result[7] && (strcmp(result[7], "test6") == 0) &&
 		(retVal == 0)) {
 		myRetVal = 0;
 		printf("%s : Passed.\n", testid);
diff --git a/allParam/test/test4.c b/allParam/test/test4.c
index 62a7354..fb5a68c 100644
--- a/allParam/test/test4.c
+++ b/allParam/test/test4.c
@@ -6,8 +6,8 @@
 #include "test4.h"
 
 int test4(const char *testid, const Param *param) {
-	char *name = "tof_tdc0";
-	char *idx = "threshold";
+	char *name = "tname";
+	char *idx = "tinta";
 	unsigned long int result[NUM2];
 	int rows;
 	int resultsum = 1;
diff --git a/allParam/test/test5.c b/allParam/test/test5.c
index c987038..3d3df18 100644
--- a/allParam/test/test5.c
+++ b/allParam/test/test5.c
@@ -6,8 +6,8 @@
 #include "test5.h"
 
 int test5(const char *testid, const Param *param) {
-	char *name = "CRATE_ID";
-	char *idx = "HERAKLES";
+	char *name = "TNAME";
+	char *idx = "TSTRING";
 	char result[PARAM_MAX_VALUE_LEN];
 	int rows;
 	int retVal;
@@ -16,7 +16,7 @@ int test5(const char *testid, const Param *param) {
 	printf("%s : Param_getString: Uppercase input on correct statements.\n", testid);
 
 	retVal = Param_getString(param, name, idx, &rows, result);
-	if ((rows == 1) && result && (strcmp(result, "test0") == 0) && (retVal == 0)) {
+	if ((rows == 1) && result && (strcmp(result, "test100") == 0) && (retVal == 0)) {
 		myRetVal = 0;
 		printf("%s : Passed.\n", testid);
 	} else {
diff --git a/allParam/test/test6.c b/allParam/test/test6.c
index 62d5e15..4a6414f 100644
--- a/allParam/test/test6.c
+++ b/allParam/test/test6.c
@@ -6,8 +6,8 @@
 #include "test6.h"
 
 int test6(const char *testid, const Param *param) {
-	char *name = "RACE0";
-	char *idx = "SE_ID";
+	char *name = "TNAME";
+	char *idx = "TINT";
 	unsigned long int result;
 	int rows;
 	int retVal;
diff --git a/allParam/test/test7.c b/allParam/test/test7.c
index 7a4d2d3..8d5d8f4 100644
--- a/allParam/test/test7.c
+++ b/allParam/test/test7.c
@@ -7,8 +7,8 @@
 #include "test7.h"
 
 int test7(const char *testid, const Param *param) {
-	char *name = "RACE0";
-	char *idx = "FEFPGAFILE";
+	char *name = "TNAME";
+	char *idx = "TSTRINGA";
 	char *result[NUM1];
 	int rows;
 	int retVal;
@@ -22,14 +22,14 @@ int test7(const char *testid, const Param *param) {
 
 	retVal = Param_getStringArray(param, name, idx, NUM1, &rows, result);
 	if ((rows == NUM1) &&
-		result[0] && (strcmp(result[0], "daq_cas/vme/race/conf/5frontend.rbt") == 0) &&
-		result[1] && (strcmp(result[1], "daq_cas/vme/race/conf/5frontend.rbt") == 0) &&
-		result[2] && (strcmp(result[2], "daq_cas/vme/race/conf/5frontend.rbt") == 0) &&
-		result[3] && (strcmp(result[3], "daq_cas/vme/race/conf/5frontend.rbt") == 0) &&
-		result[4] && (strcmp(result[4], "daq_cas/vme/race/conf/4frontend.rbt") == 0) &&
-		result[5] && (strcmp(result[5], "daq_cas/vme/race/conf/4frontend.rbt") == 0) &&
-		result[6] && (strcmp(result[6], "daq_cas/vme/race/conf/4frontend.rbt") == 0) &&
-		result[7] && (strcmp(result[7], "daq_cas/vme/race/conf/5frontend.rbt") == 0) &&
+		result[0] && (strcmp(result[0], "test1") == 0) &&
+		result[1] && (strcmp(result[1], "test0") == 0) &&
+		result[2] && (strcmp(result[2], "test3") == 0) &&
+		result[3] && (strcmp(result[3], "test2") == 0) &&
+		result[4] && (strcmp(result[4], "test5") == 0) &&
+		result[5] && (strcmp(result[5], "test4") == 0) &&
+		result[6] && (strcmp(result[6], "test7") == 0) &&
+		result[7] && (strcmp(result[7], "test6") == 0) &&
 		(retVal == 0)) {
 		myRetVal = 0;
 		printf("%s : Passed.\n", testid);
diff --git a/allParam/test/test8.c b/allParam/test/test8.c
index b817a63..ded35e6 100644
--- a/allParam/test/test8.c
+++ b/allParam/test/test8.c
@@ -6,8 +6,8 @@
 #include "test8.h"
 
 int test8(const char *testid, const Param *param) {
-	char *name = "TOF_TDC0";
-	char *idx = "THRESHOLD";
+	char *name = "TNAME";
+	char *idx = "TINTA";
 	unsigned long int result[NUM2];
 	int rows;
 	int resultsum = 1;
diff --git a/allParam/test/test9.c b/allParam/test/test9.c
index da51da8..69f017c 100644
--- a/allParam/test/test9.c
+++ b/allParam/test/test9.c
@@ -6,8 +6,8 @@
 #include "test9.h"
 
 int test9(const char *testid, const Param *param) {
-	char *name = "crate_id";
-	char *idx = "blub";
+	char *name = "tname";
+	char *idx = "bla";
 	char result[PARAM_MAX_VALUE_LEN];
 	int rows;
 	int retVal;