diff --git a/ex-6/dist-plot.py b/ex-6/dist-plot.py index 10f505a..56bedff 100755 --- a/ex-6/dist-plot.py +++ b/ex-6/dist-plot.py @@ -10,12 +10,16 @@ a, b, f = loadtxt(sys.stdin, unpack=True) subplot(121) title('FFT') +xlabel('EDM distance') +ylabel('counts') hist(a[:n], insert(b[:n], 0, a[0]), weights=f[:n], histtype='stepfilled', color='#e3c5ca', edgecolor='#92182b') ticklabel_format(style='sci', axis='x', scilimits=(0, 0)) subplot(122) title('RL') +xlabel('EDM distance') +ylabel('counts') hist(a[n:], insert(b[n:], 0, a[n]), weights=f[n:], histtype='stepfilled', color='#e3c5ca', edgecolor='#92182b') ticklabel_format(style='sci', axis='x', scilimits=(0, 0)) diff --git a/ex-6/test.c b/ex-6/test.c index 0478f0f..a7c5615 100644 --- a/ex-6/test.c +++ b/ex-6/test.c @@ -30,19 +30,15 @@ typedef struct { int show_help(char **argv) { - fprintf(stderr, "Usage: %s -[hcdoebsrmn]\n", argv[0]); + fprintf(stderr, "Usage: %s -[hexbsrn]\n", argv[0]); fprintf(stderr, " -h\t\tShow this message.\n"); - fprintf(stderr, " -c\t\tPrint the convolved histogram to stdout.\n"); - fprintf(stderr, " -d\t\tAttempt and print the deconvolved histogram.\n"); - fprintf(stderr, " -o\t\tPrint the original histogram to stdout.\n"); fprintf(stderr, " -e N\t\tThe number of events. (default: 50000)\n"); + fprintf(stderr, " -x N\t\tThe number of experiments to run. (default: 1000)\n"); fprintf(stderr, " -b N\t\tThe number of θ bins. (default: 150)\n"); fprintf(stderr, " -s SIGMA\tThe sigma of gaussian kernel. " "(default: 0.8)\n"); fprintf(stderr, " -r N\t\tThe number of RL deconvolution rounds." "(default: 3)\n"); - fprintf(stderr, " -m MODE\tThe deconvolution mode: 'fft' or 'rl'." - "(default: 'fft')\n"); fprintf(stderr, " -n SIGMA\tThe σ of the gaussian noise to add to " "the convolution. (default: 0)\n"); return EXIT_SUCCESS;