From 2c4265d4934aff04f3ce04130b43ff750718247d Mon Sep 17 00:00:00 2001 From: James Souter Date: Thu, 16 Nov 2023 10:10:02 +0000 Subject: [PATCH 1/4] base frame timestamp off epicsTS --- andorApp/src/andorCCD.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/andorApp/src/andorCCD.cpp b/andorApp/src/andorCCD.cpp index abecd28..66a0b8a 100755 --- a/andorApp/src/andorCCD.cpp +++ b/andorApp/src/andorCCD.cpp @@ -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,8 @@ 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); + pArray->timeStamp = pArray->epicsTS.secPastEpoch + pArray->epicsTS.nsec / 1.e9; /* Get any attributes that have been defined for this driver */ this->getAttributes(pArray->pAttributeList); /* Call the NDArray callback */ From 9a077b07043aee644e529bfcb9ca0ce255fd4a6e Mon Sep 17 00:00:00 2001 From: James Souter Date: Fri, 17 Nov 2023 09:17:23 +0000 Subject: [PATCH 2/4] use new updateTimeStamps method --- andorApp/src/andorCCD.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/andorApp/src/andorCCD.cpp b/andorApp/src/andorCCD.cpp index 66a0b8a..f7cb4e4 100755 --- a/andorApp/src/andorCCD.cpp +++ b/andorApp/src/andorCCD.cpp @@ -1647,8 +1647,7 @@ void AndorCCD::dataTask(void) } /* Put the frame number and time stamp into the buffer */ pArray->uniqueId = imageCounter; - updateTimeStamp(&pArray->epicsTS); - pArray->timeStamp = pArray->epicsTS.secPastEpoch + pArray->epicsTS.nsec / 1.e9; + updateTimeStamps(pArray); /* Get any attributes that have been defined for this driver */ this->getAttributes(pArray->pAttributeList); /* Call the NDArray callback */ From 2eb2fa34212754e5700f2fbcbbf1c418a516e89a Mon Sep 17 00:00:00 2001 From: keenanlang Date: Sun, 7 Jan 2024 21:03:45 -0600 Subject: [PATCH 3/4] Use OS_CLASS and ARCH_CLASS --- andorSupport/Makefile | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/andorSupport/Makefile b/andorSupport/Makefile index 7a8fe0d..c6ddc5a 100755 --- a/andorSupport/Makefile +++ b/andorSupport/Makefile @@ -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 + 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 From 2722b7240e2afdab97c1fa53a6d06d5c69bf11b5 Mon Sep 17 00:00:00 2001 From: keenanlang Date: Sun, 7 Jan 2024 21:12:47 -0600 Subject: [PATCH 4/4] Specify x86 to avoid linux-arm --- andorSupport/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/andorSupport/Makefile b/andorSupport/Makefile index c6ddc5a..3f9a91b 100755 --- a/andorSupport/Makefile +++ b/andorSupport/Makefile @@ -28,7 +28,7 @@ else ifeq ($(OS_CLASS), Linux) LIB_INSTALLS_Linux += ../os/linux-x86_64/libshamrockcif.so.2 LIB_INSTALLS_Linux += ../os/linux-x86_64/libshamrockcif.so - else + 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