Skip to content
Snippets Groups Projects
Commit b0bce3b1 authored by Prathamesh Joshi's avatar Prathamesh Joshi
Browse files

Remove checking output paths

parent c1a8da3d
No related branches found
No related tags found
1 merge request!564Online new extinction
Pipeline #582135 canceled
This commit is part of merge request !564. Comments created here will be created in the context of that merge request.
......@@ -152,23 +152,8 @@ def main():
# set up the output paths
#
marg_pdf_exists = os.path.isfile(options.output)
pdfs = DataCache.find(DataType.DIST_STAT_PDFS, svd_bins = "*")
if marg_pdf_exists and len(pdfs) == len(registries):
files_exist = True
elif not marg_pdf_exists and len(pdfs) == 0:
files_exist = False
elif marg_pdf_exists and len(pdfs) != len(registries):
raise ValueError(f"Number of registry files provided ({len(registries)}) does not match number of DIST_STAT_PDF files found ({len(pdfs)})")
else:
raise ValueError("Could not find marg DIST_STAT_PDF file")
svd_bins = [reg[:4] for reg in registries]
if files_exist:
assert set(pdfs.groupby('svd_bin').keys()) == set(svd_bins), "svd bins of registry files are not the same as svd bins of found PDFs"
else:
pdfs = DataCache.generate(DataType.DIST_STAT_PDFS, CacheEntry.from_T050017(options.output).observatory, svd_bins = svd_bins)
pdfs = DataCache.generate(DataType.DIST_STAT_PDFS, CacheEntry.from_T050017(options.output).observatory, svd_bins = svd_bins)
pdfs = pdfs.groupby('svd_bin')
#
......@@ -220,8 +205,12 @@ def main():
url = url_from_registry(reg, likelihood_path)
svd_bin = reg[:4]
# load the old ranking stat pdf for this bin:
old_pdf = far.parse_likelihood_control_doc(ligolw_utils.load_url(pdfs[svd_bin][0], verbose = options.verbose, contenthandler = far.RankingStat.LIGOLWContentHandler)) if files_exist else None
if os.path.isfile(pdfs[svd_bin].files[0]):
# load the old ranking stat pdf for this bin:
old_pdf = far.parse_likelihood_control_doc(ligolw_utils.load_url(pdfs[svd_bin].files[0], verbose = options.verbose, contenthandler = far.RankingStat.LIGOLWContentHandler))
else:
logging.warning(f"Couldn't find {pdfs[svd_bin].files[0]}, starting from scratch")
old_pdf = None
# create the new ranking stat pdf and marginalize as we go
new_pdf_status, pdf = calc_rank_pdfs(url, ranking_stat_samples, options.num_cores, verbose = options.verbose)
......@@ -263,7 +252,7 @@ def main():
else:
data = pdf.new_with_extinction()
else:
logging.warning(f'Skipping first-round extinction for {}')
logging.warning(f'Skipping first-round extinction for {pdfs[svd_bin].files[0]}')
if data:
data += pdf
else:
......@@ -319,10 +308,6 @@ def main():
ligolw_utils.write_filename(xmldoc, options.output, verbose = options.verbose)
logging.info(f"Done marginalizing likelihoods.")
# we just created the bin-specific and marg DIST_STAT_PDFs,
# so the files definitely exist for the next iteration of the loop
files_exist = True
if kafka_processor:
kafka_processor.heartbeat()
......
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