Skip to content
Snippets Groups Projects
Commit f1d30001 authored by Mark Jones's avatar Mark Jones Committed by Mark K Jones
Browse files

Modified THcShowerArray

Add the tree variable goodAdcMult which is the number of raw ADC pulses
  in an ADC channel per event for a given shower array block.
parent aa18926f
No related branches found
No related tags found
No related merge requests found
...@@ -356,6 +356,7 @@ Int_t THcShowerArray::ReadDatabase( const TDatime& date ) ...@@ -356,6 +356,7 @@ Int_t THcShowerArray::ReadDatabase( const TDatime& date )
fNumGoodAdcHits = vector<Int_t> (fNelem, 0.0); fNumGoodAdcHits = vector<Int_t> (fNelem, 0.0);
fGoodAdcPulseIntRaw = vector<Double_t> (fNelem, 0.0); fGoodAdcPulseIntRaw = vector<Double_t> (fNelem, 0.0);
fGoodAdcPed = vector<Double_t> (fNelem, 0.0); fGoodAdcPed = vector<Double_t> (fNelem, 0.0);
fGoodAdcMult = vector<Double_t> (fNelem, 0.0);
fGoodAdcPulseInt = vector<Double_t> (fNelem, 0.0); fGoodAdcPulseInt = vector<Double_t> (fNelem, 0.0);
fGoodAdcPulseAmp = vector<Double_t> (fNelem, 0.0); fGoodAdcPulseAmp = vector<Double_t> (fNelem, 0.0);
fGoodAdcPulseTime = vector<Double_t> (fNelem, 0.0); fGoodAdcPulseTime = vector<Double_t> (fNelem, 0.0);
...@@ -442,6 +443,7 @@ Int_t THcShowerArray::DefineVariables( EMode mode ) ...@@ -442,6 +443,7 @@ Int_t THcShowerArray::DefineVariables( EMode mode )
{"goodAdcPulseIntRaw", "Good Raw ADC Pulse Integrals", "fGoodAdcPulseIntRaw"}, //this is defined as pulseIntRaw, NOT ADC Amplitude in FillADC_DynamicPedestal() method {"goodAdcPulseIntRaw", "Good Raw ADC Pulse Integrals", "fGoodAdcPulseIntRaw"}, //this is defined as pulseIntRaw, NOT ADC Amplitude in FillADC_DynamicPedestal() method
{"goodAdcPed", "Good ADC Pedestals", "fGoodAdcPed"}, {"goodAdcPed", "Good ADC Pedestals", "fGoodAdcPed"},
{"goodAdcMult", "Good ADC Multiplicity", "fGoodAdcMult"},
{"goodAdcPulseInt", "Good ADC Pulse Integrals", "fGoodAdcPulseInt"}, //this is defined as pulseInt, which is the pedestal subtracted pulse integrals, and is defined if threshold is passed {"goodAdcPulseInt", "Good ADC Pulse Integrals", "fGoodAdcPulseInt"}, //this is defined as pulseInt, which is the pedestal subtracted pulse integrals, and is defined if threshold is passed
{"goodAdcPulseAmp", "Good ADC Pulse Amplitudes", "fGoodAdcPulseAmp"}, {"goodAdcPulseAmp", "Good ADC Pulse Amplitudes", "fGoodAdcPulseAmp"},
{"goodAdcPulseTime", "Good ADC Pulse Times", "fGoodAdcPulseTime"}, //this is defined as pulseInt, which is the pedestal subtracted pulse integrals, and is defined if threshold is passed {"goodAdcPulseTime", "Good ADC Pulse Times", "fGoodAdcPulseTime"}, //this is defined as pulseInt, which is the pedestal subtracted pulse integrals, and is defined if threshold is passed
...@@ -496,6 +498,7 @@ void THcShowerArray::Clear( Option_t* ) ...@@ -496,6 +498,7 @@ void THcShowerArray::Clear( Option_t* )
for (UInt_t ielem = 0; ielem < fGoodAdcPed.size(); ielem++) { for (UInt_t ielem = 0; ielem < fGoodAdcPed.size(); ielem++) {
fGoodAdcPulseIntRaw.at(ielem) = 0.0; fGoodAdcPulseIntRaw.at(ielem) = 0.0;
fGoodAdcPed.at(ielem) = 0.0; fGoodAdcPed.at(ielem) = 0.0;
fGoodAdcMult.at(ielem) = 0.0;
fGoodAdcPulseInt.at(ielem) = 0.0; fGoodAdcPulseInt.at(ielem) = 0.0;
fGoodAdcPulseAmp.at(ielem) = 0.0; fGoodAdcPulseAmp.at(ielem) = 0.0;
fGoodAdcPulseTime.at(ielem) = kBig; fGoodAdcPulseTime.at(ielem) = kBig;
...@@ -871,6 +874,10 @@ void THcShowerArray::FillADC_DynamicPedestal() ...@@ -871,6 +874,10 @@ void THcShowerArray::FillADC_DynamicPedestal()
Bool_t errorflag = ((THcSignalHit*) frAdcErrorFlag->ConstructedAt(ielem))->GetData(); Bool_t errorflag = ((THcSignalHit*) frAdcErrorFlag->ConstructedAt(ielem))->GetData();
Bool_t pulseTimeCut = (adctdcdiffTime > fAdcTimeWindowMin[npad]) && (adctdcdiffTime < fAdcTimeWindowMax[npad]); Bool_t pulseTimeCut = (adctdcdiffTime > fAdcTimeWindowMin[npad]) && (adctdcdiffTime < fAdcTimeWindowMax[npad]);
if (!errorflag)
{
fGoodAdcMult.at(npad) += 1;
}
if (!errorflag && pulseTimeCut) { if (!errorflag && pulseTimeCut) {
fTotNumAdcHits++; fTotNumAdcHits++;
......
...@@ -111,6 +111,7 @@ protected: ...@@ -111,6 +111,7 @@ protected:
vector<Double_t> fGoodAdcPulseIntRaw; // [fNelem] Good Raw ADC pulse Integrals of blocks vector<Double_t> fGoodAdcPulseIntRaw; // [fNelem] Good Raw ADC pulse Integrals of blocks
vector<Double_t> fGoodAdcPed; // [fNelem] Event by event (FADC) good pulse pedestals vector<Double_t> fGoodAdcPed; // [fNelem] Event by event (FADC) good pulse pedestals
vector<Double_t> fGoodAdcMult;
vector<Double_t> fGoodAdcPulseInt; // [fNelem] good pedestal subtracted pulse integrals vector<Double_t> fGoodAdcPulseInt; // [fNelem] good pedestal subtracted pulse integrals
vector<Double_t> fGoodAdcPulseAmp; vector<Double_t> fGoodAdcPulseAmp;
vector<Double_t> fGoodAdcPulseTime; vector<Double_t> fGoodAdcPulseTime;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment