Skip to content

Commit

Permalink
handle the uncommented lines in VizieR plaintex ouptput header
Browse files Browse the repository at this point in the history
  • Loading branch information
@kirxkirx
kirxkirx committed May 23, 2023
1 parent 4e046fc commit 4253bcd
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions util/examples/test_vast.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17341,7 +17341,7 @@ if [ ! -s test_vizquery_M31.output ];then
FAILED_TEST_CODES="$FAILED_TEST_CODES VIZQUERYTEST003"
fi
# check that the whole output was received, if not - retry
cat test_vizquery_M31.output | grep --quiet '#END# -ref=VOT'
cat test_vizquery_M31.output | grep --quiet '#END#'
if [ $? -ne 0 ];then
FAILED_TEST_CODES="$FAILED_TEST_CODES VIZQUERYTEST_RETRY"
# maybe this was a random network glitch? sleep 30 sec and retry
Expand Down Expand Up @@ -17377,7 +17377,7 @@ else
FAILED_TEST_CODES="$FAILED_TEST_CODES VIZQUERYTEST004_$TEST"
fi
fi
cat test_vizquery_M31.output | grep --quiet '#END# -ref=VOT'
cat test_vizquery_M31.output | grep --quiet '#END#'
if [ $? -ne 0 ];then
TEST_PASSED=0
FAILED_TEST_CODES="$FAILED_TEST_CODES VIZQUERYTEST005"
Expand Down
14 changes: 7 additions & 7 deletions util/search_databases_with_vizquery.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,8 +322,8 @@ DOUBLE_R_SEARCH_ARCSEC=$(echo "$R_SEARCH_ARCSEC" | awk '{print 2*$1}')
echo " "
echo "Searching USNO-B1.0 for the brightest objects within $R_SEARCH_ARCSEC\" around $RA $DEC in the range of $B2MAG_RANGE"
#echo " "
echo "$LONGTIMEOUTCOMMAND $VAST_PATH""lib/vizquery -site=$VIZIER_SITE -mime=text -source=USNO-B1 -out.max=10 -out.add=_r -out.form=mini -sort=B2mag -c="$RA $DEC" $B2MAG_RANGE -c.rs=$R_SEARCH_ARCSEC -out=USNO-B1.0,RAJ2000,DEJ2000,B2mag,B1mag"
$LONGTIMEOUTCOMMAND "$VAST_PATH"lib/vizquery -site="$VIZIER_SITE" -mime=text -source=USNO-B1 -out.max=10 -out.add=_r -out.form=mini -sort=B2mag -c="$RA $DEC" $B2MAG_RANGE -c.rs=$R_SEARCH_ARCSEC -out=USNO-B1.0,RAJ2000,DEJ2000,B2mag,B1mag 2>/dev/null | grep -v \# | grep -v "_" | grep -v "\---" |grep -v "sec" |grep -v "RAJ" |grep -v "B" | while read -r R USNOB1 CATRA_DEG CATDEC_DEG B2 B1 REST ;do
echo "$LONGTIMEOUTCOMMAND $VAST_PATH""lib/vizquery -site=$VIZIER_SITE -mime=text -source=I/284 -out.max=10 -out.add=_r -out.form=mini -sort=B2mag -c="$RA $DEC" $B2MAG_RANGE -c.rs=$R_SEARCH_ARCSEC -out=USNO-B1.0,RAJ2000,DEJ2000,B2mag,B1mag"
$LONGTIMEOUTCOMMAND "$VAST_PATH"lib/vizquery -site="$VIZIER_SITE" -mime=text -source=I/284 -out.max=10 -out.add=_r -out.form=mini -sort=B2mag -c="$RA $DEC" $B2MAG_RANGE -c.rs=$R_SEARCH_ARCSEC -out=USNO-B1.0,RAJ2000,DEJ2000,B2mag,B1mag 2>/dev/null | grep -v \# | grep -v '(' | grep -v "_" | grep -v "\---" |grep -v "sec" |grep -v "RAJ" |grep -v "B" | while read -r R USNOB1 CATRA_DEG CATDEC_DEG B2 B1 REST ;do
# skip stars with unknown B2mag
if [ -z "$B2" ] ;then
continue
Expand Down Expand Up @@ -400,7 +400,7 @@ DOUBLE_R_SEARCH_ARCSEC=$(echo "$R_SEARCH_ARCSEC" | awk '{print 2*$1}')
echo " "
echo "Searching Gaia DR3 for the brightest objects within $R_SEARCH_ARCSEC\" around $RA $DEC in the range of $GMAG_RANGE"
echo "$LONGTIMEOUTCOMMAND $VAST_PATH""lib/vizquery -site=$VIZIER_SITE -mime=text -source=I/355/gaiadr3 -out.max=10 -out.add=_r -out.form=mini -sort=Gmag -c='$RA $DEC' $GMAG_RANGE -c.rs=$R_SEARCH_ARCSEC -out=Source,RA_ICRS,DE_ICRS,Gmag,VarFlag"
$LONGTIMEOUTCOMMAND "$VAST_PATH"lib/vizquery -site="$VIZIER_SITE" -mime=text -source=I/355/gaiadr3 -out.max=10 -out.add=_r -out.form=mini -sort=Gmag -c="$RA $DEC" $GMAG_RANGE -c.rs=$R_SEARCH_ARCSEC -out=Source,RA_ICRS,DE_ICRS,Gmag,VarFlag 2>/dev/null | grep -v \# | grep -v "\---" |grep -v "sec" | grep -v 'Gma' |grep -v "RA_ICRS" | grep -e 'NOT_AVAILABLE' -e 'CONSTANT' -e 'VARIABLE' | while read -r R GAIA_SOURCE GAIA_CATRA_DEG GAIA_CATDEC_DEG GMAG VARFLAG REST ;do
$LONGTIMEOUTCOMMAND "$VAST_PATH"lib/vizquery -site="$VIZIER_SITE" -mime=text -source=I/355/gaiadr3 -out.max=10 -out.add=_r -out.form=mini -sort=Gmag -c="$RA $DEC" $GMAG_RANGE -c.rs=$R_SEARCH_ARCSEC -out=Source,RA_ICRS,DE_ICRS,Gmag,VarFlag 2>/dev/null | grep -v \# | grep -v '(' | grep -v "\---" |grep -v "sec" | grep -v 'Gma' |grep -v "RA_ICRS" | grep -e 'NOT_AVAILABLE' -e 'CONSTANT' -e 'VARIABLE' | while read -r R GAIA_SOURCE GAIA_CATRA_DEG GAIA_CATDEC_DEG GMAG VARFLAG REST ;do
# skip stars with unknown Gmag
if [ -z "$GMAG" ] ;then
continue
Expand Down Expand Up @@ -555,7 +555,7 @@ fi

# GCVS
if [ $KNOWN_VARIABLE -eq 0 ];then
GCVS_RESULT=$($TIMEOUTCOMMAND "$VAST_PATH"lib/vizquery -site="$VIZIER_SITE" -mime=text -source=B/gcvs -out.max=1 -out.form=mini -sort=_r -c="$GOOD_CATALOG_POSITION" -c.rs="$DOUBLE_R_SEARCH_ARCSEC" -out=GCVS,VarType,Period 2>/dev/null | grep -v \# | grep -v "_" | grep -v "\---" | grep -v "GCVS" |head -n2 |tail -n 1)
GCVS_RESULT=$($TIMEOUTCOMMAND "$VAST_PATH"lib/vizquery -site="$VIZIER_SITE" -mime=text -source=B/gcvs -out.max=1 -out.form=mini -sort=_r -c="$GOOD_CATALOG_POSITION" -c.rs="$DOUBLE_R_SEARCH_ARCSEC" -out=GCVS,VarType,Period 2>/dev/null | grep -v \# | grep -v '(' | grep -v "_" | grep -v "\---" | grep -v "GCVS" |head -n2 |tail -n 1)
GCVS_V=$(echo "$GCVS_RESULT" | awk '{print $1}')
if [ "$GCVS_V" != "" ] ;then
# STAR FROM GCVS
Expand All @@ -571,7 +571,7 @@ if [ $KNOWN_VARIABLE -eq 0 ];then
fi
fi
if [ $KNOWN_VARIABLE -eq 0 ];then
VSX_RESULT=$($TIMEOUTCOMMAND "$VAST_PATH"lib/vizquery -site="$VIZIER_SITE" -mime=text -source=B/vsx -out.max=1 -out.form=mini -sort=_r -c="$GOOD_CATALOG_POSITION" -c.rs="$DOUBLE_R_SEARCH_ARCSEC" -out=Name,Type,Period 2>/dev/null | grep -v \# | grep -v "_" | grep -v "\---" | grep -A 1 Name | tail -n1 | sed 's:MASTER OT:MASTER_OT:g')
VSX_RESULT=$($TIMEOUTCOMMAND "$VAST_PATH"lib/vizquery -site="$VIZIER_SITE" -mime=text -source=B/vsx -out.max=1 -out.form=mini -sort=_r -c="$GOOD_CATALOG_POSITION" -c.rs="$DOUBLE_R_SEARCH_ARCSEC" -out=Name,Type,Period 2>/dev/null | grep -v \# | grep -v '(' | grep -v "_" | grep -v "\---" | grep -A 1 Name | tail -n1 | sed 's:MASTER OT:MASTER_OT:g')
#echo "########$VSX_RESULT#########"
VSX_V=$(echo "$VSX_RESULT" | awk '{print $1}')
if [ "$VSX_V" != "" ] ;then
Expand Down Expand Up @@ -647,7 +647,7 @@ if [ $KNOWN_VARIABLE -eq 0 ];then
### Check other large variable star lists
# OGLE Bulge LPV
if [ $KNOWN_VARIABLE -eq 0 ];then
OGLE_LPV_RESULTS=$($TIMEOUTCOMMAND "$VAST_PATH"lib/vizquery -site="$VIZIER_SITE" -mime=text -source=J/AcA/63/21/catalog -out.max=10 -out.form=mini -sort=_r -c="$GOOD_CATALOG_POSITION" -c.rs="$DOUBLE_R_SEARCH_ARCSEC" -out=Star,Type,Per 2>/dev/null | grep -v \# | grep -v "_" | grep -v "\---" | grep -A 1 'Star' | tail -n1)
OGLE_LPV_RESULTS=$($TIMEOUTCOMMAND "$VAST_PATH"lib/vizquery -site="$VIZIER_SITE" -mime=text -source=J/AcA/63/21/catalog -out.max=10 -out.form=mini -sort=_r -c="$GOOD_CATALOG_POSITION" -c.rs="$DOUBLE_R_SEARCH_ARCSEC" -out=Star,Type,Per 2>/dev/null | grep -v \# | grep -v '(' | grep -v "_" | grep -v "\---" | grep -A 1 'Star' | tail -n1)
if [ -n "$OGLE_LPV_RESULTS" ];then
OGLENAME=$(echo "$OGLE_LPV_RESULTS" | awk '{print $1}')
OGLETYPE=$(echo "$OGLE_LPV_RESULTS" | awk '{print $2}')
Expand All @@ -660,7 +660,7 @@ if [ $KNOWN_VARIABLE -eq 0 ];then
fi
# ATLAS
if [ $KNOWN_VARIABLE -eq 0 ];then
ATLAS_RESULTS=$($TIMEOUTCOMMAND "$VAST_PATH"lib/vizquery -site="$VIZIER_SITE" -mime=text -source=J/AJ/156/241/table4 -out.max=10 -out.form=mini -sort=_r -c="$GOOD_CATALOG_POSITION" -c.rs="$DOUBLE_R_SEARCH_ARCSEC" -out=ATOID,Class 2>/dev/null | grep -v \# | grep -v "_" | grep -v "\---" | grep J | tail -n1)
ATLAS_RESULTS=$($TIMEOUTCOMMAND "$VAST_PATH"lib/vizquery -site="$VIZIER_SITE" -mime=text -source=J/AJ/156/241/table4 -out.max=10 -out.form=mini -sort=_r -c="$GOOD_CATALOG_POSITION" -c.rs="$DOUBLE_R_SEARCH_ARCSEC" -out=ATOID,Class 2>/dev/null | grep -v \# | grep -v '(' | grep -v "_" | grep -v "\---" | grep J | tail -n1)
if [ -n "$ATLAS_RESULTS" ];then
ATLASNAME=$(echo "$ATLAS_RESULTS" | awk '{print $1}')
ATLASTYPE=$(echo "$ATLAS_RESULTS" | awk '{print $2}')
Expand Down

0 comments on commit 4253bcd

Please sign in to comment.