From e8638ad3a487c723cd291633dfacc376d9ad61bc Mon Sep 17 00:00:00 2001 From: sailer Date: Fri, 14 Feb 2003 11:54:40 +0000 Subject: [PATCH] conParam -> conSetupParam (param.tcl -> default_p.tcl should be the only difference in behaviour but this enables caParam / oraParam / runctrl) -- Benjamin Sailer --- hadaq/default_p.tcl | 171 +++++++++++++++++++++++++++++++++++++++- hadaq/hwmdc.c | 4 +- hadaq/hwrich.c | 4 +- hadaq/hwshow.c | 4 +- hadaq/hwsoft.c | 4 +- hadaq/hwtrig.c | 4 +- hadaq/param.tcl | 188 -------------------------------------------- 7 files changed, 179 insertions(+), 200 deletions(-) delete mode 100644 hadaq/param.tcl diff --git a/hadaq/default_p.tcl b/hadaq/default_p.tcl index 023e27b..e3012f6 100644 --- a/hadaq/default_p.tcl +++ b/hadaq/default_p.tcl @@ -3,8 +3,7 @@ set evtbuild(stndln) 0 set evtbuild(prio) -2 set evtbuild(outdev) file set evtbuild(outpath) /tmp -set evtbuild(expid) te -set evtbuild(nrofmsgs) 0 +set evtbuild(nrofmsgs) 1 set netmem(file) ./daq_netmem set netmem(stndln) 0 set netmem(prio) -1 @@ -20,3 +19,171 @@ set readout(file) ./daq_readout #set readout(wmark) 0 set readout(stndln) 0 set readout(prio) -2 + +set mdc0(unit0) sam0 +set mdc0(unit1) sam1 +set mdc0(unit2) sam2 +set mdc0(unit3) sam3 +set mdc0(unit4) sam4 +set mdc0(unit5) sam5 +set mdc0(unit6) sam6 +set mdc0(unit7) sam7 +set mdc0(unit8) sam8 +set mdc0(unit9) sam9 +set mdc0(unit10) sam10 +set mdc0(unit11) sam11 + +set mdc1(unit0) sam12 +set mdc1(unit1) sam13 +set mdc1(unit2) sam14 +set mdc1(unit3) sam15 +set mdc1(unit4) sam16 +set mdc1(unit5) sam17 + +set sam0(cardtype) sam +set sam1(cardtype) sam +set sam2(cardtype) sam +set sam3(cardtype) sam +set sam4(cardtype) sam +set sam5(cardtype) sam +set sam6(cardtype) sam +set sam7(cardtype) sam +set sam8(cardtype) sam +set sam9(cardtype) sam +set sam10(cardtype) sam +set sam11(cardtype) sam +set sam12(cardtype) sam +set sam13(cardtype) sam +set sam14(cardtype) sam +set sam15(cardtype) sam +set sam16(cardtype) sam +set sam17(cardtype) sam + +set sam0(cardbase) 0x01000000 +set sam1(cardbase) 0x01100000 +set sam2(cardbase) 0x02000000 +set sam3(cardbase) 0x02100000 +set sam4(cardbase) 0x03000000 +set sam5(cardbase) 0x03100000 + +set sam6(cardbase) 0x04000000 +set sam7(cardbase) 0x04100000 +set sam8(cardbase) 0x05000000 +set sam9(cardbase) 0x05100000 +set sam10(cardbase) 0x06000000 +set sam11(cardbase) 0x06100000 + +set sam12(cardbase) 0x07000000 +set sam13(cardbase) 0x07100000 +set sam14(cardbase) 0x08000000 +set sam15(cardbase) 0x08100000 + +set sam16(cardbase) 0x09000000 +set sam17(cardbase) 0x09100000 + +set soft(size) 1024 + +set dtu(cardbase) 0x44100000 + +set show(unit0) ipc0 +set show(unit1) ipc1 +set show(unit2) ipc2 +set show(unit3) ipc3 +set show(unit4) ipc4 +set show(unit5) ipc5 +set show(unit6) ipc6 +set show(unit7) ipc7 +set show(unit8) ipc8 +set show(unit9) ipc9 +set show(unit10) ipc10 +set show(unit11) ipc11 + +set ipc0(cardtype) ipc +set ipc1(cardtype) ipc +set ipc2(cardtype) ipc +set ipc3(cardtype) ipc +set ipc4(cardtype) ipc +set ipc5(cardtype) ipc +set ipc6(cardtype) ipc +set ipc7(cardtype) ipc +set ipc8(cardtype) ipc +set ipc9(cardtype) ipc +set ipc10(cardtype) ipc +set ipc11(cardtype) ipc + +set ipc0(cardbase) 0x100000 +set ipc1(cardbase) 0x200000 +set ipc2(cardbase) 0x300000 +set ipc3(cardbase) 0x400000 +set ipc4(cardbase) 0x500000 +set ipc5(cardbase) 0x600000 +set ipc6(cardbase) 0x700000 +set ipc7(cardbase) 0x800000 +set ipc8(cardbase) 0x900000 +set ipc9(cardbase) 0xa00000 +set ipc10(cardbase) 0xb00000 +set ipc11(cardbase) 0xc00000 + +set rich2(unit0) race10 +set rich2(unit1) race11 +set rich2(unit2) race0 +set rich2(unit3) race1 + +set rich1(unit0) race2 +set rich1(unit1) race3 +set rich1(unit2) race4 +set rich1(unit3) race5 + +set rich0(unit0) race6 +set rich0(unit1) race7 +set rich0(unit2) race8 +set rich0(unit3) race9 + +set race0(cardtype) race +set race1(cardtype) race +set race2(cardtype) race +set race3(cardtype) race +set race4(cardtype) race +set race5(cardtype) race +set race6(cardtype) race +set race7(cardtype) race +set race8(cardtype) race +set race9(cardtype) race +set race10(cardtype) race +set race11(cardtype) race + +set race0(cardbase) 0x00000000 +set race1(cardbase) 0x10000000 +set race10(cardbase) 0x20000000 +set race11(cardbase) 0x30000000 +set race4(cardbase) 0x00000000 +set race5(cardbase) 0x10000000 +set race2(cardbase) 0x20000000 +set race3(cardbase) 0x30000000 +set race6(cardbase) 0x00000000 +set race7(cardbase) 0x10000000 +set race8(cardbase) 0x20000000 +set race9(cardbase) 0x30000000 + +set race0(status_id) 100 +set race1(status_id) 101 +set race10(status_id) 102 +set race11(status_id) 103 +set race4(status_id) 100 +set race5(status_id) 101 +set race2(status_id) 102 +set race3(status_id) 103 +set race6(status_id) 100 +set race7(status_id) 101 +set race8(status_id) 102 +set race9(status_id) 103 + +set trigconc(unit0) mu +set trigconc(unit1) conc + +set mu(cardtype) mu +set conc(cardtype) tip + +set mu(cardbase) 0xd0000000 +set conc(cardbase) 0x18000000 + diff --git a/hadaq/hwmdc.c b/hadaq/hwmdc.c index 5fa594d..8ce2d94 100644 --- a/hadaq/hwmdc.c +++ b/hadaq/hwmdc.c @@ -1,4 +1,4 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwmdc.c,v 6.28 2002-11-08 12:12:37 hadaq Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwmdc.c,v 6.29 2003-02-14 11:54:40 sailer Exp $"; #define _POSIX_C_SOURCE 199309L #include @@ -54,7 +54,7 @@ Hardware *newHardware(const char *subsystem) ss = subsystem; } - if (0 > conParam(param)) { + if (0 > conSetupParam(param, getenv("DAQ_SETUP"))) { syslog(LOG_ERR, "Construction of parameter source failed: %s", strerror(errno)); return NULL; } diff --git a/hadaq/hwrich.c b/hadaq/hwrich.c index d9cb53a..65efb00 100644 --- a/hadaq/hwrich.c +++ b/hadaq/hwrich.c @@ -1,4 +1,4 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrich.c,v 6.36 2002-11-19 02:32:53 hadaq Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrich.c,v 6.37 2003-02-14 11:54:40 sailer Exp $"; #define _POSIX_C_SOURCE 199309L #include @@ -54,7 +54,7 @@ Hardware *newHardware(const char *subsystem) ss = subsystem; } - if (0 > conParam(param)) { + if (0 > conSetupParam(param, getenv("DAQ_SETUP"))) { syslog(LOG_ERR, "Construction of parameter source failed: %s", strerror(errno)); return NULL; } diff --git a/hadaq/hwshow.c b/hadaq/hwshow.c index 7e1ef92..6bfce9e 100644 --- a/hadaq/hwshow.c +++ b/hadaq/hwshow.c @@ -1,4 +1,4 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwshow.c,v 6.32 2002-10-29 17:44:06 hadaq Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwshow.c,v 6.33 2003-02-14 11:54:41 sailer Exp $"; #define _POSIX_C_SOURCE 199309L #include @@ -54,7 +54,7 @@ Hardware *newHardware(const char *subsystem) ss = subsystem; } - if (0 > conParam(param)) { + if (0 > conSetupParam(param, getenv("DAQ_SETUP"))) { syslog(LOG_ERR, "Construction of parameter source failed: %s", strerror(errno)); return NULL; } diff --git a/hadaq/hwsoft.c b/hadaq/hwsoft.c index dd60074..021325c 100644 --- a/hadaq/hwsoft.c +++ b/hadaq/hwsoft.c @@ -1,4 +1,4 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwsoft.c,v 6.25 2002-10-23 15:24:49 hadaq Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwsoft.c,v 6.26 2003-02-14 11:54:41 sailer Exp $"; #define _POSIX_C_SOURCE 199309L @@ -43,7 +43,7 @@ Hardware *newHardware(void) my->maxSubEvtSize = 2 * SubEvt_hdrSize() + 5004 * sizeof(uint32_t); param = malloc(sizeof(Param)); - conParam(param); + conSetupParam(param, getenv("DAQ_SETUP")); Param_getInt(param, "soft", "size", ¶mWasFound, &size); if (!paramWasFound) { syslog(LOG_WARNING, diff --git a/hadaq/hwtrig.c b/hadaq/hwtrig.c index 42c234d..3691e22 100644 --- a/hadaq/hwtrig.c +++ b/hadaq/hwtrig.c @@ -1,4 +1,4 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtrig.c,v 6.33 2002-10-29 17:44:44 hadaq Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtrig.c,v 6.34 2003-02-14 11:54:41 sailer Exp $"; #define _POSIX_C_SOURCE 199309L #include @@ -72,7 +72,7 @@ Hardware *newHardware(const char *subsystem) ss = subsystem; } - if (0 > conParam(param)) { + if (0 > conSetupParam(param, getenv("DAQ_SETUP"))) { syslog(LOG_ERR, "Construction of parameter source failed: %s", strerror(errno)); return NULL; } diff --git a/hadaq/param.tcl b/hadaq/param.tcl deleted file mode 100644 index 9ff5ab5..0000000 --- a/hadaq/param.tcl +++ /dev/null @@ -1,188 +0,0 @@ -set evtbuild(file) ./daq_evtbuild -set evtbuild(stndln) 0 -set evtbuild(priority) -2 -set evtbuild(nrofmsgs) 1 -set evtbuild(outdev) file -set evtbuild(outpath) /tmp -set netmem(file) ./daq_netmem -set netmem(stndln) 0 -set netmem(priority) -1 -set netmem(inpath0) ATM:0:60 -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:60 -set memnet(bandwidth) 0 -set readout(file) ./daq_readout -#set readout(wmark) 0 -set readout(stndln) 0 -set readout(priority) -2 - -set mdc0(unit0) sam0 -set mdc0(unit1) sam1 -set mdc0(unit2) sam2 -set mdc0(unit3) sam3 -set mdc0(unit4) sam4 -set mdc0(unit5) sam5 -set mdc0(unit6) sam6 -set mdc0(unit7) sam7 -set mdc0(unit8) sam8 -set mdc0(unit9) sam9 -set mdc0(unit10) sam10 -set mdc0(unit11) sam11 - -set mdc1(unit0) sam12 -set mdc1(unit1) sam13 -set mdc1(unit2) sam14 -set mdc1(unit3) sam15 -set mdc1(unit4) sam16 -set mdc1(unit5) sam17 - -set sam0(cardtype) sam -set sam1(cardtype) sam -set sam2(cardtype) sam -set sam3(cardtype) sam -set sam4(cardtype) sam -set sam5(cardtype) sam -set sam6(cardtype) sam -set sam7(cardtype) sam -set sam8(cardtype) sam -set sam9(cardtype) sam -set sam10(cardtype) sam -set sam11(cardtype) sam -set sam12(cardtype) sam -set sam13(cardtype) sam -set sam14(cardtype) sam -set sam15(cardtype) sam -set sam16(cardtype) sam -set sam17(cardtype) sam - -set sam0(cardbase) 0x01000000 -set sam1(cardbase) 0x01100000 -set sam2(cardbase) 0x02000000 -set sam3(cardbase) 0x02100000 -set sam4(cardbase) 0x03000000 -set sam5(cardbase) 0x03100000 - -set sam6(cardbase) 0x04000000 -set sam7(cardbase) 0x04100000 -set sam8(cardbase) 0x05000000 -set sam9(cardbase) 0x05100000 -set sam10(cardbase) 0x06000000 -set sam11(cardbase) 0x06100000 - -set sam12(cardbase) 0x07000000 -set sam13(cardbase) 0x07100000 -set sam14(cardbase) 0x08000000 -set sam15(cardbase) 0x08100000 - -set sam16(cardbase) 0x09000000 -set sam17(cardbase) 0x09100000 - -set soft(size) 1024 - -set dtu(cardbase) 0x44100000 - -set show(unit0) ipc0 -set show(unit1) ipc1 -set show(unit2) ipc2 -set show(unit3) ipc3 -set show(unit4) ipc4 -set show(unit5) ipc5 -set show(unit6) ipc6 -set show(unit7) ipc7 -set show(unit8) ipc8 -set show(unit9) ipc9 -set show(unit10) ipc10 -set show(unit11) ipc11 - -set ipc0(cardtype) ipc -set ipc1(cardtype) ipc -set ipc2(cardtype) ipc -set ipc3(cardtype) ipc -set ipc4(cardtype) ipc -set ipc5(cardtype) ipc -set ipc6(cardtype) ipc -set ipc7(cardtype) ipc -set ipc8(cardtype) ipc -set ipc9(cardtype) ipc -set ipc10(cardtype) ipc -set ipc11(cardtype) ipc - -set ipc0(cardbase) 0x100000 -set ipc1(cardbase) 0x200000 -set ipc2(cardbase) 0x300000 -set ipc3(cardbase) 0x400000 -set ipc4(cardbase) 0x500000 -set ipc5(cardbase) 0x600000 -set ipc6(cardbase) 0x700000 -set ipc7(cardbase) 0x800000 -set ipc8(cardbase) 0x900000 -set ipc9(cardbase) 0xa00000 -set ipc10(cardbase) 0xb00000 -set ipc11(cardbase) 0xc00000 - -set rich2(unit0) race10 -set rich2(unit1) race11 -set rich2(unit2) race0 -set rich2(unit3) race1 - -set rich1(unit0) race2 -set rich1(unit1) race3 -set rich1(unit2) race4 -set rich1(unit3) race5 - -set rich0(unit0) race6 -set rich0(unit1) race7 -set rich0(unit2) race8 -set rich0(unit3) race9 - -set race0(cardtype) race -set race1(cardtype) race -set race2(cardtype) race -set race3(cardtype) race -set race4(cardtype) race -set race5(cardtype) race -set race6(cardtype) race -set race7(cardtype) race -set race8(cardtype) race -set race9(cardtype) race -set race10(cardtype) race -set race11(cardtype) race - -set race0(cardbase) 0x00000000 -set race1(cardbase) 0x10000000 -set race10(cardbase) 0x20000000 -set race11(cardbase) 0x30000000 -set race4(cardbase) 0x00000000 -set race5(cardbase) 0x10000000 -set race2(cardbase) 0x20000000 -set race3(cardbase) 0x30000000 -set race6(cardbase) 0x00000000 -set race7(cardbase) 0x10000000 -set race8(cardbase) 0x20000000 -set race9(cardbase) 0x30000000 - -set race0(status_id) 100 -set race1(status_id) 101 -set race10(status_id) 102 -set race11(status_id) 103 -set race4(status_id) 100 -set race5(status_id) 101 -set race2(status_id) 102 -set race3(status_id) 103 -set race6(status_id) 100 -set race7(status_id) 101 -set race8(status_id) 102 -set race9(status_id) 103 - -set trigconc(unit0) mu -set trigconc(unit1) conc - -set mu(cardtype) mu -set conc(cardtype) tip - -set mu(cardbase) 0xd0000000 -set conc(cardbase) 0x18000000 -- 2.43.0