From ca4bd90af54ff7bcd3c91e719040b86366141464 Mon Sep 17 00:00:00 2001 From: rivers Date: Thu, 2 Feb 2012 17:23:48 +0000 Subject: [PATCH] Added line to load NDStdArrays.template for 16-bit waveforms as well are 32-bit git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14414 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b --- iocBoot/iocAndor/st.cmd | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iocBoot/iocAndor/st.cmd b/iocBoot/iocAndor/st.cmd index 71c6d44..6eccf7e 100755 --- a/iocBoot/iocAndor/st.cmd +++ b/iocBoot/iocAndor/st.cmd @@ -20,7 +20,10 @@ dbLoadRecords("$(AREA_DETECTOR)/ADApp/Db/andorCCD.template", "P=$(PREFIX),R=ca NDStdArraysConfigure("Image1", 5, 0, "$(PORT)", 0, -1) dbLoadRecords("$(AREA_DETECTOR)/ADApp/Db/NDPluginBase.template","P=$(PREFIX),R=image1:,PORT=Image1,ADDR=0,TIMEOUT=1,NDARRAY_PORT=$(PORT),NDARRAY_ADDR=0") # Make NELEMENTS in the following be a little bigger than 2048*2048 -dbLoadRecords("$(AREA_DETECTOR)/ADApp/Db/NDStdArrays.template", "P=$(PREFIX),R=image1:,PORT=Image1,ADDR=0,TIMEOUT=1,TYPE=Int32,FTVL=LONG,NELEMENTS=4200000") +# Use the following command for 32-bit images. This is needed for 32-bit detectors or for 16-bit detectors in acccumulate mode if it would overflow 16 bits +#dbLoadRecords("$(AREA_DETECTOR)/ADApp/Db/NDStdArrays.template", "P=$(PREFIX),R=image1:,PORT=Image1,ADDR=0,TIMEOUT=1,TYPE=Int32,FTVL=LONG,NELEMENTS=4200000") +# Use the following command for 16-bit images. This can be used for 16-bit detector as long as accumulate mode would not result in 16-bit overflow +dbLoadRecords("$(AREA_DETECTOR)/ADApp/Db/NDStdArrays.template", "P=$(PREFIX),R=image1:,PORT=Image1,ADDR=0,TIMEOUT=1,TYPE=Int16,FTVL=SHORT,NELEMENTS=4200000") # Load all other plugins using commonPlugins.cmd < ../commonPlugins.cmd