Skip to content

Commit 7b0ea8d

Browse files
committed
cleanup
1 parent 9b208fa commit 7b0ea8d

File tree

1 file changed

+7
-16
lines changed

1 file changed

+7
-16
lines changed

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

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@
1010
import org.jlab.analysis.math.ClasMath;
1111

1212
import org.jlab.clas.swimtools.MagFieldsEngine;
13-
import org.jlab.jnp.hipo4.data.SchemaFactory;
1413
import org.jlab.logging.DefaultLogger;
1514
import org.jlab.utils.CLASResources;
16-
import org.jlab.utils.system.ClasUtilsFile;
1715

1816
/**
1917
*
@@ -29,17 +27,13 @@ public void testDCReconstruction() {
2927
System.setProperty("CLAS12DIR", "../../");
3028

3129
String mapDir = CLASResources.getResourcePath("etc")+"/data/magfield";
32-
try {
33-
MagneticFields.getInstance().initializeMagneticFields(mapDir,
34-
"Symm_torus_r2501_phi16_z251_24Apr2018.dat","Symm_solenoid_r601_phi1_z1201_13June2018.dat");
35-
}
36-
catch (Exception e) {
37-
e.printStackTrace();
38-
}
39-
40-
String dir = ClasUtilsFile.getResourceDir("CLAS12DIR", "etc/bankdefs/hipo4");
41-
SchemaFactory schemaFactory = new SchemaFactory();
42-
schemaFactory.initFromDirectory(dir);
30+
try {
31+
MagneticFields.getInstance().initializeMagneticFields(mapDir,
32+
"Symm_torus_r2501_phi16_z251_24Apr2018.dat","Symm_solenoid_r601_phi1_z1201_13June2018.dat");
33+
}
34+
catch (Exception e) {
35+
e.printStackTrace();
36+
}
4337

4438
DataEvent testEvent = TestEvent.getDCSector1ElectronEvent(0);
4539

@@ -72,7 +66,6 @@ public void testDCReconstruction() {
7266
if(testEvent.hasBank("TimeBasedTrkg::TBTracks")) {
7367
testEvent.getBank("TimeBasedTrkg::TBTracks").show();
7468
}
75-
7669

7770
assertEquals(testEvent.hasBank("TimeBasedTrkg::TBTracks"), true);
7871
assertEquals(testEvent.getBank("TimeBasedTrkg::TBTracks").rows(), 1);
@@ -90,7 +83,6 @@ public void testDCReconstruction() {
9083
assertEquals(testEvent.getBank("TimeBasedTrkg::TBTracks").getFloat("Vtx0_z", 0) < 0.885, true);
9184
assertEquals(testEvent.getBank("TimeBasedTrkg::TBTracks").getFloat("Vtx0_z", 0) > -0.0753, true);
9285

93-
9486
//Region 1
9587
assertEquals(ClasMath.isWithinXPercent(155, testEvent.getBank("TimeBasedTrkg::TBCrosses").getFloat("x", 0), 4.02), true);
9688
assertEquals(testEvent.getBank("TimeBasedTrkg::TBCrosses").getFloat("y", 0 ) < 9.25, true);
@@ -106,7 +98,6 @@ public void testDCReconstruction() {
10698
assertEquals(ClasMath.isWithinXPercent(127, testEvent.getBank("TimeBasedTrkg::TBCrosses").getFloat("x", 2), -11.0), true);
10799
assertEquals(testEvent.getBank("TimeBasedTrkg::TBCrosses").getFloat("y", 2 ) < 17.96, true);
108100
assertEquals(testEvent.getBank("TimeBasedTrkg::TBCrosses").getFloat("y", 2 ) > -23.66, true);
109-
110101

111102
}
112103

0 commit comments

Comments
 (0)