gstlal_inspiral_marginalize_likelihoods_online

- reduce the number of distinct steps
- enable --density-estimate-zero-lag in marginalization step

gstlal-inspiral/bin/gstlal_inspiral_marginalize_likelihoods_online

@@ -76,7 +76,6 @@ SLEEP="600"
 # loop forever
 #
 
-BACKGROUND_COUNTS=$(mktemp --suffix .xml.gz)
 while true ; do
 	echo "... sleeping for ${SLEEP} seconds ..."
 	sleep ${SLEEP}
@@ -92,32 +91,29 @@ while true ; do
 		SERVER=$(cat ${REG}) || exit 1
 		RANKING_PDF_FILE=$(mktemp --suffix .xml.gz) || exit 1
 		RANKING_PDF_FILES="${RANKING_PDF_FILES} ${RANKING_PDF_FILE}"
-		gstlal_inspiral_calc_rank_pdfs --ranking-stat-samples 100000 --verbose --output ${RANKING_PDF_FILE} ${SERVER}${LIKELIHOOD_PATH} || exit 1
+		gstlal_inspiral_calc_rank_pdfs --verbose --ranking-stat-samples 100000 --output ${RANKING_PDF_FILE} ${SERVER}${LIKELIHOOD_PATH} || exit 1
 	done || break
-
-	# sum the noise and signal model ranking statistic histograms
-	# across jobs
 	date +"%H:%M:%S" >&2
-	gstlal_inspiral_marginalize_likelihood --verbose --marginalize ranking-stat-pdf --output ${BACKGROUND_COUNTS} ${RANKING_PDF_FILES} || break
-	rm -vf ${RANKING_PDF_FILES}
 
-	# collect and sum the current observed zero-lag ranking statistic
-	# histograms from all jobs and combine with the noise and signal
-	# model ranking statistic histograms.  instead of overwriting the
-	# target file, write to a separate file then use mv to replace the
-	# target file atomically.  NOTE:  the noise and signal model
-	# ranking statistic histograms in the zero-lag counts files
-	# downloaded from the jobs must be all 0!!!
+	# sum the noise and signal model ranking statistic histograms
+	# across jobs, and collect and sum the current observed zero-lag
+	# ranking statistic histograms from all jobs. combine with the
+	# noise and signal model ranking statistic histograms.  NOTE:  the
+	# noise and signal model ranking statistic histograms in the
+	# zero-lag counts files downloaded from the jobs must be all 0, and
+	# the zero-lag counts in the output generated by
+	# gstlal_inspiral_calc_rank_pdfs must be 0.  NOTE:  this is where
+	# the zero-lag counts have the density estimation transform
+	# applied.
 	ZEROLAG_COUNTS_URLS=
 	for REG in "$@" ; do
 		SERVER=$(cat ${REG}) || exit 1
 		ZEROLAG_COUNTS_URLS="${ZEROLAG_COUNTS_URLS} ${SERVER}${ZEROLAG_COUNTS_PATH}"
 	done || break
+	gstlal_inspiral_marginalize_likelihood --verbose --marginzlize ranking-stat-pdf --density-estimate-zero-lag --output ${OUTPUT} ${RANKING_PDF_FILES} ${ZEROLAG_COUNTS_URLS} || break
 	date +"%H:%M:%S" >&2
-	gstlal_inspiral_marginalize_likelihood --verbose --marginzlize ranking-stat-pdf --output ${OUTPUT}.next.gz ${BACKGROUND_COUNTS} ${ZEROLAG_COUNTS_URLS} || break
-	mv -f ${OUTPUT}.next.gz ${OUTPUT} || break
+	rm -vf ${RANKING_PDF_FILES}
 done
-rm -vf ${BACKGROUND_COUNTS}
 
 #
 # if this program ends its an error, always, so condor will restart it