From dc7d9de4ade9f860ddd0986afe1e0af6b5c29293 Mon Sep 17 00:00:00 2001 From: Kipp Cannon <kipp.cannon@ligo.org> Date: Mon, 22 Oct 2018 13:50:06 +0900 Subject: [PATCH] Revert "inspiral_lr: deal with some files not having the mass model file set" This reverts commit 9159362d7e6269a020bcf2816d1b873184b61513. --- gstlal-inspiral/python/stats/inspiral_lr.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gstlal-inspiral/python/stats/inspiral_lr.py b/gstlal-inspiral/python/stats/inspiral_lr.py index 02386fbc7a..34c1e363e7 100644 --- a/gstlal-inspiral/python/stats/inspiral_lr.py +++ b/gstlal-inspiral/python/stats/inspiral_lr.py @@ -518,7 +518,7 @@ class LnSignalDensity(LnLRDensity): def to_xml(self, name): xml = super(LnSignalDensity, self).to_xml(name) xml.appendChild(self.horizon_history.to_xml(u"horizon_history")) - xml.appendChild(ligolw_param.Param.from_pyvalue(u"population_model_file", self.population_model_file if self.population_model_file is not None else "")) + xml.appendChild(ligolw_param.Param.from_pyvalue(u"population_model_file", self.population_model_file)) return xml @classmethod @@ -526,9 +526,7 @@ class LnSignalDensity(LnLRDensity): xml = cls.get_xml_root(xml, name) self = super(LnSignalDensity, cls).from_xml(xml, name) self.horizon_history = horizonhistory.HorizonHistories.from_xml(xml, u"horizon_history") - self.population_model_file = ligolw_param.get_pyvalue(xml, u"population_model_file") - if self.population_model_file == "": - self.population_model_file = None + self.population_model_file = ligolw_params.get_pyvalue(xml, u"population_model_file") self.population_model = inspiral_intrinsics.SourcePopulationModel(self.template_ids, filename = self.population_model_file) return self -- GitLab