aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortlatorre <tlatorre@uchicago.edu>2019-03-08 11:04:12 -0600
committertlatorre <tlatorre@uchicago.edu>2019-03-08 11:04:12 -0600
commit967c7fc4273e93397af143902992226de9bb616b (patch)
treefeddee33636159928d28a3bf3114663bb92d5eb0 /src
parenta06fff3b8b3dc42e2c4cad47f57f5bcf89b6879c (diff)
downloadsddm-967c7fc4273e93397af143902992226de9bb616b.tar.gz
sddm-967c7fc4273e93397af143902992226de9bb616b.tar.bz2
sddm-967c7fc4273e93397af143902992226de9bb616b.zip
fix some int -> floats in the PMT bank
Diffstat (limited to 'src')
-rw-r--r--src/zdab_utils.c22
-rw-r--r--src/zdab_utils.h22
2 files changed, 22 insertions, 22 deletions
diff --git a/src/zdab_utils.c b/src/zdab_utils.c
index 1f2ed03..0f78e9c 100644
--- a/src/zdab_utils.c
+++ b/src/zdab_utils.c
@@ -178,21 +178,21 @@ void unpack_pmt(uint32_t *data, PMTBank *b)
unpack((uint8_t *) (data+12),"f",&b->pit0);
unpack((uint8_t *) (data+13),"l",&b->cell);
unpack((uint8_t *) (data+14),"l",&b->pin);
- unpack((uint8_t *) (data+15),"l",&b->tslh);
- unpack((uint8_t *) (data+16),"l",&b->hca);
+ unpack((uint8_t *) (data+15),"f",&b->tslh);
+ unpack((uint8_t *) (data+16),"f",&b->hca);
unpack((uint8_t *) (data+17),"l",&b->eca_val);
unpack((uint8_t *) (data+18),"l",&b->pca_val);
unpack((uint8_t *) (data+19),"l",&b->anxx);
- unpack((uint8_t *) (data+20),"l",&b->ept);
- unpack((uint8_t *) (data+21),"l",&b->ehl);
- unpack((uint8_t *) (data+22),"l",&b->ehs);
- unpack((uint8_t *) (data+23),"l",&b->elx);
- unpack((uint8_t *) (data+24),"l",&b->pt1);
- unpack((uint8_t *) (data+25),"l",&b->ptm);
- unpack((uint8_t *) (data+26),"l",&b->ptms);
- unpack((uint8_t *) (data+27),"l",&b->qm);
+ unpack((uint8_t *) (data+20),"f",&b->ept);
+ unpack((uint8_t *) (data+21),"f",&b->ehl);
+ unpack((uint8_t *) (data+22),"f",&b->ehs);
+ unpack((uint8_t *) (data+23),"f",&b->elx);
+ unpack((uint8_t *) (data+24),"f",&b->pt1);
+ unpack((uint8_t *) (data+25),"f",&b->ptm);
+ unpack((uint8_t *) (data+26),"f",&b->ptms);
+ unpack((uint8_t *) (data+27),"f",&b->qm);
unpack((uint8_t *) (data+28),"l",&b->qms);
- unpack((uint8_t *) (data+29),"l",&b->qrc);
+ unpack((uint8_t *) (data+29),"f",&b->qrc);
}
int swap_PmtRecord(aPmtEventRecord *aPmtRecord, size_t size)
diff --git a/src/zdab_utils.h b/src/zdab_utils.h
index 8d8badc..c6b7808 100644
--- a/src/zdab_utils.h
+++ b/src/zdab_utils.h
@@ -359,9 +359,9 @@ typedef struct PMTBank {
* Before uncalibration it holds the tube no. */
uint32_t pin;
/* TSLH of PMT. */
- uint32_t tslh;
+ float tslh;
/* HCA information. */
- uint32_t hca;
+ float hca;
/* ECA validation status word. */
uint32_t eca_val;
/* PCA validation status word. */
@@ -369,25 +369,25 @@ typedef struct PMTBank {
/* ANXX validation status word. */
uint32_t anxx;
/* ECA calibrated time (nsec). */
- uint32_t ept;
+ float ept;
/* ECA calibrated QHL (pedestal subtracted). */
- uint32_t ehl;
+ float ehl;
/* ECA calibrated QHS (pedestal subtracted). */
- uint32_t ehs;
+ float ehs;
/* ECA calibrated QLX (pedestal subtracted). */
- uint32_t elx;
+ float elx;
/* Non-walk corrected PMT time. */
- uint32_t pt1;
+ float pt1;
/* Multiphoton PCA time. */
- uint32_t ptm;
+ float ptm;
/* Multiphoton PCA PMT transit time RMS. */
- uint32_t ptms;
+ float ptms;
/* Best charge (either QHS or QLX). */
- uint32_t qm;
+ float qm;
/* Best charge status word. */
uint32_t qms;
/* Charge correction for rate-dependent shifting. */
- uint32_t qrc;
+ float qrc;
} PMTBank;
void unpack_mcgn(uint32_t *data, MCGNBank *b);