Skip to content

Fix formatting and package names, remove unused imports and mains #1313

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

Merged
silvianic merged 2 commits into from
Jun 12, 2026
Merged

Fix formatting and package names, remove unused imports and mains #1313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9b8ff4
fix package names, remove unused imports
baltzell Jun 11, 2026
9da88bb
fix formatting, remove empty mains
baltzell Jun 11, 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
16 changes: 4 additions & 12 deletions ...n-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/recoil/tof/RTOFConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package org.jlab.detector.geant4.v2.recoil.tof;


import org.jlab.detector.calib.utils.DatabaseConstantProvider;
import org.jlab.geom.prim.Point3D;


public class RTOFConstants {

Expand All @@ -25,27 +22,22 @@ public class RTOFConstants {
public final static double LENGTH = (NROWS-1) * LONG_BAR_LENGTH + SHORT_BAR_LENGTH;
public final static double THICKNESS = 0.5; // cm


public static DatabaseConstantProvider connect( DatabaseConstantProvider cp )
{

load(cp );
return cp;
load(cp );
return cp;
}

/**
* Reads all the necessary constants from CCDB into static variables.
* Please use a DatabaseConstantProvider to access CCDB and load the following tables:
* @param cp a ConstantProvider that has loaded the necessary tables
*/

public static synchronized void load( DatabaseConstantProvider cp )
{
//WIDTH = NCOLUMNS * BAR_WIDTH;
//WIDTH = NCOLUMNS * BAR_WIDTH;
//LENGTH = (NROWS-1) * LONG_BAR_LENGTH + SHORT_BAR_LENGTH;
//THICKNESS = 0.5; // cm
}

}


}
155 changes: 70 additions & 85 deletions ...ols/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/recoil/tof/RTOFGeant4Factory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

/**
* Generate GEANT4 volume for the RECOIL TOF detector
*
*
* @author Nilanga Wickramaarachchi
*/
public final class RTOFGeant4Factory extends Geant4Factory {
Expand All @@ -24,121 +24,106 @@ public RTOFGeant4Factory( DatabaseConstantProvider cp) {
}

public void init(DatabaseConstantProvider cp) {

motherVolume = new G4World("root");

for (int isector = 0; isector < nSectors; isector++) {
Geant4Basic sectorVolume = createSector(isector, nRows, nCols);

sectorVolume.setName("recoil_tof_sector" + (isector + 1));
sectorVolume.setMother(motherVolume);
}
for (int isector = 0; isector < nSectors; isector++) {
Geant4Basic sectorVolume = createSector(isector, nRows, nCols);
sectorVolume.setName("recoil_tof_sector" + (isector + 1));
sectorVolume.setMother(motherVolume);
}
}



public Vector3d getCenterCoordinate(int isector)
{
int is=isector;
Vector3d vCenter = new Vector3d(0, 0, 0);

vCenter.x = (-1+is*2)*(RTOFConstants.RADIUS)*Math.sin(Math.toRadians(RTOFConstants.HORIZONTAL_OPENING_ANGLE/2+RTOFConstants.HORIZONTAL_STARTING_ANGLE));
vCenter.y = 0;
vCenter.z =RTOFConstants.RADIUS*Math.cos(Math.toRadians(RTOFConstants.HORIZONTAL_OPENING_ANGLE/2+RTOFConstants.HORIZONTAL_STARTING_ANGLE));
vCenter.x = (-1+is*2)*(RTOFConstants.RADIUS)*Math.sin(Math.toRadians(RTOFConstants.HORIZONTAL_OPENING_ANGLE/2+RTOFConstants.HORIZONTAL_STARTING_ANGLE));
vCenter.y = 0;
vCenter.z =RTOFConstants.RADIUS*Math.cos(Math.toRadians(RTOFConstants.HORIZONTAL_OPENING_ANGLE/2+RTOFConstants.HORIZONTAL_STARTING_ANGLE));
return vCenter;
}



public Geant4Basic createSector(int isector, int nRows, int nCols ) {

double hlx = RTOFConstants.WIDTH/2+1;
double hly = RTOFConstants.LENGTH/2+1;
double hlz = RTOFConstants.THICKNESS/2+1;

double hlz = RTOFConstants.THICKNESS/2+1;
Vector3d vCenter = this.getCenterCoordinate(isector);

Geant4Basic sectorVolume = new G4Box("recoil_tof_sector" + (isector + 1), hlx, hly, hlz);

if(isector==0) sectorVolume.rotate("yxz",Math.toRadians((RTOFConstants.HORIZONTAL_OPENING_ANGLE/2+RTOFConstants.HORIZONTAL_STARTING_ANGLE)),0,0);
if(isector==1) sectorVolume.rotate("yxz",Math.toRadians(-(RTOFConstants.HORIZONTAL_OPENING_ANGLE/2+RTOFConstants.HORIZONTAL_STARTING_ANGLE)),0,0);
Geant4Basic sectorVolume = new G4Box("recoil_tof_sector" + (isector + 1), hlx, hly, hlz);
if(isector==0) sectorVolume.rotate("yxz",Math.toRadians((RTOFConstants.HORIZONTAL_OPENING_ANGLE/2+RTOFConstants.HORIZONTAL_STARTING_ANGLE)),0,0);
if(isector==1) sectorVolume.rotate("yxz",Math.toRadians(-(RTOFConstants.HORIZONTAL_OPENING_ANGLE/2+RTOFConstants.HORIZONTAL_STARTING_ANGLE)),0,0);
sectorVolume.translate(vCenter.x, vCenter.y, vCenter.z);
sectorVolume.setId(isector + 1, 0, 0);
// Bars construction
for (int row = 0; row < nRows; row++) {
for (int col = 0; col < nCols; col++) {

Geant4Basic barVolume = this.createBar(isector, row, col);

for (int row = 0; row < nRows; row++) {
for (int col = 0; col < nCols; col++) {
Geant4Basic barVolume = this.createBar(isector, row, col);
barVolume.setName("bar_sector" + (isector + 1) + "_row" + (row + 1) + "_column" + (col + 1));

barVolume.setMother(sectorVolume);

barVolume.setId(isector + 1, row +1, col+1, 0);
}
}
barVolume.setMother(sectorVolume);
barVolume.setId(isector + 1, row +1, col+1, 0);
}
}

return sectorVolume;
}


public Geant4Basic createBar(int iSector, int iRow, int iCol) {

int nCols = RTOFConstants.NCOLUMNS;

double barDX = RTOFConstants.BAR_WIDTH/2;
double barDY;

if (iRow == (nRows - 1) / 2) barDY = RTOFConstants.SHORT_BAR_LENGTH/2;
else barDY = RTOFConstants.LONG_BAR_LENGTH/2;

double barDZ = RTOFConstants.BAR_THICKNESS/2;
int nCols = RTOFConstants.NCOLUMNS;

double barDX = RTOFConstants.BAR_WIDTH/2;
double barDY;

if (iRow == (nRows - 1) / 2) barDY = RTOFConstants.SHORT_BAR_LENGTH/2;
else barDY = RTOFConstants.LONG_BAR_LENGTH/2;

double barDZ = RTOFConstants.BAR_THICKNESS/2;

Geant4Basic barVolume = new G4Box("bar_sector" + (iSector + 1) + "_row" + (iRow + 1) + "_column" + (iCol + 1), barDX, barDY, barDZ);

// Constants for positioning
double y_start = -(RTOFConstants.LENGTH - RTOFConstants.LONG_BAR_LENGTH)/2; // Starting Y position
double x_spacing = RTOFConstants.BAR_WIDTH;
double x_start = -(RTOFConstants.WIDTH - x_spacing)/2; // starting X position
double dy_long = RTOFConstants.LONG_BAR_LENGTH;
double dy_short = RTOFConstants.SHORT_BAR_LENGTH;

//Position calculation
double z_pos = 0;
double x_pos = x_start + (iCol * x_spacing);

Geant4Basic barVolume = new G4Box("bar_sector" + (iSector + 1) + "_row" + (iRow + 1) + "_column" + (iCol + 1), barDX, barDY, barDZ);

// Constants for positioning
double y_start = -(RTOFConstants.LENGTH - RTOFConstants.LONG_BAR_LENGTH)/2; // Starting Y position
double x_spacing = RTOFConstants.BAR_WIDTH;
double x_start = -(RTOFConstants.WIDTH - x_spacing)/2; // starting X position
double dy_long = RTOFConstants.LONG_BAR_LENGTH;
double dy_short = RTOFConstants.SHORT_BAR_LENGTH;

//Position calculation
double z_pos = 0;
double x_pos = x_start + (iCol * x_spacing);

double y_pos;
if(iRow < (nRows - 1) / 2)
{
y_pos = y_start + (iRow * dy_long);
}
else if (iRow == (nRows - 1) / 2) // middle row
{
y_pos = 0;
}
else
{
y_pos = y_start + (iRow -1) * dy_long + dy_short;
}

barVolume.setPosition(x_pos, y_pos, z_pos);

return barVolume;
if (iRow < (nRows - 1) / 2) {
y_pos = y_start + (iRow * dy_long);
}
else if (iRow == (nRows - 1) / 2) {// middle row
y_pos = 0;
}
else {
y_pos = y_start + (iRow -1) * dy_long + dy_short;
}

barVolume.setPosition(x_pos, y_pos, z_pos);

return barVolume;
}




public static void main(String[] args) {
DatabaseConstantProvider cp = new DatabaseConstantProvider(11, "default");

RTOFConstants.connect(cp);

RTOFGeant4Factory factory = new RTOFGeant4Factory(cp);

factory.getAllVolumes().forEach(volume -> {
System.out.println(volume.gemcString());
});

}
}
}
}
Loading