aboutsummaryrefslogtreecommitdiff
path: root/src/fit.c
diff options
context:
space:
mode:
authortlatorre <tlatorre@uchicago.edu>2019-08-28 13:52:32 -0500
committertlatorre <tlatorre@uchicago.edu>2019-08-28 13:52:32 -0500
commit5a40f23ce50480edd235a309aaaad078d6cc740f (patch)
tree1a712c0e32f5c197ccc87f4dd39ce1ecdbc86048 /src/fit.c
parent8a1d843403cda4b82417167d3473f3cefdfdc463 (diff)
downloadsddm-5a40f23ce50480edd235a309aaaad078d6cc740f.tar.gz
sddm-5a40f23ce50480edd235a309aaaad078d6cc740f.tar.bz2
sddm-5a40f23ce50480edd235a309aaaad078d6cc740f.zip
fix some error handling in zebra.c
This commit updates the zebra code to properly handle all the errors from get_bytes(). I also updated fit and cat-zdab to not display the errors about the FTX banks by default unless you run them with the -v command line option.
Diffstat (limited to 'src/fit.c')
-rw-r--r--src/fit.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/fit.c b/src/fit.c
index 37a6aa9..cb8fd6b 100644
--- a/src/fit.c
+++ b/src/fit.c
@@ -5823,6 +5823,7 @@ void usage(void)
fprintf(stderr," scan the likelihood space and write out the results to FILENAME\n");
fprintf(stderr," --gtid only fit a single GTID\n");
fprintf(stderr," -p specify particle combo to fit for\n");
+ fprintf(stderr," -v verbose\n");
fprintf(stderr," -h display this help message\n");
exit(1);
}
@@ -6000,6 +6001,7 @@ int main(int argc, char **argv)
char dqxx_file[256];
int32_t gtid = -1;
int particle_combo = 0;
+ int verbose = 0;
int nevents = 0;
/* Array of events to write out to HDF5 file.
@@ -6048,6 +6050,9 @@ int main(int argc, char **argv)
case 'p':
particle_combo = atoi(argv[++i]);
break;
+ case 'v':
+ verbose = 1;
+ break;
case 'h':
usage();
default:
@@ -6290,7 +6295,7 @@ skip_mc:
hdf5_events[nevents].dc = get_dc_word(&ev, f, &bmast, &b);
if (get_ftpv(f,&b,&bftpv)) {
- fprintf(stderr, "%s\n", zdab_err);
+ if (verbose) fprintf(stderr, "%s\n", zdab_err);
hdf5_events[nevents].ftp_x = NAN;
hdf5_events[nevents].ftp_y = NAN;
hdf5_events[nevents].ftp_z = NAN;
@@ -6301,14 +6306,14 @@ skip_mc:
}
if (get_ftxk(f,&b,&bftxk)) {
- fprintf(stderr, "%s\n", zdab_err);
+ if (verbose) fprintf(stderr, "%s\n", zdab_err);
hdf5_events[nevents].ftk_energy = NAN;
} else {
hdf5_events[nevents].ftk_energy = bftxk.energy;
}
if (get_rsp(f,&b,&bftxr)) {
- fprintf(stderr, "%s\n", zdab_err);
+ if (verbose) fprintf(stderr, "%s\n", zdab_err);
hdf5_events[nevents].rsp_energy = NAN;
} else {
hdf5_events[nevents].rsp_energy = bftxr.ene;