Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Complete the range of non-bbh psd-threshold stats #3478

Merged
merged 1 commit into from
Oct 1, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions pycbc/events/stat.py
Original file line number Diff line number Diff line change
Expand Up @@ -1589,6 +1589,13 @@ def __init__(self, files=None, ifos=None, **kwargs):
self.get_newsnr = ranking.get_newsnr_sgveto_psdvar_scaled


class ExpFitSGPSDFgBgNormThreshStatistic(ExpFitSGFgBgNormNewStatistic):
def __init__(self, files=None, ifos=None, **kwargs):
ExpFitSGFgBgNormNewStatistic.__init__(self, files=files, ifos=ifos,
**kwargs)
self.get_newsnr = ranking.get_newsnr_sgveto_psdvar_threshold


class ExpFitSGPSDFgBgNormBBHStatistic(ExpFitSGFgBgNormNewStatistic):
def __init__(self, files=None, ifos=None, max_chirp_mass=None, **kwargs):
ExpFitSGFgBgNormNewStatistic.__init__(self, files=files, ifos=ifos,
Expand All @@ -1615,18 +1622,18 @@ def logsignalrate_multiifo(self, stats, shift, to_shift):
return logr_s


class ExpFitSGPSDSTFgBgNormBBHStatistic(ExpFitSGPSDFgBgNormBBHStatistic):
class ExpFitSGPSDFgBgNormBBHThreshStatistic(ExpFitSGPSDFgBgNormBBHStatistic):
def __init__(self, files=None, ifos=None, max_chirp_mass=None, **kwargs):
ExpFitSGPSDFgBgNormBBHStatistic.__init__(self, files=files, ifos=ifos,
max_chirp_mass=None, **kwargs)
self.get_newsnr = ranking.get_newsnr_sgveto_psdvar_scaled_threshold
self.get_newsnr = ranking.get_newsnr_sgveto_psdvar_threshold


class ExpFitSGPSDFgBgNormBBHThreshStatistic(ExpFitSGPSDFgBgNormBBHStatistic):
class ExpFitSGPSDSTFgBgNormBBHStatistic(ExpFitSGPSDFgBgNormBBHStatistic):
def __init__(self, files=None, ifos=None, max_chirp_mass=None, **kwargs):
ExpFitSGPSDFgBgNormBBHStatistic.__init__(self, files=files, ifos=ifos,
max_chirp_mass=None, **kwargs)
self.get_newsnr = ranking.get_newsnr_sgveto_psdvar_threshold
self.get_newsnr = ranking.get_newsnr_sgveto_psdvar_scaled_threshold


statistic_dict = {
Expand Down Expand Up @@ -1654,6 +1661,7 @@ def __init__(self, files=None, ifos=None, max_chirp_mass=None, **kwargs):
'2ogc': ExpFitSGPSDScaledFgBgNormStatistic, # backwards compatible
'2ogcbbh': ExpFitSGPSDSTFgBgNormBBHStatistic, # backwards compatible
'exp_fit_sg_fgbg_norm_psdvar': ExpFitSGPSDFgBgNormStatistic,
'exp_fit_sg_fgbg_norm_psdvar_thresh': ExpFitSGPSDFgBgNormThreshStatistic,
'exp_fit_sg_fgbg_norm_psdvar_bbh': ExpFitSGPSDFgBgNormBBHStatistic,
'exp_fit_sg_fgbg_norm_psdvar_bbh_thresh':
ExpFitSGPSDFgBgNormBBHThreshStatistic
Expand Down