aboutsummaryrefslogtreecommitdiff
path: root/src/dqxx.c
diff options
context:
space:
mode:
authortlatorre <tlatorre@uchicago.edu>2019-03-07 16:31:34 -0600
committertlatorre <tlatorre@uchicago.edu>2019-03-07 16:31:34 -0600
commitbecc37649c55bf7d673efc2d96bb099824032f42 (patch)
tree8a78a68f85ab4533e0f4dadb712c6138f3e036f5 /src/dqxx.c
parenta96111c8026d47147708796091ec7bef216aefd8 (diff)
downloadsddm-becc37649c55bf7d673efc2d96bb099824032f42.tar.gz
sddm-becc37649c55bf7d673efc2d96bb099824032f42.tar.bz2
sddm-becc37649c55bf7d673efc2d96bb099824032f42.zip
update fit to automatically load DQXX file based on run number
Diffstat (limited to 'src/dqxx.c')
-rw-r--r--src/dqxx.c24
1 files changed, 13 insertions, 11 deletions
diff --git a/src/dqxx.c b/src/dqxx.c
index 07b6037..8aa32c0 100644
--- a/src/dqxx.c
+++ b/src/dqxx.c
@@ -35,30 +35,32 @@ int dqxx_init(dict *db, event *ev)
id = i*512 + j*32 + k;
dqch_word = dqch[30+KDQCH_TABLE+32*j+k];
+ /* Clear the PMT_FLAG_DQXX bit. */
+ ev->pmt_hits[id].flags &= ~PMT_FLAG_DQXX;
if (dqch_word & KDQCH_B_PMT_CABLE)
- ev->pmt_hits[id].flags |= 0x2;
+ ev->pmt_hits[id].flags |= PMT_FLAG_DQXX;
else if (dqch_word & KDQCH_B_PMTIC_RESISTOR)
- ev->pmt_hits[id].flags |= 0x2;
+ ev->pmt_hits[id].flags |= PMT_FLAG_DQXX;
else if (dqch_word & KDQCH_B_SEQUENCER)
- ev->pmt_hits[id].flags |= 0x2;
+ ev->pmt_hits[id].flags |= PMT_FLAG_DQXX;
else if (dqch_word & KDQCH_B_750OHM)
- ev->pmt_hits[id].flags |= 0x2;
+ ev->pmt_hits[id].flags |= PMT_FLAG_DQXX;
else if (dqch_word & KDQCH_B_NOT_OP)
- ev->pmt_hits[id].flags |= 0x2;
+ ev->pmt_hits[id].flags |= PMT_FLAG_DQXX;
if (dqcr_word & KDQCR_B_CRATE)
- ev->pmt_hits[id].flags |= 0x2;
+ ev->pmt_hits[id].flags |= PMT_FLAG_DQXX;
else if (dqcr_word & KDQCR_B_MB)
- ev->pmt_hits[id].flags |= 0x2;
+ ev->pmt_hits[id].flags |= PMT_FLAG_DQXX;
else if (dqcr_word & KDQCR_B_PMTIC)
- ev->pmt_hits[id].flags |= 0x2;
+ ev->pmt_hits[id].flags |= PMT_FLAG_DQXX;
else if (dqcr_word & KDQCR_B_DAQ)
- ev->pmt_hits[id].flags |= 0x2;
+ ev->pmt_hits[id].flags |= PMT_FLAG_DQXX;
else if (dqcr_word & KDQCR_B_GT)
- ev->pmt_hits[id].flags |= 0x2;
+ ev->pmt_hits[id].flags |= PMT_FLAG_DQXX;
else if (dqcr_word & (1 << (12 + k/8)))
- ev->pmt_hits[id].flags |= 0x2;
+ ev->pmt_hits[id].flags |= PMT_FLAG_DQXX;
}
}
}