Skip to content

Geometry Factory for Muon Calorimeter #1302

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
ethancline wants to merge 15 commits into
base: development
Choose a base branch
from
Open

Geometry Factory for Muon Calorimeter #1302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
06d8a7e
imported muCLAS12/ddvcs reconstruction from ddvcs branch creating new…
raffaelladevita Dec 17, 2025
135d3b2
Merge branch 'development' into ddvcsMerge
raffaelladevita Dec 18, 2025
6f22ad8
fix version number in mu pom, and adding missing MUHD reconstruction …
raffaelladevita Dec 18, 2025
85dfbd5
fix dependency in mu pom
raffaelladevita Dec 18, 2025
9ce0517
fix dependency in mu pom
raffaelladevita Dec 18, 2025
b28aaf2
addressing spotbugs findings
raffaelladevita Dec 18, 2025
88f080c
Merge branch 'ddvcsMerge' of github.com:JeffersonLab/coatjava into de…
ethancline Jan 21, 2026
c9beaa5
Merge branch 'development' into ddvcsMerge
raffaelladevita Mar 4, 2026
41a1ffe
updatedmu pom and MUVT fixes
raffaelladevita Mar 5, 2026
18a30be
added MUVT trajectory points
raffaelladevita Mar 5, 2026
b046673
bug fixes
raffaelladevita Mar 5, 2026
ffab8f4
Merge branch 'ddvcsMerge' of github.com:JeffersonLab/coatjava into de…
ethancline Mar 6, 2026
e66b8e4
mucal factory for ddvcs experiment
ethancline Jun 2, 2026
4ace20a
make sure to make all crystals
ethancline Jun 2, 2026
6f7ca7b
Merge github.com:JeffersonLab/coatjava into cal
ethancline Jun 3, 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
27 changes: 20 additions & 7 deletions common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,7 @@ public final class DCGeant4Factory extends Geant4Factory {
private final HashMap<String, String> properties = new HashMap<>();
private int nsgwires;

private final double x_enlargement = 1.00;
private final double y_enlargement = 3.65;
private final double z_enlargement = -2.46;
private final double microgap = 0.01;
Expand Down Expand Up @@ -823,19 +824,20 @@ private Geant4Basic getRegion(int isec, int ireg) {
}

private Geant4Basic getLayer(int isec, int isuper, int ilayer) {
return getRegion(isec, isuper/2).getChildren().get((isuper%2)*6 + ilayer);
return getRegion(isec, isuper/2).getChildren().get(0).getChildren().get((isuper%2)*6 + ilayer);
Copy link
Copy Markdown
Collaborator

@baltzell baltzell Jun 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should there be a comment about "why the get(0)"?

}
///////////////////////////////////////////////////
public Geant4Basic createRegion(int isector, int iregion) {
Wire regw0 = new Wire(isector+1, iregion * 2, 0, 0);
Wire regw1 = new Wire(isector+1, iregion * 2 + 1, 7, nsgwires - 1);

double dx_shift = y_enlargement * Math.tan(Math.toRadians(29.5));
double dx_shift = y_enlargement * Math.tan(dbref.thopen(iregion)/2);
double extra = 0.2;

double reg_dz = (dbref.frontgap(iregion) + dbref.backgap(iregion) + dbref.midgap(iregion) + dbref.superwidth(iregion * 2) + dbref.superwidth(iregion * 2 + 1)) / 2.0 + z_enlargement;
double reg_dx0 = Math.abs(regw0.bottom().x) - dx_shift + 1.0;
double reg_dx1 = Math.abs(regw1.top().x) + dx_shift + 1.0;
double reg_dy = regw1.top().minus(regw0.bottom()).y / Math.cos(dbref.thtilt(iregion)) / 2.0 + y_enlargement + 1.0;
double reg_dx0 = Math.abs(regw0.bottom().x) - dx_shift + x_enlargement;
double reg_dx1 = Math.abs(regw1.top().x) + dx_shift + x_enlargement;
double reg_dy = regw1.top().minus(regw0.bottom()).y / Math.cos(dbref.thtilt(iregion)) / 2.0 + y_enlargement;
double reg_skew = 0.0;
double reg_thtilt = dbref.thtilt(iregion);

Expand All @@ -852,6 +854,17 @@ public Geant4Basic createRegion(int isector, int iregion) {
regionVolume.translate(vcenter.x, vcenter.y, vcenter.z);
regionVolume.setId(isector + 1, iregion + 1, 0, 0);

double gas_dx0 = reg_dx0 - x_enlargement + dx_shift + extra;
double gas_dx1 = reg_dx1 - x_enlargement - dx_shift + extra;
double gas_dy = reg_dy - y_enlargement + extra;
Geant4Basic regionGas = new G4Trap("regionGas" + (iregion + 1) + "_s" + (isector + 1),
reg_dz, -reg_thtilt, Math.toRadians(90.0),
gas_dy, gas_dx0, gas_dx1, 0.0,
gas_dy, gas_dx0, gas_dx1, 0.0);
regionGas.setPosition(0, 0, 0);
regionGas.setMother(regionVolume);
regionGas.setId(isector + 1, iregion + 1, 0, 0);

for (int isup = 0; isup < 2; isup++) {
int isuper = iregion * 2 + isup;
Geant4Basic superlayerVolume = this.createSuperlayer(isuper);
Expand All @@ -864,7 +877,7 @@ public Geant4Basic createRegion(int isector, int iregion) {
superlayerVolume.rotate("zxy", -dbref.thster(isuper), 0.0, 0.0);

superlayerVolume.setPosition(slshift.x, slshift.y, slshift.z);
superlayerVolume.setMother(regionVolume);
superlayerVolume.setMother(regionGas);
superlayerVolume.setId(isector + 1, iregion + 1, isuper + 1);

int nsglayers = dbref.nsenselayers(isuper) + dbref.nguardlayers(isuper);
Expand All @@ -879,7 +892,7 @@ public Geant4Basic createRegion(int isector, int iregion) {
layerVolume.rotate("zxy", -dbref.thster(isuper), 0.0, 0.0);

layerVolume.setPosition(lshift.x, lshift.y, lshift.z);
layerVolume.setMother(regionVolume);
layerVolume.setMother(regionGas);
layerVolume.setId(isector + 1, iregion + 1, isuper + 1, ilayer);
}
}
Expand Down
Loading