diff --git a/CODE/shells/gnss_run_gipsyx b/CODE/shells/gnss_run_gipsyx index 41175ff4..55fc0695 100755 --- a/CODE/shells/gnss_run_gipsyx +++ b/CODE/shells/gnss_run_gipsyx @@ -207,7 +207,8 @@ for station in $NODES; do receiver=$($PROGDIR/sitelog2json "$SITELOG" $FID $ymd|jq '.rt' | tr -d '"') antenna=$($PROGDIR/sitelog2json "$SITELOG" $FID $ymd|jq '.at' | tr -d '"') posxyz=$($PROGDIR/sitelog2json "$SITELOG" $FID $ymd|jq '.px' | tr -d '"') - alertheader=" sitelog: $FID @ $ymd - receiver = '$receiver' - antenna = '$antenna' (will use rinex header if empty)" + antennaecc=$($PROGDIR/sitelog2json "$SITELOG" $FID $ymd|jq '.pe' | tr -d '"') + alertheader=" sitelog: $FID @ $ymd - receiver = '$receiver' - antenna = '$antenna' - antenna ecc = '$antennaecc' (will use rinex header if empty)" if [ ! -z "$receiver" ]; then receiver=" -O.rt \"$receiver\"" fi @@ -217,6 +218,9 @@ for station in $NODES; do if [ ! -z "$posxyz" ]; then posxyz=" -O.px $posxyz" fi + if [ ! -z "$antennaecc" ]; then + antennaecc=" -O.pe[hEN,m] $antennaecc" + fi else alertheader='' fi @@ -235,9 +239,9 @@ for station in $NODES; do echo "$alertheader" rm -rf $tmpdir/* # makes Rinex daily file from raw data (see raw2rinex script) - $PROGDIR/raw2rinex "$RAW" $rinex $TEQCOPTIONS -O.mn \"$FID\" -O.mo \"$FID\" $receiver $antenna $posxyz + $PROGDIR/raw2rinex "$RAW" $rinex $TEQCOPTIONS -O.mn \"$FID\" -O.mo \"$FID\" $receiver $antenna $posxyz $antennaecc if [[ ! -z $VERBOSE || $? != 0 ]]; then - echo " $PROGDIR/raw2rinex \"$RAW\" $rinex $TEQCOPTIONS -O.mn \"$FID\" -O.mo \"$FID\" $receiver $antenna $posxyz" + echo " $PROGDIR/raw2rinex \"$RAW\" $rinex $TEQCOPTIONS -O.mn \"$FID\" -O.mo \"$FID\" $receiver $antenna $posxyz $antennaecc" fi # real-time case: makes a 24h window from yesterday+today data @@ -260,9 +264,9 @@ for station in $NODES; do dd=${yesterday:8:2} RAW2=$(eval "echo $FMT") echo "$RAW2" - $PROGDIR/raw2rinex "$RAW2" $rinex2 $TEQCOPTIONS -O.mn \"$FID\" -O.mo \"$FID\" $receiver $antenna $posxyz + $PROGDIR/raw2rinex "$RAW2" $rinex2 $TEQCOPTIONS -O.mn \"$FID\" -O.mo \"$FID\" $receiver $antenna $posxyz $antennaecc if [[ ! -z $VERBOSE || $? != 0 ]]; then - echo "$PROGDIR/raw2rinex \"$RAW2\" $rinex2 $TEQCOPTIONS -O.mn \"$FID\" -O.mo \"$FID\" $receiver $antenna $posxyz" + echo "$PROGDIR/raw2rinex \"$RAW2\" $rinex2 $TEQCOPTIONS -O.mn \"$FID\" -O.mo \"$FID\" $receiver $antenna $posxyz $antennaecc" fi #converting 2 days ago rinex @@ -272,9 +276,9 @@ for station in $NODES; do dd=${two_days_ago:8:2} RAW1=$(eval "echo $FMT") echo "$RAW1" - $PROGDIR/raw2rinex "$RAW1" $rinex1 $TEQCOPTIONS -O.mn \"$FID\" -O.mo \"$FID\" $receiver $antenna $posxyz + $PROGDIR/raw2rinex "$RAW1" $rinex1 $TEQCOPTIONS -O.mn \"$FID\" -O.mo \"$FID\" $receiver $antenna $posxyz $antennaecc if [[ ! -z $VERBOSE || $? != 0 ]]; then - echo "$PROGDIR/raw2rinex \"$RAW1\" $TEQCOPTIONS -O.mn \"$FID\" -O.mo \"$FID\" $receiver $antenna $posxyz" + echo "$PROGDIR/raw2rinex \"$RAW1\" $TEQCOPTIONS -O.mn \"$FID\" -O.mo \"$FID\" $receiver $antenna $posxyz $antennaecc" fi mv $rinex $rinex3 #already converted rinex for today