daqctrl is only in own directory

diff --git a/hadaq/Makefile b/hadaq/Makefile
index 6ebd5855ba9f5a5340a3ddad18af301ef9f21513..e0040f849940c4de7977386f2d7f916b490be976 100644 (file)
--- a/hadaq/Makefile
+++ b/hadaq/Makefile
@@ -14,8 +14,6 @@
 COPTS = -O3 -finline-functions -DNDEBUG
 CFLAGS = $(COPTS) $(INCLUDES) $(DEFINES)
 
-DAQCTRL_OBJS = daqctrl.o daq_lib.o \
-       worker.o psxshm.o mman.o
 DAQ_XMANAGE_OBJS = tcldaq.o tkAppInit.o \
        agent_clnt.o agent_xdr.o worker.o psxshm.o mman.o
 DAQ_MANAGE_OBJS = tcldaq.o tclAppInit.o \
@@ -64,9 +62,6 @@ xmanage: daq_xmanage anal
 
 all : seb eb anal
 
-daqctrl: $(DAQCTRL_OBJS)
-       $(CC) $(CFLAGS) $(LDFLAGS) $(DAQCTRL_OBJS) $(LOADLIBES) -o daqctrl
-
 daq_xmanage: $(DAQ_XMANAGE_OBJS)
        $(CC) $(CFLAGS) $(LDFLAGS) $(DAQ_XMANAGE_OBJS) $(LOADLIBES) -o daq_xmanage
 

diff --git a/hadaq/daq_lib.c b/hadaq/daq_lib.c
deleted file mode 100644 (file)
index cb7884b..0000000
--- a/hadaq/daq_lib.c
+++ /dev/null
@@ -1,112 +0,0 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/daq_lib.c,v 6.12 2002-01-24 13:07:26 hadaq Exp $";
-
-#define _POSIX_C_SOURCE 199309L
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <allParam.h>
-#include "worker.h"
-
-#include "daq_lib.h"
-
-static void exportSetup(const Param *p) {
-       if (p->setup != NULL) {
-               static char s[80] = "DAQ_SETUP=";
-
-               strcat(s, p->setup);
-               putenv(s);
-       }
-}
-
-int Daq_reset(const char *n, const Param *p)
-{
-       exportSetup(p);
-
-       return Daq_stop(n, p);
-}
-
-int Daq_loadThresholds(const char *n, const Param *p)
-{
-       return 0;
-}
-
-int Daq_init(const char *n, const Param *p)
-{
-       exportSetup(p);
-
-       return Daq_reset(n, p);
-}
-
-int Daq_start(const char *n, const Param *p)
-{
-       int i;
-       char *argv[2];
-       char file[PARAM_MAX_VALUE_LEN];
-
-       exportSetup(p);
-       Param_getFilename(p, n, "file", &i, file);
-       argv[0] = n;
-       argv[1] = NULL;
-
-       return Worker_start(file, argv);
-}
-
-int Daq_stop(const char *n, const Param *p)
-{
-       exportSetup(p);
-
-       Worker_stop(n, 15);
-       return 0;
-}
-
-int Daq_initialized(const char *n, const Param *p)
-{
-       return -1;
-}
-
-int Daq_running(const char *n, const Param *p)
-{
-       return -1;
-}
-
-int Daq_lvl1Busy(const char *n, const Param *p)
-{
-       return 0;
-}
-
-int Daq_lvl2Busy(const char *n, const Param *p)
-{
-       return 0;
-}
-
-int Daq_error(const char *n, const Param *p)
-{
-       return 0;
-}
-
-int Daq_statusString(const char *n, const Param *p, const char *stat, char *string)
-{
-       strcpy(string, "Dummy status string.\n");
-       return 0;
-}
-unsigned long int Daq_statusRegister(const char *n, const Param *p, const char *stat)
-{
-       unsigned long int retVal;
-       if (Worker_getStatistic(n, stat, retVal)) {
-               return 0;
-       }
-       return retVal;
-}
-
-#ifndef EPICS_RUNCTRL
-int Daq_status(const char *n, const Param *p)
-{
-       exportSetup(p);
-
-       puts(Worker_status(n));
-       return 0;
-}
-#endif
-

diff --git a/hadaq/daq_lib.h b/hadaq/daq_lib.h
deleted file mode 100644 (file)
index 45e7d2e..0000000
--- a/hadaq/daq_lib.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef Daq_LIB_H
-#define Daq_LIB_H
-
-#include <allParam.h>
-
-int Daq_init(const char *, const Param *);
-int Daq_loadThresholds(const char *, const Param *);
-int Daq_reset(const char *, const Param *);
-int Daq_start(const char *, const Param *);
-int Daq_stop(const char *, const Param *);
-int Daq_initialized(const char *, const Param *);
-int Daq_running(const char *, const Param *);
-int Daq_lvl1Busy(const char *, const Param *);
-int Daq_lvl2Busy(const char *, const Param *);
-int Daq_error(const char *, const Param *);
-int Daq_statusString(const char *, const Param *, const char *, char *);
-unsigned long int Daq_statusRegister(const char *, const Param *, const char *);
-#ifndef EPICS_RUNCTRL
-int Daq_status(const char *, const Param *);
-#endif
-
-#endif

diff --git a/hadaq/daqctrl.c b/hadaq/daqctrl.c
deleted file mode 100644 (file)
index be44897..0000000
--- a/hadaq/daqctrl.c
+++ /dev/null
@@ -1,77 +0,0 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/daqctrl.c,v 6.8 2001-11-18 11:56:21 hadaq Exp $";
-
-#define SYSLOG_NAMES
-
-#include <stdlib.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <stdio.h>
-#include <strings.h>
-#include <signal.h>
-
-#include <allParam.h>
-#include <syslog.h>
-
-#include "daq_lib.h"
-
-jmp_buf terminateJmp;
-
-void sighandler(int sig) {
-  longjmp(terminateJmp, sig);
-}
-
-void usage(char *commandName) {
-  fprintf(stderr, "Usage: %s command boardName\n", commandName);
-  fprintf(stderr, "where command may be one of the following:\n");
-  fprintf(stderr, "init\n");
-  fprintf(stderr, "reset\n");
-  fprintf(stderr, "start\n");
-  fprintf(stderr, "stop\n");
-  fprintf(stderr, "status\n");
-}
-
-
-int main(int argc, char *argv[]) {
-  Param paramS, *param = &paramS;
-  char *name;
-  char *command;
-  
-  if(argc < 3) {
-    usage(argv[0]);
-    exit(EXIT_FAILURE);
-  }
-  openlog(argv[0], LOG_PID|LOG_PERROR, LOG_LOCAL0);
-  setlogmask(LOG_UPTO(LOG_INFO));
-
-
-        
-  command = argv[1];
-  name = argv[2];
-
-  if (-1 == conSetupParam(param, getenv("DAQ_SETUP"))) {
-    perror("conSetupParam");
-    exit(EXIT_FAILURE);
-  }
-  if (0 == setjmp(terminateJmp)) {
-    signal(SIGHUP, sighandler);
-    signal(SIGINT, sighandler);
-    signal(SIGTERM, sighandler);
-
-    if(strcmp(command, "init") == 0) {
-      Daq_init(name, param);
-    } else if(strcmp(command, "reset") == 0) {
-      Daq_reset(name, param);
-    } else if(strcmp(command, "start") == 0) {
-      Daq_start(name, param);
-    } else if(strcmp(command, "stop") == 0) {
-      Daq_stop(name, param);
-    } else if(strcmp(command, "status") == 0) {
-      Daq_status(name, param);
-    } else {
-      usage(argv[0]);
-      exit(EXIT_FAILURE);
-    }
-  }
-  desParam(param);
-  exit(EXIT_SUCCESS);
-}

diff --git a/hadaq/param.tcl b/hadaq/param.tcl
index aaffdc9f71a4dd424ccb8184761619218dc80fbd..f0c67e3621938b11dafad22aba4ec31dee281c07 100644 (file)
--- a/hadaq/param.tcl
+++ b/hadaq/param.tcl
@@ -3,7 +3,7 @@ set evtbuild(stndln) 0
 set evtbuild(priority) -2
 set evtbuild(nrofmsgs) 1
 set evtbuild(outdev) file
-set evtbuild(outpath) /share/scratch5
+set evtbuild(outpath) /tmp
 set netmem(file) ./daq_netmem
 set netmem(stndln) 0
 set netmem(priority) -1