From: local account <hadaq@dircdaq002.gsi.de>
Date: Mon, 28 Apr 2014 14:49:30 +0000 (+0200)
Subject: before update, mt
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=f3a51442086c5f40c09a56d85dcb4ef221723689;p=daqtools.git

before update, mt
---

f3a51442086c5f40c09a56d85dcb4ef221723689
diff --cc users/gsi_dirc/EventBuilder.xml
index fa6c432,0000000..6ef34b2
mode 100644,000000..100644
--- a/users/gsi_dirc/EventBuilder.xml
+++ b/users/gsi_dirc/EventBuilder.xml
@@@ -1,97 -1,0 +1,97 @@@
 +<?xml version="1.0"?>
 +
 +<!-- 
 +This is example file how HADAQ event building should be configured in DABC.
 +Event building process implemented in Combiner module of hadaq::CombinerModule class.
 +Module can have several inputs, each with separate port number for receiving data 
 +from TRB boards. In each input port configuration only port number has meaning.
 +First output of combiner module reserved for the connection to 
 +the optional MBS transmitter module. Second output can be use to store data in hld files. 
 +To enable storage, one should specify two output ports and correctly configure Output1 of combiner module.
 +
 +Optionally one can enable MBS transmitter module, which converts HLD to LMD format.
 +To enable transmitter, one should specify auto="true" in configuration which says DABC
 +to automatically create module when starting application. 
 +First output of the module reserved for stream server, second output can be used to
 +store data in lmd files. 
 +  
 +-->
 +
 +<dabc version="2">
 +  <Context host="localhost" name="EventBuilder">
 +    <Run>
 +      <lib value="libDabcMbs.so"/>
 +      <lib value="libDabcHadaq.so"/>  
 +      <logfile value="hadaqevtbuild.log"/>
 +      <loglimit value="1000000"/>
 +      <!--affinity value="-1"/-->
 +    </Run>
 +    
 +    <MemoryPool name="Pool">
 +       <BufferSize value="200000"/>
 +       <NumBuffers value="1000"/>
 +    </MemoryPool>
 +
 +    <Module name="Combiner" class="hadaq::CombinerModule">    
 +        <!-- these parameters will force to create inputs/oputputs of module -->
 +       <NumInputs value="1"/>
-        <NumOutputs value="1"/>
++       <NumOutputs value="2"/>
 +
 +       <InputPort name="Input0" url="hadaq://host:50000"/>
 +       <InputPort name="Input1" url="hadaq://host:10102"/>
 +       <InputPort name="Input2" url="hadaq://host:10103"/>
 +       <InputPort name="Input3" url="hadaq://host:10104"/>
 +       <InputPort name="Input4" url="hadaq://host:10105"/>
 +
 +       <InputPort name="Input*" queue="10">
 +          <HadaqUdpBuffer value="200000"/>
 +          <DoShmControl value="false"/>  
 +          <HadaqUdpMTU value="64512"/>
 +          <FlushTimeout value="2.0"/>   
 +       </InputPort>
 +       
-        <OutputPort name="Output1" url="hld://dabc.hld?maxsize=30"/>
++       <OutputPort name="Output1" url="hld:///data.local2/dabc.hld?maxsize=500"/>
 +
 +       <DoShmControl value="false"/>  
 +       <FlushTimeout value="2.0"/>   
 +
 +       <!-- take event sequence number from vulom/roc sync message at cts -->
 +       <UseSyncSequenceNumber value="false"/>
 +       <SyncSubeventId value="0x8000"/>
 +       <SyncTriggerMask value="0x01"/>
 +       <PrintSync value="false"/>
 +       <FlushBySync value="false"/>
 +
 +       <!-- rate meters configuration -->
 +       <HadaqData width="4" prec="2" low="0" up="10" debug="1"/>
 +       <HadaqEvents width="5" prec="1" low="0" up="1000" debug="1"/>
 +       <HadaqDroppedData width="5" prec="3" low="0" up="1" debug="1"/>
 +       <HadaqLostEvents width="4" prec="2" low="0" up="100" debug="1"/>
 +     </Module>
 +
 +     <Module name="OnlineServer" class="hadaq::MbsTransmitterModule" auto="true">
 +       <NumInputs value="1"/>
 +       <NumOutputs value="1"/>
 +
 +       <InputPort name="Input0" url="Combiner/Output0" queue="10"/>
 +
 +       <OutputPort name="Output0" url="mbs://Stream"/>
 +       <OutputPort name="Output1" url="lmd://test.lmd?maxsize=30&log=2"/>
 +
 +       <!-- this is 32-bit MBS subevent id, which than can be seen in the analysis. Here procid=0x1f is configured -->
 +       <SubeventFullId value="0x000001F"/>
 +
 +       <!-- If true, all events with the same SYNC number will be merged together into same MBS event -->
 +       <DoMergeSyncedEvents value="true"/>
 +
 +       <TransmitData width="5" prec="3" low="0" up="50" debug="1"/>
 +       <TransmitEvents width="4" prec="1" low="0" up="100" debug="1"/>
 +     </Module>
 +
 +  </Context>
 +
 +  <!--Context name="*">
 +      <Thread name="CombinerThrdInp" class="dabc::SocketThread" affinity="+0"/>
 +  </Context-->
 +  
 +</dabc>
diff --cc users/gsi_dirc/configure_trb3.sh
index 7fd6474,7fd6474..e35f5c3
--- a/users/gsi_dirc/configure_trb3.sh
+++ b/users/gsi_dirc/configure_trb3.sh
@@@ -13,10 -13,10 +13,11 @@@ trbcmd w 0x8000 0x830d 0x1          # e
  
  #mac address of the EB
  #kp1pc105 00:1b:21:43:97:ea
--trbcmd w 0x8000 0x8100 0x214397ea   # lower 4 bytes 
--trbcmd w 0x8000 0x8101 0x001b       # upper two bytes
++#dircdaq002 d4:ae:52:ba:16:a6
++trbcmd w 0x8000 0x8100 0x52ba16a6   # lower 4 bytes 
++trbcmd w 0x8000 0x8101 0xd4ae       # upper two bytes
  
--trbcmd w 0x8000 0x8102 0xc0a80002   # destination IP-address: 192.168.0.2
++trbcmd w 0x8000 0x8102 0xc0a80001   # destination IP-address: 192.168.0.2
  trbcmd w 0x8000 0x8103 0xc350       # destination port 50000
  trbcmd w 0x8000 0x8104 0xdead0110   # source MAC-address
  trbcmd w 0x8000 0x8105 0x001b       # source MAC: upper bytes
diff --cc users/gsi_dirc/start_readout.pl
index 72d86db,72d86db..b016ceb
--- a/users/gsi_dirc/start_readout.pl
+++ b/users/gsi_dirc/start_readout.pl
@@@ -4,7 -4,7 +4,7 @@@ use strict
  use Getopt::Long;
  
  my $help = "";
--my $dataPath = "~/trbsoft/data";
++my $dataPath = "/data.local2/";
  my $source1 = "50000"; # don't use 50001
  my $source2 = "50002"; # it is assigned for GbE debug
  my $source3 = "50003";
@@@ -39,7 -39,7 +39,6 @@@ $c=qq|pkill -f "daq_netmem -S $label"|
  
  $c=qq|xterm -geometry 122x14-0+0 -e bash -c 'daq_evtbuild -S $label -m 1 -d file -o $dataPath'|;
  print $c;
--exit;
  
  system("$c &");
  
diff --cc users/gsi_dirc/startup.sh
index bb07d5c,bb07d5c..596aaa8
--- a/users/gsi_dirc/startup.sh
+++ b/users/gsi_dirc/startup.sh
@@@ -1,11 -1,11 +1,24 @@@
--#!/bin/sh
++#!/bin/bash
  # PATH should already be marked as exported...
  #PATH=${HOME}/trbsoft/bin:${PATH}
  #PATH=${HOME}/trbsoft/daqdata/bin:${PATH}
  #PATH=${HOME}/trbsoft/trbnettools/bin:${PATH}
--export TRB3_SERVER=trb056
++export TRB3_SERVER=trb056:26000 
++
++export TRBNETDPID=$(pgrep trbnetd)
++
++echo "trbnetd pid: $TRBNETDPID"
++
++if [[ -z "$TRBNETDPID" ]] 
++then 
++    ~/trbsoft/trbnettools/binlocal/trbnetd -i 56
++fi
++
++#export TRB3_SERVER=trb056
  export DAQOPSERVER=localhost:56
  
++trbcmd i 0xffff
++
  
  ##################################################
  ## Set addresses
@@@ -37,14 -37,14 +50,14 @@@ trbcmd w 0xfe48 0xc804 0x00000080 ## da
  ## Other Settings
  ##################################################
  # Reset trigger logic - only a workaround for a bug
--trbcmd w 0xffff 0x20 0x33
++#trbcmd w 0xffff 0x20 0x33
  
  # timeouts
  trbcmd w 0xfffe 0xc5 0x800050ff
  
  # pulser #1 to 1k Hz
--trbcmd w 0x8000 0xa137 0x0001869f
++trbcmd w 0x8000 0xa140 0x0001869f
  
  # pulser enable
--#trbcmd setbit 0x8000 0xa101 0x2
--trbcmd clearbit 0x8000 0xa101 0x2
++trbcmd setbit 0x8000 0xa101 0x2
++#trbcmd clearbit 0x8000 0xa101 0x3