- Added bridge functions to histmemsec to make it look more like histmem
- Modifed many modules using histmem to work also with histmemsec - Extended tasker with task names and task groups - There is a new taskobj which allows to list tasks and to interact with them. - Task now supports running Tcl functions as tasks - There is a new experimental sctcomtask module which allows to define communication tasks against a scriptcontext. This is a new feature which should facilitate writing sequential scripts using asynchronous communication. - A fix to make spss7 work when there are no switches - ORION support for single X. TRICS measures crystals hanging down, ORION standing up SKIPPED: psi/ease.c psi/faverage.c psi/jvlprot.c psi/make_gen psi/pardef.c psi/polterwrite.c psi/psi.c psi/sinq.c psi/spss7.c
This commit is contained in:
6
frame.c
6
frame.c
@@ -66,7 +66,7 @@ static int readHMFrame(SConnection * pCon, pHistMem pHM,
|
||||
if (nFrame >= noTimeBins) {
|
||||
nFrame = noTimeBins - 1;
|
||||
}
|
||||
if (isSINQHMDriv(pHM->pDriv) && noTimeBins > 2) {
|
||||
if (!isSecondGen(pHM) && isSINQHMDriv(pHM->pDriv) && noTimeBins > 2) {
|
||||
/*
|
||||
read from HM. The 5 is PROJECT__FRAME in Sinqhm_def.h
|
||||
Again: be friendly: fix out of range frames
|
||||
@@ -81,7 +81,7 @@ static int readHMFrame(SConnection * pCon, pHistMem pHM,
|
||||
free(buffer);
|
||||
return 0;
|
||||
}
|
||||
} else if(isSINQHTTP(pHM->pDriv) && noTimeBins > 2){
|
||||
} else if(!isSecondGen(pHM) && isSINQHTTP(pHM->pDriv) && noTimeBins > 2){
|
||||
if(sansflag){
|
||||
snprintf(histCommand,132,"sample:0:%d:%d:%d", iDim[0]*iDim[1], nFrame, nFrame+1);
|
||||
} else {
|
||||
@@ -244,7 +244,7 @@ int PSDFrameAction(SConnection * pCon, SicsInterp * pSics, void *pData,
|
||||
eError);
|
||||
return 0;
|
||||
}
|
||||
pHM = (pHistMem) FindCommandData(pSics, argv[2], "HistMem");
|
||||
pHM = (pHistMem) FindHM(pSics, argv[2]);
|
||||
if (pHM == NULL) {
|
||||
SCWrite(pCon, "ERROR: Did not find histogram memory", eError);
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user