diff --git a/countersec.c b/countersec.c index 2ec4f3e8..9ddbcb1a 100644 --- a/countersec.c +++ b/countersec.c @@ -192,6 +192,9 @@ static int SecCtrCheckStatus(void *pData, SConnection *pCon) The 1 below is only correct for PSI where only the first monitor can be the control monitor. Elsewhere this must be the control monitor channel + + This may need to change with the second generation DAQ where the + count control channel can be changed. */ fControl = v.v.intArray[1]; } diff --git a/fourmess.c b/fourmess.c index 0fc084db..d5090529 100644 --- a/fourmess.c +++ b/fourmess.c @@ -487,7 +487,7 @@ static int FourMessStoreIntern(pSICSOBJ self, SConnection * pCon, } /* get mf */ - fMF = -777.77; + fMF = -0.00; pEva = (pEVControl) FindCommandData(pServ->pSics, "mf", "Environment Controller"); if (pEva == NULL) { diff --git a/interface.c b/interface.c index a7270e36..bd6bd70f 100644 --- a/interface.c +++ b/interface.c @@ -260,7 +260,7 @@ long StartDriveTask(void *obj, SConnection *pCon, char *name, float fTarget) return -1; } if(pDriv->CheckLimits(obj,fTarget,error,sizeof(error)) != OKOK){ - SCPrintf(pCon,eError,"ERROR: %s cannot reach %f, reason %s", name, + SCPrintf(pCon,eLogError,"ERROR: %s cannot reach %f, reason %s", name, fTarget, error); return -1; } diff --git a/interface.h b/interface.h index 6753084e..3af14a9c 100644 --- a/interface.h +++ b/interface.h @@ -64,7 +64,7 @@ int running; int (*Halt)(void *self); void (*SetCountParameters)(void *self, float fPreset, - CounterMode eMode);\ + CounterMode eMode); int (*StartCount)(void *self, SConnection *pCon); int (*CheckCountStatus)(void *self, SConnection *pCon); int (*Pause)(void *self, SConnection *pCon); diff --git a/sicshipadaba.c b/sicshipadaba.c index 2de8ab68..81c2d024 100644 --- a/sicshipadaba.c +++ b/sicshipadaba.c @@ -4238,7 +4238,9 @@ static hdbCallbackReturn SICSNotifyScriptCallback(pHdb node, void *userData, return hdbContinue; } - copyHdbValue(mm->v, &node->value); + if(mm->v != &node->value){ + copyHdbValue(mm->v, &node->value); + } status = Tcl_Eval(InterpGetTcl(pServ->pSics), script); if (status != TCL_OK) { tracePar(node->name,"ERROR: %s while evaluating updatescript %s", diff --git a/tasscanub.c b/tasscanub.c index 92d060c1..c721a7aa 100644 --- a/tasscanub.c +++ b/tasscanub.c @@ -491,8 +491,8 @@ static int TASUBHeader(pScanData self) start with the scan variables */ if (pTAS->iPOL >= 0) { - strcpy(pBueffel, "FORMT: (I4,I4,"); - strcpy(pHeader, " PNT PAL"); + strcpy(pBueffel, "FORMT: (I3,1X,I3,1X,"); + strcpy(pHeader, " PNT PAL"); } else { strcpy(pBueffel, "FORMT: (I4,1X,"); strcpy(pHeader, " PNT "); @@ -587,7 +587,7 @@ static int TASUBScanPoint(pScanData self, int iPoint) write point number */ if (pTAS->iPOL >= 0) { - snprintf(pBueffel,sizeof(pBueffel)-1, "%3d %3d", iPoint + 1, pTAS->iPOL); + snprintf(pBueffel,sizeof(pBueffel)-1, "%3d %3d ", iPoint + 1, pTAS->iPOL); } else { snprintf(pBueffel,sizeof(pBueffel)-1, "%4d ", iPoint + 1); }