Added g_ prefix to global variables

Modularius · Modularius · commit eaac618cb7ad · 2024-11-14T11:20:24.000Z
diff --git a/Libs/lib.sh b/Libs/lib.sh
@@ -1,4 +1,4 @@
-RUST_LOG_OFF=tonic=off,h2=off,tokio_util=off,tower=off,hyper=off
+g_RUST_LOG_OFF=tonic=off,h2=off,tokio_util=off,tower=off,hyper=off
 
 . ./Libs/lib_run_simulator.sh
 . ./Libs/lib_inputs.sh
@@ -15,9 +15,9 @@ build_digitiser_argument() {
 }
 
 kill_persistant_components() {
-    pkill $PROCESS_EVENT_FORMATION
-    pkill $PROCESS_WRITER
-    pkill $PROCESS_AGGREGATOR
+    pkill $g_PROCESS_EVENT_FORMATION
+    pkill $g_PROCESS_WRITER
+    pkill $g_PROCESS_AGGREGATOR
     pkill trace-archiver-
 }
 
diff --git a/Libs/lib_inputs.sh b/Libs/lib_inputs.sh
@@ -1,16 +1,16 @@
 run_trace_simulator() {
-    $SIMULATOR \
-        --broker $BROKER \
-        $OTEL_ENDPOINT \
-        $OTEL_LEVEL_SIM \
-        defined "$SIMULATOR_CONFIG_SOURCE" \
-        --digitiser-trace-topic $TRACE_TOPIC \
-        --digitiser-event-topic $DAT_EVENT_TOPIC \
-        --frame-event-topic $FRAME_EVENT_TOPIC \
-        --control-topic $CONTROL_TOPIC \
-        --runlog-topic $CONTROL_TOPIC \
-        --selog-topic $CONTROL_TOPIC \
-        --alarm-topic $CONTROL_TOPIC
+    $g_SIMULATOR \
+        --broker $g_BROKER \
+        $g_OTEL_ENDPOINT \
+        $g_OTEL_LEVEL_SIM \
+        defined "$g_SIMULATOR_CONFIG_SOURCE" \
+        --digitiser-trace-topic $g_TRACE_TOPIC \
+        --digitiser-event-topic $g_DAT_EVENT_TOPIC \
+        --frame-event-topic $g_FRAME_EVENT_TOPIC \
+        --control-topic $g_CONTROL_TOPIC \
+        --runlog-topic $g_CONTROL_TOPIC \
+        --selog-topic $g_CONTROL_TOPIC \
+        --alarm-topic $g_CONTROL_TOPIC
 }
 
 run_trace_reader() {
@@ -21,13 +21,13 @@ run_trace_reader() {
     NUM_TRACE_EVENTS=$5
     TRACE_TOPIC=$6
 
-    $TRACE_READER \
+    $g_TRACE_READER \
         --broker $BROKER \
         --trace-topic $TRACE_TOPIC \
         --consumer-group trace-reader \
         --frame-number=$FRAME_NUMBER \
         --digitizer-id=$DID \
-        $OTEL_ENDPOINT \
+        $g_OTEL_ENDPOINT \
         --number-of-trace-events=$NUM_TRACE_EVENTS \
         --trace-offset=$OFFSET \
         --file-name "../Data/Traces/MuSR_A41_B42_C43_D44_Apr2021_Ag_ZF_IntDeg_Slit60_short.traces"
diff --git a/Libs/lib_persistant.sh b/Libs/lib_persistant.sh
@@ -1,17 +1,17 @@
 run_trace_to_events() {
-    echo "Using detector settings '$TTE_INPUT_MODE'"
+    echo "Using detector settings '$g_TTE_INPUT_MODE'"
 
     echo "--" "--" "Executing Event Formation"
-    $TRACE_TO_EVENTS \
-        --broker $BROKER --consumer-group $GROUP_EVENT_FORMATION \
+    $g_TRACE_TO_EVENTS \
+        --broker $g_BROKER --consumer-group $g_GROUP_EVENT_FORMATION \
         --observability-address "127.0.0.1:29094" \
-        --trace-topic $TRACE_TOPIC \
-        --event-topic $DAT_EVENT_TOPIC \
-        --polarity $TTE_POLARITY \
-        --baseline $TTE_BASELINE \
-        $OTEL_ENDPOINT \
-        $OTEL_LEVEL_EVENT_FORMATION \
-        $TTE_INPUT_MODE  &
+        --trace-topic $g_TRACE_TOPIC \
+        --event-topic $g_DAT_EVENT_TOPIC \
+        --polarity $g_TTE_POLARITY \
+        --baseline $g_TTE_BASELINE \
+        $g_OTEL_ENDPOINT \
+        $g_OTEL_LEVEL_EVENT_FORMATION \
+        $g_TTE_INPUT_MODE  &
         #        --save-file Output/HiFi/output_ \
 }
 
@@ -28,30 +28,30 @@ build_digitiser_argument() {
 run_aggregator() {
     echo "--" "--" "Executing aggregator"
 
-    $EVENT_AGGREGATOR \
-        --broker $BROKER --group $GROUP_AGGREGATOR \
-        --input-topic $DAT_EVENT_TOPIC --output-topic $FRAME_EVENT_TOPIC \
+    $g_EVENT_AGGREGATOR \
+        --broker $g_BROKER --group $g_GROUP_AGGREGATOR \
+        --input-topic $g_DAT_EVENT_TOPIC --output-topic $g_FRAME_EVENT_TOPIC \
         --observability-address "127.0.0.1:29091" \
         --frame-ttl-ms 2000 \
-        $OTEL_ENDPOINT \
-        $OTEL_LEVEL_AGGREGATOR \
-        $DIGITIZERS &
+        $g_OTEL_ENDPOINT \
+        $g_OTEL_LEVEL_AGGREGATOR \
+        $g_DIGITIZERS &
 }
 
 run_nexus_writer() {
     echo "--" "--" "Executing nexus-writer"
     
-    $NEXUS_WRITER \
-        --broker $BROKER --consumer-group "$GROUP_WRITER" \
+    $g_NEXUS_WRITER \
+        --broker $g_BROKER --consumer-group "$g_GROUP_WRITER" \
         --observability-address "127.0.0.1:29090" \
-        --control-topic $CONTROL_TOPIC \
-        --frame-event-topic $FRAME_EVENT_TOPIC \
-        --log-topic $CONTROL_TOPIC \
-        --sample-env-topic $CONTROL_TOPIC \
-        --alarm-topic $CONTROL_TOPIC \
+        --control-topic $g_CONTROL_TOPIC \
+        --frame-event-topic $g_FRAME_EVENT_TOPIC \
+        --log-topic $g_CONTROL_TOPIC \
+        --sample-env-topic $g_CONTROL_TOPIC \
+        --alarm-topic $g_CONTROL_TOPIC \
         --cache-run-ttl-ms 5000 \
-        $OTEL_ENDPOINT \
-        $OTEL_LEVEL_WRITER \
-        --file-name "$NEXUS_OUTPUT_PATH" &
+        $g_OTEL_ENDPOINT \
+        $g_OTEL_LEVEL_WRITER \
+        --file-name "g_$NEXUS_OUTPUT_PATH" &
 }
 
diff --git a/Libs/lib_run_simulator.sh b/Libs/lib_run_simulator.sh
@@ -4,16 +4,16 @@ send_run_start() {
     INSTRUMENT_NAME=$2
     TIME="$3"
 
-    $SIMULATOR --broker $BROKER \
-        --trace-topic $TRACE_TOPIC \
-        --event-topic $DAT_EVENT_TOPIC \
-        --frame-event-topic $FRAME_EVENT_TOPIC \
-        --control-topic $CONTROL_TOPIC \
-        $OTEL_ENDPOINT \
-        $OTEL_LEVEL_SIM \
+    $g_SIMULATOR --broker $g_BROKER \
+        --trace-topic $g_TRACE_TOPIC \
+        --event-topic $g_DAT_EVENT_TOPIC \
+        --frame-event-topic $g_FRAME_EVENT_TOPIC \
+        --control-topic $g_CONTROL_TOPIC \
+        $g_OTEL_ENDPOINT \
+        $g_OTEL_LEVEL_SIM \
         start $TIME \
         --run-name $RUN_NAME \
-        --topic $CONTROL_TOPIC \
+        --topic $g_CONTROL_TOPIC \
         --instrument-name $INSTRUMENT_NAME
 }
 
@@ -22,10 +22,10 @@ send_logdata() {
     VALUE_TYPE="$2"
     VALUE="$3"
 
-    $RUN_SIMULATOR --broker $BROKER --topic $CONTROL_TOPIC \
+    $g_RUN_SIMULATOR --broker $g_BROKER --topic $g_CONTROL_TOPIC \
         --run-name $RUN_NAME \
-        $OTEL_ENDPOINT \
-        $OTEL_LEVEL \
+        $g_OTEL_ENDPOINT \
+        $g_OTEL_LEVEL \
         $TIME \
         log \
             --source-name "$SOURCE_NAME" \
@@ -38,10 +38,10 @@ send_selog() {
     VALUE_TYPE="$2"
     VALUE="$3"
 
-    $RUN_SIMULATOR --broker $BROKER --topic $CONTROL_TOPIC \
+    $g_RUN_SIMULATOR --broker $g_BROKER --topic $g_CONTROL_TOPIC \
         --run-name $RUN_NAME \
-        $OTEL_ENDPOINT \
-        $OTEL_LEVEL \
+        $g_OTEL_ENDPOINT \
+        $g_OTEL_LEVEL \
         $TIME \
         sample-env \
             --name "$SOURCE_NAME" \
@@ -55,10 +55,10 @@ send_alarm() {
     SEVERITY="$2"
     MESSAGE="$3"
 
-    $RUN_SIMULATOR --broker $BROKER --topic $CONTROL_TOPIC \
+    $g_RUN_SIMULATOR --broker $g_BROKER --topic $g_CONTROL_TOPIC \
         --run-name $RUN_NAME \
-        $OTEL_ENDPOINT \
-        $OTEL_LEVEL \
+        $g_OTEL_ENDPOINT \
+        $g_OTEL_LEVEL \
         $TIME \
         alarm \
             --source-name "$SOURCE_NAME" \
@@ -70,14 +70,14 @@ send_run_stop() {
     RUN_NAME=$1
     TIME="$3"
 
-    $SIMULATOR --broker $BROKER \
-        --trace-topic $TRACE_TOPIC \
-        --event-topic $DAT_EVENT_TOPIC \
-        --frame-event-topic $FRAME_EVENT_TOPIC \
-        --control-topic $CONTROL_TOPIC \
-        $OTEL_ENDPOINT \
-        $OTEL_LEVEL_SIM \
+    $g_SIMULATOR --broker $g_BROKER \
+        --trace-topic $g_TRACE_TOPIC \
+        --event-topic $g_DAT_EVENT_TOPIC \
+        --frame-event-topic $g_FRAME_EVENT_TOPIC \
+        --control-topic $g_CONTROL_TOPIC \
+        $g_OTEL_ENDPOINT \
+        $g_OTEL_LEVEL_SIM \
         stop $TIME \
         --run-name $RUN_NAME \
-        --topic $CONTROL_TOPIC
+        --topic $g_CONTROL_TOPIC
 }
diff --git a/Settings/EventFormationConfig.sh b/Settings/EventFormationConfig.sh
@@ -1,4 +1,4 @@
-#TTE_INPUT_MODE="advanced-muon-detector --muon-onset=0.1 --muon-fall=-0.1 --muon-termination=0.01 --duration=10 --smoothing-window-size=10"
-TTE_POLARITY=positive
-TTE_BASELINE=0
-TTE_INPUT_MODE="fixed-threshold-discriminator --threshold=10 --duration=1 --cool-off=0"
+#g_TTE_INPUT_MODE="advanced-muon-detector --muon-onset=0.1 --muon-fall=-0.1 --muon-termination=0.01 --duration=10 --smoothing-window-size=10"
+g_TTE_POLARITY=positive
+g_TTE_BASELINE=0
+g_TTE_INPUT_MODE="fixed-threshold-discriminator --threshold=10 --duration=1 --cool-off=0"
diff --git a/Settings/Local/PipelineConfig.sh b/Settings/Local/PipelineConfig.sh
@@ -1,17 +1,17 @@
 # Use This Broker
-BROKER="localhost:9092"
+g_BROKER="localhost:9092"
 
 # Broker Topics
-TRACE_TOPIC=daq-traces-in
-DAT_EVENT_TOPIC=daq-events-in
-FRAME_EVENT_TOPIC=ics-_events
-CONTROL_TOPIC=ics-control-change
-LOGS_TOPIC=ics-metadata
-SELOGS_TOPIC=ics-metadata
-ALARMS_TOPIC=ics-alarms
+g_TRACE_TOPIC=daq-traces-in
+g_DAT_EVENT_TOPIC=daq-events-in
+g_FRAME_EVENT_TOPIC=ics-_events
+g_CONTROL_TOPIC=ics-control-change
+g_LOGS_TOPIC=ics-metadata
+g_SELOGS_TOPIC=ics-metadata
+g_ALARMS_TOPIC=ics-alarms
 
 # Digitisers Expected from Broker
-DIGITIZERS=$(build_digitiser_argument 7)
+g_DIGITIZERS=$(build_digitiser_argument 7)
 
 # Output Path
-NEXUS_OUTPUT_PATH="Output/Local"
+g_NEXUS_OUTPUT_PATH="Output/Local"
diff --git a/Settings/PipelineSetup.sh b/Settings/PipelineSetup.sh
@@ -1,23 +1,23 @@
-APPLICATION_PREFIX="../supermusr-data-pipeline/target/release/"
-#APPLICATION_PREFIX="cargo run --manifest-path "../supermusr-data-pipeline" --release --bin "
+g_APPLICATION_PREFIX="../supermusr-data-pipeline/target/release/"
+#g_APPLICATION_PREFIX="cargo run --manifest-path "../supermusr-data-pipeline" --release --bin "
 
-RUN_SIMULATOR="${APPLICATION_PREFIX}run-simulator"
-SIMULATOR="${APPLICATION_PREFIX}simulator"
-TRACE_READER="${APPLICATION_PREFIX}trace-reader"
-TRACE_TO_EVENTS="${APPLICATION_PREFIX}trace-to-events"
-EVENT_AGGREGATOR="${APPLICATION_PREFIX}digitiser-aggregator"
-NEXUS_WRITER="${APPLICATION_PREFIX}/nexus-writer"
+g_RUN_SIMULATOR="${g_APPLICATION_PREFIX}run-simulator"
+g_SIMULATOR="${g_APPLICATION_PREFIX}simulator"
+g_TRACE_READER="${g_APPLICATION_PREFIX}trace-reader"
+g_TRACE_TO_EVENTS="${g_APPLICATION_PREFIX}trace-to-events"
+g_EVENT_AGGREGATOR="${g_APPLICATION_PREFIX}digitiser-aggregator"
+g_NEXUS_WRITER="${g_APPLICATION_PREFIX}/nexus-writer"
 
 
-GROUP_WRITER=nexus-writer
-GROUP_AGGREGATOR=digitiser-aggregator
-GROUP_EVENT_FORMATION=trace-to-events
+g_GROUP_WRITER=nexus-writer
+g_GROUP_AGGREGATOR=digitiser-aggregator
+g_GROUP_EVENT_FORMATION=trace-to-events
 
-PROCESS_WRITER=nexus-writer
-PROCESS_AGGREGATOR=digitiser-aggre
-PROCESS_EVENT_FORMATION=trace-to-events
+g_PROCESS_WRITER=nexus-writer
+g_PROCESS_AGGREGATOR=digitiser-aggre
+g_PROCESS_EVENT_FORMATION=trace-to-events
 
-OTEL_ENDPOINT="--otel-endpoint http://localhost:4317/v1/traces"
-#OTEL_ENDPOINT="--otel-endpoint http://172.16.113.245:4317/v1/traces"       # HiFi
-#OTEL_ENDPOINT="--otel-endpoint http://146.199.207.182:4317/v1/traces"      # MyPC
-#OTEL_ENDPOINT=""
+g_OTEL_ENDPOINT="--otel-endpoint http://localhost:4317/v1/traces"
+#g_OTEL_ENDPOINT="--otel-endpoint http://172.16.113.245:4317/v1/traces"       # HiFi
+#g_OTEL_ENDPOINT="--otel-endpoint http://146.199.207.182:4317/v1/traces"      # MyPC
+#g_OTEL_ENDPOINT=""
