Skip to content
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.

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

Adjust/update Next100 geometry #215

Merged
merged 1 commit into from
Nov 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions source/geometries/Next100Ics.cc
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ namespace nexus {

void Next100Ics::Construct()
{
G4double length = gate_tp_distance_ + gate_sapphire_wdw_dist_;

G4double length = 1468.2 * mm; // (Full length of copper bars) - (copper simulated in TP_COPPER_PLATE)
// defined for G4UnionSolids to ensure a common volume within the two joined solids
// and for G4SubtractionSolids to ensure surface subtraction
G4double offset = 1.* mm;
Expand Down Expand Up @@ -117,18 +116,19 @@ namespace nexus {
ics_solid = new G4SubtractionSolid("ICS", ics_solid, upp_hole_solid_2,
port_upp_Rot, G4ThreeVector(0, (in_rad_ + thickness_/2.), upp_hole_2_z-length/2.));

/// Lateral holes
/// Lateral holes (also known as feedthrough holes)
G4double lat_hole_rad = upp_hole_1_rad;
G4double lat_hole_z = 58.1 * mm;
G4double lat_hole_z_1 = 55.5 * mm;
G4double lat_hole_z_2 = 33.0 * mm;

G4Tubs* lat_hole_solid = new G4Tubs("LAT_HOLE", 0., lat_hole_rad,
(thickness_ + offset)/2., 0.*deg, 360.*deg);

ics_solid = new G4SubtractionSolid("ICS", ics_solid, lat_hole_solid,
port_a_Rot, G4ThreeVector(port_x, port_y, lat_hole_z-length/2.));
port_a_Rot, G4ThreeVector(port_x, port_y, lat_hole_z_1-length/2.));

ics_solid = new G4SubtractionSolid("ICS", ics_solid, lat_hole_solid,
port_b_Rot, G4ThreeVector(-port_x, port_y, lat_hole_z-length/2.));
port_b_Rot, G4ThreeVector(-port_x, port_y, lat_hole_z_2-length/2.));


/// ICS step at the TP end.
Expand Down
4 changes: 2 additions & 2 deletions source/geometries/Next100OpticalGeometry.cc
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ namespace nexus {

Next100OpticalGeometry::Next100OpticalGeometry(): GeometryBase(),
// common used variables in geomety components
gate_tracking_plane_distance_(35. * mm), // to be confirmed
gate_sapphire_wdw_distance_ (1460.5 * mm),
gate_tracking_plane_distance_((26.1 + 0.1) * mm), // to be confirmed
gate_sapphire_wdw_distance_ ((1458.2 - 0.1) * mm),
pressure_(15. * bar),
temperature_ (300 * kelvin),
sc_yield_(25510. * 1/MeV),
Expand Down
8 changes: 4 additions & 4 deletions source/geometries/Next100Vessel.cc
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,10 @@ namespace nexus {
G4double port_nozzle_y = port_nozzle_x;

G4double port_reference_z = -body_length_/2. + endcap_in_body_;
port_z_1a_ = port_reference_z + 702. * mm;
port_z_2a_ = port_reference_z + 1292. * mm;
port_z_1b_ = port_reference_z + 533.6 * mm;
port_z_2b_ = port_reference_z + 1033.6 * mm;
port_z_1a_ = port_reference_z + 739.6 * mm;
port_z_2a_ = port_reference_z + 1329.6 * mm;
port_z_1b_ = port_reference_z + 570.3 * mm;
port_z_2b_ = port_reference_z + 1070.3 * mm;

G4RotationMatrix* port_a_Rot = new G4RotationMatrix;
port_a_Rot->rotateX( 90. * deg);
Expand Down
Loading