Skip to content

Commit 74235c7

Browse files
baltzellbaltzell
committed
remove ClasMath
1 parent d3db09f commit 74235c7

4 files changed

Lines changed: 31 additions & 31 deletions

File tree

‎common-tools/clas-analysis/src/main/java/org/jlab/analysis/math/ClasMath.java‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎reconstruction/cvt/src/test/java/org/jlab/rec/cvt/services/CVTReconstructionTest.java‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import org.jlab.service.eb.EBTBEngine;
1010

1111
import org.jlab.analysis.physics.TestEvent;
12-
import org.jlab.analysis.math.ClasMath;
1312
import org.jlab.clas.swimtools.MagFieldsEngine;
1413
import org.jlab.detector.base.DetectorType;
1514
import org.jlab.utils.CLASResources;
@@ -19,7 +18,13 @@
1918
* @author naharrison
2019
*/
2120
public class CVTReconstructionTest {
22-
21+
22+
public static boolean isWithinXPercent(double X, double val, double standard) {
23+
if(standard >= 0 && val > (1.0 - (X/100.0))*standard && val < (1.0 + (X/100.0))*standard) return true;
24+
else if(standard < 0 && val < (1.0 - (X/100.0))*standard && val > (1.0 + (X/100.0))*standard) return true;
25+
return false;
26+
}
27+
2328
@Test
2429
public void testCVTReconstruction() {
2530

@@ -62,10 +67,10 @@ public void testCVTReconstruction() {
6267
assertEquals(testEvent.hasBank("REC::Particle"), true);
6368
assertEquals(testEvent.getBank("REC::Particle").rows(), 1);
6469
assertEquals(testEvent.getBank("REC::Particle").getByte("charge", 0), 1);
65-
assertEquals(ClasMath.isWithinXPercent(10.0, testEvent.getBank("REC::Particle").getFloat("px", 0), 1.9504), true);
66-
assertEquals(ClasMath.isWithinXPercent(10.0, testEvent.getBank("REC::Particle").getFloat("py", 0), 0.2741), true);
67-
assertEquals(ClasMath.isWithinXPercent(10.0, testEvent.getBank("REC::Particle").getFloat("pz", 0), 0.3473), true);
68-
assertEquals(ClasMath.isWithinXPercent(30.0, testEvent.getBank("REC::Particle").getFloat("vz", 0), -1.95444), true);
70+
assertEquals(isWithinXPercent(10.0, testEvent.getBank("REC::Particle").getFloat("px", 0), 1.9504), true);
71+
assertEquals(isWithinXPercent(10.0, testEvent.getBank("REC::Particle").getFloat("py", 0), 0.2741), true);
72+
assertEquals(isWithinXPercent(10.0, testEvent.getBank("REC::Particle").getFloat("pz", 0), 0.3473), true);
73+
assertEquals(isWithinXPercent(30.0, testEvent.getBank("REC::Particle").getFloat("vz", 0), -1.95444), true);
6974

7075
}
7176

‎reconstruction/dc/src/test/java/org/jlab/service/dc/DCReconstructionTest.java‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import org.jlab.io.base.DataEvent;
88

99
import org.jlab.analysis.physics.TestEvent;
10-
import org.jlab.analysis.math.ClasMath;
1110

1211
import org.jlab.clas.swimtools.MagFieldsEngine;
1312
import org.jlab.detector.base.DetectorType;
@@ -19,6 +18,12 @@
1918
*/
2019
public class DCReconstructionTest {
2120

21+
static boolean isWithinXPercent(double X, double val, double standard) {
22+
if(standard >= 0 && val > (1.0 - (X/100.0))*standard && val < (1.0 + (X/100.0))*standard) return true;
23+
else if(standard < 0 && val < (1.0 - (X/100.0))*standard && val > (1.0 + (X/100.0))*standard) return true;
24+
return false;
25+
}
26+
2227
@Test
2328
public void testDCReconstruction() {
2429

@@ -52,10 +57,10 @@ public void testDCReconstruction() {
5257
assertEquals(testEvent.hasBank("HitBasedTrkg::HBTracks"), true);
5358
assertEquals(testEvent.getBank("HitBasedTrkg::HBTracks").rows(), 1);
5459
assertEquals(testEvent.getBank("HitBasedTrkg::HBTracks").getByte("q", 0), -1);
55-
assertEquals(ClasMath.isWithinXPercent(16.0, testEvent.getBank("HitBasedTrkg::HBTracks").getFloat("p0_x", 0), 1.057), true);
60+
assertEquals(isWithinXPercent(16.0, testEvent.getBank("HitBasedTrkg::HBTracks").getFloat("p0_x", 0), 1.057), true);
5661
assertEquals(testEvent.getBank("HitBasedTrkg::HBTracks").getFloat("p0_y", 0) > -0.1, true);
5762
assertEquals(testEvent.getBank("HitBasedTrkg::HBTracks").getFloat("p0_y", 0) < 0.1, true);
58-
assertEquals(ClasMath.isWithinXPercent(16.0, testEvent.getBank("HitBasedTrkg::HBTracks").getFloat("p0_z", 0), 2.266), true);
63+
assertEquals(isWithinXPercent(16.0, testEvent.getBank("HitBasedTrkg::HBTracks").getFloat("p0_z", 0), 2.266), true);
5964

6065
//TB reconstruction
6166
DCTBEngine engineTB = new DCTBEngine();
@@ -69,10 +74,10 @@ public void testDCReconstruction() {
6974
assertEquals(testEvent.getBank("TimeBasedTrkg::TBTracks").rows(), 1);
7075
assertEquals(testEvent.getBank("TimeBasedTrkg::TBTracks").getByte("q", 0), -1);
7176

72-
assertEquals(ClasMath.isWithinXPercent(27.9, testEvent.getBank("TimeBasedTrkg::TBTracks").getFloat("p0_x", 0), 0.997), true);
77+
assertEquals(isWithinXPercent(27.9, testEvent.getBank("TimeBasedTrkg::TBTracks").getFloat("p0_x", 0), 0.997), true);
7378
assertEquals(testEvent.getBank("TimeBasedTrkg::TBTracks").getFloat("p0_y", 0) > -0.0702, true);
7479
assertEquals(testEvent.getBank("TimeBasedTrkg::TBTracks").getFloat("p0_y", 0) < 0.0438, true);
75-
assertEquals(ClasMath.isWithinXPercent(17.5, testEvent.getBank("TimeBasedTrkg::TBTracks").getFloat("p0_z", 0), 2.04), true);
80+
assertEquals(isWithinXPercent(17.5, testEvent.getBank("TimeBasedTrkg::TBTracks").getFloat("p0_z", 0), 2.04), true);
7681

7782
assertEquals(testEvent.getBank("TimeBasedTrkg::TBTracks").getFloat("Vtx0_x", 0) < 0.2, true);
7883
assertEquals(testEvent.getBank("TimeBasedTrkg::TBTracks").getFloat("Vtx0_x", 0) > -0.2, true);
@@ -82,7 +87,7 @@ public void testDCReconstruction() {
8287
assertEquals(testEvent.getBank("TimeBasedTrkg::TBTracks").getFloat("Vtx0_z", 0) > -0.0753, true);
8388

8489
//Region 1
85-
assertEquals(ClasMath.isWithinXPercent(155, testEvent.getBank("TimeBasedTrkg::TBCrosses").getFloat("x", 0), 4.02), true);
90+
assertEquals(isWithinXPercent(155, testEvent.getBank("TimeBasedTrkg::TBCrosses").getFloat("x", 0), 4.02), true);
8691
assertEquals(testEvent.getBank("TimeBasedTrkg::TBCrosses").getFloat("y", 0 ) < 9.25, true);
8792
assertEquals(testEvent.getBank("TimeBasedTrkg::TBCrosses").getFloat("y", 0 ) > -11.78, true);
8893

@@ -93,7 +98,7 @@ public void testDCReconstruction() {
9398
assertEquals(testEvent.getBank("TimeBasedTrkg::TBCrosses").getFloat("y", 1 ) > -17.8, true);
9499

95100
//Region 3
96-
assertEquals(ClasMath.isWithinXPercent(127, testEvent.getBank("TimeBasedTrkg::TBCrosses").getFloat("x", 2), -11.0), true);
101+
assertEquals(isWithinXPercent(127, testEvent.getBank("TimeBasedTrkg::TBCrosses").getFloat("x", 2), -11.0), true);
97102
assertEquals(testEvent.getBank("TimeBasedTrkg::TBCrosses").getFloat("y", 2 ) < 17.96, true);
98103
assertEquals(testEvent.getBank("TimeBasedTrkg::TBCrosses").getFloat("y", 2 ) > -23.66, true);
99104

‎reconstruction/eb/src/test/java/org/jlab/service/eb/EBReconstructionTest.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import static org.junit.Assert.*;
55

66
import org.jlab.analysis.physics.TestEvent;
7-
import org.jlab.analysis.math.ClasMath;
87
import org.jlab.clas.swimtools.MagFieldsEngine;
98
import cnuphys.magfield.MagneticFields;
109
import org.jlab.detector.base.DetectorType;
@@ -105,6 +104,12 @@ public boolean hasValidRefs(DataEvent ev,
105104
return true;
106105
}
107106

107+
static boolean isWithinXPercent(double X, double val, double standard) {
108+
if(standard >= 0 && val > (1.0 - (X/100.0))*standard && val < (1.0 + (X/100.0))*standard) return true;
109+
else if(standard < 0 && val < (1.0 - (X/100.0))*standard && val > (1.0 + (X/100.0))*standard) return true;
110+
return false;
111+
}
112+
108113
@Test
109114
public void testEBReconstruction() {
110115
System.setProperty("CLAS12DIR", "../../");
@@ -120,10 +125,10 @@ public void testEBReconstruction() {
120125
assertEquals(hasValidRefs(photonEvent,"REC::Calorimeter","REC::Particle","pindex"),true);
121126
// additional EC reco. tests:
122127
assertEquals(photonEvent.getBank("RECHB::Particle").rows(), 1);
123-
assertEquals(ClasMath.isWithinXPercent(25.0, photonEvent.getBank("RECHB::Particle").getFloat("px", 0), 1.057), true);
128+
assertEquals(isWithinXPercent(25.0, photonEvent.getBank("RECHB::Particle").getFloat("px", 0), 1.057), true);
124129
assertEquals(photonEvent.getBank("RECHB::Particle").getFloat("py", 0) > -0.15, true);
125130
assertEquals(photonEvent.getBank("RECHB::Particle").getFloat("py", 0) < 0.15, true);
126-
assertEquals(ClasMath.isWithinXPercent(25.0, photonEvent.getBank("RECHB::Particle").getFloat("pz", 0), 2.266), true);
131+
assertEquals(isWithinXPercent(25.0, photonEvent.getBank("RECHB::Particle").getFloat("pz", 0), 2.266), true);
127132

128133
DataEvent electronEvent = TestEvent.get(DetectorType.DC);
129134
processAllEngines(electronEvent);

0 commit comments

Comments
 (0)