Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions etc/bankdefs/hipo4/dc.json
Original file line number Diff line number Diff line change
Expand Up @@ -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)"},
Expand Down Expand Up @@ -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)"},
Expand Down
24 changes: 12 additions & 12 deletions etc/bankdefs/hipo4/dcnn.json
Original file line number Diff line number Diff line change
Expand Up @@ -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)"},
Expand Down Expand Up @@ -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)"},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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()));

Expand Down Expand Up @@ -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(xInner, yInner, zInner));
cand.set_PreRegion1CrossDir(new Point3D(uxInner, uyInner, uzInner));
}

private Integer getKey(Track trk) {
Expand Down
Loading