Skip to content

Commit 5bc0b3f

Browse files
committed
fix track id bank variable name
1 parent 533964f commit 5bc0b3f

File tree

3 files changed

+3
-11
lines changed

3 files changed

+3
-11
lines changed

reconstruction/alert/src/main/java/org/jlab/rec/alert/banks/RecoBankWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public int appendTrackMatchingAIBank(DataEvent event, ArrayList<Pair<Integer, In
8282
}
8383
for (int i = 0; i < trackAIResults.size(); i++) {
8484
Pair<Integer, Integer> pair = trackAIResults.get(i);
85-
bank.setInt("track_id", i, pair.getKey());
85+
bank.setInt("trackid", i, pair.getKey());
8686
bank.setInt("matched_atof_hit_id", i, pair.getValue());
8787
}
8888
event.appendBank(bank);

reconstruction/alert/src/main/java/org/jlab/service/ahdc/AHDCEngine.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import org.jlab.io.base.DataEvent;
77
import org.jlab.io.hipo.HipoDataSource;
88
import org.jlab.io.hipo.HipoDataSync;
9-
import org.jlab.jnp.hipo4.data.SchemaFactory;
109
import org.jlab.rec.ahdc.AI.*;
1110
import org.jlab.rec.ahdc.Banks.RecoBankWriter;
1211
import org.jlab.rec.ahdc.Cluster.Cluster;
@@ -15,7 +14,6 @@
1514
import org.jlab.rec.ahdc.HelixFit.HelixFitJava;
1615
import org.jlab.rec.ahdc.Hit.Hit;
1716
import org.jlab.rec.ahdc.Hit.HitReader;
18-
import org.jlab.rec.ahdc.Hit.TrueHit;
1917
import org.jlab.rec.ahdc.HoughTransform.HoughTransform;
2018
import org.jlab.rec.ahdc.KalmanFilter.KalmanFilter;
2119
import org.jlab.rec.ahdc.KalmanFilter.MaterialMap;
@@ -24,7 +22,6 @@
2422
import org.jlab.rec.ahdc.Track.Track;
2523
import org.jlab.rec.ahdc.ModeTrackFinding;
2624
import java.io.File;
27-
import java.lang.reflect.Array;
2825
import java.util.*;
2926
import java.util.logging.Logger;
3027

reconstruction/alert/src/main/java/org/jlab/service/alert/ALERTEngine.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import java.util.ArrayList;
44
import java.util.concurrent.atomic.AtomicInteger;
55
import java.io.File;
6-
import java.util.*;
76

87
import org.jlab.detector.calib.utils.DatabaseConstantProvider;
98
import org.jlab.geom.base.Detector;
@@ -16,10 +15,6 @@
1615
import org.jlab.clas.reco.ReconstructionEngine;
1716
import org.jlab.clas.swimtools.Swim;
1817

19-
import org.jlab.rec.ahdc.AI.InterCluster;
20-
import org.jlab.rec.ahdc.AI.PreClustering;
21-
import org.jlab.rec.ahdc.Hit.Hit;
22-
import org.jlab.rec.ahdc.PreCluster.PreCluster;
2318
import org.jlab.rec.alert.TrackMatchingAI.ModelTrackMatching;
2419

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

155150
for (int i = 0; i < bank_AHDCtracks.rows(); i++) {
156-
int track_id = bank_AHDCtracks.getInt("track_id", i);
151+
int track_id = bank_AHDCtracks.getInt("trackid", i);
157152

158153
// Get all interclusters for this track
159154
ArrayList<Pair<Float, Float>> interClusters = new ArrayList<>();
160155
for (int j = 0; j < bank_AHDCInterclusters.rows(); j++) {
161-
int intercluster_track_id = bank_AHDCInterclusters.getInt("track_id", j);
156+
int intercluster_track_id = bank_AHDCInterclusters.getInt("trackid", j);
162157
if (intercluster_track_id == track_id) {
163158
float x = bank_AHDCInterclusters.getFloat("x", j);
164159
float y = bank_AHDCInterclusters.getFloat("y", j);

0 commit comments

Comments
 (0)