lin-epics-modules/ADAndor
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:areaDetector/ADAndor

Browse Source
This commit is contained in:
Mark Rivers
2024-11-29 09:21:26 -06:00
parent a9ee2e183e 4805e4faf1
commit be78d0ddfe
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
andorApp/src/andorCCD.cpp
View File

@@ -1538,7 +1538,6 @@ void AndorCCD::dataTask(void)
size_t dims[2];
int nDims = 2;
int i;
epicsTimeStamp startTime;
NDArray *pArray;
int autoSave;
int readOutMode;
@@ -1618,7 +1617,6 @@ void AndorCCD::dataTask(void)
setIntegerParam(ADNumImagesCounter, numImagesCounter);
// If array callbacks are enabled then read data into NDArray, do callbacks
if (arrayCallbacks) {
epicsTimeGetCurrent(&startTime);
// Allocate an NDArray
dims[0] = sizeX;
dims[1] = sizeY;
@@ -1649,8 +1647,7 @@ void AndorCCD::dataTask(void)
}
/* Put the frame number and time stamp into the buffer */
pArray->uniqueId = imageCounter;
pArray->timeStamp = startTime.secPastEpoch + startTime.nsec / 1.e9;
updateTimeStamp(&pArray->epicsTS);
updateTimeStamps(pArray);
/* Get any attributes that have been defined for this driver */
this->getAttributes(pArray->pAttributeList);
/* Call the NDArray callback */

23
andorSupport/Makefile
View File

@@ -21,20 +21,21 @@ else ifeq (windows-x64, $(findstring windows-x64, $(T_A)))
LIB_INSTALLS_WIN32 += ../os/windows-x64/atmcd64m.lib
LIB_INSTALLS_WIN32 += ../os/windows-x64/ShamrockCIFm.lib
else ifeq (linux-x86_64, $(findstring linux-x86_64, $(T_A)))
LIB_INSTALLS_Linux += ../os/linux-x86_64/libandor.so.2
LIB_INSTALLS_Linux += ../os/linux-x86_64/libandor.so
LIB_INSTALLS_Linux += ../os/linux-x86_64/libshamrockcif.so.2
LIB_INSTALLS_Linux += ../os/linux-x86_64/libshamrockcif.so
else ifeq ($(OS_CLASS), Linux)
ifeq ($(ARCH_CLASS), x86_64)
LIB_INSTALLS_Linux += ../os/linux-x86_64/libandor.so.2
LIB_INSTALLS_Linux += ../os/linux-x86_64/libandor.so
LIB_INSTALLS_Linux += ../os/linux-x86_64/libshamrockcif.so.2
LIB_INSTALLS_Linux += ../os/linux-x86_64/libshamrockcif.so
else ifeq (linux-x86, $(findstring linux-x86, $(T_A)))
LIB_INSTALLS_Linux += ../os/linux-x86/libandor.so.2
LIB_INSTALLS_Linux += ../os/linux-x86/libandor.so
LIB_INSTALLS_Linux += ../os/linux-x86/libshamrockcif.so.2
LIB_INSTALLS_Linux += ../os/linux-x86/libshamrockcif.so
else ifeq ($(ARCH_CLASS), x86)
LIB_INSTALLS_Linux += ../os/linux-x86/libandor.so.2
LIB_INSTALLS_Linux += ../os/linux-x86/libandor.so
LIB_INSTALLS_Linux += ../os/linux-x86/libshamrockcif.so.2
LIB_INSTALLS_Linux += ../os/linux-x86/libshamrockcif.so
endif
endif
#=============================
include $(TOP)/configure/RULES