update code to allow you to run the fit outside of the src directory

To enable the fitter to run outside of the src directory, I created a new
function open_file() which works exactly like fopen() except that it searches
for the file in both the current working directory and the path specified by an
environment variable.

1 files changed, 12 insertions, 7 deletions

diff --git a/src/fit.c b/src/fit.c
index 068a5d6..cef6873 100644
--- a/src/fit.c
+++ b/src/fit.c
@@ -26,6 +26,7 @@
 #include "quad.h"
 #include "sno.h"
 #include "find_peaks.h"
+#include "util.h"
 
 /* Maximum number of fit parameters. Should be at least 4 + 3*MAX_VERTICES. */
 #define MAX_PARS 100
@@ -5977,7 +5978,11 @@ int main(int argc, char **argv)
         fprintf(fout, "data:\n");
     }
 
-    load_pmt_info();
+    if (load_pmt_info()) {
+        zebra_close(f);
+        if (output) fclose(fout);
+        return 1;
+    }
 
     for (i = 0; i < MAX_PMTS; i++) {
         ev.pmt_hits[i].hit = 0;
@@ -5992,32 +5997,32 @@ int main(int argc, char **argv)
 
     if (load_file(db, "DQXX_0000010000.dat")) {
         fprintf(stderr, "failed to load DQXX_0000010000.dat: %s\n", db_err);
-        exit(1);
+        goto err;
     }
 
     if (dqxx_init(db, &ev)) {
         fprintf(stderr, "failed to initialize DQXX bank: %s\n", dqxx_err);
-        exit(1);
+        goto err;
     }
 
     if (load_file(db, "pmt_response_qoca_d2o_20060216.dat")) {
         fprintf(stderr, "failed to load pmt_response_qoca_d2o_20060216.dat: %s\n", db_err);
-        exit(1);
+        goto err;
     }
 
     if (load_file(db, "rsp_rayleigh.dat")) {
         fprintf(stderr, "failed to load rsp_rayleigh.dat: %s\n", db_err);
-        exit(1);
+        goto err;
     }
 
     if (pmt_response_init(db)) {
         fprintf(stderr, "failed to initialize PMTR bank: %s\n", pmtr_err);
-        exit(1);
+        goto err;
     }
 
     if (optics_init(db)) {
         fprintf(stderr, "failed to initialize optics: %s\n", optics_err);
-        exit(1);
+        goto err;
     }
 
     while (1) {