Skip to content

fix: track id bank variable name wrong #1044

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 1 commit into from
Closed

fix: track id bank variable name wrong #1044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 reconstruction/alert/src/main/java/org/jlab/rec/alert/banks/RecoBankWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public int appendTrackMatchingAIBank(DataEvent event, ArrayList<Pair<Integer, In
}
for (int i = 0; i < trackAIResults.size(); i++) {
Pair<Integer, Integer> pair = trackAIResults.get(i);
bank.setInt("track_id", i, pair.getKey());
bank.setInt("trackid", i, pair.getKey());
bank.setInt("matched_atof_hit_id", i, pair.getValue());
}
event.appendBank(bank);
Expand Down
3 changes: 0 additions & 3 deletions reconstruction/alert/src/main/java/org/jlab/service/ahdc/AHDCEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import org.jlab.io.base.DataEvent;
import org.jlab.io.hipo.HipoDataSource;
import org.jlab.io.hipo.HipoDataSync;
import org.jlab.jnp.hipo4.data.SchemaFactory;
import org.jlab.rec.ahdc.AI.*;
import org.jlab.rec.ahdc.Banks.RecoBankWriter;
import org.jlab.rec.ahdc.Cluster.Cluster;
Expand All @@ -15,7 +14,6 @@
import org.jlab.rec.ahdc.HelixFit.HelixFitJava;
import org.jlab.rec.ahdc.Hit.Hit;
import org.jlab.rec.ahdc.Hit.HitReader;
import org.jlab.rec.ahdc.Hit.TrueHit;
import org.jlab.rec.ahdc.HoughTransform.HoughTransform;
import org.jlab.rec.ahdc.KalmanFilter.KalmanFilter;
import org.jlab.rec.ahdc.KalmanFilter.MaterialMap;
Expand All @@ -24,7 +22,6 @@
import org.jlab.rec.ahdc.Track.Track;
import org.jlab.rec.ahdc.ModeTrackFinding;
import java.io.File;
import java.lang.reflect.Array;
import java.util.*;
import java.util.logging.Logger;

Expand Down
9 changes: 2 additions & 7 deletions reconstruction/alert/src/main/java/org/jlab/service/alert/ALERTEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import java.util.ArrayList;
import java.util.concurrent.atomic.AtomicInteger;
import java.io.File;
import java.util.*;

import org.jlab.detector.calib.utils.DatabaseConstantProvider;
import org.jlab.geom.base.Detector;
Expand All @@ -16,10 +15,6 @@
import org.jlab.clas.reco.ReconstructionEngine;
import org.jlab.clas.swimtools.Swim;

import org.jlab.rec.ahdc.AI.InterCluster;
import org.jlab.rec.ahdc.AI.PreClustering;
import org.jlab.rec.ahdc.Hit.Hit;
import org.jlab.rec.ahdc.PreCluster.PreCluster;
import org.jlab.rec.alert.TrackMatchingAI.ModelTrackMatching;

import org.jlab.rec.alert.banks.RecoBankWriter;
Expand Down Expand Up @@ -153,12 +148,12 @@ public boolean processDataEvent(DataEvent event) {
ArrayList<Pair<Integer, Integer>> matched_ATOF_hit_id = new ArrayList<>();

for (int i = 0; i < bank_AHDCtracks.rows(); i++) {
int track_id = bank_AHDCtracks.getInt("track_id", i);
int track_id = bank_AHDCtracks.getInt("trackid", i);

// Get all interclusters for this track
ArrayList<Pair<Float, Float>> interClusters = new ArrayList<>();
for (int j = 0; j < bank_AHDCInterclusters.rows(); j++) {
int intercluster_track_id = bank_AHDCInterclusters.getInt("track_id", j);
int intercluster_track_id = bank_AHDCInterclusters.getInt("trackid", j);
if (intercluster_track_id == track_id) {
float x = bank_AHDCInterclusters.getFloat("x", j);
float y = bank_AHDCInterclusters.getFloat("y", j);
Expand Down