From: hades Date: Thu, 26 Apr 2001 10:46:43 +0000 (+0000) Subject: End of Apr01 Beam Time X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=6e4b5597cc31f917bc14ccbe34d81097b95a2d8a;p=daqdata.git End of Apr01 Beam Time --- diff --git a/hadaq/hwmdc.c b/hadaq/hwmdc.c index c371003..4051c9b 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.12 2001-04-12 12:33:19 hades Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwmdc.c,v 6.13 2001-04-26 10:46:43 hades Exp $"; #define _POSIX_C_SOURCE 199309L @@ -14,7 +14,8 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada #include "subevt.h" #include "hwsam.h" -#define NSAMS 10 +#define NSAMS 9 + #define SAMMASK ((1 << NSAMS) - 1) struct HardwareS { diff --git a/hadaq/param.tcl b/hadaq/param.tcl index b410a84..c6b13d8 100644 --- a/hadaq/param.tcl +++ b/hadaq/param.tcl @@ -20,16 +20,15 @@ set readout(file) ./daq_readout set readout(stndln) 0 set readout(priority) -2 -set sam0(cardbase) 0x1C000000 -set sam1(cardbase) 0x3C000000 -set sam2(cardbase) 0x5C000000 -set sam3(cardbase) 0x7C000000 -set sam4(cardbase) 0x8C000000 -set sam5(cardbase) 0x9C000000 -set sam6(cardbase) 0xaC000000 -set sam7(cardbase) 0xbC000000 -set sam8(cardbase) 0xdC000000 -set sam9(cardbase) 0xec000000 +set sam0(cardbase) 0x6C000000 +set sam1(cardbase) 0x8C000000 +set sam2(cardbase) 0x9C000000 +set sam3(cardbase) 0xaC000000 +set sam4(cardbase) 0xbC000000 +set sam5(cardbase) 0xcC000000 +set sam6(cardbase) 0xdC000000 +set sam7(cardbase) 0xeC000000 +set sam8(cardbase) 0x5C000000 set soft(size) 1024 set dtu(cardbase) 0x44100000