adjusted Frankfurt Eventbuilder scripts

diff --git a/users/frankfurt_test/evtbuilder_start.sh b/users/frankfurt_test/evtbuilder_start.sh
index 2730eb766dcf9a0bb4d2f83b9dd1523cb88d3f76..ff08751f57de212d332bc4fd8e8b19298848c857 100755 (executable)
--- a/users/frankfurt_test/evtbuilder_start.sh
+++ b/users/frankfurt_test/evtbuilder_start.sh
@@ -47,13 +47,17 @@ extraopts="--online"
 cd $tmpdir
 
 
-exec uxterm -bg khaki -geometry 120x20+0+45 -e "/d/jspc22/trb/git/daqdata/hadaq/daq_evtbuild -m 2 -o ${dest} -x ${pref} -I 1 --ebnum 1 -q 32 -S test -d file ${extraopts}; read; bash" &
+#exec uxterm -fg black -bg khaki -geometry 120x20+0+45 -e "/d/jspc22/trb/git/daqdata/hadaq/daq_evtbuild -m 2 -o ${dest} -x ${pref} -I 1 --ebnum 1 -q 32 -S test -d file 
+exec uxterm -fg black -bg khaki -geometry 120x20+0+45 -e "/d/jspc22/trb/git/daqdata/hadaq/daq_evtbuild -m 1 -o ${dest} -x ${pref} -I 1 --ebnum 1 -q 32 -S test -d file 
+${extraopts}; 
+read; bash" &
 pid=$!
 echo $pid > $tmpdir/.daq_evtbuild.pid
 
 sleep 1
 
-exec uxterm -bg tan -geometry 120x20+0+345 -e "/d/jspc22/trb/git/daqdata/hadaq/daq_netmem -m 2 -i UDP:0.0.0.0:50000 -i UDP:0.0.0.0:50002 -q 32 -d 1 -S test ;  " &
+#exec uxterm -fg black -bg tan -geometry 120x20+0+345 -e "/d/jspc22/trb/git/daqdata/hadaq/daq_netmem -m 2 -i UDP:0.0.0.0:50000 -i UDP:0.0.0.0:50002 -q 32 -d 1 -S test ;  " &
+exec uxterm -fg black -bg tan -geometry 120x20+0+345 -e "/d/jspc22/trb/git/daqdata/hadaq/daq_netmem -m 1 -i UDP:0.0.0.0:50000 -q 32 -d 1 -S test ;  " &
 pid=$!
 echo $pid > $tmpdir/.daq_netmem.pid
 

diff --git a/users/frankfurt_test/nofile_evtbuilder.sh b/users/frankfurt_test/nofile_evtbuilder.sh
new file mode 100755 (executable)
index 0000000..73687eb
--- /dev/null
+++ b/users/frankfurt_test/nofile_evtbuilder.sh
@@ -0,0 +1,65 @@
+#!/bin/bash
+
+dest="/local/tmp"
+sdest="/local/tmp"
+tmpdir="/local/tmp/evtbuild"
+pref="te"
+sden=0
+
+usage() {
+       echo "Usage: $0 [-d <hlddir>] [-s <shlddir>] [-p <te|be|ca>] [-t] [-h]"
+       echo "  -t -- scale down"
+       echo " Defaults:"
+       echo "  -d=${dest}"
+       echo "  -s=${sdest}"
+       echo "  -p=${pref}"
+}
+
+while getopts "d:s:p:th" opt; do
+       case "${opt}" in
+               t)
+                       sden=1
+                       ;;
+               d)
+                       dest=${OPTARG}
+                       ;;
+               s)
+                       sdest=${OPTARG}
+                       ;;
+               p)
+                       pref=${OPTARG}
+                       ;;
+               h)
+                       usage
+                       ;;
+               *)
+                       exit -1
+                       ;;
+       esac
+done
+
+sdopts="--resdownscale 20 --resnumevents 2000 --respath ${sdest} --ressizelimit 80"
+extraopts="--online"
+[ ${sden} -eq 1 ] && extraopts="$sdopts"
+
+
+[ ! -e $tmpdir ] && mkdir -p $tmpdir
+cd $tmpdir
+
+
+#exec uxterm -fg black -bg khaki -geometry 120x20+0+45 -e "/d/jspc22/trb/git/daqdata/hadaq/daq_evtbuild -m 2 -o ${dest} -x ${pref} -I 1 --ebnum 1 -q 32 -S test -d file 
+exec uxterm -fg black -bg khaki -geometry 120x20+0+45 -e "/d/jspc22/trb/git/daqdata/hadaq/daq_evtbuild -m 1 -o ${dest} -x ${pref} -I 1 --ebnum 1 -q 32 -S test -d null
+${extraopts}; 
+read; bash" &
+pid=$!
+echo $pid > $tmpdir/.daq_evtbuild.pid
+
+sleep 1
+
+#exec uxterm -fg black -bg tan -geometry 120x20+0+345 -e "/d/jspc22/trb/git/daqdata/hadaq/daq_netmem -m 2 -i UDP:0.0.0.0:50000 -i UDP:0.0.0.0:50002 -q 32 -d 1 -S test ;  " &
+exec uxterm -fg black -bg tan -geometry 120x20+0+345 -e "/d/jspc22/trb/git/daqdata/hadaq/daq_netmem -m 1 -i UDP:0.0.0.0:50000 -q 32 -d 1 -S test ;  " &
+pid=$!
+echo $pid > $tmpdir/.daq_netmem.pid
+
+echo ${dest} > $tmpdir/.hldfilesdir
+echo ${sdest} > $tmpdir/.shldfilesdir

diff --git a/xml-db/get.pl b/xml-db/get.pl
index 2005478084457bdc004fb5f32e31a0b70e6e22b6..5c8d00e96cfbeb452b115487de836ca8b605fd6a 100755 (executable)
--- a/xml-db/get.pl
+++ b/xml-db/get.pl
@@ -144,7 +144,7 @@ sub FormatPretty {
         if($obj->{errorflag}) { $ret .= "$cl".($value?"true":"false");}
         else                  { $ret .= "$cl".($value?"true":"false");}
           }
-      when ("float")    {$ret .= sprintf("$cl%.2f",$value);}
+      when ("float")    { $ret .= sprintf("$cl%.2f",$value);}
       when ("integer")  { $t    = sprintf("%i",$value); 
                           $t =~ s/(?<=\d)(?=(?:\d\d\d)+\b)/&#8198;/g; 
                           $ret .= $cl.$t;
@@ -156,7 +156,8 @@ sub FormatPretty {
       when ("signed")   { $ret .= sprintf("$cl%d",$value);}
       when ("binary")   { $t    = sprintf("%0".$obj->{bits}."b",$value); 
                           $t =~ s/(?<=\d)(?=(?:\d\d\d\d)+\b)/&#8198;/g; 
-                          $ret .= $cl.$t;}
+                          $ret .= $cl.$t;
+                          }
       when ("bitmask")  { my $tmp = sprintf("%0".$obj->{bits}."b",$value);
                           $tmp =~ s/(?<=\d)(?=(?:\d\d\d\d)+\b)/ /g;
                           $tmp =~ s/0/\&#9633\;/g;