diff --git a/src/THcScintillatorPlane.cxx b/src/THcScintillatorPlane.cxx index 29b31b0efc48d796b5e98575b98e294572d7cf8d..94682cd71b5ca4cdf02177e34cd9117133280e52 100644 --- a/src/THcScintillatorPlane.cxx +++ b/src/THcScintillatorPlane.cxx @@ -353,21 +353,37 @@ Int_t THcScintillatorPlane::DefineVariables( EMode mode ) {"fptime", "Time at focal plane", "GetFpTime()"}, - {"nhits", "Number of paddle hits (passed TDC Min and Max cuts for either end)", "GetNScinHits() "}, - {"GoodPaddle", "List of Paddle Numbers (passed TDC Min and Max cuts for either end)", "fHodoHits.THcHodoHit.GetPaddleNumber()"}, - {"GoodNegTdcChan", "List of negative TDC values (passed TDC Min and Max cuts for either end)", "fHodoHits.THcHodoHit.GetNegTDC()"}, - {"GoodNegTdcTimeCorr", "List of negative corrected TDC values (corrected for PMT offset and ADC)", "fHodoHits.THcHodoHit.GetNegCorrectedTime()"}, - {"GoodNegTdcTimeTOFCorr", "List of negative corrected TDC values (corrected for TOF)", "fHodoHits.THcHodoHit.GetNegTOFCorrectedTime()"}, - {"GoodNegAdcPulseInt", "List of negative ADC values (passed TDC Min and Max cuts for either end)", "fHodoHits.THcHodoHit.GetNegADC()"}, - {"GoodPosTdcChan", "List of positive TDC values (passed TDC Min and Max cuts for either end)", "fHodoHits.THcHodoHit.GetPosTDC()"}, - {"GoodPosTdcTimeCorr", "List of positive corrected TDC values (corrected for PMT offset and ADC)", "fHodoHits.THcHodoHit.GetPosCorrectedTime()"}, - {"GoodPosTdcTimeTOFCorr", "List of positive corrected TDC values (corrected for TOF)", "fHodoHits.THcHodoHit.GetPosTOFCorrectedTime()"}, - {"GoodPosAdcPulseInt", "List of positive ADC values (passed TDC Min and Max cuts for either end)", "fHodoHits.THcHodoHit.GetPosADC()"}, - {"GoodPosAdcPulseAmp", "List of positive ADC peak amp (passed TDC Min and Max cuts for either end)", "fHodoHits.THcHodoHit.GetPosADCpeak()"}, - {"GoodNegAdcPulseAmp", "List of Negative ADC peak amp (passed TDC Min and Max cuts for either end)", "fHodoHits.THcHodoHit.GetNegADCpeak()"}, - {"GoodPosAdcPulseTime", "List of positive ADC peak amp (passed TDC Min and Max cuts for either end)", "fHodoHits.THcHodoHit.GetPosADCtime()"}, - {"GoodNegAdcPulseTime", "List of Negative ADC peak amp (passed TDC Min and Max cuts for either end)", "fHodoHits.THcHodoHit.GetNegADCtime()"}, - {"ngoodhits", "Number of paddle hits (passed tof tolerance and used to determine the focal plane time )", "GetNGoodHits() "}, + // {"nhits", "Number of paddle hits (passed TDC && ADC Min and Max cuts for either end)", "GetNScinHits() "}, + + {"totNumPosAdcHits", "Total Number of Positive ADC Hits", "fTotNumPosAdcHits"}, // Hodo+ raw ADC multiplicity + {"totNumNegAdcHits", "Total Number of Negative ADC Hits", "fTotNumNegAdcHits"}, // Hodo- raw ADC multiplicity + {"totnumAdcHits", "Total Number of ADC Hits Per PMT", "fTotNumAdcHits"}, // Hodo raw ADC multiplicity + + {"numGoodPosAdcHits", "Number of Good Positive ADC Hits Per PMT", "fNumGoodPosAdcHits"}, // Hodo+ good ADC occupancy + {"numGoodNegAdcHits", "Number of Good Negative ADC Hits Per PMT", "fNumGoodNegAdcHits"}, // Hodo- good ADC occupancy + {"totNumGoodPosAdcHits", "Total Number of Good Positive ADC Hits", "fTotNumGoodPosAdcHits"}, // Hodo+ good ADC multiplicity + {"totNumGoodNegAdcHits", "Total Number of Good Negative ADC Hits", "fTotNumGoodNegAdcHits"}, // Hodo- good ADC multiplicity + {"totNumGoodAdcHits", "TotalNumber of Good ADC Hits Per PMT", "fTotNumGoodAdcHits"}, // Hodo good ADC multiplicity + + + // {"GoodPaddle", "List of Paddle Numbers (passed TDC && ADC Min and Max cuts for either end)", "fHodoHits.THcHodoHit.GetPaddleNumber()"}, + + {"GoodPosAdcPed", "List of Positive ADC pedestals (passed TDC && ADC Min and Max cuts for either end)", "fGoodPosAdcPed"}, + {"GoodNegAdcPed", "List of Negative ADC pedestals (passed TDC && ADC Min and Max cuts for either end)", "fGoodNegAdcPed"}, + + {"GoodNegTdcChan", "List of negative TDC values (passed TDC && ADC Min and Max cuts for either end)", "fGoodNegTdcChan"}, + {"GoodNegTdcTimeCorr", "List of negative corrected TDC values (corrected for PMT offset and ADC)", "fGoodNegTdcTimeCorr"}, + {"GoodNegTdcTimeTOFCorr", "List of negative corrected TDC values (corrected for TOF)", "fGoodNegTdcTimeTOFCorr"}, + {"GoodNegAdcPulseInt", "List of negative ADC values (passed TDC && ADC Min and Max cuts for either end)", "fGoodNegAdcPulseInt"}, + {"GoodPosTdcChan", "List of positive TDC values (passed TDC && ADC Min and Max cuts for either end)", "fGoodPosTdcChan"}, + {"GoodPosTdcTimeCorr", "List of positive corrected TDC values (corrected for PMT offset and ADC)", "fGoodPosTdcTimeCorr"}, + {"GoodPosTdcTimeTOFCorr", "List of positive corrected TDC values (corrected for TOF)", "fGoodPosTdcTimeTOFCorr"}, + {"GoodPosAdcPulseInt", "List of positive ADC values (passed TDC && ADC Min and Max cuts for either end)", "fGoodPosAdcPulseInt"}, + {"GoodPosAdcPulseAmp", "List of positive ADC peak amp (passed TDC && ADC Min and Max cuts for either end)", "fGoodPosAdcPulseAmp"}, + {"GoodNegAdcPulseAmp", "List of Negative ADC peak amp (passed TDC && ADC Min and Max cuts for either end)", "fGoodNegAdcPulseAmp"}, + {"GoodPosAdcPulseTime", "List of positive ADC time (passed TDC && ADC Min and Max cuts for either end)", "fGoodPosAdcPulseTime"}, + {"GoodNegAdcPulseTime", "List of Negative ADC time (passed TDC && ADC Min and Max cuts for either end)", "fGoodNegAdcPulseTime"}, + //{"ngoodhits", "Number of paddle hits (passed tof tolerance and used to determine the focal plane time )", "GetNGoodHits() "}, { 0 } }; @@ -691,7 +707,7 @@ Int_t THcScintillatorPlane::ProcessHits(TClonesArray* rawhits, Int_t nexthit) - // Proceed if there is a valid TDC on either end of the bar + // Proceed if there is a valid TDC and ADC on either end of the bar // cout << ihit << " " << hit->fCounter << " " << fNScinHits<< " " << tdc_neg << " " << btdcraw_neg << " " << tdc_pos << " " << btdcraw_pos << " " <<endl; if((btdcraw_pos && badcraw_pos) || (btdcraw_neg && badcraw_neg )) {