Tutorial3: remove superfluous scripts

examples/advanced/Tutorial3/CMakeLists.txt

@@ -84,11 +84,7 @@ else()
   set(MSGPACK_USED false)
 endif()
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/MQ/run/startMQTut3Three.sh.in          ${CMAKE_CURRENT_BINARY_DIR}/startMQTut3Three.sh)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/MQ/run/startMQTut3All.sh.in            ${CMAKE_CURRENT_BINARY_DIR}/startMQTut3All.sh)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/MQ/run/startMQTut3AllProxy.sh.in       ${CMAKE_CURRENT_BINARY_DIR}/startMQTut3AllProxy.sh)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/MQ/run/startMQTut3PushPull.sh.in       ${CMAKE_CURRENT_BINARY_DIR}/startMQTut3PushPull.sh)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/MQ/run/startMQTut3ExtraProcessor.sh.in ${CMAKE_CURRENT_BINARY_DIR}/startMQTut3ExtraProcessor.sh)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/MQ/run/startMQTut3.sh.in ${CMAKE_CURRENT_BINARY_DIR}/startMQTut3.sh)
 
 add_library(${target} SHARED ${sources} ${headers})
 add_library(FairRoot::${target} ALIAS ${target})

examples/advanced/Tutorial3/MQ/run/startMQTut3PushPull.sh.in → examples/advanced/Tutorial3/MQ/run/startMQTut3.sh.in

@@ -2,6 +2,8 @@
 
 mcEngine="TGeant3"
 
+session="$(@FairMQ_BINDIR@/fairmq-uuid-gen -h)"
+
 echo "Supported data formats: binary, boost, boost-text, flatbuffers, msgpack, protobuf, tmessage"
 dataFormat="binary"
 if [ "$1" = "binary" ]; then
@@ -41,10 +43,12 @@ else
     echo "Using: binary"
 fi
 
+echo "Session: $session"
+
 SAMPLER="tut3-sampler"
 SAMPLER+=" --id sampler1"
+SAMPLER+=" --session $session"
 SAMPLER+=" --data-format $dataFormat"
-SAMPLER+=" --severity info"
 SAMPLER+=" --chain-input 99"
 SAMPLER+=" --input-file @CMAKE_CURRENT_SOURCE_DIR@/macro/data/testdigi_$mcEngine.root"
 SAMPLER+=" --parameter-file @CMAKE_CURRENT_SOURCE_DIR@/macro/data/testparams_$mcEngine.root"
@@ -54,20 +58,23 @@ xterm -geometry 80x23+0+0 -hold -e @CMAKE_CURRENT_BINARY_DIR@/$SAMPLER &
 
 PROCESSOR1="tut3-processor"
 PROCESSOR1+=" --id processor1"
+PROCESSOR1+=" --session $session"
 PROCESSOR1+=" --data-format $dataFormat"
 PROCESSOR1+=" --channel-config name=data1,type=pull,method=connect,address=tcp://localhost:5565"
 PROCESSOR1+="                  name=data2,type=push,method=connect,address=tcp://localhost:5570"
 xterm -geometry 80x23+500+0 -hold -e @CMAKE_CURRENT_BINARY_DIR@/$PROCESSOR1 &
 
 PROCESSOR2="tut3-processor"
 PROCESSOR2+=" --id processor2"
+PROCESSOR2+=" --session $session"
 PROCESSOR2+=" --data-format $dataFormat"
 PROCESSOR2+=" --channel-config name=data1,type=pull,method=connect,address=tcp://localhost:5565"
 PROCESSOR2+="                  name=data2,type=push,method=connect,address=tcp://localhost:5570"
 xterm -geometry 80x23+500+350 -hold -e @CMAKE_CURRENT_BINARY_DIR@/$PROCESSOR2 &
 
 FILESINK="tut3-sink"
 FILESINK+=" --id sink1"
+FILESINK+=" --session $session"
 FILESINK+=" --data-format $dataFormat"
 FILESINK+=" --channel-config name=data2,type=pull,method=bind,address=tcp://localhost:5570"
 FILESINK+="                  name=ack,type=push,method=connect,address=tcp://localhost:5999"