From fefec3dea673ee05d2316482511b98139fa33ebd Mon Sep 17 00:00:00 2001
From: Jure Bericic <bericic@jlab.org>
Date: Fri, 13 Jan 2017 09:51:08 -0500
Subject: [PATCH] Changed '*AdcPeak*' to '*AdcPulse*' across the board. Add
raw ADC time leaf.
---
src/THcAerogel.cxx | 132 ++++++++++++++++-------------
src/THcAerogel.h | 18 ++--
src/THcCherenkov.cxx | 76 +++++++++--------
src/THcCherenkov.h | 9 +-
src/THcRawAdcHit.cxx | 31 ++++---
src/THcRawAdcHit.h | 16 ++--
src/THcRawHodoHit.cxx | 4 +-
src/THcScintillatorPlane.cxx | 156 +++++++++++++++++++----------------
src/THcScintillatorPlane.h | 18 ++--
src/THcShowerArray.cxx | 62 ++++++++------
src/THcShowerArray.h | 9 +-
src/THcShowerPlane.cxx | 124 ++++++++++++++++------------
src/THcShowerPlane.h | 18 ++--
src/THcTrigRawHit.cxx | 14 ++--
src/THcTrigRawHit.h | 4 +-
15 files changed, 384 insertions(+), 307 deletions(-)
diff --git a/src/THcAerogel.cxx b/src/THcAerogel.cxx
index 0381a75..a81f07a 100644
--- a/src/THcAerogel.cxx
+++ b/src/THcAerogel.cxx
@@ -47,20 +47,22 @@ THcAerogel::THcAerogel( const char* name, const char* description,
fNegADCHits = new TClonesArray("THcSignalHit",16);
frPosAdcPedRaw = new TClonesArray("THcSignalHit", 16);
- frPosAdcPeakIntRaw = new TClonesArray("THcSignalHit", 16);
- frPosAdcPeakAmpRaw = new TClonesArray("THcSignalHit", 16);
+ frPosAdcPulseIntRaw = new TClonesArray("THcSignalHit", 16);
+ frPosAdcPulseAmpRaw = new TClonesArray("THcSignalHit", 16);
+ frPosAdcPulseTimeRaw = new TClonesArray("THcSignalHit", 16);
frPosAdcPed = new TClonesArray("THcSignalHit", 16);
- frPosAdcPeakInt = new TClonesArray("THcSignalHit", 16);
- frPosAdcPeakAmp = new TClonesArray("THcSignalHit", 16);
+ frPosAdcPulseInt = new TClonesArray("THcSignalHit", 16);
+ frPosAdcPulseAmp = new TClonesArray("THcSignalHit", 16);
frNegAdcPedRaw = new TClonesArray("THcSignalHit", 16);
- frNegAdcPeakIntRaw = new TClonesArray("THcSignalHit", 16);
- frNegAdcPeakAmpRaw = new TClonesArray("THcSignalHit", 16);
+ frNegAdcPulseIntRaw = new TClonesArray("THcSignalHit", 16);
+ frNegAdcPulseAmpRaw = new TClonesArray("THcSignalHit", 16);
+ frNegAdcPulseTimeRaw = new TClonesArray("THcSignalHit", 16);
frNegAdcPed = new TClonesArray("THcSignalHit", 16);
- frNegAdcPeakInt = new TClonesArray("THcSignalHit", 16);
- frNegAdcPeakAmp = new TClonesArray("THcSignalHit", 16);
+ frNegAdcPulseInt = new TClonesArray("THcSignalHit", 16);
+ frNegAdcPulseAmp = new TClonesArray("THcSignalHit", 16);
InitArrays();
@@ -78,20 +80,22 @@ THcAerogel::THcAerogel( ) :
fNegADCHits = NULL;
frPosAdcPedRaw = NULL;
- frPosAdcPeakIntRaw = NULL;
- frPosAdcPeakAmpRaw = NULL;
+ frPosAdcPulseIntRaw = NULL;
+ frPosAdcPulseAmpRaw = NULL;
+ frPosAdcPulseTimeRaw = NULL;
frPosAdcPed = NULL;
- frPosAdcPeakInt = NULL;
- frPosAdcPeakAmp = NULL;
+ frPosAdcPulseInt = NULL;
+ frPosAdcPulseAmp = NULL;
frNegAdcPedRaw = NULL;
- frNegAdcPeakIntRaw = NULL;
- frNegAdcPeakAmpRaw = NULL;
+ frNegAdcPulseIntRaw = NULL;
+ frNegAdcPulseAmpRaw = NULL;
+ frNegAdcPulseTimeRaw = NULL;
frNegAdcPed = NULL;
- frNegAdcPeakInt = NULL;
- frNegAdcPeakAmp = NULL;
+ frNegAdcPulseInt = NULL;
+ frNegAdcPulseAmp = NULL;
InitArrays();
@@ -109,20 +113,22 @@ THcAerogel::~THcAerogel()
delete fNegADCHits; fNegADCHits = NULL;
delete frPosAdcPedRaw; frPosAdcPedRaw = NULL;
- delete frPosAdcPeakIntRaw; frPosAdcPeakIntRaw = NULL;
- delete frPosAdcPeakAmpRaw; frPosAdcPeakAmpRaw = NULL;
+ delete frPosAdcPulseIntRaw; frPosAdcPulseIntRaw = NULL;
+ delete frPosAdcPulseAmpRaw; frPosAdcPulseAmpRaw = NULL;
+ delete frPosAdcPulseTimeRaw; frPosAdcPulseTimeRaw = NULL;
delete frPosAdcPed; frPosAdcPed = NULL;
- delete frPosAdcPeakInt; frPosAdcPeakInt = NULL;
- delete frPosAdcPeakAmp; frPosAdcPeakAmp = NULL;
+ delete frPosAdcPulseInt; frPosAdcPulseInt = NULL;
+ delete frPosAdcPulseAmp; frPosAdcPulseAmp = NULL;
delete frNegAdcPedRaw; frNegAdcPedRaw = NULL;
- delete frNegAdcPeakIntRaw; frNegAdcPeakIntRaw = NULL;
- delete frNegAdcPeakAmpRaw; frNegAdcPeakAmpRaw = NULL;
+ delete frNegAdcPulseIntRaw; frNegAdcPulseIntRaw = NULL;
+ delete frNegAdcPulseAmpRaw; frNegAdcPulseAmpRaw = NULL;
+ delete frNegAdcPulseTimeRaw; frNegAdcPulseTimeRaw = NULL;
delete frNegAdcPed; frNegAdcPed = NULL;
- delete frNegAdcPeakInt; frNegAdcPeakInt = NULL;
- delete frNegAdcPeakAmp; frNegAdcPeakAmp = NULL;
+ delete frNegAdcPulseInt; frNegAdcPulseInt = NULL;
+ delete frNegAdcPulseAmp; frNegAdcPulseAmp = NULL;
}
//_____________________________________________________________________________
@@ -307,24 +313,26 @@ Int_t THcAerogel::DefineVariables( EMode mode )
{"ntdc_neg_hits", "Number of Negative Tube Hits", "fNTDCNegHits"},
{"ngood_hits", "Total number of good hits", "fNGoodHits"},
- {"posAdcCounter", "List of positive ADC counter numbers.", "frPosAdcPeakIntRaw.THcSignalHit.GetPaddleNumber()"},
- {"negAdcCounter", "List of negative ADC counter numbers.", "frNegAdcPeakIntRaw.THcSignalHit.GetPaddleNumber()"},
+ {"posAdcCounter", "List of positive ADC counter numbers.", "frPosAdcPulseIntRaw.THcSignalHit.GetPaddleNumber()"},
+ {"negAdcCounter", "List of negative ADC counter numbers.", "frNegAdcPulseIntRaw.THcSignalHit.GetPaddleNumber()"},
- {"posAdcPedRaw", "List of Positive raw ADC pedestals", "frPosAdcPedRaw.THcSignalHit.GetData()"},
- {"posAdcPeakIntRaw", "List of Positive raw ADC peak integrals.", "frPosAdcPeakIntRaw.THcSignalHit.GetData()"},
- {"posAdcPeakAmpRaw", "List of Positive raw ADC peak amplitudes.", "frPosAdcPeakAmpRaw.THcSignalHit.GetData()"},
+ {"posAdcPedRaw", "List of positive raw ADC pedestals", "frPosAdcPedRaw.THcSignalHit.GetData()"},
+ {"posAdcPulseIntRaw", "List of positive raw ADC pulse integrals.", "frPosAdcPulseIntRaw.THcSignalHit.GetData()"},
+ {"posAdcPulseAmpRaw", "List of positive raw ADC pulse amplitudes.", "frPosAdcPulseAmpRaw.THcSignalHit.GetData()"},
+ {"posAdcPulseTimeRaw", "List of positive raw ADC pulse times.", "frPosAdcPulseTimeRaw.THcSignalHit.GetData()"},
- {"posAdcPed", "List of Positive ADC pedestals", "frPosAdcPed.THcSignalHit.GetData()"},
- {"posAdcPeakInt", "List of Positive ADC peak integrals.", "frPosAdcPeakInt.THcSignalHit.GetData()"},
- {"posAdcPeakAmp", "List of Positive ADC peak amplitudes.", "frPosAdcPeakAmp.THcSignalHit.GetData()"},
+ {"posAdcPed", "List of positive ADC pedestals", "frPosAdcPed.THcSignalHit.GetData()"},
+ {"posAdcPulseInt", "List of positive ADC pulse integrals.", "frPosAdcPulseInt.THcSignalHit.GetData()"},
+ {"posAdcPulseAmp", "List of positive ADC pulse amplitudes.", "frPosAdcPulseAmp.THcSignalHit.GetData()"},
- {"negAdcPedRaw", "List of Negative raw ADC pedestals", "frNegAdcPedRaw.THcSignalHit.GetData()"},
- {"negAdcPeakIntRaw", "List of Negative raw ADC peak integrals.", "frNegAdcPeakIntRaw.THcSignalHit.GetData()"},
- {"negAdcPeakAmpRaw", "List of Negative raw ADC peak amplitudes.", "frNegAdcPeakAmpRaw.THcSignalHit.GetData()"},
+ {"negAdcPedRaw", "List of negative raw ADC pedestals", "frNegAdcPedRaw.THcSignalHit.GetData()"},
+ {"negAdcPulseIntRaw", "List of negative raw ADC pulse integrals.", "frNegAdcPulseIntRaw.THcSignalHit.GetData()"},
+ {"negAdcPulseAmpRaw", "List of negative raw ADC pulse amplitudes.", "frNegAdcPulseAmpRaw.THcSignalHit.GetData()"},
+ {"negAdcPulseTimeRaw", "List of negative raw ADC pulse times.", "frNegAdcPulseTimeRaw.THcSignalHit.GetData()"},
- {"negAdcPed", "List of Negative ADC pedestals", "frNegAdcPed.THcSignalHit.GetData()"},
- {"negAdcPeakInt", "List of Negative ADC peak integrals.", "frNegAdcPeakInt.THcSignalHit.GetData()"},
- {"negAdcPeakAmp", "List of Negative ADC peak amplitudes.", "frNegAdcPeakAmp.THcSignalHit.GetData()"},
+ {"negAdcPed", "List of negative ADC pedestals", "frNegAdcPed.THcSignalHit.GetData()"},
+ {"negAdcPulseInt", "List of negative ADC pulse integrals.", "frNegAdcPulseInt.THcSignalHit.GetData()"},
+ {"negAdcPulseAmp", "List of negative ADC pulse amplitudes.", "frNegAdcPulseAmp.THcSignalHit.GetData()"},
{ 0 }
};
@@ -368,20 +376,22 @@ void THcAerogel::Clear(Option_t* opt)
}
frPosAdcPedRaw->Clear();
- frPosAdcPeakIntRaw->Clear();
- frPosAdcPeakAmpRaw->Clear();
+ frPosAdcPulseIntRaw->Clear();
+ frPosAdcPulseAmpRaw->Clear();
+ frPosAdcPulseTimeRaw->Clear();
frPosAdcPed->Clear();
- frPosAdcPeakInt->Clear();
- frPosAdcPeakAmp->Clear();
+ frPosAdcPulseInt->Clear();
+ frPosAdcPulseAmp->Clear();
frNegAdcPedRaw->Clear();
- frNegAdcPeakIntRaw->Clear();
- frNegAdcPeakAmpRaw->Clear();
+ frNegAdcPulseIntRaw->Clear();
+ frNegAdcPulseAmpRaw->Clear();
+ frNegAdcPulseTimeRaw->Clear();
frNegAdcPed->Clear();
- frNegAdcPeakInt->Clear();
- frNegAdcPeakAmp->Clear();
+ frNegAdcPulseInt->Clear();
+ frNegAdcPulseAmp->Clear();
}
//_____________________________________________________________________________
@@ -425,11 +435,14 @@ Int_t THcAerogel::Decode( const THaEvData& evdata )
((THcSignalHit*) frPosAdcPedRaw->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPedRaw());
((THcSignalHit*) frPosAdcPed->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPed());
- ((THcSignalHit*) frPosAdcPeakIntRaw->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPeakIntRaw());
- ((THcSignalHit*) frPosAdcPeakInt->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPeakInt());
+ ((THcSignalHit*) frPosAdcPulseIntRaw->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPulseIntRaw());
+ ((THcSignalHit*) frPosAdcPulseInt->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPulseInt());
+
+ ((THcSignalHit*) frPosAdcPulseAmpRaw->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPulseAmpRaw());
+ ((THcSignalHit*) frPosAdcPulseAmp->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPulseAmp());
+
+ ((THcSignalHit*) frPosAdcPulseTimeRaw->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPulseTimeRaw());
- ((THcSignalHit*) frPosAdcPeakAmpRaw->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPeakAmpRaw());
- ((THcSignalHit*) frPosAdcPeakAmp->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPeakAmp());
++nrPosAdcHits;
}
THcRawAdcHit& rawNegAdcHit = hit->GetRawAdcHitNeg();
@@ -437,11 +450,14 @@ Int_t THcAerogel::Decode( const THaEvData& evdata )
((THcSignalHit*) frNegAdcPedRaw->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPedRaw());
((THcSignalHit*) frNegAdcPed->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPed());
- ((THcSignalHit*) frNegAdcPeakIntRaw->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPeakIntRaw());
- ((THcSignalHit*) frNegAdcPeakInt->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPeakInt());
+ ((THcSignalHit*) frNegAdcPulseIntRaw->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPulseIntRaw());
+ ((THcSignalHit*) frNegAdcPulseInt->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPulseInt());
+
+ ((THcSignalHit*) frNegAdcPulseAmpRaw->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPulseAmpRaw());
+ ((THcSignalHit*) frNegAdcPulseAmp->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPulseAmp());
+
+ ((THcSignalHit*) frNegAdcPulseTimeRaw->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPulseTimeRaw());
- ((THcSignalHit*) frNegAdcPeakAmpRaw->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPeakAmpRaw());
- ((THcSignalHit*) frNegAdcPeakAmp->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPeakAmp());
++nrNegAdcHits;
}
@@ -464,13 +480,13 @@ Int_t THcAerogel::Decode( const THaEvData& evdata )
}
// ADC positive hit
- if((adc_pos = hit->GetRawAdcHitPos().GetPeakInt()) > 0) {
+ if((adc_pos = hit->GetRawAdcHitPos().GetPulseInt()) > 0) {
THcSignalHit *sighit = (THcSignalHit*) fPosADCHits->ConstructedAt(nPosADCHits++);
sighit->Set(hit->fCounter, adc_pos);
}
// ADC negative hit
- if((adc_neg = hit->GetRawAdcHitNeg().GetPeakInt()) > 0) {
+ if((adc_neg = hit->GetRawAdcHitNeg().GetPulseInt()) > 0) {
THcSignalHit *sighit = (THcSignalHit*) fNegADCHits->ConstructedAt(nNegADCHits++);
sighit->Set(hit->fCounter, adc_neg);
}
@@ -647,8 +663,8 @@ void THcAerogel::AccumulatePedestals(TClonesArray* rawhits)
THcAerogelHit* hit = (THcAerogelHit *) rawhits->At(ihit);
Int_t element = hit->fCounter - 1;
- Int_t adcpos = hit->GetRawAdcHitPos().GetPeakInt();
- Int_t adcneg = hit->GetRawAdcHitNeg().GetPeakInt();
+ Int_t adcpos = hit->GetRawAdcHitPos().GetPulseInt();
+ Int_t adcneg = hit->GetRawAdcHitNeg().GetPulseInt();
if(adcpos <= fPosPedLimit[element]) {
fPosPedSum[element] += adcpos;
fPosPedSum2[element] += adcpos*adcpos;
diff --git a/src/THcAerogel.h b/src/THcAerogel.h
index 815fda5..fb40ebf 100644
--- a/src/THcAerogel.h
+++ b/src/THcAerogel.h
@@ -97,20 +97,22 @@ class THcAerogel : public THaNonTrackingDetector, public THcHitList {
Int_t fTdcOffset; /* Global TDC offset */
TClonesArray* frPosAdcPedRaw;
- TClonesArray* frPosAdcPeakIntRaw;
- TClonesArray* frPosAdcPeakAmpRaw;
+ TClonesArray* frPosAdcPulseIntRaw;
+ TClonesArray* frPosAdcPulseAmpRaw;
+ TClonesArray* frPosAdcPulseTimeRaw;
TClonesArray* frPosAdcPed;
- TClonesArray* frPosAdcPeakInt;
- TClonesArray* frPosAdcPeakAmp;
+ TClonesArray* frPosAdcPulseInt;
+ TClonesArray* frPosAdcPulseAmp;
TClonesArray* frNegAdcPedRaw;
- TClonesArray* frNegAdcPeakIntRaw;
- TClonesArray* frNegAdcPeakAmpRaw;
+ TClonesArray* frNegAdcPulseIntRaw;
+ TClonesArray* frNegAdcPulseAmpRaw;
+ TClonesArray* frNegAdcPulseTimeRaw;
TClonesArray* frNegAdcPed;
- TClonesArray* frNegAdcPeakInt;
- TClonesArray* frNegAdcPeakAmp;
+ TClonesArray* frNegAdcPulseInt;
+ TClonesArray* frNegAdcPulseAmp;
void Setup(const char* name, const char* description);
virtual void InitializePedestals( );
diff --git a/src/THcCherenkov.cxx b/src/THcCherenkov.cxx
index 91ffd76..d5be11c 100644
--- a/src/THcCherenkov.cxx
+++ b/src/THcCherenkov.cxx
@@ -50,12 +50,13 @@ THcCherenkov::THcCherenkov( const char* name, const char* description,
fADCHits = new TClonesArray("THcSignalHit",16);
frAdcPedRaw = new TClonesArray("THcSignalHit", 16);
- frAdcPeakIntRaw = new TClonesArray("THcSignalHit", 16);
- frAdcPeakAmpRaw = new TClonesArray("THcSignalHit", 16);
+ frAdcPulseIntRaw = new TClonesArray("THcSignalHit", 16);
+ frAdcPulseAmpRaw = new TClonesArray("THcSignalHit", 16);
+ frAdcPulseTimeRaw = new TClonesArray("THcSignalHit", 16);
frAdcPed = new TClonesArray("THcSignalHit", 16);
- frAdcPeakInt = new TClonesArray("THcSignalHit", 16);
- frAdcPeakAmp = new TClonesArray("THcSignalHit", 16);
+ frAdcPulseInt = new TClonesArray("THcSignalHit", 16);
+ frAdcPulseAmp = new TClonesArray("THcSignalHit", 16);
cout << "fADCHits " << fADCHits << endl;
InitArrays();
@@ -71,12 +72,13 @@ THcCherenkov::THcCherenkov( ) :
fADCHits = NULL;
frAdcPedRaw = NULL;
- frAdcPeakIntRaw = NULL;
- frAdcPeakAmpRaw = NULL;
+ frAdcPulseIntRaw = NULL;
+ frAdcPulseAmpRaw = NULL;
+ frAdcPulseTimeRaw = NULL;
frAdcPed = NULL;
- frAdcPeakInt = NULL;
- frAdcPeakAmp = NULL;
+ frAdcPulseInt = NULL;
+ frAdcPulseAmp = NULL;
InitArrays();
}
@@ -122,12 +124,13 @@ THcCherenkov::~THcCherenkov()
delete fADCHits; fADCHits = NULL;
delete frAdcPedRaw; frAdcPedRaw = NULL;
- delete frAdcPeakIntRaw; frAdcPeakIntRaw = NULL;
- delete frAdcPeakAmpRaw; frAdcPeakAmpRaw = NULL;
+ delete frAdcPulseIntRaw; frAdcPulseIntRaw = NULL;
+ delete frAdcPulseAmpRaw; frAdcPulseAmpRaw = NULL;
+ delete frAdcPulseTimeRaw; frAdcPulseTimeRaw = NULL;
delete frAdcPed; frAdcPed = NULL;
- delete frAdcPeakInt; frAdcPeakInt = NULL;
- delete frAdcPeakAmp; frAdcPeakAmp = NULL;
+ delete frAdcPulseInt; frAdcPulseInt = NULL;
+ delete frAdcPulseAmp; frAdcPulseAmp = NULL;
DeleteArrays();
@@ -268,15 +271,16 @@ Int_t THcCherenkov::DefineVariables( EMode mode )
{"certrackcounter", "Tracks inside Cherenkov region", "fCerTrackCounter"},
{"cerfiredcounter", "Tracks with engough Cherenkov NPEs ", "fCerFiredCounter"},
- {"adcCounter", "List of ADC counter numbers.", "frPosAdcPeakIntRaw.THcSignalHit.GetPaddleNumber()"},
+ {"adcCounter", "List of ADC counter numbers.", "frPosAdcPulseIntRaw.THcSignalHit.GetPaddleNumber()"},
- {"adcPedRaw", "List of raw ADC pedestals", "frAdcPedRaw.THcSignalHit.GetData()"},
- {"adcPeakIntRaw", "List of raw ADC peak integrals.", "frAdcPeakIntRaw.THcSignalHit.GetData()"},
- {"adcPeakAmpRaw", "List of raw ADC peak amplitudes.", "frAdcPeakAmpRaw.THcSignalHit.GetData()"},
+ {"adcPedRaw", "List of raw ADC pedestals", "frAdcPedRaw.THcSignalHit.GetData()"},
+ {"adcPulseIntRaw", "List of raw ADC pulse integrals.", "frAdcPulseIntRaw.THcSignalHit.GetData()"},
+ {"adcPulseAmpRaw", "List of raw ADC pulse amplitudes.", "frAdcPulseAmpRaw.THcSignalHit.GetData()"},
+ {"adcPulseTimeRaw", "List of raw ADC pulse times.", "frAdcPulseTimeRaw.THcSignalHit.GetData()"},
- {"adcPed", "List of ADC pedestals", "frAdcPed.THcSignalHit.GetData()"},
- {"adcPeakInt", "List of ADC peak integrals.", "frAdcPeakInt.THcSignalHit.GetData()"},
- {"adcPeakAmp", "List of ADC peak amplitudes.", "frAdcPeakAmp.THcSignalHit.GetData()"},
+ {"adcPed", "List of ADC pedestals", "frAdcPed.THcSignalHit.GetData()"},
+ {"adcPulseInt", "List of ADC pulse integrals.", "frAdcPulseInt.THcSignalHit.GetData()"},
+ {"adcPulseAmp", "List of ADC pulse amplitudes.", "frAdcPulseAmp.THcSignalHit.GetData()"},
{ 0 }
};
@@ -304,12 +308,13 @@ void THcCherenkov::Clear(Option_t* opt)
}
frAdcPedRaw->Clear();
- frAdcPeakIntRaw->Clear();
- frAdcPeakAmpRaw->Clear();
+ frAdcPulseIntRaw->Clear();
+ frAdcPulseAmpRaw->Clear();
+ frAdcPulseTimeRaw->Clear();
frAdcPed->Clear();
- frAdcPeakInt->Clear();
- frAdcPeakAmp->Clear();
+ frAdcPulseInt->Clear();
+ frAdcPulseAmp->Clear();
}
@@ -346,18 +351,21 @@ Int_t THcCherenkov::Decode( const THaEvData& evdata )
((THcSignalHit*) frAdcPedRaw->ConstructedAt(nrAdcHits))->Set(padnum, rawAdcHit.GetPedRaw());
((THcSignalHit*) frAdcPed->ConstructedAt(nrAdcHits))->Set(padnum, rawAdcHit.GetPed());
- ((THcSignalHit*) frAdcPeakIntRaw->ConstructedAt(nrAdcHits))->Set(padnum, rawAdcHit.GetPeakIntRaw());
- ((THcSignalHit*) frAdcPeakInt->ConstructedAt(nrAdcHits))->Set(padnum, rawAdcHit.GetPeakInt());
+ ((THcSignalHit*) frAdcPulseIntRaw->ConstructedAt(nrAdcHits))->Set(padnum, rawAdcHit.GetPulseIntRaw());
+ ((THcSignalHit*) frAdcPulseInt->ConstructedAt(nrAdcHits))->Set(padnum, rawAdcHit.GetPulseInt());
+
+ ((THcSignalHit*) frAdcPulseAmpRaw->ConstructedAt(nrAdcHits))->Set(padnum, rawAdcHit.GetPulseAmpRaw());
+ ((THcSignalHit*) frAdcPulseAmp->ConstructedAt(nrAdcHits))->Set(padnum, rawAdcHit.GetPulseAmp());
+
+ ((THcSignalHit*) frAdcPulseTimeRaw->ConstructedAt(nrAdcHits))->Set(padnum, rawAdcHit.GetPulseTimeRaw());
- ((THcSignalHit*) frAdcPeakAmpRaw->ConstructedAt(nrAdcHits))->Set(padnum, rawAdcHit.GetPeakAmpRaw());
- ((THcSignalHit*) frAdcPeakAmp->ConstructedAt(nrAdcHits))->Set(padnum, rawAdcHit.GetPeakAmp());
++nrAdcHits;
}
// ADC hit
- if(hit->GetRawAdcHitPos().GetPeakIntRaw() > 0) {
+ if(hit->GetRawAdcHitPos().GetPulseIntRaw() > 0) {
THcSignalHit *sighit = (THcSignalHit*) fADCHits->ConstructedAt(nADCHits++);
- sighit->Set(hit->fCounter, hit->GetRawAdcHitPos().GetPeakIntRaw());
+ sighit->Set(hit->fCounter, hit->GetRawAdcHitPos().GetPulseIntRaw());
}
ihit++;
@@ -391,13 +399,13 @@ Int_t THcCherenkov::CoarseProcess( TClonesArray& ) //tracks
cout << "ihit != npmt " << endl;
fNPMT[npmt] = hit->fCounter;
- fADC[npmt] = hit->GetRawAdcHitPos().GetPeakIntRaw();
- fADC_P[npmt] = hit->GetRawAdcHitPos().GetPeakIntRaw() - fPedMean[npmt];
+ fADC[npmt] = hit->GetRawAdcHitPos().GetPulseIntRaw();
+ fADC_P[npmt] = hit->GetRawAdcHitPos().GetPulseIntRaw() - fPedMean[npmt];
- if ( ( fADC_P[npmt] > fCerWidth[npmt] ) && ( hit->GetRawAdcHitPos().GetPeakIntRaw() < 8000 ) ) {
+ if ( ( fADC_P[npmt] > fCerWidth[npmt] ) && ( hit->GetRawAdcHitPos().GetPulseIntRaw() < 8000 ) ) {
fNPE[npmt] = fGain[npmt]*fADC_P[npmt];
fNCherHit ++;
- } else if ( hit->GetRawAdcHitPos().GetPeakIntRaw() > 8000 ) {
+ } else if ( hit->GetRawAdcHitPos().GetPulseIntRaw() > 8000 ) {
fNPE[npmt] = 100.0;
} else {
fNPE[npmt] = 0.0;
@@ -494,7 +502,7 @@ void THcCherenkov::AccumulatePedestals(TClonesArray* rawhits)
THcCherenkovHit* hit = (THcCherenkovHit *) rawhits->At(ihit);
Int_t element = hit->fCounter - 1;
- Int_t nadc = hit->GetRawAdcHitPos().GetPeakIntRaw();
+ Int_t nadc = hit->GetRawAdcHitPos().GetPulseIntRaw();
if(nadc <= fPedLimit[element]) {
fPedSum[element] += nadc;
fPedSum2[element] += nadc*nadc;
diff --git a/src/THcCherenkov.h b/src/THcCherenkov.h
index 9f2b122..8b48f88 100644
--- a/src/THcCherenkov.h
+++ b/src/THcCherenkov.h
@@ -86,12 +86,13 @@ class THcCherenkov : public THaNonTrackingDetector, public THcHitList {
Double_t* fThresh;
TClonesArray* frAdcPedRaw;
- TClonesArray* frAdcPeakIntRaw;
- TClonesArray* frAdcPeakAmpRaw;
+ TClonesArray* frAdcPulseIntRaw;
+ TClonesArray* frAdcPulseAmpRaw;
+ TClonesArray* frAdcPulseTimeRaw;
TClonesArray* frAdcPed;
- TClonesArray* frAdcPeakInt;
- TClonesArray* frAdcPeakAmp;
+ TClonesArray* frAdcPulseInt;
+ TClonesArray* frAdcPulseAmp;
void Setup(const char* name, const char* description);
virtual void InitializePedestals( );
diff --git a/src/THcRawAdcHit.cxx b/src/THcRawAdcHit.cxx
index 8a4c275..1817706 100644
--- a/src/THcRawAdcHit.cxx
+++ b/src/THcRawAdcHit.cxx
@@ -18,7 +18,7 @@ THcRawAdcHit::THcRawAdcHit() :
TObject(),
fNPedestalSamples(4), fNPeakSamples(10),
fPeakPedestalRatio(1.0*fNPeakSamples/fNPedestalSamples),
- fAdc(), fAdcTime(), fAdcPedestal(), fAdcPeak(), fAdcSample(),
+ fAdc(), fAdcTime(), fAdcPedestal(), fAdcPulse(), fAdcSample(),
fHasMulti(kFALSE), fNPulses(0), fNSamples(0)
{}
@@ -31,7 +31,7 @@ THcRawAdcHit& THcRawAdcHit::operator=(const THcRawAdcHit& right) {
fAdc[i] = right.fAdc[i];
fAdcTime[i] = right.fAdcTime[i];
fAdcPedestal[i] = right.fAdcPedestal[i];
- fAdcPeak[i] = right.fAdcPeak[i];
+ fAdcPulse[i] = right.fAdcPulse[i];
}
for (UInt_t i=0; i<fMaxNSamples; ++i) {
fAdcSample[i] = right.fAdcSample[i];
@@ -55,7 +55,7 @@ void THcRawAdcHit::Clear(Option_t* opt) {
fAdc[i] = 0;
fAdcTime[i] = 0;
fAdcPedestal[i] = 0;
- fAdcPeak[i] = 0;
+ fAdcPulse[i] = 0;
}
for (UInt_t i=0; i<fNSamples; ++i) {
fAdcSample[i] = 0 ;
@@ -99,7 +99,7 @@ void THcRawAdcHit::SetDataTimePedestalPeak(
fAdc[fNPulses] = data;
fAdcTime[fNPulses] = time;
fAdcPedestal[fNPulses] = pedestal;
- fAdcPeak[fNPulses] = peak;
+ fAdcPulse[fNPulses] = peak;
fHasMulti = kTRUE;
++fNPulses;
}
@@ -156,16 +156,16 @@ Int_t THcRawAdcHit::GetAdcPedestal(UInt_t iPulse) {
}
-Int_t THcRawAdcHit::GetAdcPeak(UInt_t iPulse) {
+Int_t THcRawAdcHit::GetAdcPulse(UInt_t iPulse) {
if (iPulse >= fNPulses && iPulse != 0) {
TString msg = TString::Format(
- "`THcRawAdcHit::GetAdcPeak`: requested pulse %d where only %d pulses available!",
+ "`THcRawAdcHit::GetAdcPulse`: requested pulse %d where only %d pulses available!",
iPulse, fNPulses
);
throw std::out_of_range(msg.Data());
}
else if (fHasMulti) {
- return fAdcPeak[iPulse];
+ return fAdcPulse[iPulse];
}
else {
return 0;
@@ -253,13 +253,18 @@ Int_t THcRawAdcHit::GetPedRaw() {
}
-Int_t THcRawAdcHit::GetPeakIntRaw(UInt_t iPulse) {
+Int_t THcRawAdcHit::GetPulseIntRaw(UInt_t iPulse) {
return fAdc[iPulse];
}
-Int_t THcRawAdcHit::GetPeakAmpRaw(UInt_t iPulse) {
- return fAdcPeak[iPulse];
+Int_t THcRawAdcHit::GetPulseAmpRaw(UInt_t iPulse) {
+ return fAdcPulse[iPulse];
+}
+
+
+Int_t THcRawAdcHit::GetPulseTimeRaw(UInt_t iPulse) {
+ return fAdcTime[iPulse];
}
@@ -268,13 +273,13 @@ Double_t THcRawAdcHit::GetPed() {
}
-Double_t THcRawAdcHit::GetPeakInt(UInt_t iPulse) {
+Double_t THcRawAdcHit::GetPulseInt(UInt_t iPulse) {
return fAdc[iPulse] - fAdcPedestal[0] * fPeakPedestalRatio;
}
-Double_t THcRawAdcHit::GetPeakAmp(UInt_t iPulse) {
- return fAdcPeak[iPulse] - 1.0 * fAdcPedestal[0]/fNPedestalSamples;
+Double_t THcRawAdcHit::GetPulseAmp(UInt_t iPulse) {
+ return fAdcPulse[iPulse] - 1.0 * fAdcPedestal[0]/fNPedestalSamples;
}
diff --git a/src/THcRawAdcHit.h b/src/THcRawAdcHit.h
index 83a09e8..42c812d 100644
--- a/src/THcRawAdcHit.h
+++ b/src/THcRawAdcHit.h
@@ -21,7 +21,7 @@ class THcRawAdcHit : public TObject {
Int_t GetRawData(UInt_t iPulse=0);
Int_t GetAdcTime(UInt_t iPulse=0);
Int_t GetAdcPedestal(UInt_t iPulse=0);
- Int_t GetAdcPeak(UInt_t iPulse=0);
+ Int_t GetAdcPulse(UInt_t iPulse=0);
Int_t GetSample(UInt_t iSample);
Double_t GetAverage(UInt_t iSampleLow, UInt_t iSampleHigh);
@@ -36,14 +36,14 @@ class THcRawAdcHit : public TObject {
Bool_t HasMulti();
Int_t GetPedRaw();
- Int_t GetPeakIntRaw(UInt_t iPulse=0);
- Int_t GetPeakAmpRaw(UInt_t iPulse=0);
- //Int_t GetPeakTimeRaw(UInt_t iPulse=0); // TODO: Figure out what to do with time.
+ Int_t GetPulseIntRaw(UInt_t iPulse=0);
+ Int_t GetPulseAmpRaw(UInt_t iPulse=0);
+ Int_t GetPulseTimeRaw(UInt_t iPulse=0);
Double_t GetPed();
- Double_t GetPeakInt(UInt_t iPulse=0);
- Double_t GetPeakAmp(UInt_t iPulse=0);
- //Double_t GetPeakTime(UInt_t iPulse=0);
+ Double_t GetPulseInt(UInt_t iPulse=0);
+ Double_t GetPulseAmp(UInt_t iPulse=0);
+ //Double_t GetPulseTime(UInt_t iPulse=0); // TODO: Figure out what to do with time.
Int_t GetSampleIntRaw();
Double_t GetSampleInt();
@@ -59,7 +59,7 @@ class THcRawAdcHit : public TObject {
Int_t fAdc[fMaxNPulses]; // TODO: Rename these...
Int_t fAdcTime[fMaxNPulses];
Int_t fAdcPedestal[fMaxNPulses]; // TODO: There should only be 1 pedestal...
- Int_t fAdcPeak[fMaxNPulses];
+ Int_t fAdcPulse[fMaxNPulses];
Int_t fAdcSample[fMaxNSamples];
Bool_t fHasMulti;
diff --git a/src/THcRawHodoHit.cxx b/src/THcRawHodoHit.cxx
index df78910..514712a 100644
--- a/src/THcRawHodoHit.cxx
+++ b/src/THcRawHodoHit.cxx
@@ -107,7 +107,7 @@ void THcRawHodoHit::SetReference(Int_t signal, Int_t reference) {
Int_t THcRawHodoHit::GetData(Int_t signal) {
if (0 <= signal && signal < fNAdcSignals) {
- return fAdcHits[signal].GetPeakInt();
+ return fAdcHits[signal].GetPulseInt();
}
else if (fNAdcSignals <= signal && signal < fNAdcSignals+fNTdcSignals) {
return fTdcHits[signal-fNAdcSignals].GetTime();
@@ -122,7 +122,7 @@ Int_t THcRawHodoHit::GetData(Int_t signal) {
Int_t THcRawHodoHit::GetRawData(Int_t signal) {
if (0 <= signal && signal < fNAdcSignals) {
- return fAdcHits[signal].GetPeakIntRaw();
+ return fAdcHits[signal].GetPulseIntRaw();
}
else if (fNAdcSignals <= signal && signal < fNAdcSignals+fNTdcSignals) {
return fTdcHits[signal-fNAdcSignals].GetTimeRaw();
diff --git a/src/THcScintillatorPlane.cxx b/src/THcScintillatorPlane.cxx
index af338f6..4cb2a96 100644
--- a/src/THcScintillatorPlane.cxx
+++ b/src/THcScintillatorPlane.cxx
@@ -47,23 +47,25 @@ THcScintillatorPlane::THcScintillatorPlane( const char* name,
frPosTdcTimeRaw = new TClonesArray("THcSignalHit", 16);
frPosAdcPedRaw = new TClonesArray("THcSignalHit", 16);
- frPosAdcPeakIntRaw = new TClonesArray("THcSignalHit", 16);
- frPosAdcPeakAmpRaw = new TClonesArray("THcSignalHit", 16);
+ frPosAdcPulseIntRaw = new TClonesArray("THcSignalHit", 16);
+ frPosAdcPulseAmpRaw = new TClonesArray("THcSignalHit", 16);
+ frPosAdcPulseTimeRaw = new TClonesArray("THcSignalHit", 16);
frPosTdcTime = new TClonesArray("THcSignalHit", 16);
frPosAdcPed = new TClonesArray("THcSignalHit", 16);
- frPosAdcPeakInt = new TClonesArray("THcSignalHit", 16);
- frPosAdcPeakAmp = new TClonesArray("THcSignalHit", 16);
+ frPosAdcPulseInt = new TClonesArray("THcSignalHit", 16);
+ frPosAdcPulseAmp = new TClonesArray("THcSignalHit", 16);
frNegTdcTimeRaw = new TClonesArray("THcSignalHit", 16);
frNegAdcPedRaw = new TClonesArray("THcSignalHit", 16);
- frNegAdcPeakIntRaw = new TClonesArray("THcSignalHit", 16);
- frNegAdcPeakAmpRaw = new TClonesArray("THcSignalHit", 16);
+ frNegAdcPulseIntRaw = new TClonesArray("THcSignalHit", 16);
+ frNegAdcPulseAmpRaw = new TClonesArray("THcSignalHit", 16);
+ frNegAdcPulseTimeRaw = new TClonesArray("THcSignalHit", 16);
frNegTdcTime = new TClonesArray("THcSignalHit", 16);
frNegAdcPed = new TClonesArray("THcSignalHit", 16);
- frNegAdcPeakInt = new TClonesArray("THcSignalHit", 16);
- frNegAdcPeakAmp = new TClonesArray("THcSignalHit", 16);
+ frNegAdcPulseInt = new TClonesArray("THcSignalHit", 16);
+ frNegAdcPulseAmp = new TClonesArray("THcSignalHit", 16);
fPlaneNum = planenum;
fTotPlanes = planenum;
@@ -94,23 +96,25 @@ THcScintillatorPlane::~THcScintillatorPlane()
delete frPosTdcTimeRaw;
delete frPosAdcPedRaw;
- delete frPosAdcPeakIntRaw;
- delete frPosAdcPeakAmpRaw;
+ delete frPosAdcPulseIntRaw;
+ delete frPosAdcPulseAmpRaw;
+ delete frPosAdcPulseTimeRaw;
delete frPosTdcTime;
delete frPosAdcPed;
- delete frPosAdcPeakInt;
- delete frPosAdcPeakAmp;
+ delete frPosAdcPulseInt;
+ delete frPosAdcPulseAmp;
delete frNegTdcTimeRaw;
delete frNegAdcPedRaw;
- delete frNegAdcPeakIntRaw;
- delete frNegAdcPeakAmpRaw;
+ delete frNegAdcPulseIntRaw;
+ delete frNegAdcPulseAmpRaw;
+ delete frNegAdcPulseTimeRaw;
delete frNegTdcTime;
delete frNegAdcPed;
- delete frNegAdcPeakInt;
- delete frNegAdcPeakAmp;
+ delete frNegAdcPulseInt;
+ delete frNegAdcPulseAmp;
delete fpTimes;
delete [] fScinTime;
@@ -316,30 +320,32 @@ Int_t THcScintillatorPlane::DefineVariables( EMode mode )
{"posadcped", "List of Positive ADC Pedestals", "frPosADCPeds.THcSignalHit.GetData()"},
{"negadcped", "List of Negative ADC Pedestals", "frNegADCPeds.THcSignalHit.GetData()"},
- {"posTdcCounter", "List of positive TDC counter numbers.", "frPosTdcTimeRaw.THcSignalHit.GetPaddleNumber()"},
- {"posAdcCounter", "List of positive ADC counter numbers.", "frPosAdcPeakIntRaw.THcSignalHit.GetPaddleNumber()"},
- {"negTdcCounter", "List of negative TDC counter numbers.", "frNegTdcTimeRaw.THcSignalHit.GetPaddleNumber()"},
- {"negAdcCounter", "List of negative ADC counter numbers.", "frNegAdcPeakIntRaw.THcSignalHit.GetPaddleNumber()"},
-
- {"posTdcTimeRaw", "List of positive raw TDC values.", "frPosTdcTimeRaw.THcSignalHit.GetData()"},
- {"posAdcPedRaw", "List of positive raw ADC pedestals", "frPosAdcPedRaw.THcSignalHit.GetData()"},
- {"posAdcPeakIntRaw", "List of positive raw ADC peak integrals.", "frPosAdcPeakIntRaw.THcSignalHit.GetData()"},
- {"posAdcPeakAmpRaw", "List of positive raw ADC peak amplitudes.", "frPosAdcPeakAmpRaw.THcSignalHit.GetData()"},
-
- {"posTdcTime", "List of positive TDC values.", "frPosTdcTime.THcSignalHit.GetData()"},
- {"posAdcPed", "List of positive ADC pedestals", "frPosAdcPed.THcSignalHit.GetData()"},
- {"posAdcPeakInt", "List of positive ADC peak integrals.", "frPosAdcPeakInt.THcSignalHit.GetData()"},
- {"posAdcPeakAmp", "List of positive ADC peak amplitudes.", "frPosAdcPeakAmp.THcSignalHit.GetData()"},
-
- {"negTdcTimeRaw", "List of negative raw TDC values.", "frNegTdcTimeRaw.THcSignalHit.GetData()"},
- {"negAdcPedRaw", "List of negative raw ADC pedestals", "frNegAdcPedRaw.THcSignalHit.GetData()"},
- {"negAdcPeakIntRaw", "List of negative raw ADC peak integrals.", "frNegAdcPeakIntRaw.THcSignalHit.GetData()"},
- {"negAdcPeakAmpRaw", "List of negative raw ADC peak amplitudes.", "frNegAdcPeakAmpRaw.THcSignalHit.GetData()"},
-
- {"negTdcTime", "List of negative TDC values.", "frNegTdcTime.THcSignalHit.GetData()"},
- {"negAdcPed", "List of negative ADC pedestals", "frNegAdcPed.THcSignalHit.GetData()"},
- {"negAdcPeakInt", "List of negative ADC peak integrals.", "frNegAdcPeakInt.THcSignalHit.GetData()"},
- {"negAdcPeakAmp", "List of negative ADC peak amplitudes.", "frNegAdcPeakAmp.THcSignalHit.GetData()"},
+ {"posTdcCounter", "List of positive TDC counter numbers.", "frPosTdcTimeRaw.THcSignalHit.GetPaddleNumber()"},
+ {"posAdcCounter", "List of positive ADC counter numbers.", "frPosAdcPulseIntRaw.THcSignalHit.GetPaddleNumber()"},
+ {"negTdcCounter", "List of negative TDC counter numbers.", "frNegTdcTimeRaw.THcSignalHit.GetPaddleNumber()"},
+ {"negAdcCounter", "List of negative ADC counter numbers.", "frNegAdcPulseIntRaw.THcSignalHit.GetPaddleNumber()"},
+
+ {"posTdcTimeRaw", "List of positive raw TDC values.", "frPosTdcTimeRaw.THcSignalHit.GetData()"},
+ {"posAdcPedRaw", "List of positive raw ADC pedestals", "frPosAdcPedRaw.THcSignalHit.GetData()"},
+ {"posAdcPulseIntRaw", "List of positive raw ADC pulse integrals.", "frPosAdcPulseIntRaw.THcSignalHit.GetData()"},
+ {"posAdcPulseAmpRaw", "List of positive raw ADC pulse amplitudes.", "frPosAdcPulseAmpRaw.THcSignalHit.GetData()"},
+ {"posAdcPulseTimeRaw", "List of positive raw ADC pulse times.", "frPosAdcPulseTimeRaw.THcSignalHit.GetData()"},
+
+ {"posTdcTime", "List of positive TDC values.", "frPosTdcTime.THcSignalHit.GetData()"},
+ {"posAdcPed", "List of positive ADC pedestals", "frPosAdcPed.THcSignalHit.GetData()"},
+ {"posAdcPulseInt", "List of positive ADC pulse integrals.", "frPosAdcPulseInt.THcSignalHit.GetData()"},
+ {"posAdcPulseAmp", "List of positive ADC pulse amplitudes.", "frPosAdcPulseAmp.THcSignalHit.GetData()"},
+
+ {"negTdcTimeRaw", "List of negative raw TDC values.", "frNegTdcTimeRaw.THcSignalHit.GetData()"},
+ {"negAdcPedRaw", "List of negative raw ADC pedestals", "frNegAdcPedRaw.THcSignalHit.GetData()"},
+ {"negAdcPulseIntRaw", "List of negative raw ADC pulse integrals.", "frNegAdcPulseIntRaw.THcSignalHit.GetData()"},
+ {"negAdcPulseAmpRaw", "List of negative raw ADC pulse amplitudes.", "frNegAdcPulseAmpRaw.THcSignalHit.GetData()"},
+ {"negAdcPulseTimeRaw", "List of negative raw ADC pulse times.", "frNegAdcPulseTimeRaw.THcSignalHit.GetData()"},
+
+ {"negTdcTime", "List of negative TDC values.", "frNegTdcTime.THcSignalHit.GetData()"},
+ {"negAdcPed", "List of negative ADC pedestals", "frNegAdcPed.THcSignalHit.GetData()"},
+ {"negAdcPulseInt", "List of negative ADC pulse integrals.", "frNegAdcPulseInt.THcSignalHit.GetData()"},
+ {"negAdcPulseAmp", "List of negative ADC pulse amplitudes.", "frNegAdcPulseAmp.THcSignalHit.GetData()"},
{"fptime", "Time at focal plane", "GetFpTime()"},
{"nhits", "Number of paddle hits (passed TDC Min and Max cuts for either end)", "GetNScinHits() "},
@@ -367,23 +373,25 @@ void THcScintillatorPlane::Clear( Option_t* )
frPosTdcTimeRaw->Clear();
frPosAdcPedRaw->Clear();
- frPosAdcPeakIntRaw->Clear();
- frPosAdcPeakAmpRaw->Clear();
+ frPosAdcPulseIntRaw->Clear();
+ frPosAdcPulseAmpRaw->Clear();
+ frPosAdcPulseTimeRaw->Clear();
frPosTdcTime->Clear();
frPosAdcPed->Clear();
- frPosAdcPeakInt->Clear();
- frPosAdcPeakAmp->Clear();
+ frPosAdcPulseInt->Clear();
+ frPosAdcPulseAmp->Clear();
frNegTdcTimeRaw->Clear();
frNegAdcPedRaw->Clear();
- frNegAdcPeakIntRaw->Clear();
- frNegAdcPeakAmpRaw->Clear();
+ frNegAdcPulseIntRaw->Clear();
+ frNegAdcPulseAmpRaw->Clear();
+ frNegAdcPulseTimeRaw->Clear();
frNegTdcTime->Clear();
frNegAdcPed->Clear();
- frNegAdcPeakInt->Clear();
- frNegAdcPeakAmp->Clear();
+ frNegAdcPulseInt->Clear();
+ frNegAdcPulseAmp->Clear();
fpTime = -1.e4;
}
@@ -460,23 +468,25 @@ Int_t THcScintillatorPlane::ProcessHits(TClonesArray* rawhits, Int_t nexthit)
frPosTdcTimeRaw->Clear();
frPosAdcPedRaw->Clear();
- frPosAdcPeakIntRaw->Clear();
- frPosAdcPeakAmpRaw->Clear();
+ frPosAdcPulseIntRaw->Clear();
+ frPosAdcPulseAmpRaw->Clear();
+ frPosAdcPulseTimeRaw->Clear();
frPosTdcTime->Clear();
frPosAdcPed->Clear();
- frPosAdcPeakInt->Clear();
- frPosAdcPeakAmp->Clear();
+ frPosAdcPulseInt->Clear();
+ frPosAdcPulseAmp->Clear();
frNegTdcTimeRaw->Clear();
frNegAdcPedRaw->Clear();
- frNegAdcPeakIntRaw->Clear();
- frNegAdcPeakAmpRaw->Clear();
+ frNegAdcPulseIntRaw->Clear();
+ frNegAdcPulseAmpRaw->Clear();
+ frNegAdcPulseTimeRaw->Clear();
frNegTdcTime->Clear();
frNegAdcPed->Clear();
- frNegAdcPeakInt->Clear();
- frNegAdcPeakAmp->Clear();
+ frNegAdcPulseInt->Clear();
+ frNegAdcPulseAmp->Clear();
//stripped
fNScinHits=0;
@@ -518,11 +528,14 @@ Int_t THcScintillatorPlane::ProcessHits(TClonesArray* rawhits, Int_t nexthit)
((THcSignalHit*) frPosAdcPedRaw->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPedRaw());
((THcSignalHit*) frPosAdcPed->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPed());
- ((THcSignalHit*) frPosAdcPeakIntRaw->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPeakIntRaw());
- ((THcSignalHit*) frPosAdcPeakInt->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPeakInt());
+ ((THcSignalHit*) frPosAdcPulseIntRaw->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPulseIntRaw());
+ ((THcSignalHit*) frPosAdcPulseInt->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPulseInt());
+
+ ((THcSignalHit*) frPosAdcPulseAmpRaw->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPulseAmpRaw());
+ ((THcSignalHit*) frPosAdcPulseAmp->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPulseAmp());
+
+ ((THcSignalHit*) frPosAdcPulseTimeRaw->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPulseTimeRaw());
- ((THcSignalHit*) frPosAdcPeakAmpRaw->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPeakAmpRaw());
- ((THcSignalHit*) frPosAdcPeakAmp->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPeakAmp());
++nrPosAdcHits;
}
THcRawAdcHit& rawNegAdcHit = hit->GetRawAdcHitNeg();
@@ -530,11 +543,14 @@ Int_t THcScintillatorPlane::ProcessHits(TClonesArray* rawhits, Int_t nexthit)
((THcSignalHit*) frNegAdcPedRaw->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPedRaw());
((THcSignalHit*) frNegAdcPed->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPed());
- ((THcSignalHit*) frNegAdcPeakIntRaw->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPeakIntRaw());
- ((THcSignalHit*) frNegAdcPeakInt->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPeakInt());
+ ((THcSignalHit*) frNegAdcPulseIntRaw->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPulseIntRaw());
+ ((THcSignalHit*) frNegAdcPulseInt->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPulseInt());
+
+ ((THcSignalHit*) frNegAdcPulseAmpRaw->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPulseAmpRaw());
+ ((THcSignalHit*) frNegAdcPulseAmp->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPulseAmp());
+
+ ((THcSignalHit*) frNegAdcPulseTimeRaw->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPulseTimeRaw());
- ((THcSignalHit*) frNegAdcPeakAmpRaw->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPeakAmpRaw());
- ((THcSignalHit*) frNegAdcPeakAmp->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPeakAmp());
++nrNegAdcHits;
}
@@ -550,8 +566,8 @@ Int_t THcScintillatorPlane::ProcessHits(TClonesArray* rawhits, Int_t nexthit)
Double_t adc_pos;
Double_t adc_neg;
if(fADCMode == kADCDynamicPedestal) {
- adc_pos = hit->GetRawAdcHitPos().GetPeakInt();
- adc_neg = hit->GetRawAdcHitNeg().GetPeakInt();
+ adc_pos = hit->GetRawAdcHitPos().GetPulseInt();
+ adc_neg = hit->GetRawAdcHitNeg().GetPulseInt();
} else if (fADCMode == kADCSampleIntegral) {
adc_pos = hit->GetRawAdcHitPos().GetSampleIntRaw() - fPosPed[index];
adc_neg = hit->GetRawAdcHitNeg().GetSampleIntRaw() - fNegPed[index];
@@ -559,8 +575,8 @@ Int_t THcScintillatorPlane::ProcessHits(TClonesArray* rawhits, Int_t nexthit)
adc_pos = hit->GetRawAdcHitPos().GetSampleInt();
adc_neg = hit->GetRawAdcHitNeg().GetSampleInt();
} else {
- adc_pos = hit->GetRawAdcHitPos().GetPeakIntRaw()-fPosPed[index];
- adc_neg = hit->GetRawAdcHitNeg().GetPeakIntRaw()-fNegPed[index];
+ adc_pos = hit->GetRawAdcHitPos().GetPulseIntRaw()-fPosPed[index];
+ adc_neg = hit->GetRawAdcHitNeg().GetPulseIntRaw()-fNegPed[index];
}
if (adc_pos >= fADCDiagCut) {
((THcSignalHit*) frPosADCHits->ConstructedAt(nrPosADCHits))->Set(padnum, adc_pos);
@@ -680,8 +696,8 @@ Int_t THcScintillatorPlane::AccumulatePedestals(TClonesArray* rawhits, Int_t nex
break;
}
Int_t element = hit->fCounter - 1; // Should check if in range
- Int_t adcpos = hit->GetRawAdcHitPos().GetPeakIntRaw();
- Int_t adcneg = hit->GetRawAdcHitNeg().GetPeakIntRaw();
+ Int_t adcpos = hit->GetRawAdcHitPos().GetPulseIntRaw();
+ Int_t adcneg = hit->GetRawAdcHitNeg().GetPulseIntRaw();
if(adcpos <= fPosPedLimit[element]) {
fPosPedSum[element] += adcpos;
diff --git a/src/THcScintillatorPlane.h b/src/THcScintillatorPlane.h
index aaf8528..123eaf5 100644
--- a/src/THcScintillatorPlane.h
+++ b/src/THcScintillatorPlane.h
@@ -74,23 +74,25 @@ class THcScintillatorPlane : public THaSubDetector {
TClonesArray* frPosTdcTimeRaw;
TClonesArray* frPosAdcPedRaw;
- TClonesArray* frPosAdcPeakIntRaw;
- TClonesArray* frPosAdcPeakAmpRaw;
+ TClonesArray* frPosAdcPulseIntRaw;
+ TClonesArray* frPosAdcPulseAmpRaw;
+ TClonesArray* frPosAdcPulseTimeRaw;
TClonesArray* frPosTdcTime;
TClonesArray* frPosAdcPed;
- TClonesArray* frPosAdcPeakInt;
- TClonesArray* frPosAdcPeakAmp;
+ TClonesArray* frPosAdcPulseInt;
+ TClonesArray* frPosAdcPulseAmp;
TClonesArray* frNegTdcTimeRaw;
TClonesArray* frNegAdcPedRaw;
- TClonesArray* frNegAdcPeakIntRaw;
- TClonesArray* frNegAdcPeakAmpRaw;
+ TClonesArray* frNegAdcPulseIntRaw;
+ TClonesArray* frNegAdcPulseAmpRaw;
+ TClonesArray* frNegAdcPulseTimeRaw;
TClonesArray* frNegTdcTime;
TClonesArray* frNegAdcPed;
- TClonesArray* frNegAdcPeakInt;
- TClonesArray* frNegAdcPeakAmp;
+ TClonesArray* frNegAdcPulseInt;
+ TClonesArray* frNegAdcPulseAmp;
Int_t fPlaneNum; /* Which plane am I 1-4 */
UInt_t fTotPlanes; /* so we can read variables that are not indexed by plane id */
diff --git a/src/THcShowerArray.cxx b/src/THcShowerArray.cxx
index a37c5b4..6ea83d7 100644
--- a/src/THcShowerArray.cxx
+++ b/src/THcShowerArray.cxx
@@ -40,12 +40,13 @@ THcShowerArray::THcShowerArray( const char* name,
fLayerNum = layernum;
frAdcPedRaw = new TClonesArray("THcSignalHit", 16);
- frAdcPeakIntRaw = new TClonesArray("THcSignalHit", 16);
- frAdcPeakAmpRaw = new TClonesArray("THcSignalHit", 16);
+ frAdcPulseIntRaw = new TClonesArray("THcSignalHit", 16);
+ frAdcPulseAmpRaw = new TClonesArray("THcSignalHit", 16);
+ frAdcPulseTimeRaw = new TClonesArray("THcSignalHit", 16);
frAdcPed = new TClonesArray("THcSignalHit", 16);
- frAdcPeakInt = new TClonesArray("THcSignalHit", 16);
- frAdcPeakAmp = new TClonesArray("THcSignalHit", 16);
+ frAdcPulseInt = new TClonesArray("THcSignalHit", 16);
+ frAdcPulseAmp = new TClonesArray("THcSignalHit", 16);
fClusterList = new THcShowerClusterList; // List of hit clusters
}
@@ -60,12 +61,13 @@ THcShowerArray::~THcShowerArray()
delete fADCHits;
delete frAdcPedRaw; frAdcPedRaw = NULL;
- delete frAdcPeakIntRaw; frAdcPeakIntRaw = NULL;
- delete frAdcPeakAmpRaw; frAdcPeakAmpRaw = NULL;
+ delete frAdcPulseIntRaw; frAdcPulseIntRaw = NULL;
+ delete frAdcPulseAmpRaw; frAdcPulseAmpRaw = NULL;
+ delete frAdcPulseTimeRaw; frAdcPulseTimeRaw = NULL;
delete frAdcPed; frAdcPed = NULL;
- delete frAdcPeakInt; frAdcPeakInt = NULL;
- delete frAdcPeakAmp; frAdcPeakAmp = NULL;
+ delete frAdcPulseInt; frAdcPulseInt = NULL;
+ delete frAdcPulseAmp; frAdcPulseAmp = NULL;
delete [] fA;
delete [] fP;
@@ -331,15 +333,16 @@ Int_t THcShowerArray::DefineVariables( EMode mode )
{"earray", "Energy Deposition in array", "fEarray"},
{ "ntracks", "Number of shower tracks", "fNtracks" },
- {"adcCounter", "List of ADC counter numbers.", "frPosAdcPeakIntRaw.THcSignalHit.GetPaddleNumber()"},
+ {"adcCounter", "List of ADC counter numbers.", "frPosAdcPulseIntRaw.THcSignalHit.GetPaddleNumber()"},
- {"adcPedRaw", "List of raw ADC pedestals", "frAdcPedRaw.THcSignalHit.GetData()"},
- {"adcPeakIntRaw", "List of raw ADC peak integrals.", "frAdcPeakIntRaw.THcSignalHit.GetData()"},
- {"adcPeakAmpRaw", "List of raw ADC peak amplitudes.", "frAdcPeakAmpRaw.THcSignalHit.GetData()"},
+ {"adcPedRaw", "List of raw ADC pedestals", "frAdcPedRaw.THcSignalHit.GetData()"},
+ {"adcPulseIntRaw", "List of raw ADC pulse integrals.", "frAdcPulseIntRaw.THcSignalHit.GetData()"},
+ {"adcPulseAmpRaw", "List of raw ADC pulse amplitudes.", "frAdcPulseAmpRaw.THcSignalHit.GetData()"},
+ {"adcPulseTimeRaw", "List of raw ADC pulse times.", "frAdcPulseTimeRaw.THcSignalHit.GetData()"},
- {"adcPed", "List of ADC pedestals", "frAdcPed.THcSignalHit.GetData()"},
- {"adcPeakInt", "List of ADC peak integrals.", "frAdcPeakInt.THcSignalHit.GetData()"},
- {"adcPeakAmp", "List of ADC peak amplitudes.", "frAdcPeakAmp.THcSignalHit.GetData()"},
+ {"adcPed", "List of ADC pedestals", "frAdcPed.THcSignalHit.GetData()"},
+ {"adcPulseInt", "List of ADC pulse integrals.", "frAdcPulseInt.THcSignalHit.GetData()"},
+ {"adcPulseAmp", "List of ADC pulse amplitudes.", "frAdcPulseAmp.THcSignalHit.GetData()"},
{ 0 }
};
@@ -365,12 +368,13 @@ void THcShowerArray::Clear( Option_t* )
fClusterList->clear();
frAdcPedRaw->Clear();
- frAdcPeakIntRaw->Clear();
- frAdcPeakAmpRaw->Clear();
+ frAdcPulseIntRaw->Clear();
+ frAdcPulseAmpRaw->Clear();
+ frAdcPulseTimeRaw->Clear();
frAdcPed->Clear();
- frAdcPeakInt->Clear();
- frAdcPeakAmp->Clear();
+ frAdcPulseInt->Clear();
+ frAdcPulseAmp->Clear();
}
@@ -653,12 +657,13 @@ Int_t THcShowerArray::ProcessHits(TClonesArray* rawhits, Int_t nexthit)
fADCHits->Clear();
frAdcPedRaw->Clear();
- frAdcPeakIntRaw->Clear();
- frAdcPeakAmpRaw->Clear();
+ frAdcPulseIntRaw->Clear();
+ frAdcPulseAmpRaw->Clear();
+ frAdcPulseTimeRaw->Clear();
frAdcPed->Clear();
- frAdcPeakInt->Clear();
- frAdcPeakAmp->Clear();
+ frAdcPulseInt->Clear();
+ frAdcPulseAmp->Clear();
for(Int_t i=0;i<fNelem;i++) {
fA[i] = 0;
@@ -694,11 +699,14 @@ Int_t THcShowerArray::ProcessHits(TClonesArray* rawhits, Int_t nexthit)
((THcSignalHit*) frAdcPedRaw->ConstructedAt(nrAdcHits))->Set(padnum, rawAdcHit.GetPedRaw());
((THcSignalHit*) frAdcPed->ConstructedAt(nrAdcHits))->Set(padnum, rawAdcHit.GetPed());
- ((THcSignalHit*) frAdcPeakIntRaw->ConstructedAt(nrAdcHits))->Set(padnum, rawAdcHit.GetPeakIntRaw());
- ((THcSignalHit*) frAdcPeakInt->ConstructedAt(nrAdcHits))->Set(padnum, rawAdcHit.GetPeakInt());
+ ((THcSignalHit*) frAdcPulseIntRaw->ConstructedAt(nrAdcHits))->Set(padnum, rawAdcHit.GetPulseIntRaw());
+ ((THcSignalHit*) frAdcPulseInt->ConstructedAt(nrAdcHits))->Set(padnum, rawAdcHit.GetPulseInt());
+
+ ((THcSignalHit*) frAdcPulseAmpRaw->ConstructedAt(nrAdcHits))->Set(padnum, rawAdcHit.GetPulseAmpRaw());
+ ((THcSignalHit*) frAdcPulseAmp->ConstructedAt(nrAdcHits))->Set(padnum, rawAdcHit.GetPulseAmp());
+
+ ((THcSignalHit*) frAdcPulseTimeRaw->ConstructedAt(nrAdcHits))->Set(padnum, rawAdcHit.GetPulseTimeRaw());
- ((THcSignalHit*) frAdcPeakAmpRaw->ConstructedAt(nrAdcHits))->Set(padnum, rawAdcHit.GetPeakAmpRaw());
- ((THcSignalHit*) frAdcPeakAmp->ConstructedAt(nrAdcHits))->Set(padnum, rawAdcHit.GetPeakAmp());
++nrAdcHits;
}
diff --git a/src/THcShowerArray.h b/src/THcShowerArray.h
index 9196cef..18d2be0 100644
--- a/src/THcShowerArray.h
+++ b/src/THcShowerArray.h
@@ -136,12 +136,13 @@ protected:
THcShowerClusterList* fClusterList; // List of hit clusters
TClonesArray* frAdcPedRaw;
- TClonesArray* frAdcPeakIntRaw;
- TClonesArray* frAdcPeakAmpRaw;
+ TClonesArray* frAdcPulseIntRaw;
+ TClonesArray* frAdcPulseAmpRaw;
+ TClonesArray* frAdcPulseTimeRaw;
TClonesArray* frAdcPed;
- TClonesArray* frAdcPeakInt;
- TClonesArray* frAdcPeakAmp;
+ TClonesArray* frAdcPulseInt;
+ TClonesArray* frAdcPulseAmp;
virtual Int_t ReadDatabase( const TDatime& date );
virtual Int_t DefineVariables( EMode mode = kDefine );
diff --git a/src/THcShowerPlane.cxx b/src/THcShowerPlane.cxx
index 425ac3d..060c927 100644
--- a/src/THcShowerPlane.cxx
+++ b/src/THcShowerPlane.cxx
@@ -40,20 +40,22 @@ THcShowerPlane::THcShowerPlane( const char* name,
fNegADCHits = new TClonesArray("THcSignalHit",fNelem);
frPosAdcPedRaw = new TClonesArray("THcSignalHit", 16);
- frPosAdcPeakIntRaw = new TClonesArray("THcSignalHit", 16);
- frPosAdcPeakAmpRaw = new TClonesArray("THcSignalHit", 16);
+ frPosAdcPulseIntRaw = new TClonesArray("THcSignalHit", 16);
+ frPosAdcPulseAmpRaw = new TClonesArray("THcSignalHit", 16);
+ frPosAdcPulseTimeRaw = new TClonesArray("THcSignalHit", 16);
frPosAdcPed = new TClonesArray("THcSignalHit", 16);
- frPosAdcPeakInt = new TClonesArray("THcSignalHit", 16);
- frPosAdcPeakAmp = new TClonesArray("THcSignalHit", 16);
+ frPosAdcPulseInt = new TClonesArray("THcSignalHit", 16);
+ frPosAdcPulseAmp = new TClonesArray("THcSignalHit", 16);
frNegAdcPedRaw = new TClonesArray("THcSignalHit", 16);
- frNegAdcPeakIntRaw = new TClonesArray("THcSignalHit", 16);
- frNegAdcPeakAmpRaw = new TClonesArray("THcSignalHit", 16);
+ frNegAdcPulseIntRaw = new TClonesArray("THcSignalHit", 16);
+ frNegAdcPulseAmpRaw = new TClonesArray("THcSignalHit", 16);
+ frNegAdcPulseTimeRaw = new TClonesArray("THcSignalHit", 16);
frNegAdcPed = new TClonesArray("THcSignalHit", 16);
- frNegAdcPeakInt = new TClonesArray("THcSignalHit", 16);
- frNegAdcPeakAmp = new TClonesArray("THcSignalHit", 16);
+ frNegAdcPulseInt = new TClonesArray("THcSignalHit", 16);
+ frNegAdcPulseAmp = new TClonesArray("THcSignalHit", 16);
//#if ROOT_VERSION_CODE < ROOT_VERSION(5,32,0)
// fPosADCHitsClass = fPosADCHits->GetClass();
@@ -71,20 +73,22 @@ THcShowerPlane::~THcShowerPlane()
delete fNegADCHits;
frPosAdcPedRaw = NULL;
- frPosAdcPeakIntRaw = NULL;
- frPosAdcPeakAmpRaw = NULL;
+ frPosAdcPulseIntRaw = NULL;
+ frPosAdcPulseAmpRaw = NULL;
+ frPosAdcPulseTimeRaw = NULL;
frPosAdcPed = NULL;
- frPosAdcPeakInt = NULL;
- frPosAdcPeakAmp = NULL;
+ frPosAdcPulseInt = NULL;
+ frPosAdcPulseAmp = NULL;
frNegAdcPedRaw = NULL;
- frNegAdcPeakIntRaw = NULL;
- frNegAdcPeakAmpRaw = NULL;
+ frNegAdcPulseIntRaw = NULL;
+ frNegAdcPulseAmpRaw = NULL;
+ frNegAdcPulseTimeRaw = NULL;
frNegAdcPed = NULL;
- frNegAdcPeakInt = NULL;
- frNegAdcPeakAmp = NULL;
+ frNegAdcPulseInt = NULL;
+ frNegAdcPulseAmp = NULL;
delete [] fA_Pos;
delete [] fA_Neg;
@@ -249,24 +253,26 @@ Int_t THcShowerPlane::DefineVariables( EMode mode )
{"eplane_pos", "Energy Deposition per plane from pos. PMTs","fEplane_pos"},
{"eplane_neg", "Energy Deposition per plane from neg. PMTs","fEplane_neg"},
- {"posAdcCounter", "List of positive ADC counter numbers.", "frPosAdcPeakIntRaw.THcSignalHit.GetPaddleNumber()"},
- {"negAdcCounter", "List of negative ADC counter numbers.", "frNegAdcPeakIntRaw.THcSignalHit.GetPaddleNumber()"},
+ {"posAdcCounter", "List of positive ADC counter numbers.", "frPosAdcPulseIntRaw.THcSignalHit.GetPaddleNumber()"},
+ {"negAdcCounter", "List of negative ADC counter numbers.", "frNegAdcPulseIntRaw.THcSignalHit.GetPaddleNumber()"},
- {"posAdcPedRaw", "List of Positive raw ADC pedestals", "frPosAdcPedRaw.THcSignalHit.GetData()"},
- {"posAdcPeakIntRaw", "List of Positive raw ADC peak integrals.", "frPosAdcPeakIntRaw.THcSignalHit.GetData()"},
- {"posAdcPeakAmpRaw", "List of Positive raw ADC peak amplitudes.", "frPosAdcPeakAmpRaw.THcSignalHit.GetData()"},
+ {"posAdcPedRaw", "List of positive raw ADC pedestals", "frPosAdcPedRaw.THcSignalHit.GetData()"},
+ {"posAdcPulseIntRaw", "List of positive raw ADC pulse integrals.", "frPosAdcPulseIntRaw.THcSignalHit.GetData()"},
+ {"posAdcPulseAmpRaw", "List of positive raw ADC pulse amplitudes.", "frPosAdcPulseAmpRaw.THcSignalHit.GetData()"},
+ {"posAdcPulseTimeRaw", "List of positive raw ADC pulse times.", "frPosAdcPulseTimeRaw.THcSignalHit.GetData()"},
- {"posAdcPed", "List of Positive ADC pedestals", "frPosAdcPed.THcSignalHit.GetData()"},
- {"posAdcPeakInt", "List of Positive ADC peak integrals.", "frPosAdcPeakInt.THcSignalHit.GetData()"},
- {"posAdcPeakAmp", "List of Positive ADC peak amplitudes.", "frPosAdcPeakAmp.THcSignalHit.GetData()"},
+ {"posAdcPed", "List of positive ADC pedestals", "frPosAdcPed.THcSignalHit.GetData()"},
+ {"posAdcPulseInt", "List of positive ADC pulse integrals.", "frPosAdcPulseInt.THcSignalHit.GetData()"},
+ {"posAdcPulseAmp", "List of positive ADC pulse amplitudes.", "frPosAdcPulseAmp.THcSignalHit.GetData()"},
- {"negAdcPedRaw", "List of Negative raw ADC pedestals", "frNegAdcPedRaw.THcSignalHit.GetData()"},
- {"negAdcPeakIntRaw", "List of Negative raw ADC peak integrals.", "frNegAdcPeakIntRaw.THcSignalHit.GetData()"},
- {"negAdcPeakAmpRaw", "List of Negative raw ADC peak amplitudes.", "frNegAdcPeakAmpRaw.THcSignalHit.GetData()"},
+ {"negAdcPedRaw", "List of negative raw ADC pedestals", "frNegAdcPedRaw.THcSignalHit.GetData()"},
+ {"negAdcPulseIntRaw", "List of negative raw ADC pulse integrals.", "frNegAdcPulseIntRaw.THcSignalHit.GetData()"},
+ {"negAdcPulseAmpRaw", "List of negative raw ADC pulse amplitudes.", "frNegAdcPulseAmpRaw.THcSignalHit.GetData()"},
+ {"negAdcPulseTimeRaw", "List of negative raw ADC pulse times.", "frNegAdcPulseTimeRaw.THcSignalHit.GetData()"},
- {"negAdcPed", "List of Negative ADC pedestals", "frNegAdcPed.THcSignalHit.GetData()"},
- {"negAdcPeakInt", "List of Negative ADC peak integrals.", "frNegAdcPeakInt.THcSignalHit.GetData()"},
- {"negAdcPeakAmp", "List of Negative ADC peak amplitudes.", "frNegAdcPeakAmp.THcSignalHit.GetData()"},
+ {"negAdcPed", "List of negative ADC pedestals", "frNegAdcPed.THcSignalHit.GetData()"},
+ {"negAdcPulseInt", "List of negative ADC pulse integrals.", "frNegAdcPulseInt.THcSignalHit.GetData()"},
+ {"negAdcPulseAmp", "List of negative ADC pulse amplitudes.", "frNegAdcPulseAmp.THcSignalHit.GetData()"},
{ 0 }
};
@@ -282,20 +288,22 @@ void THcShowerPlane::Clear( Option_t* )
fNegADCHits->Clear();
frPosAdcPedRaw->Clear();
- frPosAdcPeakIntRaw->Clear();
- frPosAdcPeakAmpRaw->Clear();
+ frPosAdcPulseIntRaw->Clear();
+ frPosAdcPulseAmpRaw->Clear();
+ frPosAdcPulseTimeRaw->Clear();
frPosAdcPed->Clear();
- frPosAdcPeakInt->Clear();
- frPosAdcPeakAmp->Clear();
+ frPosAdcPulseInt->Clear();
+ frPosAdcPulseAmp->Clear();
frNegAdcPedRaw->Clear();
- frNegAdcPeakIntRaw->Clear();
- frNegAdcPeakAmpRaw->Clear();
+ frNegAdcPulseIntRaw->Clear();
+ frNegAdcPulseAmpRaw->Clear();
+ frNegAdcPulseTimeRaw->Clear();
frNegAdcPed->Clear();
- frNegAdcPeakInt->Clear();
- frNegAdcPeakAmp->Clear();
+ frNegAdcPulseInt->Clear();
+ frNegAdcPulseAmp->Clear();
// Debug output.
if ( ((THcShower*) GetParent())->fdbg_decoded_cal ) {
@@ -360,20 +368,22 @@ Int_t THcShowerPlane::ProcessHits(TClonesArray* rawhits, Int_t nexthit)
fNegADCHits->Clear();
frPosAdcPedRaw->Clear();
- frPosAdcPeakIntRaw->Clear();
- frPosAdcPeakAmpRaw->Clear();
+ frPosAdcPulseIntRaw->Clear();
+ frPosAdcPulseAmpRaw->Clear();
+ frPosAdcPulseTimeRaw->Clear();
frPosAdcPed->Clear();
- frPosAdcPeakInt->Clear();
- frPosAdcPeakAmp->Clear();
+ frPosAdcPulseInt->Clear();
+ frPosAdcPulseAmp->Clear();
frNegAdcPedRaw->Clear();
- frNegAdcPeakIntRaw->Clear();
- frNegAdcPeakAmpRaw->Clear();
+ frNegAdcPulseIntRaw->Clear();
+ frNegAdcPulseAmpRaw->Clear();
+ frNegAdcPulseTimeRaw->Clear();
frNegAdcPed->Clear();
- frNegAdcPeakInt->Clear();
- frNegAdcPeakAmp->Clear();
+ frNegAdcPulseInt->Clear();
+ frNegAdcPulseAmp->Clear();
for(Int_t i=0;i<fNelem;i++) {
fA_Pos[i] = 0;
@@ -415,11 +425,14 @@ Int_t THcShowerPlane::ProcessHits(TClonesArray* rawhits, Int_t nexthit)
((THcSignalHit*) frPosAdcPedRaw->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPedRaw());
((THcSignalHit*) frPosAdcPed->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPed());
- ((THcSignalHit*) frPosAdcPeakIntRaw->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPeakIntRaw());
- ((THcSignalHit*) frPosAdcPeakInt->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPeakInt());
+ ((THcSignalHit*) frPosAdcPulseIntRaw->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPulseIntRaw());
+ ((THcSignalHit*) frPosAdcPulseInt->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPulseInt());
+
+ ((THcSignalHit*) frPosAdcPulseAmpRaw->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPulseAmpRaw());
+ ((THcSignalHit*) frPosAdcPulseAmp->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPulseAmp());
+
+ ((THcSignalHit*) frPosAdcPulseTimeRaw->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPulseTimeRaw());
- ((THcSignalHit*) frPosAdcPeakAmpRaw->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPeakAmpRaw());
- ((THcSignalHit*) frPosAdcPeakAmp->ConstructedAt(nrPosAdcHits))->Set(padnum, rawPosAdcHit.GetPeakAmp());
++nrPosAdcHits;
}
THcRawAdcHit& rawNegAdcHit = hit->GetRawAdcHitNeg();
@@ -427,11 +440,14 @@ Int_t THcShowerPlane::ProcessHits(TClonesArray* rawhits, Int_t nexthit)
((THcSignalHit*) frNegAdcPedRaw->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPedRaw());
((THcSignalHit*) frNegAdcPed->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPed());
- ((THcSignalHit*) frNegAdcPeakIntRaw->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPeakIntRaw());
- ((THcSignalHit*) frNegAdcPeakInt->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPeakInt());
+ ((THcSignalHit*) frNegAdcPulseIntRaw->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPulseIntRaw());
+ ((THcSignalHit*) frNegAdcPulseInt->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPulseInt());
+
+ ((THcSignalHit*) frNegAdcPulseAmpRaw->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPulseAmpRaw());
+ ((THcSignalHit*) frNegAdcPulseAmp->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPulseAmp());
+
+ ((THcSignalHit*) frNegAdcPulseTimeRaw->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPulseTimeRaw());
- ((THcSignalHit*) frNegAdcPeakAmpRaw->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPeakAmpRaw());
- ((THcSignalHit*) frNegAdcPeakAmp->ConstructedAt(nrNegAdcHits))->Set(padnum, rawNegAdcHit.GetPeakAmp());
++nrNegAdcHits;
}
diff --git a/src/THcShowerPlane.h b/src/THcShowerPlane.h
index 0eb544e..de1ebce 100644
--- a/src/THcShowerPlane.h
+++ b/src/THcShowerPlane.h
@@ -152,20 +152,22 @@ protected:
Float_t *fNegThresh;
TClonesArray* frPosAdcPedRaw;
- TClonesArray* frPosAdcPeakIntRaw;
- TClonesArray* frPosAdcPeakAmpRaw;
+ TClonesArray* frPosAdcPulseIntRaw;
+ TClonesArray* frPosAdcPulseAmpRaw;
+ TClonesArray* frPosAdcPulseTimeRaw;
TClonesArray* frPosAdcPed;
- TClonesArray* frPosAdcPeakInt;
- TClonesArray* frPosAdcPeakAmp;
+ TClonesArray* frPosAdcPulseInt;
+ TClonesArray* frPosAdcPulseAmp;
TClonesArray* frNegAdcPedRaw;
- TClonesArray* frNegAdcPeakIntRaw;
- TClonesArray* frNegAdcPeakAmpRaw;
+ TClonesArray* frNegAdcPulseIntRaw;
+ TClonesArray* frNegAdcPulseAmpRaw;
+ TClonesArray* frNegAdcPulseTimeRaw;
TClonesArray* frNegAdcPed;
- TClonesArray* frNegAdcPeakInt;
- TClonesArray* frNegAdcPeakAmp;
+ TClonesArray* frNegAdcPulseInt;
+ TClonesArray* frNegAdcPulseAmp;
virtual Int_t ReadDatabase( const TDatime& date );
virtual Int_t DefineVariables( EMode mode = kDefine );
diff --git a/src/THcTrigRawHit.cxx b/src/THcTrigRawHit.cxx
index 342ac00..738b310 100644
--- a/src/THcTrigRawHit.cxx
+++ b/src/THcTrigRawHit.cxx
@@ -154,7 +154,7 @@ available, `0` is returned.
*/
/**
-\fn Int_t THcTrigRawHit::GetAdcPeak(UInt_t iHit)
+\fn Int_t THcTrigRawHit::GetAdcPulse(UInt_t iHit)
\brief Gets the position of ADC peak.
@@ -231,7 +231,7 @@ THcTrigRawHit::THcTrigRawHit(
Int_t plane, Int_t counter
) :
THcRawHit(plane, counter),
- fAdc(), fAdcTime(), fAdcPedestal(), fAdcPeak(), fAdcSamples(), fTdc(),
+ fAdc(), fAdcTime(), fAdcPedestal(), fAdcPulse(), fAdcSamples(), fTdc(),
fReferenceTime(), fHasReference(), fHasMulti(), fNRawHits(), fNRawSamples(0)
{}
@@ -245,7 +245,7 @@ THcTrigRawHit& THcTrigRawHit::operator=(const THcTrigRawHit& right) {
fAdc[i] = right.fAdc[i];
fAdcTime[i] = right.fAdcTime[i];
fAdcPedestal[i] = right.fAdcPedestal[i];
- fAdcPeak[i] = right.fAdcPeak[i];
+ fAdcPulse[i] = right.fAdcPulse[i];
}
for (UInt_t i=0; i<fMaxNSamplesAdc; ++i) {
fAdcSamples[i] = right.fAdcSamples[i];
@@ -336,7 +336,7 @@ void THcTrigRawHit::SetDataTimePedestalPeak(
fAdc[fNRawHits[signal]] = data;
fAdcTime[fNRawHits[signal]] = time;
fAdcPedestal[fNRawHits[signal]] = pedestal;
- fAdcPeak[fNRawHits[signal]] = peak;
+ fAdcPulse[fNRawHits[signal]] = peak;
fHasMulti[signal] = kTRUE;
++fNRawHits[signal];
}
@@ -461,13 +461,13 @@ Int_t THcTrigRawHit::GetAdcPedestal(UInt_t iHit) {
}
-Int_t THcTrigRawHit::GetAdcPeak(UInt_t iHit) {
+Int_t THcTrigRawHit::GetAdcPulse(UInt_t iHit) {
Int_t value = 0;
Int_t signal = 0;
if (iHit >= fNRawHits[signal] && iHit != 0) {
TString msg = TString::Format(
- "`THcTrigRawHit::GetAdcPeak`: requested hit %d for signal %d where only %d hit available!",
+ "`THcTrigRawHit::GetAdcPulse`: requested hit %d for signal %d where only %d hit available!",
iHit, signal, fNRawHits[signal]
);
throw std::out_of_range(msg.Data());
@@ -476,7 +476,7 @@ Int_t THcTrigRawHit::GetAdcPeak(UInt_t iHit) {
value = 0;
}
else {
- if (fHasMulti[0]) value = fAdcPeak[iHit];
+ if (fHasMulti[0]) value = fAdcPulse[iHit];
else value = 0;
}
diff --git a/src/THcTrigRawHit.h b/src/THcTrigRawHit.h
index 7774178..a6e0bce 100644
--- a/src/THcTrigRawHit.h
+++ b/src/THcTrigRawHit.h
@@ -26,7 +26,7 @@ class THcTrigRawHit : public THcRawHit {
Int_t GetRawData(Int_t signal, UInt_t iHit);
Int_t GetAdcTime(UInt_t iHit);
Int_t GetAdcPedestal(UInt_t iHit);
- Int_t GetAdcPeak(UInt_t iHit);
+ Int_t GetAdcPulse(UInt_t iHit);
Int_t GetNSignals();
ESignalType GetSignalType(Int_t signal);
Int_t GetReference(Int_t signal);
@@ -45,7 +45,7 @@ class THcTrigRawHit : public THcRawHit {
Int_t fAdc[fMaxNPulsesAdc];
Int_t fAdcTime[fMaxNPulsesAdc];
Int_t fAdcPedestal[fMaxNPulsesAdc];
- Int_t fAdcPeak[fMaxNPulsesAdc];
+ Int_t fAdcPulse[fMaxNPulsesAdc];
Int_t fAdcSamples[fMaxNSamplesAdc];
--
GitLab