Skip to content

Iss 1183 v2 #1199

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

Closed
baltzell wants to merge 4 commits into from
Closed

Iss 1183 v2 #1199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e82e721
fix: update requireConstants to handle varying column counts in calib…
mathieuouillon Apr 7, 2026
b4de3eb
fix: remove CalibrationConstantsLoader and fix calibration reload bugs
mathieuouillon Apr 9, 2026
9edb7d4
fix: streamline mode configuration handling and remove redundant code
mathieuouillon Apr 9, 2026
fabcaf3
fix: guard against empty hit list in ALERTEngine Kalman filter loop
mathieuouillon Apr 9, 2026
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
46 changes: 22 additions & 24 deletions reconstruction/alert/src/main/java/org/jlab/rec/ahdc/Hit/HitReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,36 @@
package org.jlab.rec.ahdc.Hit;

import java.util.ArrayList;
import java.util.Map;

import org.jlab.io.base.DataBank;
import org.jlab.io.base.DataEvent;
import org.jlab.detector.banks.RawDataBank;
import org.jlab.geom.detector.alert.AHDC.AlertDCDetector;
import org.jlab.rec.alert.constants.CalibrationConstantsLoader;

public class HitReader {

private ArrayList<Hit> _AHDCHits;
private ArrayList<TrueHit> _TrueAHDCHits;
private boolean sim = false;

public HitReader(DataEvent event, AlertDCDetector detector, boolean simulation) {
public HitReader(DataEvent event, AlertDCDetector detector, boolean simulation,
Map<Integer, double[]> rawHitCuts,
Map<Integer, double[]> timeOffsets,
Map<Integer, double[]> timeToDistance,
Map<Integer, double[]> timeOverThreshold,
Map<Integer, double[]> adcGains) {
sim = simulation;
fetch_AHDCHits(event, detector);
fetch_AHDCHits(event, detector, rawHitCuts, timeOffsets, timeToDistance, timeOverThreshold, adcGains);
if (simulation) fetch_TrueAHDCHits(event);
}

public final void fetch_AHDCHits(DataEvent event, AlertDCDetector detector) {
public final void fetch_AHDCHits(DataEvent event, AlertDCDetector detector,
Map<Integer, double[]> rawHitCutsMap,
Map<Integer, double[]> timeOffsetsMap,
Map<Integer, double[]> timeToDistanceMap,
Map<Integer, double[]> timeOverThresholdMap,
Map<Integer, double[]> adcGainsMap) {

ArrayList<Hit> hits = new ArrayList<>();

Expand Down Expand Up @@ -60,12 +70,9 @@ public final void fetch_AHDCHits(DataEvent event, AlertDCDetector detector) {
// -----------------------------
// Raw hit cuts
// -----------------------------
// double[] rawHitCuts = CalibrationConstantsLoader.AHDC_RAW_HIT_CUTS.get(key_value);
//if (rawHitCuts == null) continue;


double[] rawHitCuts = CalibrationConstantsLoader.AHDC_RAW_HIT_CUTS.get(key_value);
if (rawHitCuts == null) {throw new IllegalStateException("Missing CCDB table /calibration/alert/ahdc/raw_hit_cuts for key=" + key_value+ " (check run/variation + key mapping)");
double[] rawHitCuts = rawHitCutsMap.get(key_value);
if (rawHitCuts == null) {
throw new IllegalStateException("Missing CCDB table /calibration/alert/ahdc/raw_hit_cuts for key=" + key_value + " (check run/variation + key mapping)");
}

double t_min = rawHitCuts[0];
Expand All @@ -80,24 +87,15 @@ public final void fetch_AHDCHits(DataEvent event, AlertDCDetector detector) {
// -----------------------------
// Time calibration + t->d
// -----------------------------
//double[] timeOffsets = CalibrationConstantsLoader.AHDC_TIME_OFFSETS.get(key_value);
//if (timeOffsets == null) continue;

// double[] timeOffsets = CalibrationConstantsLoader.AHDC_TIME_OFFSETS.get(key_value);
//if (timeOffsets == null) {
//throw new IllegalStateException("Missing AHDC time_offsets for key=" + key_value);
//}

double[] timeOffsets = CalibrationConstantsLoader.AHDC_TIME_OFFSETS.get(key_value);

double[] timeOffsets = timeOffsetsMap.get(key_value);
if (timeOffsets == null) {
throw new IllegalStateException("Missing CCDB /calibration/alert/ahdc/time_offsets for key=" + key_value + " (check run/variation + key mapping)");
throw new IllegalStateException("Missing CCDB /calibration/alert/ahdc/time_offsets for key=" + key_value + " (check run/variation + key mapping)");
}




double[] time2distance = CalibrationConstantsLoader.AHDC_TIME_TO_DISTANCE.get(10101);
double[] time2distance = timeToDistanceMap.get(10101);
if (time2distance == null) continue;

double t0 = timeOffsets[0];
Expand All @@ -117,7 +115,7 @@ public final void fetch_AHDCHits(DataEvent event, AlertDCDetector detector) {
// -----------------------------
double totUsed = timeOverThreshold;
if (!sim) {
double[] totArr = CalibrationConstantsLoader.AHDC_TIME_OVER_THRESHOLD.get(key_value);
double[] totArr = timeOverThresholdMap.get(key_value);
if (totArr != null && totArr.length > 0) {
double totCorr = totArr[0];
totUsed = timeOverThreshold * totCorr;
Expand Down Expand Up @@ -157,7 +155,7 @@ public final void fetch_AHDCHits(DataEvent event, AlertDCDetector detector) {
// -----------------------------
double adcCal = adcRaw;
if (!sim) {
double[] gainArr = CalibrationConstantsLoader.AHDC_ADC_GAINS.get(key_value);
double[] gainArr = adcGainsMap.get(key_value);
if (gainArr != null && gainArr.length > 0) {
double gainCorr = gainArr[0];
adcCal = adcRaw * gainCorr;
Expand Down
Loading
Loading