From 397412c86a088c5fc5362295c8560a7fdcd3f8e9 Mon Sep 17 00:00:00 2001
From: Christopher Wipf <wipf@ligo.mit.edu>
Date: Thu, 23 Aug 2018 16:31:33 -0700
Subject: [PATCH] Match matgwinc value of nu_small in precomp, and enable
strict testing
With this tweak, most noises agree within 1 ppb. Exceptions are
seismic and substrate TE (which still have open bugs in matgwinc).
Arguments added to gwinc.test for setting a tolerance level, and a
list of noises to skip in the comparison.
The CI pipeline will now fail when tests fail.
---
.gitlab-ci.yml | 5 +++--
gwinc/precomp.py | 2 +-
gwinc/test/__main__.py | 44 ++++++++++++++++++++++--------------------
3 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dc9975a7..3c6aa69b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,14 +17,15 @@ test:
- python3 -m gwinc aLIGO -s aLIGO.png
- python3 -m gwinc A+ -s A+.png
- python3 -m gwinc Voyager -s Voyager.png
- - python3 -m gwinc.test aLIGO -p -s aLIGO_test.png || true
- - python3 -m gwinc.test A+ -p -s A+_test.png || true
+ - python3 -m gwinc.test aLIGO -t 10e-6 -k Seismic -k "Substrate Thermo-Elastic" -p -s aLIGO_test.png
+ - python3 -m gwinc.test -t 10e-6 -k Seismic -k "Substrate Thermo-Elastic" A+ -p -s A+_test.png
after_script:
- rm gitID.txt
cache:
key: "$CI_PROJECT_NAMESPACE:$CI_PROJECT_NAME:$CI_JOB_NAME"
untracked: true
artifacts:
+ when: always
expire_in: 4w
paths:
- aLIGO.png
diff --git a/gwinc/precomp.py b/gwinc/precomp.py
index 8cd37b58..f4c3bbc4 100644
--- a/gwinc/precomp.py
+++ b/gwinc/precomp.py
@@ -261,7 +261,7 @@ def dhdl(f, armlen):
"""
c = scipy.constants.c
- nu_small = 0.05
+ nu_small = 15*pi/180
omega_arm = pi * f * armlen / c
omega_arm_f = (1 - sin(nu_small)) * pi * f * armlen / c
omega_arm_b = (1 + sin(nu_small)) * pi * f * armlen / c
diff --git a/gwinc/test/__main__.py b/gwinc/test/__main__.py
index b23e89f7..f648311b 100644
--- a/gwinc/test/__main__.py
+++ b/gwinc/test/__main__.py
@@ -23,13 +23,6 @@ except ImportError:
FLO = 5
FHI = 6000
NPOINTS = 3000
-FRACTIONAL_TOLERANCE = 0.01
-# comparisons to skip
-SKIP = [
- # 'Seismic',
- # 'Suspension Thermal',
- # 'Newtonian Gravity',
- ]
def path_hash(path):
@@ -58,6 +51,8 @@ def main():
parser.add_argument('--plot', '-p', action='store_true', help='plot differences')
parser.add_argument('--save', '-s', help='save plot to file')
parser.add_argument('--recalc', '-r', action='store_true', help='recalculate all traces')
+ parser.add_argument('--tolerance', '-t', help='fractional tolerance', type=float, default=1e-6)
+ parser.add_argument('--skip', '-k', action='append', help='traces to skip comparing')
parser.add_argument('IFO', help='IFO name or description file')
args = parser.parse_args()
@@ -145,11 +140,14 @@ pygwinc: {fom:.2f} Mpc""".format(
##############################
# find differences
+ skip = args.skip
+ fractional_tolerance = args.tolerance
+
diffs = {}
for name, noise in noises.items():
if name in ['Freq']:
continue
- if name in SKIP:
+ if skip and name in skip:
logging.warning("SKIPPING TEST: '{}'".format(name))
continue
@@ -167,11 +165,11 @@ pygwinc: {fom:.2f} Mpc""".format(
diff = np.sqrt(mn) - np.sqrt(pn)
frac = abs(diff / np.sqrt(pn))
- if max(frac) < FRACTIONAL_TOLERANCE:
+ if max(frac) < fractional_tolerance:
continue
- logging.warning("EXCESSIVE DIFFERENCE: {:{w}} {:6.1f}%".format(
- name, max(frac)*100, w=max([len(n) for n in noises])))
+ logging.warning("EXCESSIVE DIFFERENCE: {:{w}} {:6.1f} ppm".format(
+ name, max(frac)*1e6, w=max([len(n) for n in noises])))
# logging.warning(" max: {:e}, min: {:e}".format(max(frac), min(frac)))
diffs[name] = (mn, pn, frac)
@@ -198,22 +196,26 @@ pygwinc: {fom:.2f} Mpc""".format(
axr.loglog(freq, frac)
axr.grid()
axr.axhline(y=max(frac), color='r', linestyle='--')
- axr.text(max(freq)+4000, max(frac), '{:.1f}%'.format(max(frac)*100),
+ axr.text(max(freq)+4000, max(frac), '{:.1f} ppm'.format(max(frac)*1e6),
horizontalalignment='left', verticalalignment='center',
color='red')
- axl.set_xlabel("frequency [Hz]")
- axr.set_xlabel("frequency [Hz]")
+ if diffs:
+ axl.set_xlabel("frequency [Hz]")
+ axr.set_xlabel("frequency [Hz]")
- plt.suptitle("""{} mat/py gwinc noise comparison
-noises that differ by more than {}% [(mat-py)/py]
-{}""".format(args.IFO, FRACTIONAL_TOLERANCE*100, fom_title))
+ plt.suptitle("""{} mat/py gwinc noise comparison
+noises that differ by more than {} ppm [(mat-py)/py]
+{}""".format(args.IFO, fractional_tolerance*1e6, fom_title))
+
+ if args.save:
+ plt.gcf().set_size_inches(11, (len(diffs)+1)*4)
+ plt.savefig(args.save)
+ else:
+ plt.show()
- if args.save:
- plt.gcf().set_size_inches(11, (len(diffs)+1)*4)
- plt.savefig(args.save)
else:
- plt.show()
+ logging.warning("All tests passed, so no plot was generated")
##############################
--
GitLab