From dbcbe8642aaeeaa62c1defd0c2b64e93618de979 Mon Sep 17 00:00:00 2001 From: Geoffrey Mant Date: Thu, 22 Feb 2018 16:21:06 +0000 Subject: [PATCH 1/3] Remove -DSIPCOMPILATION flags --- sip/configure.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sip/configure.py b/sip/configure.py index 56f9bac86..8e617b6a4 100644 --- a/sip/configure.py +++ b/sip/configure.py @@ -189,14 +189,13 @@ def main(): extraIncludes += ['../../third-party/yat/include','/home/xpix_user/PCI_VALIDATED/trunk/sw/xpci_lib'] elif(modName == 'xspress3'): extraIncludes += ['../../third-party/hdf5/c++/src'] - extra_cxxflags += ['-DSIPCOMPILATION'] elif(modName == 'pco'): extraIncludes += ['R:/bliss/projects/LIMA/package/WIN32/PCO/sdkPco/include'] elif(modName == 'marccd'): extraIncludes += ['../../../include/DiffractionImage'] extraIncludes += ['../../third-party/yat/include'] elif(modName == 'pointgrey'): - extraIncludes += ['/usr/include/flycapture'] + extraIncludes += ['../../camera/pointgrey/sdk/usr/include/flycapture'] elif(modName == 'rayonixhs'): extraIncludes += ['/opt/rayonix/include/craydl','/opt/rayonix/include','/opt/rayonix/include/marccd'] extra_cxxflags += ['-std=c++0x'] @@ -210,7 +209,6 @@ def main(): elif (modName == 'hexitec'): extraIncludes += ['../../camera/hexitec/sdk','/opt/pleora/ebus_sdk/CentOS-RHEL-7-x86_64/include'] extra_cxxflags += ['-std=c++11'] - extra_cxxflags += ['-DSIPCOMPILATION'] elif (modName == 'slsdetector'): SLS_DETECTORS_DIR = '../../camera/slsdetector/slsDetectorPackage' SLS_DETECTORS_SW = os.path.join(SLS_DETECTORS_DIR, From 32730653375fc97814eddfdfac77e46b71e9bf90 Mon Sep 17 00:00:00 2001 From: Geoffrey Mant Date: Thu, 22 Feb 2018 16:22:31 +0000 Subject: [PATCH 2/3] Add Bpp64 and Bpp64S --- common/include/lima/Constants.h | 3 ++- common/sip/Constants.sip | 2 +- common/src/Constants.cpp | 4 ++++ common/src/SizeUtils.cpp | 6 +++++- control/src/CtBuffer.cpp | 4 ++++ control/src/CtSpsImage.cpp | 2 ++ 6 files changed, 18 insertions(+), 3 deletions(-) diff --git a/common/include/lima/Constants.h b/common/include/lima/Constants.h index 8559cd478..344d9f44a 100644 --- a/common/include/lima/Constants.h +++ b/common/include/lima/Constants.h @@ -41,7 +41,8 @@ LIMACORE_API std::ostream& operator <<(std::ostream& os, AlignDir align_dir); */ enum ImageType { Bpp8, Bpp8S, Bpp10, Bpp10S, Bpp12, Bpp12S, Bpp14, Bpp14S, - Bpp16, Bpp16S, Bpp32, Bpp32S, Bpp32F, Bpp1, Bpp4, Bpp6, Bpp24, Bpp24S + Bpp16, Bpp16S, Bpp32, Bpp32S, Bpp32F, Bpp1, Bpp4, Bpp6, Bpp24, Bpp24S, + Bpp64, Bpp64S }; LIMACORE_API std::ostream& operator <<(std::ostream& os, ImageType image_type); diff --git a/common/sip/Constants.sip b/common/sip/Constants.sip index c4d183407..02d8f948f 100644 --- a/common/sip/Constants.sip +++ b/common/sip/Constants.sip @@ -25,7 +25,7 @@ enum AlignDir { enum ImageType { Bpp8, Bpp8S, Bpp10, Bpp10S, Bpp12, Bpp12S, Bpp14, Bpp14S, Bpp16, Bpp16S, Bpp32, Bpp32S, - Bpp32F, Bpp1, Bpp4, Bpp6, Bpp24, Bpp24S + Bpp32F, Bpp1, Bpp4, Bpp6, Bpp24, Bpp24S, Bpp64, Bpp64S }; enum AcqMode { diff --git a/common/src/Constants.cpp b/common/src/Constants.cpp index 38b05e718..72b554ec5 100644 --- a/common/src/Constants.cpp +++ b/common/src/Constants.cpp @@ -60,6 +60,8 @@ const char* lima::convert_2_string(ImageType image_type) case Bpp6: name = "Bpp6"; break; case Bpp24: name = "Bpp24"; break; case Bpp24S: name = "Bpp24S"; break; + case Bpp64: name = "Bpp64"; break; + case Bpp64S: name = "Bpp64S"; break; } return name; } @@ -88,6 +90,8 @@ void lima::convert_from_string(const std::string& val, else if(buffer == "bpp6") image_type = Bpp6; else if(buffer == "bpp24") image_type = Bpp24; else if(buffer == "bpp24s") image_type = Bpp24S; + else if(buffer == "bpp64") image_type = Bpp64; + else if(buffer == "bpp64s") image_type = Bpp64S; else { std::ostringstream msg; diff --git a/common/src/SizeUtils.cpp b/common/src/SizeUtils.cpp index 2859223bf..d291e20dd 100644 --- a/common/src/SizeUtils.cpp +++ b/common/src/SizeUtils.cpp @@ -173,6 +173,8 @@ int FrameDim::getImageTypeBpp(ImageType type) case Bpp24: case Bpp24S: return 32; + case Bpp64S: + case Bpp64: return 64; default: throw LIMA_COM_EXC(InvalidValue, "Invalid image type"); } @@ -205,7 +207,9 @@ int FrameDim::getImageTypeDepth(ImageType type) case Bpp24: case Bpp24S: return 4; - + case Bpp64: + case Bpp64S: + return 8; default: throw LIMA_COM_EXC(InvalidValue, "Invalid image type"); } diff --git a/control/src/CtBuffer.cpp b/control/src/CtBuffer.cpp index 9bd16076d..1c8fb0222 100644 --- a/control/src/CtBuffer.cpp +++ b/control/src/CtBuffer.cpp @@ -309,6 +309,10 @@ void CtBuffer::transformHwFrameInfoToData(Data &fdata, fdata.type= Data::UINT32; break; case Bpp24S: fdata.type = Data::INT32; break; + case Bpp64: + fdata.type= Data::UINT64; break; + case Bpp64S: + fdata.type = Data::INT64; break; default: THROW_CTL_ERROR(InvalidValue) << "Data type not yet managed" << DEB_VAR1(ftype); } diff --git a/control/src/CtSpsImage.cpp b/control/src/CtSpsImage.cpp index fb08e2c96..cdb83b6f6 100644 --- a/control/src/CtSpsImage.cpp +++ b/control/src/CtSpsImage.cpp @@ -133,6 +133,8 @@ void CtSpsImage::_check_data_size(Data &data) case Data::UINT32: image_type = Bpp32; break; case Data::INT32: image_type = Bpp32S; break; case Data::FLOAT: image_type = Bpp32F; break; + case Data::UINT64: image_type = Bpp64; break; + case Data::INT64: image_type = Bpp64S; break; default: THROW_CTL_ERROR(InvalidValue) << "Invalid " << DEB_VAR1(data.type); From d7aa5a52c587bb57194aa976dc763bdc19e2314a Mon Sep 17 00:00:00 2001 From: Geoffrey Mant Date: Mon, 26 Feb 2018 12:54:22 +0000 Subject: [PATCH 3/3] Extra lib moving from Pleora v4.1.5 to V5.0.2 --- build/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Makefile b/build/Makefile index fdb2ade86..a101e09bc 100644 --- a/build/Makefile +++ b/build/Makefile @@ -891,7 +891,7 @@ endif ifneq ($(COMPILE_HEXITEC),0) HEXITEC_LDFLAGS := -L/opt/pleora/ebus_sdk/CentOS-RHEL-7-x86_64/lib -HEXITEC_LDLIBS := -lPvDevice -lPvStream -lPvBuffer -lPvGenICam -lPvBase -lPvSerial -lEbUtilsLib +HEXITEC_LDLIBS := -lPvDevice -lPvStream -lPvBuffer -lPvGenICam -lPvBase -lPvSerial -lPvSystem -lEbUtilsLib hexitec-name := hexitec hexitec-objs := ../camera/hexitec/src/Hexitec.o