diff --git a/reconstruction/alert/src/main/java/org/jlab/rec/alert/banks/RecoBankWriter.java b/reconstruction/alert/src/main/java/org/jlab/rec/alert/banks/RecoBankWriter.java index 5f6915804c..3d654b7433 100644 --- a/reconstruction/alert/src/main/java/org/jlab/rec/alert/banks/RecoBankWriter.java +++ b/reconstruction/alert/src/main/java/org/jlab/rec/alert/banks/RecoBankWriter.java @@ -82,7 +82,7 @@ public int appendTrackMatchingAIBank(DataEvent event, ArrayList 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); diff --git a/reconstruction/alert/src/main/java/org/jlab/service/ahdc/AHDCEngine.java b/reconstruction/alert/src/main/java/org/jlab/service/ahdc/AHDCEngine.java index 4f8dda448f..b7cbb1b01c 100644 --- a/reconstruction/alert/src/main/java/org/jlab/service/ahdc/AHDCEngine.java +++ b/reconstruction/alert/src/main/java/org/jlab/service/ahdc/AHDCEngine.java @@ -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; @@ -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; @@ -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; diff --git a/reconstruction/alert/src/main/java/org/jlab/service/alert/ALERTEngine.java b/reconstruction/alert/src/main/java/org/jlab/service/alert/ALERTEngine.java index c4483be4eb..6a54552d89 100644 --- a/reconstruction/alert/src/main/java/org/jlab/service/alert/ALERTEngine.java +++ b/reconstruction/alert/src/main/java/org/jlab/service/alert/ALERTEngine.java @@ -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; @@ -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; @@ -153,12 +148,12 @@ public boolean processDataEvent(DataEvent event) { ArrayList> 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> 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);