Skip to content

Crv Calibration Updates #1679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ehrlich-uva wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Crv Calibration Updates #1679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
635edca
small changes for Crv calibration and DQM
ehrlich-uva Dec 30, 2025
564af28
more Crv calibration updates
ehrlich-uva Dec 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 40 additions & 31 deletions CRVReco/src/CrvCalibration_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,13 @@ namespace mu2e
fhicl::Atom<double> histMaxPulseHeight{Name("histMaxPulseHeight"), Comment("end range of pulseArea histogram"), 150.0};
fhicl::Atom<double> fitRangeStart{Name("fitRangeStart"), Comment("low end of the 1PE fit range as fraction of peak"), 0.8};
fhicl::Atom<double> fitRangeEnd{Name("fitRangeEnd"), Comment("high end of the 1PE fit range as fraction of peak"), 1.2};
fhicl::Atom<double> minPeakPulseArea{Name("minPeakPulseArea"), Comment("minimum accepted SPE peak for pulseArea histogram"), 250.0};
fhicl::Atom<double> minPeakPulseHeight{Name("minPeakPulseHeight"), Comment("minimum accepted SPE peak for pulseHeight histogram"), 10.0};
fhicl::Atom<int> minHistEntries{Name("minHistEntries"), Comment("minimum number of entries required for a fit"), 100};
fhicl::Atom<int> spectrumNPeaks{Name("spectrumNPeaks"), Comment("maximum number of peaks searched by TSpectrum. numbers less then 4 result in warnings"), 6};
fhicl::Atom<int> spectrumNPeaks{Name("spectrumNPeaks"), Comment("maximum number of peaks searched by TSpectrum. numbers less then 4 result in warnings"), 100};
fhicl::Atom<double> spectrumPeakSigma{Name("spectrumPeakSigma"), Comment("TSpectrum search parameter sigma"), 4.0};
fhicl::Atom<double> spectrumPeakThreshold{Name("spectrumPeakThreshold"), Comment("TSpectrum search parameter threshold"), 0.01};
fhicl::Atom<double> peakRatioTolerance{Name("peakRatioTolerance"), Comment("allowed deviation of the ratio between 1PE peak and 2PE peak from 2.0"), 0.1};
fhicl::Atom<double> peakRatioTolerance{Name("peakRatioTolerance"), Comment("allowed deviation of the ratio between 1PE peak and 2PE peak from 2.0"), 0.2};
fhicl::Atom<std::string> tmpDBfileName{Name("tmpDBfileName"), Comment("name of the tmp. DB file name for the pedestals")};
};

Expand All @@ -60,14 +62,16 @@ namespace mu2e
void analyze(const art::Event& e);
void beginRun(const art::Run&);
void endJob();
bool FindSPEpeak(TH1F *hist, TSpectrum &spectrum, double &SPEpeak);
template<size_t N>
bool FindSPEpeak(TH1F *hist, TSpectrum &spectrum, std::array<TF1,N> &functions, double &SPEpeak, double minPeak);

private:
std::string _crvRecoPulsesModuleLabel;
int _histBinsPulseArea, _histBinsPulseHeight;
double _histMaxPulseArea, _histMaxPulseHeight;
double _fitRangeStart, _fitRangeEnd;
int _minHistEntries;
double _minPeakPulseArea, _minPeakPulseHeight;
int _spectrumNPeaks;
double _spectrumPeakSigma;
double _spectrumPeakThreshold;
Expand Down Expand Up @@ -96,6 +100,8 @@ namespace mu2e
_fitRangeStart(conf().fitRangeStart()),
_fitRangeEnd(conf().fitRangeEnd()),
_minHistEntries(conf().minHistEntries()),
_minPeakPulseArea(conf().minPeakPulseArea()),
_minPeakPulseHeight(conf().minPeakPulseHeight()),
_spectrumNPeaks(conf().spectrumNPeaks()),
_spectrumPeakSigma(conf().spectrumPeakSigma()),
_spectrumPeakThreshold(conf().spectrumPeakThreshold()),
Expand Down Expand Up @@ -143,7 +149,7 @@ namespace mu2e
treePedestal->Branch("channel", &channel);
treePedestal->Branch("pedestal", &pedestal);

TF1 funcCalib("SPEpeak", "gaus");
std::array functions={TF1("calibPeak1","gaus"), TF1("calibPeak2","gaus"), TF1("calibPeak3","gaus")}; //only need to fit three peaks
TSpectrum spectrum(_spectrumNPeaks); //any value of 3 or less results in a "Peak buffer full" warning.

std::ofstream outputFile;
Expand All @@ -160,22 +166,13 @@ namespace mu2e
if(i==1) hist=_calibHistsPulseArea.at(channel);
else hist=_calibHistsPulseHeight.at(channel);

double peakCalib=0;
if(!FindSPEpeak(hist, spectrum, peakCalib))
double SPEpeak=-1;
if(!FindSPEpeak(hist, spectrum, functions, SPEpeak, (i==0?_minPeakPulseHeight:_minPeakPulseArea)))
{
calibValue[i]=-1;
continue;
}

funcCalib.SetRange(peakCalib*_fitRangeStart,peakCalib*_fitRangeEnd);
if(hist->FindBin(peakCalib*_fitRangeStart)==hist->FindBin(peakCalib*_fitRangeEnd)) //fit range start/end are in the same bin
{
calibValue[i]=-1;
continue;
}
funcCalib.SetParameter(1,peakCalib);
hist->Fit(&funcCalib, "0QR");
calibValue[i]=funcCalib.GetParameter(1);
calibValue[i]=SPEpeak;
}

pedestal=_pedestals.at(channel);
Expand Down Expand Up @@ -241,29 +238,41 @@ namespace mu2e
}
}

bool CrvCalibration::FindSPEpeak(TH1F *hist, TSpectrum &spectrum, double &SPEpeak)
template<size_t N>
bool CrvCalibration::FindSPEpeak(TH1F *hist, TSpectrum &spectrum, std::array<TF1,N> &functions, double &SPEpeak, double minPeak)
{
if(hist->GetEntries()<_minHistEntries) return false; //not enough data

int nPeaks = spectrum.Search(hist,_spectrumPeakSigma,"nodraw",_spectrumPeakThreshold);
size_t nPeaks = spectrum.Search(hist,_spectrumPeakSigma,"nodraw",_spectrumPeakThreshold);
if(nPeaks==0) return false;

//peaks are not returned sorted
//peaks are returned sorted by Y
double *peaksX = spectrum.GetPositionX();
double *peaksY = spectrum.GetPositionY();
std::vector<std::pair<double,double> > peaks;
for(int iPeak=0; iPeak<nPeaks; ++iPeak) peaks.emplace_back(peaksX[iPeak],peaksY[iPeak]);
std::sort(peaks.begin(),peaks.end(), [](const std::pair<double,double> &a, const std::pair<double,double> &b) {return a.first<b.first;});

int peakToUse=0;
if(nPeaks>1 && peaks[0].first>0) //if more than one peak is found, the first peak could be due to baseline fluctuations
//never seen peaks at 0, but still checking to avoid division by 0.
std::vector<double> fittedPeaks;
for(size_t iPeak=0; iPeak<nPeaks && iPeak<functions.size(); ++iPeak)
{
if(fabs(peaks[1].first/peaks[0].first-2.0)>_peakRatioTolerance) peakToUse=1; //2nd peak is not twice the 1st peak, so the 1st peak is not the SPE peak
//assume that the 2nd peak is the SPE peak
//we have never seen that the 3rd peak was the SPE peak - no need to test it
double x=peaksX[iPeak];
if(hist->FindBin(x*_fitRangeStart)==hist->FindBin(x*_fitRangeEnd)) continue; //fit range start/end are in the same bin
functions[iPeak].SetRange(x*_fitRangeStart,x*_fitRangeEnd);
functions[iPeak].SetParameter(1,x);
hist->Fit(&functions[iPeak], "QR+");
fittedPeaks.emplace_back(functions[iPeak].GetParameter(1));
}
SPEpeak = peaks[peakToUse].first;
if(fittedPeaks.size()==0) return false;

int peakToUse=-1;
//only need to test two highest peaks (=first two entries in vector)
//one of the peaks could be due to baseline fluctuations
for(size_t iPeak=0; iPeak<fittedPeaks.size() && iPeak<2; ++iPeak)
for(size_t jPeak=iPeak+1; jPeak<fittedPeaks.size(); ++jPeak)
{
if(fabs(fittedPeaks.at(jPeak)/fittedPeaks.at(iPeak)-2.0)<_peakRatioTolerance) peakToUse=iPeak;
}
if(peakToUse==-1) return false;
if(fittedPeaks.at(peakToUse)<minPeak) return false;

SPEpeak = fittedPeaks.at(peakToUse);

return true;
}

Expand Down
8 changes: 4 additions & 4 deletions CRVReco/src/CrvDQMcollector_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,10 +411,10 @@ namespace mu2e
Form("crvDigiRatesNZS_ROC%zu",ROC),
CRVId::nFEBPerROC*CRVId::nChanPerFEB,0,CRVId::nFEBPerROC*CRVId::nChanPerFEB));
}
_hist2DPEsMPVROC=tfs->make<TH2F>("crvPEsMPV","crvPEsMPV", CRVId::nChanPerFEB,0,CRVId::nChanPerFEB, CRVId::nROC*CRVId::nFEBPerROC,0,CRVId::nROC*CRVId::nFEBPerROC);
_hist2DDigiRatesROC=tfs->make<TH2F>("crvDigiRates","crvDigiRates", CRVId::nChanPerFEB,0,CRVId::nChanPerFEB, CRVId::nROC*CRVId::nFEBPerROC,0,CRVId::nROC*CRVId::nFEBPerROC);
_hist2DDigiRatesROCNZS=tfs->make<TH2F>("crvDigiRatesNZS","crvDigiRatesNZS", CRVId::nChanPerFEB,0,CRVId::nChanPerFEB, CRVId::nROC*CRVId::nFEBPerROC,0,CRVId::nROC*CRVId::nFEBPerROC);
_histCoincidenceClusters=tfs->make<TH1I>("crvCoincidencesClusters","crvCoincidenceClusters",10,0,10);
_hist2DPEsMPVROC=tfs->make<TH2F>("crvPEsMPV","crvPEsMPV:FEBchannel:FEB", CRVId::nChanPerFEB,0,CRVId::nChanPerFEB, CRVId::nROC*CRVId::nFEBPerROC,0,CRVId::nROC*CRVId::nFEBPerROC);
_hist2DDigiRatesROC=tfs->make<TH2F>("crvDigiRates","crvDigiRates:FEBchannel:FEB", CRVId::nChanPerFEB,0,CRVId::nChanPerFEB, CRVId::nROC*CRVId::nFEBPerROC,0,CRVId::nROC*CRVId::nFEBPerROC);
_hist2DDigiRatesROCNZS=tfs->make<TH2F>("crvDigiRatesNZS","crvDigiRatesNZS:FEBchannel:FEB", CRVId::nChanPerFEB,0,CRVId::nChanPerFEB, CRVId::nROC*CRVId::nFEBPerROC,0,CRVId::nROC*CRVId::nFEBPerROC);
_histCoincidenceClusters=tfs->make<TH1I>("crvCoincidencesClusters","crvCoincidenceClusters:sectorType",10,0,10);

_treeMetaData=tfs->make<TTree>("crvMetaData","crvMetaData");
_treeMetaData->Branch("runNumberStart",&_firstRunSubrun.first);
Expand Down
7 changes: 2 additions & 5 deletions CRVReco/src/CrvTimingStudies_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,8 @@ namespace mu2e
uint16_t ROC = onlineChannel.ROC();
uint16_t feb = onlineChannel.FEB();
uint16_t febChannel = onlineChannel.FEBchannel();
ROC--;
feb--;
uint16_t fpgaIndex = (ROC*CRVId::nFEBPerROC*CRVId::nChanPerFEB+feb*CRVId::nChanPerFEB+febChannel)/(CRVId::nChanPerFEB/CRVId::nFPGAPerFEB);
//uint16_t fpgaIndex = (ROC*CRVId::nFEBPerROC*CRVId::nChanPerFEB+feb*CRVId::nChanPerFEB+febChannel)/(8);
//uint16_t fpgaIndex = (ROC*CRVId::nFEBPerROC*CRVId::nChanPerFEB+feb*CRVId::nChanPerFEB+febChannel);

uint16_t fpgaIndex = ((ROC-1)*CRVId::nFEBPerROC*CRVId::nChanPerFEB+(feb-1)*CRVId::nChanPerFEB+febChannel)/(CRVId::nChanPerFEB/CRVId::nFPGAPerFEB);

fpgaTimes[fpgaIndex].push_back(recoPulseTime);
}
Expand Down
4 changes: 3 additions & 1 deletion CRVReco/src/MakeCrvRecoPulses.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ MakeCrvRecoPulses::MakeCrvRecoPulses(float minADCdifference, float defaultBeta,
_pulseThreshold(pulseThreshold),
_pulseAreaThreshold(pulseAreaThreshold),
_doublePulseSeparation(doublePulseSeparation)
{}
{
if(_pulseAreaThreshold>_minADCdifference) _pulseAreaThreshold=_minADCdifference;
}

void MakeCrvRecoPulses::FillGraphAndFindPeaks(const std::vector<int16_t> &waveform, uint16_t startTDC,
float digitizationPeriod, float pedestal,
Expand Down