Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace hard coded paths with macros #4

Merged
merged 1 commit into from
May 16, 2024
Merged

Replace hard coded paths with macros #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions dev/fp1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"load": {
"index": "dummy",
"name": "DummyUDPProcessPlugin",
"library": "/scratch/development/odin/odin-data/vscode_prefix//lib/libDummyUDPProcessPlugin.so"
"library": "<ODIN_DATA>/lib/libDummyUDPProcessPlugin.so"
}
}
},
Expand All @@ -20,7 +20,7 @@
"load": {
"index": "offset",
"name": "OffsetAdjustmentPlugin",
"library": "/scratch/development/odin/odin-data/vscode_prefix//lib/libOffsetAdjustmentPlugin.so"
"library": "<ODIN_DATA>/lib/libOffsetAdjustmentPlugin.so"
}
}
},
Expand All @@ -29,7 +29,7 @@
"load": {
"index": "param",
"name": "ParameterAdjustmentPlugin",
"library": "/scratch/development/odin/odin-data/vscode_prefix//lib/libParameterAdjustmentPlugin.so"
"library": "<ODIN_DATA>/lib/libParameterAdjustmentPlugin.so"
}
}
},
Expand All @@ -38,7 +38,7 @@
"load": {
"index": "hdf",
"name": "FileWriterPlugin",
"library": "/scratch/development/odin/odin-data/vscode_prefix//lib/libHdf5Plugin.so"
"library": "<ODIN_DATA>/lib/libHdf5Plugin.so"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion dev/fr1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"frame_ready_endpoint": "tcp://127.0.0.1:10001",
"frame_release_endpoint": "tcp://127.0.0.1:10002",
"decoder_type": "DummyUDP",
"decoder_path": "/scratch/development/odin/odin-data/vscode_prefix//lib",
"decoder_path": "<ODIN_DATA>/lib",
"rx_ports": "61649",
"max_buffer_mem": 840000000,
"decoder_config": {
Expand Down
8 changes: 4 additions & 4 deletions dev/layout.kdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ layout {
}
pane split_direction="vertical" {
pane split_direction="horizontal" {
pane command="/scratch/development/odin-fastcs/dev/stFrameReceiver1.sh"
pane command="/scratch/development/odin-fastcs/dev/stFrameProcessor1.sh"
pane command="/scratch/development/odin-fastcs/dev/stMetaWriter.sh"
pane command="<SCRIPT_DIR>/stFrameReceiver1.sh"
pane command="<SCRIPT_DIR>/stFrameProcessor1.sh"
pane command="<SCRIPT_DIR>/stMetaWriter.sh"
}
pane split_direction="horizontal" {
pane command="/scratch/development/odin-fastcs/dev/stOdinServer.sh" start_suspended=true
pane command="<SCRIPT_DIR>/stOdinServer.sh" start_suspended=true
}
}
pane size=2 borderless=true {
Expand Down
2 changes: 1 addition & 1 deletion dev/stFrameProcessor1.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"

export HDF5_PLUGIN_PATH=/dls_sw/prod/tools/RHEL7-x86_64/hdf5filters/0-7-0/prefix/hdf5_1.10/h5plugin

/scratch/development/odin/odin-data/vscode_prefix//bin/frameProcessor --ctrl=tcp://0.0.0.0:10004 --config=$SCRIPT_DIR/fp1.json --log-config $SCRIPT_DIR/log4cxx.xml
<ODIN_DATA>/bin/frameProcessor --ctrl=tcp://0.0.0.0:10004 --config=$SCRIPT_DIR/fp1.json --log-config $SCRIPT_DIR/log4cxx.xml
2 changes: 1 addition & 1 deletion dev/stFrameReceiver1.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"

/scratch/development/odin/odin-data/vscode_prefix//bin/frameReceiver --io-threads 2 --ctrl=tcp://0.0.0.0:10000 --config=$SCRIPT_DIR/fr1.json --log-config $SCRIPT_DIR/log4cxx.xml
<ODIN_DATA>/bin/frameReceiver --io-threads 2 --ctrl=tcp://0.0.0.0:10000 --config=$SCRIPT_DIR/fr1.json --log-config $SCRIPT_DIR/log4cxx.xml
2 changes: 1 addition & 1 deletion dev/stMetaWriter.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

/scratch/development/odin-fastcs/venv/bin/meta_writer --data-endpoints tcp://127.0.0.1:10008
<VENV>/bin/meta_writer --data-endpoints tcp://127.0.0.1:10008
2 changes: 1 addition & 1 deletion dev/stOdinServer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
# Increase maximum fds available for ZeroMQ sockets
ulimit -n 2048

/scratch/development/odin-fastcs/venv/bin/odin_control --config=$SCRIPT_DIR/odin_server.cfg --logging=info --access_logging=ERROR
<VENV>/bin/odin_control --config=$SCRIPT_DIR/odin_server.cfg --logging=info --access_logging=ERROR