From a162a81f8221acffbb7578343af6939df4502798 Mon Sep 17 00:00:00 2001 From: Kipp Cannon <kipp.cannon@ligo.org> Date: Mon, 5 Nov 2018 11:31:21 +0900 Subject: [PATCH] OnlineFrankenStein: - fix spelling error in name - population_model_file needs to be passed as keyword argument in numerator's .splice() method --- gstlal-inspiral/python/far.py | 6 +++--- gstlal-inspiral/python/lloidhandler.py | 4 ++-- gstlal-inspiral/python/stats/inspiral_lr.py | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gstlal-inspiral/python/far.py b/gstlal-inspiral/python/far.py index 32283bae0f..5d2477afeb 100644 --- a/gstlal-inspiral/python/far.py +++ b/gstlal-inspiral/python/far.py @@ -360,7 +360,7 @@ class DatalessRankingStat(RankingStat): return True -class OnlineFrakensteinRankingStat(RankingStat): +class OnlineFrankensteinRankingStat(RankingStat): """ Version of RankingStat with horizon distance history and trigger rate history spliced in from another instance. Used to solve a @@ -378,8 +378,8 @@ class OnlineFrakensteinRankingStat(RankingStat): # instances, no need to add extra code here to prevent these # operations def __init__(self, src, donor): - self.numerator = inspiral_lr.OnlineFrakensteinLnSignalDensity.splice(src.numerator, donor.numerator) - self.denominator = inspiral_lr.OnlineFrakensteinLnNoiseDensity.splice(src.denominator, donor.denominator) + self.numerator = inspiral_lr.OnlineFrankensteinLnSignalDensity.splice(src.numerator, donor.numerator) + self.denominator = inspiral_lr.OnlineFrankensteinLnNoiseDensity.splice(src.denominator, donor.denominator) def finish(self): # no zero-lag diff --git a/gstlal-inspiral/python/lloidhandler.py b/gstlal-inspiral/python/lloidhandler.py index e40fb74670..febeffa4b6 100644 --- a/gstlal-inspiral/python/lloidhandler.py +++ b/gstlal-inspiral/python/lloidhandler.py @@ -677,7 +677,7 @@ class Handler(simplehandler.Handler): if self.ranking_stat_input_url is not None: if self.rankingstat.is_healthy(self.verbose): - self.stream_thinca.ln_lr_from_triggers = far.OnlineFrakensteinRankingStat(self.rankingstat, self.rankingstat).finish().ln_lr_from_triggers + self.stream_thinca.ln_lr_from_triggers = far.OnlineFrankensteinRankingStat(self.rankingstat, self.rankingstat).finish().ln_lr_from_triggers if self.verbose: print >>sys.stderr, "ranking statistic assignment ENABLED" else: @@ -991,7 +991,7 @@ class Handler(simplehandler.Handler): # update streamthinca's ranking statistic # data if self.rankingstat.is_healthy(self.verbose): - self.stream_thinca.ln_lr_from_triggers = far.OnlineFrakensteinRankingStat(self.rankingstat, self.rankingstat).finish().ln_lr_from_triggers + self.stream_thinca.ln_lr_from_triggers = far.OnlineFrankensteinRankingStat(self.rankingstat, self.rankingstat).finish().ln_lr_from_triggers if self.verbose: print >>sys.stderr, "ranking statistic assignment ENABLED" else: diff --git a/gstlal-inspiral/python/stats/inspiral_lr.py b/gstlal-inspiral/python/stats/inspiral_lr.py index 118954229f..b11f7e6844 100644 --- a/gstlal-inspiral/python/stats/inspiral_lr.py +++ b/gstlal-inspiral/python/stats/inspiral_lr.py @@ -603,7 +603,7 @@ class DatalessLnSignalDensity(LnSignalDensity): raise NotImplementedError -class OnlineFrakensteinLnSignalDensity(LnSignalDensity): +class OnlineFrankensteinLnSignalDensity(LnSignalDensity): """ Version of LnSignalDensity with horizon distance history spliced in from another instance. Used to solve a chicken-or-egg problem and @@ -618,7 +618,7 @@ class OnlineFrakensteinLnSignalDensity(LnSignalDensity): """ @classmethod def splice(cls, src, Dh_donor): - self = cls(src.template_ids, src.instruments, src.delta_t, src.population_model_file, src.min_instruments) + self = cls(src.template_ids, src.instruments, src.delta_t, population_model_file = src.population_model_file, min_instruments = src.min_instruments) for key, lnpdf in src.densities.items(): self.densities[key] = lnpdf.copy() # NOTE: not a copy. we hold a reference to the donor's @@ -990,7 +990,7 @@ class DatalessLnNoiseDensity(LnNoiseDensity): raise NotImplementedError -class OnlineFrakensteinLnNoiseDensity(LnNoiseDensity): +class OnlineFrankensteinLnNoiseDensity(LnNoiseDensity): """ Version of LnNoiseDensity with trigger rate data spliced in from another instance. Used to solve a chicken-or-egg problem and @@ -1005,7 +1005,7 @@ class OnlineFrakensteinLnNoiseDensity(LnNoiseDensity): """ @classmethod def splice(cls, src, rates_donor): - self = cls(src.template_ids, src.instruments, src.delta_t, src.min_instruments) + self = cls(src.template_ids, src.instruments, src.delta_t, min_instruments = src.min_instruments) for key, lnpdf in src.densities.items(): self.densities[key] = lnpdf.copy() # NOTE: not a copy. we hold a reference to the donor's -- GitLab