From cb5c98211b3c65af3b7da0ec37510653d209ec16 Mon Sep 17 00:00:00 2001
From: Mark Jones <jones@jlab.org>
Date: Mon, 30 Oct 2017 17:42:29 -0400
Subject: [PATCH] Modify THcRawAdcHit.cxx and THcRawAdcHit.h
Modify the way that the constants for conversion to mV and pC are defined
so that it will compile with and without C11.
---
src/THcRawAdcHit.cxx | 5 +++++
src/THcRawAdcHit.h | 10 +++++-----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/THcRawAdcHit.cxx b/src/THcRawAdcHit.cxx
index 6199941..5377003 100644
--- a/src/THcRawAdcHit.cxx
+++ b/src/THcRawAdcHit.cxx
@@ -181,6 +181,11 @@ Returns 0 if no signal pedestal is set.
#include "THcRawAdcHit.h"
#include <stdexcept>
#include "TString.h"
+ const Double_t THcRawAdcHit::fNAdcChan = 4096.0; // Number of FADC channels in units of ADC channels
+ const Double_t THcRawAdcHit::fAdcRange = 1.0; // Dynamic range of FADCs in units of V, // TO-DO: Get fAdcRange from pre-start event
+ const Double_t THcRawAdcHit::fAdcImpedence = 50.0; // FADC input impedence in units of Ohms
+ const Double_t THcRawAdcHit::fAdcTimeSample = 4000.0; // Length of FADC time sample in units of ps
+ const Double_t THcRawAdcHit::fAdcTimeRes = 0.0625; // FADC time resolution in units of ns
THcRawAdcHit::THcRawAdcHit() :
TObject(),
diff --git a/src/THcRawAdcHit.h b/src/THcRawAdcHit.h
index 9b0a38b..6dc9ad6 100644
--- a/src/THcRawAdcHit.h
+++ b/src/THcRawAdcHit.h
@@ -57,11 +57,11 @@ class THcRawAdcHit : public TObject {
static const UInt_t fMaxNSamples = 511;
// FADC conversion factors
- const Double_t fNAdcChan = 4096.0; // Number of FADC channels in units of ADC channels
- const Double_t fAdcRange = 1.0; // Dynamic range of FADCs in units of V, // TO-DO: Get fAdcRange from pre-start event
- const Double_t fAdcImpedence = 50.0; // FADC input impedence in units of Ohms
- const Double_t fAdcTimeSample = 4000.0; // Length of FADC time sample in units of ps
- const Double_t fAdcTimeRes = 0.0625; // FADC time resolution in units of ns
+ static const Double_t fNAdcChan; // Number of FADC channels in units of ADC channels
+ static const Double_t fAdcRange; // Dynamic range of FADCs in units of V, // TO-DO: Get fAdcRange from pre-start event
+ static const Double_t fAdcImpedence; // FADC input impedence in units of Ohms
+ static const Double_t fAdcTimeSample; // Length of FADC time sample in units of ps
+ static const Double_t fAdcTimeRes; // FADC time resolution in units of ns
Int_t fNPedestalSamples; // TODO: Get this from prestart event...
Int_t fNPeakSamples;
--
GitLab