From 5f8159ec90f89fe9c4425ca2f56e2b5c84461a89 Mon Sep 17 00:00:00 2001 From: tongtongcao Date: Fri, 19 Dec 2025 13:26:50 -0500 Subject: [PATCH 1/2] update C1 state at z = 229 cm in tilted sector frame --- .../java/org/jlab/rec/dc/track/TrackCandListFinder.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/track/TrackCandListFinder.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/track/TrackCandListFinder.java index 952d3d80ea..378dc15e98 100644 --- a/reconstruction/dc/src/main/java/org/jlab/rec/dc/track/TrackCandListFinder.java +++ b/reconstruction/dc/src/main/java/org/jlab/rec/dc/track/TrackCandListFinder.java @@ -580,7 +580,7 @@ public void setTrackPars(Track cand, -cand.get_Q()); //swimming to a ref point upstream of the first DC region - double[] VecAtTarIn = dcSwim.SwimToPlaneTiltSecSys(cand.get(0).get_Sector(), 180); + double[] VecAtTarIn = dcSwim.SwimToPlaneTiltSecSys(cand.get(0).get_Sector(), 229); if (VecAtTarIn == null) { cand.fit_Successful = false; return; @@ -667,8 +667,8 @@ public void setTrackPars(Track cand, double uzInner = VecAtHtccSurf[5] / cand.get_P(); //set the pseudocross at extrapolated position - cand.set_PreRegion1CrossPoint(new Point3D(xInner, yInner, zInner)); - cand.set_PreRegion1CrossDir(new Point3D(uxInner, uyInner, uzInner)); + cand.set_PreRegion1CrossPoint(new Point3D(xOr, yOr, zOr)); + cand.set_PreRegion1CrossDir(new Point3D(pxOr / cand.get_P(), pyOr / cand.get_P(), pzOr / cand.get_P())); } private Integer getKey(Track trk) { From 87b0eb5bfc4dc12861756f78386c6edc409414dc Mon Sep 17 00:00:00 2001 From: tongtongcao Date: Tue, 3 Nov 2026 07:35:40 -0500 Subject: [PATCH 2/2] update banks --- etc/bankdefs/hipo4/dc.json | 24 +++++++++---------- etc/bankdefs/hipo4/dcnn.json | 24 +++++++++---------- .../rec/dc/track/TrackCandListFinder.java | 14 ++++------- 3 files changed, 29 insertions(+), 33 deletions(-) diff --git a/etc/bankdefs/hipo4/dc.json b/etc/bankdefs/hipo4/dc.json index 54ce6acbb6..b9b2f5c332 100644 --- a/etc/bankdefs/hipo4/dc.json +++ b/etc/bankdefs/hipo4/dc.json @@ -251,12 +251,12 @@ {"name":"id", "type":"S", "info":"id of the track"}, {"name":"status", "type":"S", "info":"status of the track"}, {"name":"sector", "type":"B", "info":"sector of the track"}, - {"name":"c1_x", "type":"F", "info":"Upstream Region 1 cross x-position in the lab (in cm)"}, - {"name":"c1_y", "type":"F", "info":"Upstream Region 1 cross y-position in the lab (in cm)"}, - {"name":"c1_z", "type":"F", "info":"Upstream Region 1 cross z-position in the lab (in cm)"}, - {"name":"c1_ux", "type":"F", "info":"Upstream Region 1 cross unit x-direction vector in the lab"}, - {"name":"c1_uy", "type":"F", "info":"Upstream Region 1 cross unit y-direction vector in the lab"}, - {"name":"c1_uz", "type":"F", "info":"Upstream Region 1 cross unit z-direction vector in the lab"}, + {"name":"c1_x", "type":"F", "info":"x-position at z = 229 cm in the tilted sector frame"}, + {"name":"c1_y", "type":"F", "info":"y-position at z = 229 cm in the tilted sector frame"}, + {"name":"c1_z", "type":"F", "info":"z-position = 229 cm in the tilted sector frame"}, + {"name":"c1_ux", "type":"F", "info":"x-direction at z = 229 cm in the tilted sector frame"}, + {"name":"c1_uy", "type":"F", "info":"y-direction at z = 229 cm in the tilted sector frame"}, + {"name":"c1_uz", "type":"F", "info":"z-direction at z = 229 cm in the tilted sector frame"}, {"name":"c3_x", "type":"F", "info":"Downstream Region 3 cross x-position in the lab (in cm)"}, {"name":"c3_y", "type":"F", "info":"Downstream Region 3 cross y-position in the lab (in cm)"}, {"name":"c3_z", "type":"F", "info":"Downstream Region 3 cross z-position in the lab (in cm)"}, @@ -485,12 +485,12 @@ {"name":"id", "type":"S", "info":"id of the track"}, {"name":"status", "type":"S", "info":"status of the track"}, {"name":"sector", "type":"B", "info":"sector of the track"}, - {"name":"c1_x", "type":"F", "info":"Upstream Region 1 cross x-position in the lab (in cm)"}, - {"name":"c1_y", "type":"F", "info":"Upstream Region 1 cross y-position in the lab (in cm)"}, - {"name":"c1_z", "type":"F", "info":"Upstream Region 1 cross z-position in the lab (in cm)"}, - {"name":"c1_ux", "type":"F", "info":"Upstream Region 1 cross unit x-direction vector in the lab"}, - {"name":"c1_uy", "type":"F", "info":"Upstream Region 1 cross unit y-direction vector in the lab"}, - {"name":"c1_uz", "type":"F", "info":"Upstream Region 1 cross unit z-direction vector in the lab"}, + {"name":"c1_x", "type":"F", "info":"x-position at z = 229 cm in the tilted sector frame"}, + {"name":"c1_y", "type":"F", "info":"y-position at z = 229 cm in the tilted sector frame"}, + {"name":"c1_z", "type":"F", "info":"z-position = 229 cm in the tilted sector frame"}, + {"name":"c1_ux", "type":"F", "info":"x-direction at z = 229 cm in the tilted sector frame"}, + {"name":"c1_uy", "type":"F", "info":"y-direction at z = 229 cm in the tilted sector frame"}, + {"name":"c1_uz", "type":"F", "info":"z-direction at z = 229 cm in the tilted sector frame"}, {"name":"c3_x", "type":"F", "info":"Downstream Region 3 cross x-position in the lab (in cm)"}, {"name":"c3_y", "type":"F", "info":"Downstream Region 3 cross y-position in the lab (in cm)"}, {"name":"c3_z", "type":"F", "info":"Downstream Region 3 cross z-position in the lab (in cm)"}, diff --git a/etc/bankdefs/hipo4/dcnn.json b/etc/bankdefs/hipo4/dcnn.json index 145f3cba6b..f6682c274b 100644 --- a/etc/bankdefs/hipo4/dcnn.json +++ b/etc/bankdefs/hipo4/dcnn.json @@ -126,12 +126,12 @@ {"name":"id", "type":"S", "info":"id of the track"}, {"name":"status", "type":"S", "info":"status of the track"}, {"name":"sector", "type":"B", "info":"sector of the track"}, - {"name":"c1_x", "type":"F", "info":"Upstream Region 1 cross x-position in the lab (in cm)"}, - {"name":"c1_y", "type":"F", "info":"Upstream Region 1 cross y-position in the lab (in cm)"}, - {"name":"c1_z", "type":"F", "info":"Upstream Region 1 cross z-position in the lab (in cm)"}, - {"name":"c1_ux", "type":"F", "info":"Upstream Region 1 cross unit x-direction vector in the lab"}, - {"name":"c1_uy", "type":"F", "info":"Upstream Region 1 cross unit y-direction vector in the lab"}, - {"name":"c1_uz", "type":"F", "info":"Upstream Region 1 cross unit z-direction vector in the lab"}, + {"name":"c1_x", "type":"F", "info":"x-position at z = 229 cm in the tilted sector frame"}, + {"name":"c1_y", "type":"F", "info":"y-position at z = 229 cm in the tilted sector frame"}, + {"name":"c1_z", "type":"F", "info":"z-position = 229 cm in the tilted sector frame"}, + {"name":"c1_ux", "type":"F", "info":"x-direction at z = 229 cm in the tilted sector frame"}, + {"name":"c1_uy", "type":"F", "info":"y-direction at z = 229 cm in the tilted sector frame"}, + {"name":"c1_uz", "type":"F", "info":"z-direction at z = 229 cm in the tilted sector frame"}, {"name":"c3_x", "type":"F", "info":"Downstream Region 3 cross x-position in the lab (in cm)"}, {"name":"c3_y", "type":"F", "info":"Downstream Region 3 cross y-position in the lab (in cm)"}, {"name":"c3_z", "type":"F", "info":"Downstream Region 3 cross z-position in the lab (in cm)"}, @@ -346,12 +346,12 @@ {"name":"id", "type":"S", "info":"id of the track"}, {"name":"status", "type":"S", "info":"status of the track"}, {"name":"sector", "type":"B", "info":"sector of the track"}, - {"name":"c1_x", "type":"F", "info":"Upstream Region 1 cross x-position in the lab (in cm)"}, - {"name":"c1_y", "type":"F", "info":"Upstream Region 1 cross y-position in the lab (in cm)"}, - {"name":"c1_z", "type":"F", "info":"Upstream Region 1 cross z-position in the lab (in cm)"}, - {"name":"c1_ux", "type":"F", "info":"Upstream Region 1 cross unit x-direction vector in the lab"}, - {"name":"c1_uy", "type":"F", "info":"Upstream Region 1 cross unit y-direction vector in the lab"}, - {"name":"c1_uz", "type":"F", "info":"Upstream Region 1 cross unit z-direction vector in the lab"}, + {"name":"c1_x", "type":"F", "info":"x-position at z = 229 cm in the tilted sector frame"}, + {"name":"c1_y", "type":"F", "info":"y-position at z = 229 cm in the tilted sector frame"}, + {"name":"c1_z", "type":"F", "info":"z-position = 229 cm in the tilted sector frame"}, + {"name":"c1_ux", "type":"F", "info":"x-direction at z = 229 cm in the tilted sector frame"}, + {"name":"c1_uy", "type":"F", "info":"y-direction at z = 229 cm in the tilted sector frame"}, + {"name":"c1_uz", "type":"F", "info":"z-direction at z = 229 cm in the tilted sector frame"}, {"name":"c3_x", "type":"F", "info":"Downstream Region 3 cross x-position in the lab (in cm)"}, {"name":"c3_y", "type":"F", "info":"Downstream Region 3 cross y-position in the lab (in cm)"}, {"name":"c3_z", "type":"F", "info":"Downstream Region 3 cross z-position in the lab (in cm)"}, diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/track/TrackCandListFinder.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/track/TrackCandListFinder.java index 378dc15e98..406def6e85 100644 --- a/reconstruction/dc/src/main/java/org/jlab/rec/dc/track/TrackCandListFinder.java +++ b/reconstruction/dc/src/main/java/org/jlab/rec/dc/track/TrackCandListFinder.java @@ -602,6 +602,11 @@ public void setTrackPars(Track cand, Point3D trkR1X = C.getCoordsInLab(xOr, yOr, zOr); Point3D trkR1P = C.getCoordsInLab(pxOr, pyOr, pzOr); + + //set the pseudocross at z = 229 cm in the tilted sector frame + cand.set_PreRegion1CrossPoint(new Point3D(xOr, yOr, zOr)); + cand.set_PreRegion1CrossDir(new Point3D(pxOr / cand.get_P(), pyOr / cand.get_P(), pzOr / cand.get_P())); + cand.set_Region1TrackX(new Point3D(trkR1X.x(), trkR1X.y(), trkR1X.z())); cand.set_Region1TrackP(new Point3D(trkR1P.x(), trkR1P.y(), trkR1P.z())); @@ -659,16 +664,7 @@ public void setTrackPars(Track cand, cand.fit_Successful = false; return; } - double xInner = VecAtHtccSurf[0]; - double yInner = VecAtHtccSurf[1]; - double zInner = VecAtHtccSurf[2]; - double uxInner = VecAtHtccSurf[3] / cand.get_P(); - double uyInner = VecAtHtccSurf[4] / cand.get_P(); - double uzInner = VecAtHtccSurf[5] / cand.get_P(); - //set the pseudocross at extrapolated position - cand.set_PreRegion1CrossPoint(new Point3D(xOr, yOr, zOr)); - cand.set_PreRegion1CrossDir(new Point3D(pxOr / cand.get_P(), pyOr / cand.get_P(), pzOr / cand.get_P())); } private Integer getKey(Track trk) {