DAQ uses SetupParam now, param file name therefore has changed from

param.tcl to default_p.tcl.
Stop date now ist last item to store in evtbuild.

diff --git a/hadaq/daq_lib.c b/hadaq/daq_lib.c
index bb8fe67356dc3c5a662e97c518522dad3ec43a48..f506d843c9408d9d9802b862b180178e41e916b1 100644 (file)
--- a/hadaq/daq_lib.c
+++ b/hadaq/daq_lib.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/daq_lib.c,v 6.7 2001-11-14 17:18:52 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/daq_lib.c,v 6.8 2001-11-15 10:20:18 hadaq Exp $";
 
 
 #include <stdlib.h>
@@ -9,8 +9,15 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada
 #include "worker.h"
 #include "daq_lib.h"
 
+static void exportSetup(const Param *p) {
+       if (p->setup != NULL) {
+               setenv("DAQ_SETUP", p->setup, 1);
+       }
+}
+
 int Daq_reset(const char *n, const Param *p)
 {
+       exportSetup(p);
        Daq_stop(n, p);
 
        return 0;
@@ -18,6 +25,7 @@ int Daq_reset(const char *n, const Param *p)
 
 int Daq_init(const char *n, const Param *p)
 {
+       exportSetup(p);
        Daq_reset(n, p);
 
        return 0;
@@ -29,6 +37,7 @@ int Daq_start(const char *n, const Param *p)
        char *argv[2];
        char file[PARAM_MAX_VALUE_LEN];
 
+       exportSetup(p);
        Param_getString(p, n, "file", &i, file);
        argv[0] = n;
        argv[1] = NULL;
@@ -38,6 +47,7 @@ int Daq_start(const char *n, const Param *p)
 
 int Daq_stop(const char *n, const Param *p)
 {
+       exportSetup(p);
        Worker_halt(n, 15);
        puts(Worker_status(n));
        Worker_stop(n, 15);
@@ -46,6 +56,7 @@ int Daq_stop(const char *n, const Param *p)
 
 int Daq_status(const char *n, const Param *p)
 {
+       exportSetup(p);
        puts(Worker_status(n));
        return 0;
 }

diff --git a/hadaq/daqctrl.c b/hadaq/daqctrl.c
index d52442a958aa79e183e1d3eeecd17387e40c9a3e..e30b9c4c20b1d6e3784022302f16e3903c141a49 100644 (file)
--- a/hadaq/daqctrl.c
+++ b/hadaq/daqctrl.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/daqctrl.c,v 6.6 2001-03-07 16:02:43 hades Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/daqctrl.c,v 6.7 2001-11-15 10:20:18 hadaq Exp $";
 
 
 #include <stdlib.h>
@@ -44,8 +44,8 @@ int main(int argc, char *argv[]) {
   command = argv[1];
   name = argv[2];
 
-  if (-1 == conParam(param)) {
-    perror("conParam");
+  if (-1 == conSetupParam(param, getenv("DAQ_SETUP"))) {
+    perror("conSetupParam");
     exit(EXIT_FAILURE);
   }
   if (0 == setjmp(terminateJmp)) {

diff --git a/hadaq/default_p.tcl b/hadaq/default_p.tcl
new file mode 100644 (file)
index 0000000..964d5b4
--- /dev/null
+++ b/hadaq/default_p.tcl
@@ -0,0 +1,21 @@
+set evtbuild(file) ./daq_evtbuild
+set evtbuild(stndln) 0
+set evtbuild(priority) -2
+set evtbuild(outdev) file
+set evtbuild(outpath) /tmp
+set evtbuild(expid) ha
+set netmem(file) ./daq_netmem
+set netmem(stndln) 0
+set netmem(priority) -1
+set netmem(inpath0) ATM:0:50
+set netmem(nrofmsgs) 1
+set netmem(verb) debug
+set memnet(file) ./daq_memnet
+set memnet(stndln) 0
+set memnet(priority) -1
+set memnet(outpath) ATM:0:50
+set memnet(bandwidth) 0
+set readout(file) ./daq_readout
+#set readout(wmark) 0
+set readout(stndln) 0
+set readout(priority) -2

diff --git a/hadaq/default_s.tcl b/hadaq/default_s.tcl
new file mode 100644 (file)
index 0000000..b9e1d93
--- /dev/null
+++ b/hadaq/default_s.tcl
@@ -0,0 +1,21 @@
+set evtbuild(start_date)       "2001-11-15T10:25:38"
+set evtbuild(exp_id)   "yy"
+set evtbuild(run_id)   1005816338
+set evtbuild(file_name)        "yy01319102538.hld"
+set evtbuild(evts_complete)    0
+set evtbuild(bytes_written)    0
+set evtbuild(stop_date)        "2001-11-15T10:25:53"
+set evtbuild(start_date)       "2001-11-15T10:27:27"
+set evtbuild(exp_id)   "yy"
+set evtbuild(run_id)   1005816447
+set evtbuild(file_name)        "yy01319102727.hld"
+set evtbuild(evts_complete)    0
+set evtbuild(bytes_written)    0
+set evtbuild(stop_date)        "2001-11-15T10:28:43"
+set evtbuild(start_date)       "2001-11-15T11:15:37"
+set evtbuild(exp_id)   "ha"
+set evtbuild(run_id)   1005819337
+set evtbuild(file_name)        "ha01319111537.hld"
+set evtbuild(evts_complete)    0
+set evtbuild(bytes_written)    0
+set evtbuild(stop_date)        "2001-11-15T11:15:45"

diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c
index c881672d539f34e972756815a847d42e9ae21104..f7891bab79c3a291375fcb9a05f2f8aa4486c0df 100644 (file)
--- a/hadaq/evtbuild.c
+++ b/hadaq/evtbuild.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.31 2001-11-14 09:29:26 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.32 2001-11-15 10:20:18 hadaq Exp $";
 
 
 #define _POSIX_C_SOURCE 199506L
@@ -198,7 +198,8 @@ static int argsFromParam(TheArgs *my, int argc, char *argv[]) {
        Param paramS, *param = &paramS;
        int paramWasFound;
 
-       conParam(param);
+       conSetupParam(param, getenv("DAQ_SETUP"));
+
        Param_getInt(param, argv[0], "nrofmsgs", &paramWasFound, &my->nrOfMsgs);
        Param_getIntArray(param, argv[0], "skipmsgs",
                NTRIGTYPES, &paramWasFound, my->skipMsgs);
@@ -221,7 +222,7 @@ static void storeRunInfoStart(const char *name, time_t t, const char *expId, uns
        int paramWasFound;
        char s[20];
 
-       conParam(param);
+       conSetupParam(param, getenv("DAQ_SETUP"));
        strftime(s, 20, "%Y-%m-%dT%H:%M:%S", localtime(&t));
        Param_storeString(param, name, "start_date", s);
        Param_storeString(param, name, "exp_id", expId);
@@ -235,11 +236,11 @@ static void storeRunInfoStop(const char *name, time_t t, unsigned long evtsCompl
        int paramWasFound;
        char s[20];
 
-       conParam(param);
+       conSetupParam(param, getenv("DAQ_SETUP"));
        strftime(s, 20, "%Y-%m-%dT%H:%M:%S", localtime(&t));
-       Param_storeString(param, name, "stop_date", s);
        Param_storeInt(param, name, "evts_complete", evtsComplete);
        Param_storeInt(param, name, "bytes_written", bytesWritten);
+       Param_storeString(param, name, "stop_date", s);
        desParam(param);
 }
 

diff --git a/hadaq/memnet.c b/hadaq/memnet.c
index e0bb51530085b741e1f353098493fe9e1f199d97..faf8c71d57b268ab299f3a34d3ce354b3ff06da5 100644 (file)
--- a/hadaq/memnet.c
+++ b/hadaq/memnet.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/memnet.c,v 6.11 2001-11-14 09:29:27 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/memnet.c,v 6.12 2001-11-15 10:20:18 hadaq Exp $";
 
 
 #define _GNU_C_SOURCE
@@ -102,7 +102,7 @@ static int argsFromParam(TheArgs *my, int argc, char *argv[]) {
        Param paramS, *param = &paramS;
        int paramWasFound;
 
-       conParam(param);
+       conSetupParam(param, getenv("DAQ_SETUP"));
        Param_getString(param, argv[0], "outpath", &paramWasFound, my->outPath);
        Param_getInt(param, argv[0], "bdwidth", &paramWasFound, &my->bandWidth);
        Param_getInt(param, argv[0], "stndln", &paramWasFound, &my->isStandalone);

diff --git a/hadaq/netmem.c b/hadaq/netmem.c
index 67a2125bb1671eed74bca6d5aeeb72e3a7ed85b8..44abac71c4ac81d6c61fdc05a75c3e0fd7b6f781 100644 (file)
--- a/hadaq/netmem.c
+++ b/hadaq/netmem.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/netmem.c,v 6.15 2001-11-14 09:29:27 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/netmem.c,v 6.16 2001-11-15 10:20:18 hadaq Exp $";
 
 
 #define _GNU_C_SOURCE
@@ -105,7 +105,7 @@ static int argsFromParam(TheArgs *my, int argc, char *argv[]) {
        Param paramS, *param = &paramS;
        int paramWasFound;
 
-       conParam(param);
+       conSetupParam(param, getenv("DAQ_SETUP"));
        Param_getStringArray(param, argv[0], "inpath",
                MAXINPATH, &my->inPathCnt, my->inPath);
        Param_getInt(param, argv[0], "nrofmsgs", &paramWasFound, &my->nrOfMsgs);

diff --git a/hadaq/param.tcl b/hadaq/param.tcl
index ccd6049826e5234c407ac3e675c86fd6fbdaecc0..473f8dc5edad078f169ab877852a86d56d40182a 100644 (file)
--- a/hadaq/param.tcl
+++ b/hadaq/param.tcl
@@ -1,25 +1,3 @@
-set evtbuild(file) ./daq_evtbuild
-set evtbuild(stndln) 0
-set evtbuild(priority) -2
-set evtbuild(outdev) null
-set evtbuild(outpath) /tmp
-set evtbuild(expid) ha
-set netmem(file) ./daq_netmem
-set netmem(stndln) 0
-set netmem(priority) -1
-set netmem(inpath0) ATM:0:50
-set netmem(nrofmsgs) 1
-set netmem(verb) debug
-set memnet(file) ./daq_memnet
-set memnet(stndln) 0
-set memnet(priority) -1
-set memnet(outpath) ATM:0:50
-set memnet(bandwidth) 0
-set readout(file) ./daq_readout
-#set readout(wmark) 0
-set readout(stndln) 0
-set readout(priority) -2
-
 set sam0(cardbase) 0x6C000000
 set sam1(cardbase) 0x8C000000
 set sam2(cardbase) 0x9C000000

diff --git a/hadaq/readout.c b/hadaq/readout.c
index d576fb8b20d28db782e7915a2c85a2ab85077fdf..57f05b1432041135c87cbbb2868b87b5b61d7b1e 100644 (file)
--- a/hadaq/readout.c
+++ b/hadaq/readout.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/readout.c,v 6.18 2001-11-14 09:29:27 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/readout.c,v 6.19 2001-11-15 10:20:18 hadaq Exp $";
 
 
 #define _POSIX_C_SOURCE 199506L
@@ -89,7 +89,7 @@ static int argsFromParam(TheArgs *my, int argc, char *argv[]) {
        Param paramS, *param = &paramS;
        int paramWasFound;
 
-       conParam(param);
+       conSetupParam(param, getenv("DAQ_SETUP"));
        Param_getInt(param, argv[0], "wmark", &paramWasFound, &my->waterMark);
        Param_getInt(param, argv[0], "stndln", &paramWasFound, &my->isStandalone);
        Param_getInt(param, argv[0], "prio", &paramWasFound, &my->priority);