From 7e9a9be80b1f3cbb12a0e32281910c46652a25a0 Mon Sep 17 00:00:00 2001 From: hades Date: Thu, 2 Sep 1999 08:36:07 +0000 Subject: [PATCH] *** empty log message *** --- hadaq/Makefile | 29 ++++++++++++++--------------- hadaq/param.tcl | 24 ++++++++++++------------ 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/hadaq/Makefile b/hadaq/Makefile index 14ed4c2..3065fe4 100644 --- a/hadaq/Makefile +++ b/hadaq/Makefile @@ -6,11 +6,11 @@ #DEFINES = -UNDEBUG -DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT # UNIX w/o ATM -#CC = c89 -#RPCGEN = rpcgen -#LOADLIBES = -L$(HOME)/lib/$(SYSTYPE) -lhadesstd -lrt -ltk -lX11 -ltcl -lm -#INCLUDES = -I$(HOME)/include -I/usr/fore/include -#DEFINES = -UNDEBUG -DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT -DNOATM +CC = c89 +RPCGEN = rpcgen +LOADLIBES = -L/usr/local/lib/ -lhadesstd -llvme -lrt -ltk -lX11 -ltcl -lm +INCLUDES = -I/usr/local/include -I/usr/fore/include +DEFINES = -UNDEBUG -DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT -DNOATM # Linux #CC = gcc @@ -20,15 +20,16 @@ #DEFINES = -UNDEBUG -DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT -DNOATM # LynxOS -CC = gcc -RPCGEN = rpcgen -LOADLIBES = -L/usr/local/lib -L$(HOME)/lib/$(SYSTYPE) -lhadesstd -llvme -ltcl -lm -lrpc -lnetinet -L/lib/ces -lvme -lbma -luio -INCLUDES = -I/usr/local/include -I$(HOME)/include -DEFINES = -UNDEBUG -DHADESSTD_NEXITSTAT -DNOATM +#CC = gcc +#RPCGEN = rpcgen +#LOADLIBES = -L/usr/local/lib -L$(HOME)/lib/$(SYSTYPE) -lhadesstd -llvme -ltcl -lm -lrpc -lnetinet -L/lib/ces -lvme -lbma -luio +#INCLUDES = -I/usr/local/include -I$(HOME)/include +#DEFINES = -UNDEBUG -DHADESSTD_NEXITSTAT -DNOATM CFLAGS = -g $(INCLUDES) $(DEFINES) -HW_OBJS = hwrich.o hwrace.o rc.o +HW_OBJS = hwtof.o hwv775.o +#HW_OBJS = hwrich.o hwrace.o rc.o #HW_OBJS = hwsoft.o @@ -187,9 +188,7 @@ shmtrans.o: shmtrans.c grmblfx.h psxshm.h hadtuqueue.h hadtu.h \ showevt.o: showevt.c hldread.h evt.h hadtu.h subevt.h sniff.o: sniff.c online.h subevt.o: subevt.c subevt.h hadtu.h -tclAppInit.o: tclAppInit.c \ - /usr/lib/gcc-lib/ppc-unknown-lynxos2.5/2.7-96q1/../../../../include/tcl.h +tclAppInit.o: tclAppInit.c tcldaq.o: tcldaq.c worker.h psxshm.h agent.h -tkAppInit.o: tkAppInit.c \ - /usr/lib/gcc-lib/ppc-unknown-lynxos2.5/2.7-96q1/../../../../include/tk.h +tkAppInit.o: tkAppInit.c worker.o: worker.c worker.h psxshm.h diff --git a/hadaq/param.tcl b/hadaq/param.tcl index 60fd674..31edc07 100644 --- a/hadaq/param.tcl +++ b/hadaq/param.tcl @@ -3,7 +3,7 @@ set soft(size) 1024 set dtu0(cardbase) 1148190720 ;# 0x44700000 set dtu0(deadtime) 10 -set tdc3(cardbase) 3992977408 ;# 0xee000000 +set tdc0(cardbase) 3992977408 ;# 0xee000000 set tdc0(threshold00) 0 set tdc0(threshold01) 0 set tdc0(threshold02) 0 @@ -37,10 +37,10 @@ set tdc0(threshold29) 0 set tdc0(threshold30) 0 set tdc0(threshold31) 0 set tdc0(range) 255 -set tdc0(voltage) 254 -set tdc0(offset) 0 +set tdc0(vset) 254 +set tdc0(voff) 0 -set tdc0(cardbase) 3993108480 ;# 0xee000000 +set tdc1(cardbase) 3993108480 ;# 0xee000000 set tdc1(threshold00) 0 set tdc1(threshold01) 0 set tdc1(threshold02) 0 @@ -74,10 +74,10 @@ set tdc1(threshold29) 0 set tdc1(threshold30) 0 set tdc1(threshold31) 0 set tdc1(range) 255 -set tdc1(voltage) 254 -set tdc1(offset) 0 +set tdc1(vset) 254 +set tdc1(voff) 0 -set tdc1(cardbase) 3993239552 ;# 0xee000000 +set tdc2(cardbase) 3993239552 ;# 0xee000000 set tdc2(threshold00) 0 set tdc2(threshold01) 0 set tdc2(threshold02) 0 @@ -111,10 +111,10 @@ set tdc2(threshold29) 0 set tdc2(threshold30) 0 set tdc2(threshold31) 0 set tdc2(range) 255 -set tdc2(voltage) 254 -set tdc2(offset) 0 +set tdc2(vset) 254 +set tdc2(voff) 0 -set tdc2(cardbase) 3993370624 ;# 0xee000000 +set tdc3(cardbase) 3993370624 ;# 0xee000000 set tdc3(threshold00) 0 set tdc3(threshold01) 0 set tdc3(threshold02) 0 @@ -148,8 +148,8 @@ set tdc3(threshold29) 0 set tdc3(threshold30) 0 set tdc3(threshold31) 0 set tdc3(range) 255 -set tdc3(voltage) 254 -set tdc3(offset) 0 +set tdc3(vset) 254 +set tdc3(voff) 0 set tdc4(cardbase) 2097408 ;# 0x200100 set tdc4(lowThreshold) 1 -- 2.43.0