Skip to content

feat: remove ClasMath from clas-analysis #1298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
baltzell wants to merge 3 commits into
base: development
Choose a base branch
from
Open

feat: remove ClasMath from clas-analysis #1298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47ac3af
remove unused ClasMath methods
baltzell Jun 2, 2026
ae22c13
switch to a "better" sector getter
baltzell Jun 2, 2026
e19acbc
remove ClasMath
baltzell Jun 2, 2026
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
68 changes: 0 additions & 68 deletions common-tools/clas-analysis/src/main/java/org/jlab/analysis/math/ClasMath.java
View file
Open in desktop

This file was deleted.

17 changes: 11 additions & 6 deletions reconstruction/cvt/src/test/java/org/jlab/rec/cvt/services/CVTReconstructionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import org.jlab.service.eb.EBTBEngine;

import org.jlab.analysis.physics.TestEvent;
import org.jlab.analysis.math.ClasMath;
import org.jlab.clas.swimtools.MagFieldsEngine;
import org.jlab.detector.base.DetectorType;
import org.jlab.utils.CLASResources;
Expand All @@ -19,7 +18,13 @@
* @author naharrison
*/
public class CVTReconstructionTest {


public static boolean isWithinXPercent(double X, double val, double standard) {
if(standard >= 0 && val > (1.0 - (X/100.0))*standard && val < (1.0 + (X/100.0))*standard) return true;
else if(standard < 0 && val < (1.0 - (X/100.0))*standard && val > (1.0 + (X/100.0))*standard) return true;
return false;
}

@Test
public void testCVTReconstruction() {

Expand Down Expand Up @@ -62,10 +67,10 @@ public void testCVTReconstruction() {
assertEquals(testEvent.hasBank("REC::Particle"), true);
assertEquals(testEvent.getBank("REC::Particle").rows(), 1);
assertEquals(testEvent.getBank("REC::Particle").getByte("charge", 0), 1);
assertEquals(ClasMath.isWithinXPercent(10.0, testEvent.getBank("REC::Particle").getFloat("px", 0), 1.9504), true);
assertEquals(ClasMath.isWithinXPercent(10.0, testEvent.getBank("REC::Particle").getFloat("py", 0), 0.2741), true);
assertEquals(ClasMath.isWithinXPercent(10.0, testEvent.getBank("REC::Particle").getFloat("pz", 0), 0.3473), true);
assertEquals(ClasMath.isWithinXPercent(30.0, testEvent.getBank("REC::Particle").getFloat("vz", 0), -1.95444), true);
assertEquals(isWithinXPercent(10.0, testEvent.getBank("REC::Particle").getFloat("px", 0), 1.9504), true);
assertEquals(isWithinXPercent(10.0, testEvent.getBank("REC::Particle").getFloat("py", 0), 0.2741), true);
assertEquals(isWithinXPercent(10.0, testEvent.getBank("REC::Particle").getFloat("pz", 0), 0.3473), true);
assertEquals(isWithinXPercent(30.0, testEvent.getBank("REC::Particle").getFloat("vz", 0), -1.95444), true);

}

Expand Down
19 changes: 12 additions & 7 deletions reconstruction/dc/src/test/java/org/jlab/service/dc/DCReconstructionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import org.jlab.io.base.DataEvent;

import org.jlab.analysis.physics.TestEvent;
import org.jlab.analysis.math.ClasMath;

import org.jlab.clas.swimtools.MagFieldsEngine;
import org.jlab.detector.base.DetectorType;
Expand All @@ -19,6 +18,12 @@
*/
public class DCReconstructionTest {

static boolean isWithinXPercent(double X, double val, double standard) {
if(standard >= 0 && val > (1.0 - (X/100.0))*standard && val < (1.0 + (X/100.0))*standard) return true;
else if(standard < 0 && val < (1.0 - (X/100.0))*standard && val > (1.0 + (X/100.0))*standard) return true;
return false;
}

@Test
public void testDCReconstruction() {

Expand Down Expand Up @@ -52,10 +57,10 @@ public void testDCReconstruction() {
assertEquals(testEvent.hasBank("HitBasedTrkg::HBTracks"), true);
assertEquals(testEvent.getBank("HitBasedTrkg::HBTracks").rows(), 1);
assertEquals(testEvent.getBank("HitBasedTrkg::HBTracks").getByte("q", 0), -1);
assertEquals(ClasMath.isWithinXPercent(16.0, testEvent.getBank("HitBasedTrkg::HBTracks").getFloat("p0_x", 0), 1.057), true);
assertEquals(isWithinXPercent(16.0, testEvent.getBank("HitBasedTrkg::HBTracks").getFloat("p0_x", 0), 1.057), true);
assertEquals(testEvent.getBank("HitBasedTrkg::HBTracks").getFloat("p0_y", 0) > -0.1, true);
assertEquals(testEvent.getBank("HitBasedTrkg::HBTracks").getFloat("p0_y", 0) < 0.1, true);
assertEquals(ClasMath.isWithinXPercent(16.0, testEvent.getBank("HitBasedTrkg::HBTracks").getFloat("p0_z", 0), 2.266), true);
assertEquals(isWithinXPercent(16.0, testEvent.getBank("HitBasedTrkg::HBTracks").getFloat("p0_z", 0), 2.266), true);

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

assertEquals(ClasMath.isWithinXPercent(27.9, testEvent.getBank("TimeBasedTrkg::TBTracks").getFloat("p0_x", 0), 0.997), true);
assertEquals(isWithinXPercent(27.9, testEvent.getBank("TimeBasedTrkg::TBTracks").getFloat("p0_x", 0), 0.997), true);
assertEquals(testEvent.getBank("TimeBasedTrkg::TBTracks").getFloat("p0_y", 0) > -0.0702, true);
assertEquals(testEvent.getBank("TimeBasedTrkg::TBTracks").getFloat("p0_y", 0) < 0.0438, true);
assertEquals(ClasMath.isWithinXPercent(17.5, testEvent.getBank("TimeBasedTrkg::TBTracks").getFloat("p0_z", 0), 2.04), true);
assertEquals(isWithinXPercent(17.5, testEvent.getBank("TimeBasedTrkg::TBTracks").getFloat("p0_z", 0), 2.04), true);

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

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

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

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

Expand Down
11 changes: 8 additions & 3 deletions reconstruction/eb/src/test/java/org/jlab/service/eb/EBReconstructionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import static org.junit.Assert.*;

import org.jlab.analysis.physics.TestEvent;
import org.jlab.analysis.math.ClasMath;
import org.jlab.clas.swimtools.MagFieldsEngine;
import cnuphys.magfield.MagneticFields;
import org.jlab.detector.base.DetectorType;
Expand Down Expand Up @@ -105,6 +104,12 @@ public boolean hasValidRefs(DataEvent ev,
return true;
}

static boolean isWithinXPercent(double X, double val, double standard) {
if(standard >= 0 && val > (1.0 - (X/100.0))*standard && val < (1.0 + (X/100.0))*standard) return true;
else if(standard < 0 && val < (1.0 - (X/100.0))*standard && val > (1.0 + (X/100.0))*standard) return true;
return false;
}

@Test
public void testEBReconstruction() {
System.setProperty("CLAS12DIR", "../../");
Expand All @@ -120,10 +125,10 @@ public void testEBReconstruction() {
assertEquals(hasValidRefs(photonEvent,"REC::Calorimeter","REC::Particle","pindex"),true);
// additional EC reco. tests:
assertEquals(photonEvent.getBank("RECHB::Particle").rows(), 1);
assertEquals(ClasMath.isWithinXPercent(25.0, photonEvent.getBank("RECHB::Particle").getFloat("px", 0), 1.057), true);
assertEquals(isWithinXPercent(25.0, photonEvent.getBank("RECHB::Particle").getFloat("px", 0), 1.057), true);
assertEquals(photonEvent.getBank("RECHB::Particle").getFloat("py", 0) > -0.15, true);
assertEquals(photonEvent.getBank("RECHB::Particle").getFloat("py", 0) < 0.15, true);
assertEquals(ClasMath.isWithinXPercent(25.0, photonEvent.getBank("RECHB::Particle").getFloat("pz", 0), 2.266), true);
assertEquals(isWithinXPercent(25.0, photonEvent.getBank("RECHB::Particle").getFloat("pz", 0), 2.266), true);

DataEvent electronEvent = TestEvent.get(DetectorType.DC);
processAllEngines(electronEvent);
Expand Down
8 changes: 4 additions & 4 deletions validation/advanced-tests/src/eb/EBTwoTrackTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import org.jlab.detector.base.DetectorType;
import org.jlab.clas.pdg.PDGDatabase;

import org.jlab.analysis.math.ClasMath;
import org.jlab.clas.detector.DetectorResponse;

/**
*
Expand Down Expand Up @@ -554,7 +554,7 @@ private void processEventFT(DataEvent event) {
if (pid==hadronPDG) {
final double px=recPartBank.getFloat("px",ii);
final double py=recPartBank.getFloat("py",ii);
final int sector = ClasMath.getSectorFromPhi(Math.atan2(py,px));
final int sector = DetectorResponse.getSector(Math.atan2(py,px));
nHadronsSector[sector-1]++;
if (sector==hadronSector || (pid==11 && sector==electronSector)) {
nFtFd++;
Expand Down Expand Up @@ -601,7 +601,7 @@ else if (!isCentral && trkBank.getInt("sector",ii)==hadronSector) {
for (int ii=0; ii<ctrkBank.rows(); ii++) {
if (ctrkBank.getInt("q",ii)>0) {
final double phi0 = ctrkBank.getFloat("phi0",ii);
final int sector = ClasMath.getSectorFromPhi(phi0);
final int sector = DetectorResponse.getSector(phi0);
if (sector == hadronSector)
nPosTracks++;
}
Expand Down Expand Up @@ -645,7 +645,7 @@ else if (!isCentral && trkBank.getInt("sector",ii)==hadronSector) {
px = recSciBank.getFloat("x",recSciMap.get(ii).get(0));
py = recSciBank.getFloat("y",recSciMap.get(ii).get(0));
}
final int sector = ClasMath.getSectorFromPhi(Math.atan2(py,px));
final int sector = DetectorResponse.getSector(Math.atan2(py,px));

if (pid==11 && sector==electronSector) {
if (!foundElectron) nElectronsSector[sector-1]++;
Expand Down