diff --git a/AreaDetector_Scripts/start_imageJ b/AreaDetector_Scripts/start_imageJ deleted file mode 100755 index ff60fa89c1dfa919f4e2e91dc1f7e6cb1bf4a75a..0000000000000000000000000000000000000000 --- a/AreaDetector_Scripts/start_imageJ +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -cd /local/DPbin/ImageJ/ -sed -e 's/dp_andor3_xrd34/'$1'/' /local/DPbin/ImageJ/ImageJ_Profiles/DP_Generic.properties > ~/EPICS_AD_Viewer.properties -export EPICS_CA_MAX_ARRAY_BYTES=30000000 -./jre/bin/java -Xmx1024m -jar ij.jar -run "EPICS AD Viewer" & diff --git a/AreaDetector_Scripts/start_imageJ_GC1380H b/AreaDetector_Scripts/start_imageJ_GC1380H deleted file mode 100755 index 58e2bf8dd6443127fe9aaed7a09129a12628a877..0000000000000000000000000000000000000000 --- a/AreaDetector_Scripts/start_imageJ_GC1380H +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -cd /local/DPbin/ImageJ/ -cp /local/DPbin/ImageJ/ImageJ_Profiles/DP_GC1380H.properties ~/EPICS_AD_Viewer.properties -export EPICS_CA_MAX_ARRAY_BYTES=30000000 -./jre/bin/java -Xmx512m -jar ij.jar -run "EPICS AD Viewer" & diff --git a/AreaDetector_Scripts/start_imageJ_GC2450 b/AreaDetector_Scripts/start_imageJ_GC2450 deleted file mode 100755 index e22eaaad17e96caf5f717b60eeb4174a17659ef5..0000000000000000000000000000000000000000 --- a/AreaDetector_Scripts/start_imageJ_GC2450 +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -cd /local/DPbin/ImageJ/ -cp /local/DPbin/ImageJ/ImageJ_Profiles/DP_GC2450.properties ~/EPICS_AD_Viewer.properties -export EPICS_CA_MAX_ARRAY_BYTES=30000000 -./jre/bin/java -Xmx512m -jar ij.jar -run "EPICS AD Viewer" & diff --git a/AreaDetector_Scripts/start_imageJ_XrayEye b/AreaDetector_Scripts/start_imageJ_XrayEye deleted file mode 100755 index ceb8adfc1387e3207a1dd588dbbb50a10999719e..0000000000000000000000000000000000000000 --- a/AreaDetector_Scripts/start_imageJ_XrayEye +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -cd /local/DPbin/ImageJ/ -cp /local/DPbin/ImageJ/ImageJ_Profiles/DP_XrayEye.properties ~/EPICS_AD_Viewer.properties -export EPICS_CA_MAX_ARRAY_BYTES=30000000 -./jre/bin/java -Xmx512m -jar ij.jar -run "EPICS AD Viewer" & diff --git a/AreaDetector_Scripts/start_imageJ_andor b/AreaDetector_Scripts/start_imageJ_andor deleted file mode 100755 index 5d49617eb450cb58736da3174b5c93894b88d211..0000000000000000000000000000000000000000 --- a/AreaDetector_Scripts/start_imageJ_andor +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -cd /local/DPbin/ImageJ/ -sed -e 's/xrd34/'$1'/' /local/DPbin/ImageJ/ImageJ_Profiles/DP_Generic.properties > ~/EPICS_AD_Viewer.properties -export EPICS_CA_MAX_ARRAY_BYTES=30000000 -./jre/bin/java -Xmx1024m -jar ij.jar -run "EPICS AD Viewer" & diff --git a/AreaDetector_Scripts/start_imageJ_coolsnap b/AreaDetector_Scripts/start_imageJ_coolsnap deleted file mode 100755 index 20b3f676db9027dfdeffca11a420d7f05bbcdf3b..0000000000000000000000000000000000000000 --- a/AreaDetector_Scripts/start_imageJ_coolsnap +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -cd /local/DPbin/ImageJ/ -sed -e 's/xrd24/'$1'/' /local/DPbin/ImageJ/ImageJ_Profiles/DP_CoolSnap.properties > ~/EPICS_AD_Viewer.properties -export EPICS_CA_MAX_ARRAY_BYTES=30000000 -./jre/bin/java -Xmx512m -jar ij.jar -run "EPICS AD Viewer" & diff --git a/AreaDetector_Scripts/start_imageJ_mar165a b/AreaDetector_Scripts/start_imageJ_mar165a deleted file mode 100755 index 7747b54609d6fda21e067b7a9ca2f8b24fbefec8..0000000000000000000000000000000000000000 --- a/AreaDetector_Scripts/start_imageJ_mar165a +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -cd /local/DPbin/ImageJ/ -cp /local/DPbin/ImageJ/ImageJ_Profiles/dp_mar165_a.properties ~/EPICS_AD_Viewer.properties -export EPICS_CA_MAX_ARRAY_BYTES=30000000 -./jre/bin/java -Xmx512m -jar ij.jar -run "EPICS AD Viewer" & diff --git a/AreaDetector_Scripts/start_imageJ_mar165b b/AreaDetector_Scripts/start_imageJ_mar165b deleted file mode 100755 index 984f0125afa42ccf1dea56db42f47c0d9d3cb293..0000000000000000000000000000000000000000 --- a/AreaDetector_Scripts/start_imageJ_mar165b +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -cd /local/DPbin/ImageJ/ -cp /local/DPbin/ImageJ/ImageJ_Profiles/dp_mar165_b.properties ~/EPICS_AD_Viewer.properties -export EPICS_CA_MAX_ARRAY_BYTES=30000000 -./jre/bin/java -Xmx512m -jar ij.jar -run "EPICS AD Viewer" & diff --git a/AreaDetector_Scripts/start_imageJ_mar165c b/AreaDetector_Scripts/start_imageJ_mar165c deleted file mode 100755 index 97870f106c8841639520e39170edcc454d5b7b11..0000000000000000000000000000000000000000 --- a/AreaDetector_Scripts/start_imageJ_mar165c +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -cd /local/DPbin/ImageJ/ -cp /local/DPbin/ImageJ/ImageJ_Profiles/dp_mar165_c.properties ~/EPICS_AD_Viewer.properties -export EPICS_CA_MAX_ARRAY_BYTES=30000000 -./jre/bin/java -Xmx512m -jar ij.jar -run "EPICS AD Viewer" & diff --git a/AreaDetector_Scripts/start_imageJ_mar345 b/AreaDetector_Scripts/start_imageJ_mar345 deleted file mode 100755 index 8e01339549b22cbf5f207d10414056c8025252be..0000000000000000000000000000000000000000 --- a/AreaDetector_Scripts/start_imageJ_mar345 +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -cd /local/DPbin/ImageJ/ -cp /local/DPbin/ImageJ/ImageJ_Profiles/dp_mar345.properties ~/EPICS_AD_Viewer.properties -export EPICS_CA_MAX_ARRAY_BYTES=30000000 -./jre/bin/java -Xmx512m -jar ij.jar -run "EPICS AD Viewer" & diff --git a/ImageJ_Profiles/DP_CoolSnap.properties b/ImageJ_Profiles/DP_CoolSnap.properties deleted file mode 100644 index 12c6197dfe487dd507cf24401b5cf2291ed65fc7..0000000000000000000000000000000000000000 --- a/ImageJ_Profiles/DP_CoolSnap.properties +++ /dev/null @@ -1,3 +0,0 @@ -#EPICS_AD_Viewer Properties -#Fri Mar 01 10:25:41 CST 2013 -PVPrefix=dp_coolsnap_xrd24\:image1\: diff --git a/ImageJ_Profiles/DP_GC1380H.properties b/ImageJ_Profiles/DP_GC1380H.properties deleted file mode 100644 index b1e18ff81aebca0d07ed1c8b34533745bb473863..0000000000000000000000000000000000000000 --- a/ImageJ_Profiles/DP_GC1380H.properties +++ /dev/null @@ -1,3 +0,0 @@ -#EPICS_AD_Viewer Properties -#Fri Mar 01 10:25:41 CST 2013 -PVPrefix=dp_gc1380h\:image1\: diff --git a/ImageJ_Profiles/DP_GC2450.properties b/ImageJ_Profiles/DP_GC2450.properties deleted file mode 100644 index b02c98de783e3f686354472550874ae07ccf8778..0000000000000000000000000000000000000000 --- a/ImageJ_Profiles/DP_GC2450.properties +++ /dev/null @@ -1,3 +0,0 @@ -#EPICS_AD_Viewer Properties -#Fri Mar 01 10:25:41 CST 2013 -PVPrefix=dp_gc2450\:image1\: diff --git a/ImageJ_Profiles/DP_Generic.properties b/ImageJ_Profiles/DP_Generic.properties deleted file mode 100644 index 04957c12957db3d991aff6c590e9497512314dea..0000000000000000000000000000000000000000 --- a/ImageJ_Profiles/DP_Generic.properties +++ /dev/null @@ -1,3 +0,0 @@ -#EPICS_AD_Viewer Properties -#Fri Mar 01 10:25:41 CST 2013 -PVPrefix=dp_andor3_xrd34\:image1\: diff --git a/ImageJ_Profiles/DP_XrayEye.properties b/ImageJ_Profiles/DP_XrayEye.properties deleted file mode 100644 index fddd9c3d12ddb8ddf34b6ec88a26c3b2a9e8c43e..0000000000000000000000000000000000000000 --- a/ImageJ_Profiles/DP_XrayEye.properties +++ /dev/null @@ -1,3 +0,0 @@ -#EPICS_AD_Viewer Properties -#Fri Mar 01 10:25:41 CST 2013 -PVPrefix=dp_xrayeye\:image1\: diff --git a/ImageJ_Profiles/dp_mar165_a.properties b/ImageJ_Profiles/dp_mar165_a.properties deleted file mode 100644 index 9578babb3df8eab0fe410521b1d66704fe511ed2..0000000000000000000000000000000000000000 --- a/ImageJ_Profiles/dp_mar165_a.properties +++ /dev/null @@ -1,3 +0,0 @@ -#EPICS_AD_Viewer Properties -#Fri Mar 01 10:25:41 CST 2013 -PVPrefix=dp_mar165_a\:image1\: diff --git a/ImageJ_Profiles/dp_mar165_b.properties b/ImageJ_Profiles/dp_mar165_b.properties deleted file mode 100644 index 54e4a437354398a98aef3714656adab33dd80c62..0000000000000000000000000000000000000000 --- a/ImageJ_Profiles/dp_mar165_b.properties +++ /dev/null @@ -1,3 +0,0 @@ -#EPICS_AD_Viewer Properties -#Fri Mar 01 10:25:41 CST 2013 -PVPrefix=dp_mar165_b\:image1\: diff --git a/ImageJ_Profiles/dp_mar165_c.properties b/ImageJ_Profiles/dp_mar165_c.properties deleted file mode 100644 index f460b0c220b62987151f33ed38d66b92374797a2..0000000000000000000000000000000000000000 --- a/ImageJ_Profiles/dp_mar165_c.properties +++ /dev/null @@ -1,3 +0,0 @@ -#EPICS_AD_Viewer Properties -#Fri Mar 01 10:25:41 CST 2013 -PVPrefix=dp_mar165_c\:image1\: diff --git a/ImageJ_Profiles/dp_mar345.properties b/ImageJ_Profiles/dp_mar345.properties deleted file mode 100644 index 0848657eecdfee6c31309629098fa9925716505f..0000000000000000000000000000000000000000 --- a/ImageJ_Profiles/dp_mar345.properties +++ /dev/null @@ -1,3 +0,0 @@ -#EPICS_AD_Viewer Properties -#Fri Mar 01 10:25:41 CST 2013 -PVPrefix=dp_mar345\:image1\: diff --git a/build_imagej+ad_plugins.sh b/build_imagej+ad_plugins.sh index 89b87609b89555d3e20c3364a6221cb56b7babc7..1a70550cafa64fdded2d95bb1a98eb3f72e6d3e5 100644 --- a/build_imagej+ad_plugins.sh +++ b/build_imagej+ad_plugins.sh @@ -126,10 +126,5 @@ done popd -# Detector Pool pre-configured ImageJ profiles for specific detectors -if [ -d "ImageJ_Profiles" ]; then - cp -a "ImageJ_Profiles" "ImageJ" -fi - # Make permissions consistent -chmod -R ug+rwX,o+rX ImageJ +chmod -R ug=rwX,o=rX ImageJ