File tree Expand file tree Collapse file tree 5 files changed +10
-7
lines changed
Expand file tree Collapse file tree 5 files changed +10
-7
lines changed Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ WORK=/dls_sw/work/R3.14.12.3/support
2525TOOLS_BASE=/dls_sw/prod/tools/RHEL6-x86_64
2626
2727ASYN=$(SUPPORT)/asyn/4-26
28- ADCORE=$(SUPPORT)/ADCore/2-4dls2
28+ ADCORE=$(SUPPORT)/ADCore/2-4dls6
2929PYTHON_PREFIX=$(TOOLS_BASE)/Python/2-7-3/prefix
3030
3131# EPICS_BASE usually appears last so other apps can override stuff:
Original file line number Diff line number Diff line change 11<?xml version =" 1.0" ?>
22<components arch =" linux-x86_64" >
33 <ADURL .URLDriver ADDR =" 0" P =" ADPYTHONTEST" PORT =" CAM.URL" R =" :URL:" TIMEOUT =" 1" />
4- <adPython .adPythonPlugin ADDR =" 0" NDARRAY_ADDR =" 0" NDARRAY_PORT =" CAM.URL" P =" ADPYTHONTEST" PORT =" CAM.PY1" R =" :PY1:" TIMEOUT =" 1" classname =" Gaussian2DFitter" />
4+ <!-- <adPython.adPythonPlugin ADDR="0" NDARRAY_ADDR="0" NDARRAY_PORT="CAM.URL" P="ADPYTHONTEST" PORT="CAM.PY1" R=":PY1:" TIMEOUT="1" classname="Gaussian2DFitter"/>-->
5+ <adPython .adPythonPlugin ADDR =" 0" NDARRAY_PORT =" CAM.URL" P =" ADPYTHONTEST" PORT =" CAM.PY1" R =" :PY1:" TIMEOUT =" 1" classname =" Template" />
6+ <adPython .adPythonPlugin ADDR =" 0" NDARRAY_PORT =" CAM.URL" P =" ADPYTHONTEST" PORT =" CAM.PY2" R =" :PY2:" TIMEOUT =" 1" classname =" Rotate" />
57 <ADCore .NDStdArrays ADDR =" 0" FTVL =" UCHAR" NDARRAY_ADDR =" 0" NDARRAY_PORT =" CAM.PY1" NELEMENTS =" 786432" P =" ADPYTHONTEST" PORT =" CAM.ARR1" R =" :ARR1:" TIMEOUT =" 1" TYPE =" Int8" />
8+ <ADCore .NDStdArrays ADDR =" 0" FTVL =" UCHAR" NDARRAY_PORT =" CAM.PY1" NELEMENTS =" 1149184" P =" ADPYTHONTEST" PORT =" CAM.ARR2" R =" :ARR1:" TIMEOUT =" 1" TYPE =" Int8" />
69 <ADCore .NDFileHDF5 ADDR =" 0" NDARRAY_ADDR =" 0" NDARRAY_PORT =" CAM.PY1" P =" ADPYTHONTEST" PORT =" CAM.HDF" R =" :HDF:" TIMEOUT =" 1" />
7- <EPICS_BASE .StartupCommand command =" dbpf(" ADPYTHONTEST:URL:URL1" , " $(ADPYTHON)/greyscale_beam_corner.png " )" post_init =" True" />
10+ <EPICS_BASE .StartupCommand command =" dbpf(" ADPYTHONTEST:URL:URL1" , " $(ADPYTHON)/test.jpg " )" post_init =" True" />
811 <EPICS_BASE .StartupCommand command =" dbpf(" ADPYTHONTEST:URL:AcquirePeriod" , " 1" )" post_init =" True" />
912 <EPICS_BASE .StartupCommand command =" dbpf(" ADPYTHONTEST:URL:Acquire" , " 1" )" post_init =" True" />
1013</components >
Original file line number Diff line number Diff line change 11# Place any example specific dependencies here
2- ADURL=$(SUPPORT)/ADURL/2-1dls1
2+ ADURL=$(SUPPORT)/ADURL/2-1dls2
Original file line number Diff line number Diff line change 1- FFMPEGSERVER=$(SUPPORT)/ffmpegServer/3-0dls0-8
2- ADURL=$(SUPPORT)/ADURL/2-1dls1
1+ FFMPEGSERVER=$(SUPPORT)/ffmpegServer/3-0dls0-10
2+ ADURL=$(SUPPORT)/ADURL/2-1dls2
Original file line number Diff line number Diff line change 11# Place any example specific dependencies here
2- BUSY=$(SUPPORT)/busy/1-4dls1
2+ BUSY=$(SUPPORT)/busy/1-6-1
You can’t perform that action at this time.
0 commit comments