From 3fb2fd08939b3fa7690b41fce3e12563389560d2 Mon Sep 17 00:00:00 2001 From: rivers Date: Fri, 8 Mar 2013 22:32:58 +0000 Subject: [PATCH] Removed large stack sizes for NDFileNexus and NDFileHDF5; these were previously needed for Windows, but base 3.14.12.3 made the default stack size much larger git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@16067 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b --- iocBoot/commonPlugins.cmd | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/iocBoot/commonPlugins.cmd b/iocBoot/commonPlugins.cmd index 178422d..ed157ae 100644 --- a/iocBoot/commonPlugins.cmd +++ b/iocBoot/commonPlugins.cmd @@ -17,15 +17,13 @@ dbLoadRecords("$(AREA_DETECTOR)/ADApp/Db/NDFile.template", "P=$(PREFIX),R=J dbLoadRecords("$(AREA_DETECTOR)/ADApp/Db/NDFileJPEG.template", "P=$(PREFIX),R=JPEG1:,PORT=FileJPEG1,ADDR=0,TIMEOUT=1") # Create a NeXus file saving plugin -# The default stack size on Windows in base 3.14.12.2 is only 6000 bytes, not enough for this plugin -NDFileNexusConfigure("FileNexus1", $(QSIZE), 0, "$(PORT)", 0, 0, 100000) +NDFileNexusConfigure("FileNexus1", $(QSIZE), 0, "$(PORT)", 0) dbLoadRecords("$(AREA_DETECTOR)/ADApp/Db/NDPluginBase.template","P=$(PREFIX),R=Nexus1:,PORT=FileNexus1,ADDR=0,TIMEOUT=1,NDARRAY_PORT=$(PORT),NDARRAY_ADDR=0") dbLoadRecords("$(AREA_DETECTOR)/ADApp/Db/NDFile.template", "P=$(PREFIX),R=Nexus1:,PORT=FileNexus1,ADDR=0,TIMEOUT=1") dbLoadRecords("$(AREA_DETECTOR)/ADApp/Db/NDFileNexus.template", "P=$(PREFIX),R=Nexus1:,PORT=FileNexus1,ADDR=0,TIMEOUT=1") # Create an HDF5 file saving plugin -# The default stack size on Windows in base 3.14.12.2 is only 6000 bytes, not enough for this plugin -NDFileHDF5Configure("FileHDF1", $(QSIZE), 0, "$(PORT)", 0, 0, 100000) +NDFileHDF5Configure("FileHDF1", $(QSIZE), 0, "$(PORT)", 0) dbLoadRecords("$(AREA_DETECTOR)/ADApp/Db/NDPluginBase.template","P=$(PREFIX),R=HDF1:,PORT=FileHDF1,ADDR=0,TIMEOUT=1,NDARRAY_PORT=$(PORT),NDARRAY_ADDR=0") dbLoadRecords("$(AREA_DETECTOR)/ADApp/Db/NDFile.template", "P=$(PREFIX),R=HDF1:,PORT=FileHDF1,ADDR=0,TIMEOUT=1") dbLoadRecords("$(AREA_DETECTOR)/ADApp/Db/NDFileHDF5.template", "P=$(PREFIX),R=HDF1:,PORT=FileHDF1,ADDR=0,TIMEOUT=1")