update fit to automatically load DQXX file based on run number

1 files changed, 28 insertions, 4 deletions

diff --git a/src/fit.c b/src/fit.c
index cef6873..f292325 100644
--- a/src/fit.c
+++ b/src/fit.c
@@ -5828,7 +5828,10 @@ int get_event(zebraFile *f, event *ev, zebraBank *bev)
         ev->pmt_hits[id].qhl = bpmt.phl;
         ev->pmt_hits[id].qhs = bpmt.phs;
         ev->pmt_hits[id].qlx = bpmt.plx;
-        ev->pmt_hits[id].flags |= bpmt.pf & KPF_DIS;
+        /* Clear the PMT_FLAG_DIS bit. */
+        ev->pmt_hits[id].flags &= ~PMT_FLAG_DIS;
+        if (bpmt.pf & KPF_DIS)
+            ev->pmt_hits[id].flags |= PMT_FLAG_DIS;
 
         if (!b.next) break;
 
@@ -5915,6 +5918,8 @@ int main(int argc, char **argv)
     size_t len;
     char tmp[256];
     size_t nhit, min_nhit = 100;
+    int last_run;
+    char dqxx_file[256];
 
     for (i = 1; i < argc; i++) {
         if (strlen(argv[i]) >= 2 && !strncmp(argv[i], "--", 2)) {
@@ -5995,7 +6000,9 @@ int main(int argc, char **argv)
     init_charge();
     dict *db = db_init();
 
-    if (load_file(db, "DQXX_0000010000.dat")) {
+    last_run = 10000;
+
+    if (load_file(db, "DQXX_0000010000.dat", 0)) {
         fprintf(stderr, "failed to load DQXX_0000010000.dat: %s\n", db_err);
         goto err;
     }
@@ -6005,12 +6012,12 @@ int main(int argc, char **argv)
         goto err;
     }
 
-    if (load_file(db, "pmt_response_qoca_d2o_20060216.dat")) {
+    if (load_file(db, "pmt_response_qoca_d2o_20060216.dat", 0)) {
         fprintf(stderr, "failed to load pmt_response_qoca_d2o_20060216.dat: %s\n", db_err);
         goto err;
     }
 
-    if (load_file(db, "rsp_rayleigh.dat")) {
+    if (load_file(db, "rsp_rayleigh.dat", 0)) {
         fprintf(stderr, "failed to load rsp_rayleigh.dat: %s\n", db_err);
         goto err;
     }
@@ -6171,6 +6178,23 @@ skip_mc:
             ev.run = bev.run;
             ev.gtid = bev.gtr_id;
 
+            if (ev.run != last_run) {
+                printf("loading DQXX file for run %010i\n", ev.run);
+
+                sprintf(dqxx_file, "DQXX_%010i.dat", ev.run);
+                if (load_file(db, dqxx_file, 1)) {
+                    fprintf(stderr, "failed to load %s: %s\n", dqxx_file, db_err);
+                    goto err;
+                }
+
+                if (dqxx_init(db, &ev)) {
+                    fprintf(stderr, "failed to initialize DQXX bank: %s\n", dqxx_err);
+                    goto err;
+                }
+
+                last_run = ev.run;
+            }
+
             rv = get_event(f,&ev,&b);
 
             nhit = get_nhit(&ev);