sf-daq/sf_daq_buffer
0
0
Fork 0
mirror of https://github.com/paulscherrerinstitute/sf_daq_buffer.git synced 2026-05-12 10:15:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

control script adjust. some extra debug msg

Browse Source
This commit is contained in:
lhdamiani
2021-04-13 12:04:16 +02:00
parent 22f73b0273
commit 739b4ee8e7
3 changed files with 3 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
eiger/config_eiger.txt → eiger/config/config_eiger.txt
-1
View File
@@ -1,4 +1,3 @@
detsize 1024 512
hostname localhost:2050+localhost:2052+
eiger/control/kill_controls.sh
+1 -1
View File
@@ -39,7 +39,7 @@ if (( ${STREAM} == 1 )); then
fi
if (( ${ASSEMBLER} == 1 )); then
echo "Killing stream..."
echo "Killing assembler..."
ps aux | grep eiger_assembler | awk 'NR > 1 { print prev } { prev = $2 }' | xargs -I{} kill {}
fi
jf-udp-recv/src/FrameUdpReceiver.cpp
+2 -23
View File
@@ -47,8 +47,8 @@ inline void FrameUdpReceiver::init_frame(
frame_metadata.frame_index = packet_buffer_[i_packet].framenum;
frame_metadata.daq_rec = (uint64_t) packet_buffer_[i_packet].debug;
frame_metadata.module_id = (int64_t) module_id_;
frame_metadata.row = (int16_t) packet_buffer_[i_packet].row;
frame_metadata.column = (int16_t) packet_buffer_[i_packet].column;
frame_metadata.row = (int16_t) packet_buffer_[i_packet].xCoord;
frame_metadata.column = (int16_t) packet_buffer_[i_packet].yCoord;
#ifdef DEBUG_OUTPUT
using namespace date;
cout << " [" << std::chrono::system_clock::now();
@@ -98,27 +98,6 @@ inline uint64_t FrameUdpReceiver::process_packets(
}
copy_packet_to_buffers(metadata, frame_buffer, i_packet);
#ifdef DEBUG_OUTPUT
using namespace date;
if (i_packet == 120){
cout << "Packet: " << i_packet;
cout << " || framenum " << packet_buffer_[i_packet].framenum;
cout << " || exptime " << packet_buffer_[i_packet].exptime;
cout << " || packetnum " << packet_buffer_[i_packet].packetnum;
cout << " || bunchid " << packet_buffer_[i_packet].bunchid ;
cout << " || timestamp " << packet_buffer_[i_packet].timestamp ;
cout << " || moduleID " << packet_buffer_[i_packet].moduleID ;
cout << " || x coord " << packet_buffer_[i_packet].row ;
cout << " || y coord " << packet_buffer_[i_packet].column ;
cout << " || reserved " << packet_buffer_[i_packet].reserved ;
cout << " || debug " << packet_buffer_[i_packet].debug ;
cout << " || roundRobin " << packet_buffer_[i_packet].roundRobin ;
cout << " || detectortype " << packet_buffer_[i_packet].detectortype ;
cout << " || headerVersion " << packet_buffer_[i_packet].headerVersion ;
cout << endl;
}
#endif
// Last frame packet received. Frame finished.
if (packet_buffer_[i_packet].packetnum ==