- Fixed a normalisation problem in diffscan when the first value

did not have enough counts
- Reduced polling frequency in emon
- Fixed a scriptcontext bug which would cause it to dump core in SctTransact
  on interrupts
- Fixed an issue with missing <nl> at the end of batch files
- Added a feature which does not call halt when counting stops in hmcontrol.c
  This is necessary for the BOA CCD
- Initalized doNotFree properly in hipadaba.c
- Added the travelling salesman reflection measurement algorithm
- Added another component to amorset
- Removed old SicsWait from nserver.c
- Added a means to nxscript to write 16 bit data for BOA
- Modified tasub to accept a drivabel as a motor and not only a motor.
  This became necessary to make EIGER work as A2 on EIGER is a virtual
  motor


SKIPPED:
	psi/amorcomp.h
	psi/amordrive.h
	psi/amorset.c
	psi/amorset.h
	psi/amorset.tex
	psi/amorset.w
	psi/el734hp.c
	psi/el737hpdriv.c
	psi/make_gen
	psi/pardef.c
	psi/polterwrite.c
	psi/psi.c
	psi/sinqhttpopt.c
This commit is contained in:
koennecke
2011-09-23 07:55:49 +00:00
parent 2dd46f0968
commit ce565b4d50
29 changed files with 676 additions and 145 deletions

14
emon.c
View File

@ -6,6 +6,8 @@
Mark Koennecke, Juli 1997
Reduced polling frequency to any 20 seconds, Mark Koennecke, August 2011
Copyright:
Labor fuer Neutronenstreuung
@ -39,6 +41,7 @@
#include <string.h>
#include <stdlib.h>
#include <assert.h>
#include <time.h>
#include <tcl.h> /* for DString */
#include "fortify.h"
#include "lld.h"
@ -46,6 +49,11 @@
#include "emon.i"
#include "emon.h"
#include "event.h"
/*
* any how many seconds we check
*/
#define SCANINTERVALL 20
/*--------------------------------------------------------------------------*/
pEnvMon CreateEnvMon(void)
{
@ -68,6 +76,7 @@ pEnvMon CreateEnvMon(void)
free(pNew);
return NULL;
}
pNew->nextRun = time(NULL)+SCANINTERVALL;
AddCommand(pServ->pSics, "emon", EVWrapper, DeleteEnvMon, pNew);
return pNew;
}
@ -340,7 +349,10 @@ int EnvMonTask(void *pData)
return 0;
}
EVMonitorControllers(self);
if(time(NULL) > self->nextRun){
EVMonitorControllers(self);
self->nextRun = time(NULL) + SCANINTERVALL;
}
return 1;
}