From 3be55fc734396b31177e520174c76fb7a4fb96f5 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Fri, 16 Oct 2026 18:24:35 -0400 Subject: [PATCH 1/2] do not reinitialize --- .../java/org/jlab/rec/cvt/track/Seed.java | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/track/Seed.java b/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/track/Seed.java index 14da31acc7..41bb73a1df 100644 --- a/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/track/Seed.java +++ b/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/track/Seed.java @@ -260,13 +260,6 @@ else if(tr.sortingMethod ==1) { public boolean fit(int fitIter, double xb, double yb, double bfield) { - List X = new ArrayList<>(); - List Y = new ArrayList<>(); - List Z = new ArrayList<>(); - List Rho = new ArrayList<>(); - List ErrZ = new ArrayList<>(); - List ErrRho = new ArrayList<>(); - List ErrRt = new ArrayList<>(); List BMTCrossesC = new ArrayList<>(); List BMTCrossesZ = new ArrayList<>(); List SVTCrosses = new ArrayList<>(); @@ -302,13 +295,14 @@ else if (c.getDetector()==DetectorType.BMT && c.getType()==BMTType.Z ) { if (bmtCSz >= 2) { useSVTdipAngEst = 0; } - ((ArrayList) X).ensureCapacity(svtSz + bmtZSz); - ((ArrayList) Y).ensureCapacity(svtSz + bmtZSz); - ((ArrayList) Z).ensureCapacity(svtSz * useSVTdipAngEst + bmtCSz); - ((ArrayList) Rho).ensureCapacity(svtSz * useSVTdipAngEst + bmtCSz); - ((ArrayList) ErrZ).ensureCapacity(svtSz * useSVTdipAngEst + bmtCSz); - ((ArrayList) ErrRho).ensureCapacity(svtSz * useSVTdipAngEst + bmtCSz); // Try: don't use svt in dipdangle fit determination - ((ArrayList) ErrRt).ensureCapacity(svtSz + bmtZSz); + + List X = new ArrayList<>(svtSz + bmtZSz); + List Y = new ArrayList<>(svtSz + bmtZSz); + List Z = new ArrayList<>(svtSz * useSVTdipAngEst + bmtCSz); + List Rho = new ArrayList<>(svtSz * useSVTdipAngEst + bmtCSz); + List ErrZ = new ArrayList<>(svtSz * useSVTdipAngEst + bmtCSz); + List ErrRho = new ArrayList<>(svtSz * useSVTdipAngEst + bmtCSz); + List ErrRt = new ArrayList<>(svtSz + bmtZSz); HelicalTrackFitter fitTrk = new HelicalTrackFitter(); for (int i = 0; i < fitIter; i++) { From 00ffc13bab9b26af0db0499b8cb26192b90f7ab9 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Fri, 16 Oct 2026 18:27:14 -0400 Subject: [PATCH 2/2] cleanup initialization --- .../java/org/jlab/rec/cvt/track/Seed.java | 21 +++++-------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/track/Seed.java b/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/track/Seed.java index 41bb73a1df..6261c7d016 100644 --- a/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/track/Seed.java +++ b/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/track/Seed.java @@ -266,10 +266,6 @@ public boolean fit(int fitIter, double xb, double yb, double bfield) { double chisqMax = Double.POSITIVE_INFINITY; - int svtSz = 0; - int bmtZSz = 0; - int bmtCSz = 0; - for (Cross c : this.getCrosses()) { // reset cross to clear previous track settings on direction and Point c.reset(); @@ -283,19 +279,12 @@ else if (c.getDetector()==DetectorType.BMT && c.getType()==BMTType.Z ) { BMTCrossesZ.add(c); } } - svtSz = SVTCrosses.size(); - if (BMTCrossesZ != null) { - bmtZSz = BMTCrossesZ.size(); - } - if (BMTCrossesC != null) { - bmtCSz = BMTCrossesC.size(); - } - - int useSVTdipAngEst = 1; - if (bmtCSz >= 2) { - useSVTdipAngEst = 0; - } + int svtSz = SVTCrosses.size(); + int bmtZSz = BMTCrossesZ.size(); + int bmtCSz = BMTCrossesC.size(); + int useSVTdipAngEst = bmtCSz >= 2 ? 0 : 1; + List X = new ArrayList<>(svtSz + bmtZSz); List Y = new ArrayList<>(svtSz + bmtZSz); List Z = new ArrayList<>(svtSz * useSVTdipAngEst + bmtCSz);