Skip to content

Commit 4f88d93

Browse files
committed
includes requested changes
1 parent b5f715e commit 4f88d93

File tree

3 files changed

+9
-13
lines changed

3 files changed

+9
-13
lines changed

broker/consumer/lvk/vm_startup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ fi
2323

2424
#--- GCP resources used in this script
2525
broker_bucket="${PROJECT_ID}-${survey}-broker_files"
26-
PS_TOPIC_DEFAULT="${survey}-alerts_raw"
26+
PS_TOPIC_DEFAULT="${survey}-alerts"
2727
# use test resources, if requested
2828
if [ "$testid" != "False" ]; then
2929
broker_bucket="${broker_bucket}-${testid}"

broker/setup_broker/lvk/setup_broker.sh

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,8 @@ if [ "${teardown}" != "True" ]; then
5555
# create bigquery dataset and table
5656
bq --location="${region}" mk --dataset "${bq_dataset}"
5757

58-
cd templates || exit
59-
bq mk --table "${PROJECT_ID}:${bq_dataset}.${alerts_table}" "bq_${survey}_${alerts_table}_schema.json"
60-
cd .. || exit
58+
cd templates && bq mk --table "${PROJECT_ID}:${bq_dataset}.${alerts_table}" "bq_${survey}_${alerts_table}_schema.json" || exit 5
59+
cd .. || exit 5
6160

6261
# create broker bucket and upload files
6362
echo "Creating broker_bucket and uploading files..."
@@ -94,13 +93,10 @@ echo "Configuring VMs..."
9493
#--- Deploy Cloud Functions
9594
echo
9695
echo "Configuring Cloud Functions..."
97-
cd .. && cd .. || exit
98-
cd cloud_functions && cd lvk || exit
96+
cd .. && cd .. && cd cloud_functions && cd lvk || exit 5
9997

10098
#--- BigQuery storage cloud function
101-
cd store_BigQuery || exit
102-
./deploy.sh "$testid" "$teardown" "$survey"
99+
cd store_BigQuery && ./deploy.sh "$testid" "$teardown" "$survey" || exit 5
103100

104-
#--- return to setup_broker directory
105-
cd .. && cd .. || exit
106-
cd .. && cd setup_broker || exit
101+
#--- return to setup_broker/lvk directory
102+
cd .. && cd .. && cd .. && cd setup_broker && cd lvk || exit 5

broker/setup_broker/lvk/templates/bq_lvk_alerts_schema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,13 @@
8989
"type": "TIMESTAMP"
9090
},
9191
{
92-
"description": "estimation of the frequency of the signal's main component",
92+
"description": "estimation of the frequency of the signal's main component [Hz]",
9393
"mode": "NULLABLE",
9494
"name": "central_frequency",
9595
"type": "INTEGER"
9696
},
9797
{
98-
"description": "Probability, under the assumption that the source is not noise, that at least one of the compact objects was a neutron star, that the system ejected a non-zero amount of neutron star matter, and that at least one of the compact objects has mass in the range 3-5 solar masses, respectively",
98+
"description": "Probabilities, under the assumption that the source is not noise, regarding the physical characteristics of the event's progenitor and possible remnants.",
9999
"fields": [
100100
{
101101
"description": "Probability that at least one of the compact objects was a neutron star",

0 commit comments

Comments
 (0)