Skip to content

fix: reduce thread contention in DC TableLoader #1238

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 2 commits into
base: development
Choose a base branch
from
+9 −5
Open

fix: reduce thread contention in DC TableLoader #1238

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa87d7b
cleanup
baltzell Apr 30, 2026
5d69a4e
private some methods and reduce locks
baltzell Apr 30, 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
14 changes: 9 additions & 5 deletions reconstruction/dc/src/main/java/org/jlab/rec/dc/timetodistance/TableLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ private static int getAlphaBin(double Alpha) {
return bin;
}

private static synchronized void FillAlpha() {
private static void FillAlpha() {
for(int icosalpha =0; icosalpha<maxBinIdxAlpha+1; icosalpha++) {

double cos30minusalphaM = Math.cos(Math.toRadians(30.)) + (double)
Expand All @@ -249,8 +249,10 @@ private static synchronized void FillAlpha() {
AlphaBounds[0][0] = 0;
AlphaBounds[5][1] = 30;
}

public static boolean useP = true;
public static synchronized void getConstants(IndexedTable t2dPressure, IndexedTable t2dPressRef, IndexedTable pressure){

private static void getConstants(IndexedTable t2dPressure, IndexedTable t2dPressRef, IndexedTable pressure){
double p_ref = t2dPressRef.getDoubleValue("pressure", 0,0,0);
double p = pressure.getDoubleValue("value", 0,0,3);
double dp = p - p_ref;
Expand Down Expand Up @@ -300,7 +302,8 @@ public static synchronized void getConstants(IndexedTable t2dPressure, IndexedTa
}
}
}
public static synchronized void FillTable() {

private static void FillTable() {
double stepSize = 0.00010;
for(int s = 0; s<6; s++ ){ // loop over sectors
for(int r = 0; r<6; r++ ){ //loop over slys
Expand Down Expand Up @@ -363,6 +366,7 @@ public static synchronized void FillTable() {

TableLoader.fillMissingTableBins();
}

public static synchronized void Fill(IndexedTable t2dPressure, IndexedTable t2dPressRef, IndexedTable pressure) {

//CCDBTables 0 = "/calibration/dc/signal_generation/doca_resolution";
Expand Down Expand Up @@ -411,7 +415,7 @@ private static void fillMissingTableBins() {
* @param superlayer superlayer
* @return returns time (ns) when given inputs of distance x (cm), local angle alpha (degrees) and magnitude of bfield (Tesla).
*/
public static synchronized double calc_Time(double x, double alpha, double bfield, int sector, int superlayer) {
public static double calc_Time(double x, double alpha, double bfield, int sector, int superlayer) {
int s = sector - 1;
int r = superlayer - 1;
double dmax = 2.*Constants.getInstance().wpdist[r];
Expand All @@ -428,7 +432,7 @@ public static synchronized double calc_Time(double x, double alpha, double bfiel

}

public static synchronized double getDeltaTimeBeta(double x, double beta, double distbeta, double v_0) {
public static double getDeltaTimeBeta(double x, double beta, double distbeta, double v_0) {

double value = (0.5*Math.pow(beta*beta*distbeta,3)*x/(Math.pow(beta*beta*distbeta,3)+x*x*x))/v_0;

Expand Down