Skip to content

Commit 511eac5

Browse files
veroniquebaltzell
authored andcommitted
swimtools cleanup
1 parent 2e1407b commit 511eac5

File tree

8 files changed

+300
-501
lines changed

8 files changed

+300
-501
lines changed

common-tools/clas-decay-tools/src/main/java/org/jlab/clas/decay/analysis/Particle.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -997,7 +997,7 @@ private double calcUncorrMass(Particle part1, Particle part2) { //momentum not c
997997
} else {
998998
swim.SetSwimParameters(vxch, vych, vzch,
999999
-pxch, -pych, -pzch, -q);
1000-
double[] tr1 = swim.SwimToPlaneBoundary((vzvo-buffer),new Vector3D(0,0,1), -1);
1000+
double[] tr1 = swim.SwimToPlaneBoundary((vzvo-buffer),new Vector3D(0,0,1));
10011001

10021002
swim.SetSwimParameters(tr1[0], tr1[1], tr1[2], -tr1[3], -tr1[4], -tr1[5], q);
10031003
}

common-tools/swim-tools/src/main/java/org/jlab/clas/swimtools/ASwim.java

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,17 @@
1111
public abstract class ASwim extends SwimPars implements ISwim {
1212

1313
@Override
14-
public double[] SwimToPlaneTiltSecSys(int sector, double z_cm) {
15-
throw new UnsupportedOperationException("Not supported yet.");
16-
}
17-
18-
@Override
19-
public double[] SwimToPlaneTiltSecSysBdlXZPlane(int sector, double z_cm) {
20-
throw new UnsupportedOperationException("Not supported yet.");
21-
}
22-
23-
@Override
24-
public double[] SwimToPlaneBoundary(double d_cm, Vector3D n, int dir) {
25-
throw new UnsupportedOperationException("Not supported yet.");
14+
public double[] SwimToPlaneBoundary(double d_cm, Vector3D n) {
15+
// Normalize the normal - should already be done, but just in case
16+
Vector3D nhat = n.asUnit();
17+
18+
// Point on the plane at distance d_cm from origin
19+
Point3D p = new Point3D(
20+
nhat.x() * d_cm,
21+
nhat.y() * d_cm,
22+
nhat.z() * d_cm
23+
);
24+
return SwimPlane(nhat, p, accuracy);
2625
}
2726

2827
@Override
@@ -34,6 +33,11 @@ public double[] SwimToPlaneLab(double z_cm) {
3433
public double[] SwimToCylinder(double radius) {
3534
return SwimGenCylinder(new Point3D(0,0,-1), new Point3D(0,0,1), radius, accuracy);
3635
}
36+
37+
@Override
38+
public double[] SwimRho(double radius, double accuracy) {
39+
return SwimGenCylinder(new Point3D(0,0,-1), new Point3D(0,0,1), radius, accuracy);
40+
}
3741

3842
@Override
3943
public double[] SwimToZ(double Z, int dir) {

common-tools/swim-tools/src/main/java/org/jlab/clas/swimtools/AdaptiveSwim.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,5 @@ public double[] SwimToLine(Line3D l) {
135135
return null;
136136
}
137137

138-
@Override
139-
public double[] SwimToDCA(SwimTrajectory trk2) {
140-
throw new UnsupportedOperationException("Not supported yet.");
141-
}
142138

143139
}
Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
11
package org.jlab.clas.swimtools;
22

3-
import cnuphys.swim.SwimTrajectory;
43
import org.jlab.geom.prim.Line3D;
54
import org.jlab.geom.prim.Point3D;
65
import org.jlab.geom.prim.Vector3D;
76

87
/**
9-
* FIXME: Can any of these be removed?
108
*
119
* @author baltzell
1210
*/
1311
interface ISwim {
1412

15-
public double[] SwimToPlaneTiltSecSys(int sector, double z_cm);
16-
17-
public double[] SwimToPlaneTiltSecSysBdlXZPlane(int sector, double z_cm);
18-
1913
public double[] SwimToPlaneLab(double z_cm);
2014

2115
public double[] SwimToCylinder(double Rad);
@@ -28,14 +22,12 @@ interface ISwim {
2822

2923
public double[] SwimToSphere(double Rad);
3024

31-
public double[] SwimToPlaneBoundary(double d_cm, Vector3D n, int dir);
25+
public double[] SwimToPlaneBoundary(double d_cm, Vector3D n);
3226

3327
public double[] SwimToBeamLine(double xB, double yB);
3428

3529
public double[] SwimToLine(Line3D l);
3630

3731
public double[] SwimToZ(double Z, int dir);
3832

39-
public double[] SwimToDCA(SwimTrajectory trk2);
40-
4133
}

0 commit comments

Comments
 (0)