diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 8 | ||||
| -rw-r--r-- | src/fit.c | 3 | ||||
| -rw-r--r-- | src/zdab-cat.c | 5 |
3 files changed, 14 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index bd77dfb..a0eef06 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,6 +3,10 @@ release_hdr := $(shell sh -c './mkreleasehdr.sh') CFLAGS=-fdiagnostics-color -O2 -Wall -g -DSWAP_BYTES LDLIBS=-fdiagnostics-color -lm -lgsl -lgslcblas -lnlopt_cxx -lstdc++ +PREFIX?=$(HOME)/local +INSTALL_BIN=$(PREFIX)/bin +INSTALL=install + all: test test-vector test-likelihood fit test-charge test-path calculate-csda-range test-time-pdf test-zebra test-find-peaks zdab-cat Makefile.dep: @@ -36,6 +40,10 @@ calculate-csda-range: calculate-csda-range.o zdab-cat: zdab-cat.o zebra.o pmt.o vector.o misc.o zdab_utils.o pack2b.o db.o dqxx.o dict.o siphash.o release.o dc.o sort.o util.o +install: + @mkdir -p $(INSTALL_BIN) + $(INSTALL) fit $(INSTALL_BIN) + clean: rm -f *.o calculate_limits test test-vector test-likelihood fit test-charge test-path calculate-csda-range test-time-pdf test-zebra test-find-peaks Makefile.dep zdab-cat @@ -6173,7 +6173,8 @@ skip_mc: nhit = get_nhit(&ev); if (fout) { - fprintf(fout, " - gtid: %i\n", ev.gtid); + fprintf(fout, " - run: %i\n", ev.run); + fprintf(fout, " gtid: %i\n", ev.gtid); fprintf(fout, " nhit: %zu\n", nhit); } diff --git a/src/zdab-cat.c b/src/zdab-cat.c index a109b46..d891c78 100644 --- a/src/zdab-cat.c +++ b/src/zdab-cat.c @@ -92,7 +92,9 @@ int main(int argc, char **argv) fprintf(stderr, "failed to open '%s': %s\n", output, strerror(errno)); return 1; } + } + if (fout) { fprintf(fout, "git_sha1: %s\n", GitSHA1()); fprintf(fout, "git_dirty: %s\n", GitDirty()); fprintf(fout, "data:\n"); @@ -293,7 +295,8 @@ skip_mc: nhit = get_nhit(&ev); if (fout) { - fprintf(fout, " - gtid: %i\n", ev.gtid); + fprintf(fout, " - run: %i\n", ev.run); + fprintf(fout, " gtid: %i\n", ev.gtid); fprintf(fout, " nhit: %zu\n", nhit); } |