- Introduced a general Hipadaba table module and modified the four
circle codes to use it. - Added to functions to histmem, getdelay and formattof, to support new HM - Removed obsolete mesure.*
This commit is contained in:
@ -41,7 +41,7 @@ extern void SNXFormatTime(char *pBueffel, int iLen);
|
||||
typedef struct {
|
||||
FILE *profFile; /* file with reflection profiles, ccl */
|
||||
FILE *hklFile; /* file with integrated intensities */
|
||||
int stepTable; /* table with the scan parameters */
|
||||
pSICSOBJ stepTable; /* table with the scan parameters */
|
||||
char *currentFileRoot;
|
||||
pSICSOBJ messList;
|
||||
pHdb currentRefl; /* the current reflection being measured */
|
||||
@ -90,7 +90,7 @@ static int FourMessAction(SConnection * pCon, SicsInterp * pSics,
|
||||
}
|
||||
|
||||
if (strcmp(argv[1], "table") == 0) {
|
||||
return HandleFourCircleCommands(&priv->stepTable, pCon,
|
||||
return HandleFourCircleCommands(priv->stepTable, pCon,
|
||||
argc, argv, &err);
|
||||
}
|
||||
|
||||
@ -774,7 +774,7 @@ static int FourMessSave(void *data, char *name, FILE * fd)
|
||||
pFourMess priv = self->pPrivate;
|
||||
|
||||
SaveSICSOBJ(data, name, fd);
|
||||
SaveFourCircleTable(priv->stepTable, name, fd);
|
||||
priv->stepTable->pDes->SaveStatus(priv->stepTable,"fmess table", fd);
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -878,6 +878,7 @@ void InstallFourMess(SConnection * pCon, SicsInterp * pSics)
|
||||
MakeHipadabaCallback(SetScannerCB, priv, NULL));
|
||||
|
||||
priv->pScanner = FindCommandData(pSics, "xxxscan", "ScanObject");
|
||||
AddHipadabaChild(pNew->objectNode, priv->stepTable->objectNode,pCon);
|
||||
|
||||
AddCommand(pSics, "fmess", FourMessAction, KillSICSOBJ, pNew);
|
||||
}
|
||||
|
Reference in New Issue
Block a user