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

Revert "inspiral_lr: deal with some files not having the mass model file set"

This reverts commit 9159362d.
parent da16cc01
No related branches found
No related tags found
No related merge requests found
Pipeline #35254 failed
......@@ -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
......
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