From 8b12033cb291c752f957f9c92da3ec2e4409a70d Mon Sep 17 00:00:00 2001 From: koennecke Date: Tue, 23 May 2006 15:05:39 +0000 Subject: [PATCH] - Fixes for FOCUS 2D - Mapped fileeval to exe manager - Updates for TRICS file formats --- hardsup/asynsrv_utility.c | 5 ++-- hardsup/sinqhm.c | 13 ++++++++++ libpsi.a | Bin 1709502 -> 1710722 bytes sinqhmdriv.c | 2 +- sinqhttp.c | 22 +++++++++------- tabledrive.c | 5 ++-- tasscan.c | 53 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 85 insertions(+), 15 deletions(-) diff --git a/hardsup/asynsrv_utility.c b/hardsup/asynsrv_utility.c index 0db06f9..57a28cc 100644 --- a/hardsup/asynsrv_utility.c +++ b/hardsup/asynsrv_utility.c @@ -1499,9 +1499,9 @@ */ if (asyn_info->skt <= 0) { memset (rcve_buff, - '0', sizeof (*rcve_buff)); + '0', sizeof (*rcve_buff)); if ((AsynSrv_errcode == 0) && (asyn_info->skt < 0)) { - AsynSrv_errcode = ASYNSRV__FORCED_CLOSED; + AsynSrv_errcode = ASYNSRV__FORCED_CLOSED; } return False; } @@ -1601,6 +1601,7 @@ ** .. timeout of 1.5*tmo */ } + memset (rcve_buff,0, sizeof (*rcve_buff)); size = sizeof (rcve_buff->msg_size); memset(rcve_buff->msg_size,0,size); status = recv (asyn_info->skt, rcve_buff->msg_size, size, 0); diff --git a/hardsup/sinqhm.c b/hardsup/sinqhm.c index 2130591..3cea5af 100644 --- a/hardsup/sinqhm.c +++ b/hardsup/sinqhm.c @@ -78,6 +78,9 @@ extern int close(int fp); assert(self); assert(self->iClientSocket); + + memset(&Req_buff,0,sizeof(struct req_buff_struct)); + memset(&Rply_buff,0,sizeof(struct rply_buff_struct)); /* prepare a message */ Req_buff.bigend = htonl (0x12345678); @@ -466,6 +469,8 @@ extern int close(int fp); { return INVALID_HARSH; } + memset(&Req_buff,0,sizeof(struct req_buff_struct)); + memset(&Rply_buff,0,sizeof(struct rply_buff_struct)); /* fill in the request data structure */ Req_buff.bigend = htonl (0x12345678); @@ -700,6 +705,9 @@ extern int close(int fp); assert(self); + memset(&Req_buff,0,sizeof(struct req_buff_struct)); + memset(&Rply_buff,0,sizeof(struct rply_buff_struct)); + /* fill in the request data structure */ Req_buff.bigend = htonl (0x12345678); Req_buff.cmnd = htonl (SQHM_CNCT); @@ -804,6 +812,8 @@ extern int close(int fp); } iRet = 1; + memset(&Req_buff,0,sizeof(struct req_buff_struct)); + /* send close message, this helps the master to clean up */ Req_buff.bigend = htonl (0x12345678); @@ -1660,6 +1670,9 @@ extern int close(int fp); struct tof tofi; assert(self); + + memset(&Req_buff,0,sizeof(struct req_buff_struct)); + memset(&Rply_buff,0,sizeof(struct rply_buff_struct)); /* figure out how long we are going to be*/ iLength = 24 + self->iBanks*sizeof(struct tof_bank); diff --git a/libpsi.a b/libpsi.a index a804ba5a0073b582dc5b57a432f649a8508d5535..c46e1ee4bd73be229b60af550d500db0afd4b293 100644 GIT binary patch delta 23317 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 R=7`=i;#+}no71Y6{V$d0t#beX diff --git a/sinqhmdriv.c b/sinqhmdriv.c index 4a22c26..3336263 100644 --- a/sinqhmdriv.c +++ b/sinqhmdriv.c @@ -293,7 +293,7 @@ else { /* close the connection if there is such a thing */ - SINQHMCloseDAQ(pInternal->pMaster); + SINQHMCloseDAQ(pInternal->pMaster); } /* in any case let us propagate the state of affairs to diff --git a/sinqhttp.c b/sinqhttp.c index 5b221b7..0bd9ea4 100644 --- a/sinqhttp.c +++ b/sinqhttp.c @@ -25,14 +25,14 @@ extern char *trim(char *); /*=================================================================== The request strings to append to the computer address ====================================================================*/ -static char startdaq[] = {"/sinqhm/startdaq.egi"}; -static char stopdaq[] = {"/sinqhm/stopdaq.egi"}; -static char pausedaq[] = {"/sinqhm/pausedaq.egi"}; -static char continuedaq[] = {"/sinqhm/continuedaq.egi"}; -static char statusdaq[] = {"/sinqhm/textstatus.egi"}; -static char gethm[] = {"/sinqhm/readhmdata.egi"}; -static char configure[] = {"/sinqhm/configure.egi"}; -static char preset[] = {"/sinqhm/presethm.egi"}; +static char startdaq[] = {"/admin/startdaq.egi"}; +static char stopdaq[] = {"/admin/stopdaq.egi"}; +static char pausedaq[] = {"/admin/pausedaq.egi"}; +static char continuedaq[] = {"/admin/continuedaq.egi"}; +static char statusdaq[] = {"/admin/textstatus.egi"}; +static char gethm[] = {"/admin/readhmdata.egi"}; +static char configure[] = {"/admin/configure.egi"}; +static char preset[] = {"/admin/presethm.egi"}; /*==================================================================== error codes ======================================================================*/ @@ -191,7 +191,7 @@ static int SinqHttpConfigure(pHistDriver self, SConnection *pCon, /* actually do configure */ - if(iInit == 0){ + if(iInit == 1){ memset(confCommand,0,512*sizeof(char)); if(StringDictGet(pOpt,"hmconfigscript",confCommand,511) != 1){ SCWrite(pCon, @@ -201,7 +201,8 @@ static int SinqHttpConfigure(pHistDriver self, SConnection *pCon, } status = Tcl_Eval(pSics->pTcl,confCommand); if(status != TCL_OK){ - snprintf(confCommand,511,"ERROR: Tcl reported %s while evaluating hmconfigscript", + snprintf(confCommand,511, + "ERROR: Tcl reported %s while evaluating hmconfigscript", Tcl_GetStringResult(pSics->pTcl)); SCWrite(pCon,confCommand,eError); return 0; @@ -218,6 +219,7 @@ static int SinqHttpConfigure(pHistDriver self, SConnection *pCon, } status = ghttp_set_type(pPriv->syncRequest,ghttp_type_post); confData = (char *)Tcl_GetStringResult(pSics->pTcl); + /* puts(confData); */ status = ghttp_set_body(pPriv->syncRequest,confData, strlen(confData)); ghttp_set_authinfo(pPriv->syncRequest, pPriv->userName, diff --git a/tabledrive.c b/tabledrive.c index 8ddf49b..0b51db3 100644 --- a/tabledrive.c +++ b/tabledrive.c @@ -445,8 +445,9 @@ static int loadTable(pTableDrive self, char *filename, SConnection *pCon){ while(fgets(pBueffel,511,fd) != NULL){ if(pBueffel[0] == '#'){ strcpy(moti.motorName,trim(&pBueffel[1])); - moti.pMot = FindCommandData(pServ->pSics,moti.motorName, - "Motor"); + moti.pMot = FindCommandData(pServ->pSics, + moti.motorName, + "Motor"); if(moti.pMot == NULL){ snprintf(pBueffel,511,"ERROR: motor %s NOT found!", moti.motorName); diff --git a/tasscan.c b/tasscan.c index b4f8d1a..bcaf081 100644 --- a/tasscan.c +++ b/tasscan.c @@ -151,6 +151,8 @@ static int TASHeader(pScanData self) pDummy pDum= NULL; pIDrivable pDrive = NULL; pEVControl pTem = NULL; + pSicsVariable sVar = NULL; + float f1, f2, f3, f4; assert(self); assert(pTAS); @@ -285,6 +287,57 @@ static int TASHeader(pScanData self) pTAS->tasPar[BX]->fVal, pTAS->tasPar[BY]->fVal, pTAS->tasPar[BZ]->fVal); + + /* + * write mupad stuff if available + */ + sVar = FindCommandData(pServ->pSics,"w1","SicsVariable"); + if(sVar != NULL) + { + f1 = sVar->fVal; + sVar = FindCommandData(pServ->pSics,"w2","SicsVariable"); + if(sVar != NULL) + { + f2 = sVar->fVal; + } + sVar = FindCommandData(pServ->pSics,"w3","SicsVariable"); + if(sVar != NULL) + { + f3 = sVar->fVal; + } + sVar = FindCommandData(pServ->pSics,"w4","SicsVariable"); + if(sVar != NULL) + { + f4 = sVar->fVal; + } + fprintf(self->fd,"PARAM: W1=%8.4f, W2=%8.4f, W3=%8.4f, W4=%8.4f\n", + f1, f2, f3, f4); + + sVar = FindCommandData(pServ->pSics,"p1","SicsVariable"); + if(sVar != NULL) + { + f1 = sVar->fVal; + } + sVar = FindCommandData(pServ->pSics,"p2","SicsVariable"); + if(sVar != NULL) + { + f2 = sVar->fVal; + } + sVar = FindCommandData(pServ->pSics,"p3","SicsVariable"); + if(sVar != NULL) + { + f3 = sVar->fVal; + } + sVar = FindCommandData(pServ->pSics,"p4","SicsVariable"); + if(sVar != NULL) + { + f4 = sVar->fVal; + } + fprintf(self->fd,"PARAM: P1=%8.4f, P2=%8.4f, P3=%8.4f, P4=%8.4f\n", + f1, f2, f3, f4); + + + } /* write currents if in polarisation mode