From d04558d8536f426e0965b86334f4eb734c92a501 Mon Sep 17 00:00:00 2001 From: veronique Date: Fri, 30 Jun 2023 14:18:12 -0400 Subject: [PATCH] Fix to fill detector and layer for Cosmics trajectory bank --- .../src/main/java/org/jlab/rec/cvt/track/StraightTrack.java | 4 +++- .../java/org/jlab/rec/cvt/trajectory/TrajectoryFinder.java | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/track/StraightTrack.java b/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/track/StraightTrack.java index 4ef3246cb5..98ec32a60e 100644 --- a/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/track/StraightTrack.java +++ b/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/track/StraightTrack.java @@ -191,6 +191,7 @@ public void findTrajectory() { stVec.setTrkThetaAtSurface(ThetaTrackIntersPlane); stVec.setTrkToModuleAngle(trkToMPlnAngl); stVec.setCalcCentroidStrip(CalcCentroidStrip); + stVec.setSurfaceDetector(DetectorType.BST.getDetectorId()); if(stateVecs.size()>0 && stateVecs.get(stateVecs.size()-1).x()==stVec.x() && stateVecs.get(stateVecs.size()-1).y()==stVec.y() @@ -230,7 +231,8 @@ public void findTrajectory() { stVec.setTrkThetaAtSurface(ThetaTrackIntersSurf); stVec.setTrkToModuleAngle(trkToMPlnAngl); stVec.setCalcCentroidStrip(CalcCentroidStrip); - if(stateVecs.size()>0 + stVec.setSurfaceDetector(DetectorType.BMT.getDetectorId()); + if(stateVecs.size()>0 && stateVecs.get(stateVecs.size()-1).x()==stVec.x() && stateVecs.get(stateVecs.size()-1).y()==stVec.y() && stateVecs.get(stateVecs.size()-1).z()==stVec.z()) { diff --git a/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/trajectory/TrajectoryFinder.java b/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/trajectory/TrajectoryFinder.java index e466611b42..0e4fa6d690 100644 --- a/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/trajectory/TrajectoryFinder.java +++ b/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/trajectory/TrajectoryFinder.java @@ -120,6 +120,7 @@ public Trajectory findTrajectory(int id, Ray ray, ArrayList candCrossList continue; } + stVec.setSurfaceDetector(DetectorType.BST.getDetectorId()); Cluster clsOnTrk = null; if (l % 2 == 0) { clsOnTrk = c.getCluster1(); @@ -195,6 +196,7 @@ public Trajectory findTrajectory(int id, Ray ray, ArrayList candCrossList continue; } + stVec.setSurfaceDetector(DetectorType.BMT.getDetectorId()); if (c.getType()==BMTType.C) { //C-detector measuring Z //if(traj.isFinal) { // reset the cross only for final trajectory @@ -226,9 +228,8 @@ public Trajectory findTrajectory(int id, Ray ray, ArrayList candCrossList } //Collections.sort(stateVecs); - stateVecs.sort(Comparator.comparing(StateVec::y)); - for (int l = 0; l < stateVecs.size(); l++) { + for (int l = 0; l < stateVecs.size(); l++) { stateVecs.get(l).setSurfaceDetector(DetectorType.CVT.getDetectorId()); stateVecs.get(l).setPlaneIdx(l); }