Skip to content
Snippets Groups Projects
Commit 0dfa3c3d authored by Kipp Cannon's avatar Kipp Cannon
Browse files

add --ilwdchar-compat to ligolw_print

parent 1dd45c21
No related branches found
No related tags found
No related merge requests found
......@@ -92,8 +92,8 @@ else
START_FILE=${CUMULATIVE_SEG_FILE}
fi
SEGMENT_DEF_ID=$(ligolw_print --table segment_definer --column name --column segment_def_id ${START_FILE} | grep triggersegments | sed -e 's/,/\n/g' | grep segment_definer | head -n 1)
START=$(ligolw_print --table segment --column start_time --column segment_def_id ${START_FILE} | grep ${SEGMENT_DEF_ID} | sed -e 's/,/\n/g' | sed -e '/segment_definer/d' | sort -g | head -n 1)
SEGMENT_DEF_ID=$(ligolw_print --ilwdchar-compat --table segment_definer --column name --column segment_def_id ${START_FILE} | grep triggersegments | sed -e 's/,/\n/g' | grep segment_definer | head -n 1)
START=$(ligolw_print --ilwdchar-compat --table segment --column start_time --column segment_def_id ${START_FILE} | grep ${SEGMENT_DEF_ID} | sed -e 's/,/\n/g' | sed -e '/segment_definer/d' | sort -g | head -n 1)
echo analysis start time read as ${START}
while true; do
......@@ -154,7 +154,7 @@ while true; do
gstlal_segments_operations --union --segment-file1 ${TMP_CUMULATIVE_SEG_XML}.gz --segment-file2 ${TMP_TOTAL_SEG_XML_GZ} --output-file ${TRIGGER_SEG_XML} --segment-name1 triggersegments --segment-name2 triggersegments --output-segment-name triggersegments --verbose
SEG_FILES=""
for SEG_FILE in ${STATEVECTOR_SEG_XML} ${WHITEHT_SEG_XML} ${TRIGGER_SEG_XML}; do
if [ $(ligolw_print --table segment ${SEG_FILE} | wc -l) -gt 0 ]; then
if [ $(ligolw_print --ilwdchar-compat --table segment ${SEG_FILE} | wc -l) -gt 0 ]; then
SEG_FILES="${SEG_FILE} ${SEG_FILES}"
fi
done
......@@ -187,7 +187,7 @@ while true; do
else
cp ${LIGOLW_XML_GZ} ${TMP_LIGOLW_XML_GZ}
if [ $(ligolw_print --table coinc_inspiral --column end_time ${TMP_LIGOLW_XML_GZ} | wc -l) -eq 0 ]; then
if [ $(ligolw_print --ilwdchar-compat --table coinc_inspiral --column end_time ${TMP_LIGOLW_XML_GZ} | wc -l) -eq 0 ]; then
QUERYSTART=${START}
else
# QUERYSTART is chosen so that the simdb query will
......@@ -195,7 +195,7 @@ while true; do
# downloaded. This way we avoid any potential issues
# with the asynchronous nature of the simdb queries and
# the segment updates
QUERYSTART=$(ligolw_print --table coinc_inspiral --column end_time ${TMP_LIGOLW_XML_GZ} | sort -g | tail -n 1)
QUERYSTART=$(ligolw_print --ilwdchar-compat --table coinc_inspiral --column end_time ${TMP_LIGOLW_XML_GZ} | sort -g | tail -n 1)
fi
fi
......@@ -208,7 +208,7 @@ while true; do
echo querying simdb from ${QUERYSTART} to ${QUERYSTOP}...
gracedb --ligolw --service-url=${SIMDB_SERVICE_URL} search ${QUERYSTART}..${QUERYSTOP} ${PIPELINE} ${GROUP} ${SEARCH} > ${TMP_QUERY_XML}
if [ $(ligolw_print --table coinc_inspiral --column end_time ${TMP_QUERY_XML} | wc -l) -gt 0 ]; then
if [ $(ligolw_print --ilwdchar-compat --table coinc_inspiral --column end_time ${TMP_QUERY_XML} | wc -l) -gt 0 ]; then
ligolw_add --ilwdchar-compat ${TMP_LIGOLW_XML_GZ} ${TMP_QUERY_XML} --verbose --output ${TMP_LIGOLW_XML_GZ}
fi
......@@ -219,13 +219,13 @@ while true; do
# the events+injections file and then generate the range plot
#
if [ $(ligolw_print --table coinc_inspiral --column end_time ${TMP_LIGOLW_XML_GZ} | wc -l) -gt 0 ]; then
if [ $(ligolw_print --ilwdchar-compat --table coinc_inspiral --column end_time ${TMP_LIGOLW_XML_GZ} | wc -l) -gt 0 ]; then
#
# Delete old segments from events+injections file, then add new
# segments, again using atomic operations
#
if [ $(ligolw_print --table segment ${TMP_LIGOLW_XML_GZ} | wc -l) -gt 0 ]; then
if [ $(ligolw_print --ilwdchar-compat --table segment ${TMP_LIGOLW_XML_GZ} | wc -l) -gt 0 ]; then
lalapps_run_sqlite --verbose --sql='DELETE FROM segment; DELETE FROM segment_definer' ${TMP_LIGOLW_XML_GZ}
fi
ligolw_add --ilwdchar-compat --verbose ${TMP_LIGOLW_XML_GZ} ${TMP_TOTAL_SEG_XML_GZ} --output ${TMP_LIGOLW_XML_GZ}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment