diff --git a/Mu2eG4/geom/geom_run1.txt b/Mu2eG4/geom/geom_run1.txt index 09f518237d..693e2f508c 100644 --- a/Mu2eG4/geom/geom_run1.txt +++ b/Mu2eG4/geom/geom_run1.txt @@ -63,7 +63,7 @@ double mu2e.detectorSystemZ0 = 10171.; // mm G4BL: (17730-7292=9801 mm) #include "Offline/Mu2eG4/geom/STM_v09.txt" // (muon) stopping target monitor // Proton Absorber -#include "Offline/Mu2eG4/geom/protonAbsorber_cylindrical_v04.txt" +#include "Offline/Mu2eG4/geom/protonAbsorber_cylindrical_v05.txt" #include "Offline/Mu2eG4/geom/degrader_v02.txt" // pion degrader. Off by default #include "Offline/Mu2eG4/geom/ProductionTarget_Hayman_v2_2.txt" diff --git a/Mu2eG4/geom/geom_run1_a_stickman.txt b/Mu2eG4/geom/geom_run1_a_stickman.txt index 47ed2d2bc8..3a6482810f 100644 --- a/Mu2eG4/geom/geom_run1_a_stickman.txt +++ b/Mu2eG4/geom/geom_run1_a_stickman.txt @@ -63,7 +63,7 @@ double mu2e.detectorSystemZ0 = 10171.; // mm G4BL: (17730-7292=9801 mm) #include "Offline/Mu2eG4/geom/STM_v09.txt" // (muon) stopping target monitor // Proton Absorber -#include "Offline/Mu2eG4/geom/protonAbsorber_cylindrical_v04.txt" +#include "Offline/Mu2eG4/geom/protonAbsorber_cylindrical_v05.txt" #include "Offline/Mu2eG4/geom/degrader_v02.txt" // pion degrader. Off by default #include "Offline/Mu2eG4/geom/ProductionTarget_Stickman_v1_0.txt" diff --git a/Mu2eG4/geom/protonAbsorber_cylindrical_v05.txt b/Mu2eG4/geom/protonAbsorber_cylindrical_v05.txt new file mode 100644 index 0000000000..0fc748c70f --- /dev/null +++ b/Mu2eG4/geom/protonAbsorber_cylindrical_v05.txt @@ -0,0 +1,12 @@ +// +// Conical proton absorber geometry file. +// Correced Dimensions and endRing Material +// See Doc-57487-v3 +// + +#include "Offline/Mu2eG4/geom/protonAbsorber_cylindrical_v04.txt" + +//Corrected Dimensions - overwriting previous entries +double protonabsorber.ipa.endRingHalfLength = 3.175; // 1/4" long in the z-direction +double protonabsorber.ipa.endRingRadialLength = 19.05; // 3/4" long in the r-direction +string protonabsorber.ipa.endRingMaterial = "IPAPolystyrene"; //Changed Material diff --git a/Mu2eG4/src/ConstructMaterials.cc b/Mu2eG4/src/ConstructMaterials.cc index 55aeea3145..50a7fe5027 100644 --- a/Mu2eG4/src/ConstructMaterials.cc +++ b/Mu2eG4/src/ConstructMaterials.cc @@ -1,4 +1,4 @@ -// + // // Construct materials requested by the run-time configuration system. // @@ -1334,6 +1334,15 @@ namespace mu2e { CorrugatedPolypropylene->AddElement( getElementOrThrow("H"), 6); } + mat = uniqueMaterialOrThrow("IPAPolystyrene"); + { + // We used an explicity density here + // Reflects the corrected density for End Ring material + G4double IPAEffectiveDensity = 0.426*CLHEP::g/CLHEP::cm3; //explicit density refer to Doc-57487-v3 + G4Material* IPAPolystyrene = new G4Material( mat.name, IPAEffectiveDensity, 2); + IPAPolystyrene->AddElement( getElementOrThrow("C"), 8); + IPAPolystyrene->AddElement( getElementOrThrow("H"), 8); + } //G10-FR4 used for printed board of the I-Tracker // G10 http://personalpages.to.infn.it/~tosello/EngMeet/ITSmat/SDD/SDD_G10FR4.html diff --git a/Mu2eG4/src/constructProtonAbsorber.cc b/Mu2eG4/src/constructProtonAbsorber.cc index 174ef37edc..5c38d3a1fd 100644 --- a/Mu2eG4/src/constructProtonAbsorber.cc +++ b/Mu2eG4/src/constructProtonAbsorber.cc @@ -1614,6 +1614,9 @@ namespace mu2e { ostringstream wirename ; wirename << "IPAsupport_set" << iS << "_wire" << ++iW ; const double rStartOfWire = pabs1rOut0+(supportWire.originInMu2e().z()-zstartOfIPA)/pabs1len*(pabs1rOut1-pabs1rOut0); + if ( verbosityLevel > 0){ + std::cout << "Set " << iSet << ", Wire " << iWire << ": rStartOfWire = " << rStartOfWire << "\n"; + } const double wirePhi = iWire * 360.*CLHEP::deg / ipaSup->nWiresPerSet() + wire_angle_offset ; CLHEP::Hep3Vector additionalOffset ( (supportWire.halfLength()+0.005+rStartOfWire) * std::cos(wirePhi),