Skip to content

Use AHDC pulse time and hide MVTFitter #520

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

Merged
merged 3 commits into from
Mar 30, 2025
Merged

Use AHDC pulse time and hide MVTFitter #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb765b7
Use pulse time and hide MVTFitter
ftouchte Mar 30, 2025
4e9b817
Change samplingTime
ftouchte Mar 30, 2025
b1c6ffd
Fix issue
ftouchte Mar 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
2 changes: 1 addition & 1 deletion common-tools/clas-detector/src/main/java/org/jlab/detector/decode/DetectorEventDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ public void fitPulses(List<DetectorDataDgtz> detectorData){
//custom MM fitter
if( ( (table.equals("BMT"))&&(data.getDescriptor().getType().getName().equals("BMT")) )
|| ( (table.equals("FMT"))&&(data.getDescriptor().getType().getName().equals("FMT")) )
|| ( (table.equals("AHDC"))&&(data.getDescriptor().getType().getName().equals("AHDC")) )
//|| ( (table.equals("AHDC"))&&(data.getDescriptor().getType().getName().equals("AHDC")) )
|| ( (table.equals("FTTRK"))&&(data.getDescriptor().getType().getName().equals("FTTRK")) ) ){
IndexedTable daq = fitterManager.getConstants(runNumber, table);
short adcOffset = (short) daq.getDoubleValue("adc_offset", 0, 0, 0);
Expand Down
55 changes: 12 additions & 43 deletions common-tools/clas-detector/src/main/java/org/jlab/detector/pulse/ModeAHDC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
/**
* A new extraction method dedicated to the AHDC signal waveform
*
* Some blocks of code are inspired by MVTFitter.java
* Some blocks of code are inspired by MVTFitter.java and Bonus12 (`createBonusBank()`)
*
* @author ftouchte
*/
Expand All @@ -25,15 +25,15 @@ public class ModeAHDC extends HipoExtractor {
*
* @param pars CCDB row
* @param id link to row in source bank
* @param timestamp ...
* @param time time (exprimed in bin) of the first channel of the AHDC pulse (after or not zero suppress; if ZS=0, time == 0)
* @param samples ADC samples
*/
@Override
public List<Pulse> extract(NamedEntry pars, int id, long par1, long par2, short... samples){
public List<Pulse> extract(NamedEntry pars, int id, long timestamp, long time, short... samples){
// Settings parameters (they can be initialised by a CCDB)
float samplingTime = 44;
int sparseSample = 0;
short adcOffset = 0;
long timeStamp = 0;
float samplingTime = 50.0f;
short adcOffset = 0; ///< pedestal of the pulse
float fineTimeStampResolution = 0;

float amplitudeFractionCFA = 0.5f;
Expand All @@ -42,11 +42,9 @@ public List<Pulse> extract(NamedEntry pars, int id, long par1, long par2, short.

// Calculation intermediaries
int binMax = 0; //Bin of the max ADC over the pulse
int binOffset = 0; //Offset due to sparse sample
float adcMax = 0; //Max value of ADC over the pulse (fitted)
float timeMax =0; //Time of the max ADC over the pulse (fitted)
float integral = 0; //Sum of ADCs over the pulse (not fitted)
long timestamp = 0;

short[] samplesCorr; //Waveform after offset (pedestal) correction
int binNumber = 0; //Number of bins in one waveform
Expand All @@ -58,17 +56,16 @@ public List<Pulse> extract(NamedEntry pars, int id, long par1, long par2, short.
/// /////////////////////////
// Begin waveform correction
/// ////////////////////////
//waveformCorrection(samples,adcOffset,samplingTime,sparseSample, binMax, adcMax, integral, samplesCorr[], binOffset, timeMax);
//waveformCorrection(samples,adcOffset,samplingTime, binMax, adcMax, integral, samplesCorr[], time, timeMax);
/**
* This method subtracts the pedestal (noise) from samples and stores it in : samplesCorr
* It also computes a first value for : adcMax, binMax, timeMax and integral
* This code is inspired by the one of MVTFitter.java
* @param samples ADC samples
* @param adcOffset pedestal or noise level
* @param samplingTime time between two adc bins
* @param sparseSample used to define binOffset
*/
//private void waveformCorrection(short[] samples, short adcOffset, float samplingTime, int sparseSample, int binMax, int adcMax, int integral, short samplesCorr[], int binOffset, int timeMax){
//private void waveformCorrection(short[] samples, short adcOffset, float samplingTime, int binMax, int adcMax, int integral, short samplesCorr[], int time, int timeMax){
binNumber = samples.length;
binMax = 0;
if (binNumber >= 5) {
Expand Down Expand Up @@ -102,8 +99,7 @@ public List<Pulse> extract(NamedEntry pars, int id, long par1, long par2, short.
}
binMax = (binMax + binMax2)/2;
}
binOffset = sparseSample*binMax;
timeMax = (binMax + binOffset)*samplingTime;
timeMax = (binMax + time)*samplingTime;
//}

/// /////////////////////////
Expand Down Expand Up @@ -151,7 +147,7 @@ public List<Pulse> extract(NamedEntry pars, int id, long par1, long par2, short.
if (binRise + 1 <= binNumber-1)
slopeRise = samplesCorr[binRise+1] - samplesCorr[binRise];
float fittedBinRise = (slopeRise == 0) ? binRise : binRise + (threshold - samplesCorr[binRise])/slopeRise;
leadingEdgeTime = (fittedBinRise + binOffset)*samplingTime; // binOffset is determined in wavefromCorrection() // must be the same for all time ? // or must be defined using fittedBinRise*sparseSample
leadingEdgeTime = (fittedBinRise + time)*samplingTime;

// trailingEdgeTime
int binFall = binMax;
Expand All @@ -168,7 +164,7 @@ public List<Pulse> extract(NamedEntry pars, int id, long par1, long par2, short.
if (binFall - 1 >= 0)
slopeFall = samplesCorr[binFall] - samplesCorr[binFall-1];
float fittedBinFall = (slopeFall == 0) ? binFall : binFall-1 + (threshold - samplesCorr[binFall-1])/slopeFall;
trailingEdgeTime = (fittedBinFall + binOffset)*samplingTime;
trailingEdgeTime = (fittedBinFall + time)*samplingTime;

// timeOverThreshold
timeOverThreshold = trailingEdgeTime - leadingEdgeTime;
Expand Down Expand Up @@ -213,29 +209,10 @@ public List<Pulse> extract(NamedEntry pars, int id, long par1, long par2, short.
if (binZero + 1 <= binNumber)
slopeCFD = signal[binZero+1] - signal[binZero];
float fittedBinZero = (slopeCFD == 0) ? binZero : binZero + (0 - signal[binZero])/slopeCFD;
constantFractionTime = (fittedBinZero + binOffset)*samplingTime;
constantFractionTime = (fittedBinZero + time)*samplingTime;

//}

/// /////////////////////////
// Begin fineTimeStampCorrection
/// ////////////////////////
//fineTimeStampCorrection(timeStamp,fineTimeStampResolution);
/**
* From MVTFitter.java
* Make fine timestamp correction (using dream (=electronic chip) clock)
* @param timeStamp timing informations (used to make fine corrections)
* @param fineTimeStampResolution precision of dream clock (usually 8)
*/
//private void fineTimeStampCorrection (long timeStamp, float fineTimeStampResolution) {
//this.timestamp = timeStamp;
String binaryTimeStamp = Long.toBinaryString(timeStamp); //get 64 bit timestamp in binary format
if (binaryTimeStamp.length()>=3){
byte fineTimeStamp = Byte.parseByte(binaryTimeStamp.substring(binaryTimeStamp.length()-3,binaryTimeStamp.length()),2); //fineTimeStamp : keep and convert last 3 bits of binary timestamp
timeMax += (float) ((fineTimeStamp+0.5) * fineTimeStampResolution); //fineTimeStampCorrection
// Question : I wonder if I have to do the same thing of all time quantities that the extract() methods compute.
}
//}
// output
Pulse pulse = new Pulse();
pulse.id = id;
Expand All @@ -248,19 +225,11 @@ public List<Pulse> extract(NamedEntry pars, int id, long par1, long par2, short.
pulse.timeOverThreshold = timeOverThreshold;
pulse.constantFractionTime = constantFractionTime;
//pulse.binMax = binMax;
//pulse.binOffset = binOffset;
pulse.pedestal = adcOffset;
List<Pulse> output = new ArrayList<>();
output.add(pulse);
return output;
}
/**
* Fit the max of the pulse using parabolic fit, this method updates the timeMax and adcMax values
* @param samplingTime time between 2 ADC bins
*/
private void fitParabolic(float samplingTime) {

}

@Override
public void update(int n, IndexedTable it, DataEvent event, String wfBankName, String adcBankName) {
Expand Down