From 5941c7ad5e53204aa00721bebc75da1568082c10 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Sat, 23 Oct 2010 09:10:02 -0400 Subject: [PATCH] Replace EXAMPLE_HISTOGRAM_FILE_CONTENTS histograms with N=400 examples. --- pysawsim/parameter_scan.py | 134 +++++++++++++++++++++++-------------- 1 file changed, 85 insertions(+), 49 deletions(-) diff --git a/pysawsim/parameter_scan.py b/pysawsim/parameter_scan.py index 03cd990..1c66540 100644 --- a/pysawsim/parameter_scan.py +++ b/pysawsim/parameter_scan.py @@ -46,48 +46,77 @@ EXAMPLE_HISTOGRAM_FILE_CONTENTS = """# Velocity histograms #HISTOGRAM: -v 6e-7 #Force (N)\tUnfolding events -1.8e-10\t1 -1.9e-10\t0 -2e-10\t0 -2.1e-10\t0 -2.2e-10\t0 -2.3e-10\t0 -2.4e-10\t1 -2.5e-10\t0 -2.6e-10\t2 -2.7e-10\t0 -2.8e-10\t1 -2.9e-10\t6 -3e-10\t2 -3.1e-10\t3 +1.4e-10\t1 +1.5e-10\t0 +1.6e-10\t4 +1.7e-10\t6 +1.8e-10\t8 +1.9e-10\t20 +2e-10\t28 +2.1e-10\t38 +2.2e-10\t72 +2.3e-10\t110 +2.4e-10\t155 +2.5e-10\t247 +2.6e-10\t395 +2.7e-10\t451 +2.8e-10\t430 +2.9e-10\t300 +3e-10\t116 +3.1e-10\t18 +3.2e-10\t1 #HISTOGRAM: -v 8e-7 #Force (N)\tUnfolding events -2.4e-10\t1 -2.5e-10\t0 -2.6e-10\t4 -2.7e-10\t2 -2.8e-10\t2 -2.9e-10\t3 -3e-10\t2 -3.1e-10\t1 -3.2e-10\t1 +8e-11\t1 +9e-11\t0 +1e-10\t0 +1.1e-10\t1 +1.2e-10\t0 +1.3e-10\t0 +1.4e-10\t0 +1.5e-10\t3 +1.6e-10\t3 +1.7e-10\t4 +1.8e-10\t4 +1.9e-10\t13 +2e-10\t29 +2.1e-10\t39 +2.2e-10\t60 +2.3e-10\t102 +2.4e-10\t154 +2.5e-10\t262 +2.6e-10\t402 +2.7e-10\t497 +2.8e-10\t541 +2.9e-10\t555 +3e-10\t325 +3.1e-10\t142 +3.2e-10\t50 +3.3e-10\t13 #HISTOGRAM: -v 1e-6 #Force (N)\tUnfolding events -2e-10\t1 -2.1e-10\t0 -2.2e-10\t1 -2.3e-10\t1 -2.4e-10\t1 -2.5e-10\t0 -2.6e-10\t2 -2.7e-10\t1 -2.8e-10\t4 -2.9e-10\t2 -3e-10\t2 -3.1e-10\t0 -3.2e-10\t1 +1.5e-10\t2 +1.6e-10\t3 +1.7e-10\t7 +1.8e-10\t8 +1.9e-10\t7 +2e-10\t25 +2.1e-10\t30 +2.2e-10\t58 +2.3e-10\t76 +2.4e-10\t159 +2.5e-10\t216 +2.6e-10\t313 +2.7e-10\t451 +2.8e-10\t568 +2.9e-10\t533 +3e-10\t416 +3.1e-10\t222 +3.2e-10\t80 +3.3e-10\t24 +3.4e-10\t2 """ @@ -157,19 +186,26 @@ class HistogramMatcher (object): >>> histograms['-v 1e-6'].to_stream(sys.stdout) ... # doctest: +NORMALIZE_WHITESPACE, +REPORT_UDIFF #Force (N)\tUnfolding events - 2e-10\t1 - 2.1e-10\t0 - 2.2e-10\t1 - 2.3e-10\t1 - 2.4e-10\t1 - 2.5e-10\t0 - 2.6e-10\t2 - 2.7e-10\t1 - 2.8e-10\t4 - 2.9e-10\t2 - 3e-10\t2 - 3.1e-10\t0 - 3.2e-10\t1 + 1.5e-10\t2 + 1.6e-10\t3 + 1.7e-10\t7 + 1.8e-10\t8 + 1.9e-10\t7 + 2e-10\t25 + 2.1e-10\t30 + 2.2e-10\t58 + 2.3e-10\t76 + 2.4e-10\t159 + 2.5e-10\t216 + 2.6e-10\t313 + 2.7e-10\t451 + 2.8e-10\t568 + 2.9e-10\t533 + 3e-10\t416 + 3.1e-10\t222 + 3.2e-10\t80 + 3.3e-10\t24 + 3.4e-10\t2 """ token = '#HISTOGRAM:' hist_blocks = {None: []} -- 2.26.2