diff --git a/Mu2eG4/geom/calorimeter_CsI.txt b/Mu2eG4/geom/calorimeter_CsI.txt index 3739a2c02e..14bc9f033a 100644 --- a/Mu2eG4/geom/calorimeter_CsI.txt +++ b/Mu2eG4/geom/calorimeter_CsI.txt @@ -60,7 +60,16 @@ vector calorimeter.pipeTorRadius = {397,457,517,577,637}; double calorimeter.pipeRadius = 4.75; double calorimeter.pipeThickness = 0.5; double calorimeter.pipeInitSeparation = 25.4; -bool calorimeter.hasUpdatedSourceCalibrationSystem = false; + +vector calorimeter.largeTorPhi = {161.34, 149.50, 139.50, 132.07, 125.39};//full angle of large torus +vector calorimeter.smallTorPhi = {84.63, 85.28, 85.79, 86.20, 86.53}; // full angle of small torus +vector calorimeter.straightEndPhi = {3.96, 10.53, 15.80, 20.16, 23.84}; // angle of the ending poing of the straight pipe +vector calorimeter.yposition = {432.2, 480.5, 524.3, 564.7, 602.5}; // start y position of the strait pipe +double calorimeter.radSmTor = 41.0; +double calorimeter.xsmall = 71.0; +double calorimeter.xdistance = 60.0; +double calorimeter.rInnerManifold = 681.6; + int calorimeter.crateVersion = 2; int calorimeter.numberOfCrates = 10; int calorimeter.numberOfBoards = 9; diff --git a/Mu2eG4/geom/calorimeter_CsI_v02.txt b/Mu2eG4/geom/calorimeter_CsI_v02.txt deleted file mode 100644 index 941cec2c65..0000000000 --- a/Mu2eG4/geom/calorimeter_CsI_v02.txt +++ /dev/null @@ -1,145 +0,0 @@ -// Crystal calorimeter - all length in mm, angles in degres - -double calorimeter.caloMotherRadiusIn = 330; -double calorimeter.caloMotherRadiusOut = 719;//720; -double calorimeter.caloMotherZ0 = 11842; -double calorimeter.caloMotherZ1 = 13220; -double calorimeter.vdThickness = 0.02; - - - -int calorimeter.numberOfDisks = 2; -double calorimeter.diskCaseZLength = 206.; -double calorimeter.diskInnerRingIn = 356.; -double calorimeter.diskInnerRingOut = 361.; -double calorimeter.diskCrystalRadiusIn = 374.; -double calorimeter.diskCrystalRadiusOut = 660.; -double calorimeter.diskOuterRingIn = 662.; -double calorimeter.diskOuterRingOut = 672.; -double calorimeter.diskOutRingEdgeZLength = 30.; -double calorimeter.diskOutRingEdgeRLength = 47.; -double calorimeter.diskStepThickness = 3.; -vector calorimeter.diskZ0MotherShift = {0.0,700.0}; //separation w.r.t caloMotherZ0 - -bool calorimeter.crystalShift = true; -double calorimeter.crystalXYLength = 34.0; -double calorimeter.crystalZLength = 200.0; -double calorimeter.crystalFrameZLength = 2.0; -double calorimeter.crystalFrameThickness = 1.0; -double calorimeter.wrapperThickness = 0.150; -double calorimeter.refractiveIndex = 1.8; - - -int calorimeter.readoutPerCrystal = 2; -double calorimeter.readoutXLength = 12; -double calorimeter.readoutYLength = 18; -double calorimeter.readoutZLength = 2; -double calorimeter.FEEXLength = 3; -double calorimeter.FEEYLength = 30; -double calorimeter.FEEZLength = 58; -double calorimeter.FEEBoxThickness = 0.7; -double calorimeter.BPHoleXLength = 30.2; -double calorimeter.BPHoleYLength = 21.8; -double calorimeter.BPHoleZLength = 15; -double calorimeter.BPStripThickness = 5; -double calorimeter.BPOuterRadius = 714; //inner radius same as FP -double calorimeter.BPPipeRadiusHigh = 13.45; -double calorimeter.BPPipeRadiusLow = 8.60; -double calorimeter.BPPipeThickness = 1.5; -double calorimeter.BPPipeZOffset = 43.0; - -double calorimeter.FPInnerRadius = 336; -double calorimeter.FPOuterRadius = 680; -double calorimeter.FPFoamZLength = 21.75; -double calorimeter.FPCarbonZLength = 3; -double calorimeter.FPCoolPipeTorRadius = 698.5; -double calorimeter.FPCoolPipeRadius = 16.85; -double calorimeter.FPCoolPipeThickness = 0.9; -int calorimeter.nPipes = 5; -vector calorimeter.pipeTorRadius = {397,457,517,577,637}; -double calorimeter.pipeRadius = 4.75; -double calorimeter.pipeThickness = 0.5; -double calorimeter.pipeInitSeparation = 25.4; - -bool calorimeter.hasUpdatedSourceCalibrationSystem = true; -vector calorimeter.largeTorPhi = {161.34, 149.50, 139.50, 132.07, 125.39};//full angle of large torus -vector calorimeter.smallTorPhi = {84.63, 85.28, 85.79, 86.20, 86.53}; // full angle of small torus -vector calorimeter.straightEndPhi = {3.96, 10.53, 15.80, 20.16, 23.84}; // angle of the ending poing of the straight pipe -vector calorimeter.yposition = {432.2, 480.5, 524.3, 564.7, 602.5}; // start y position of the strait pipe -double calorimeter.radSmTor = 41.0; -double calorimeter.xsmall = 71.0; -double calorimeter.xdistance = 60.0; -double calorimeter.rInnerManifold = 681.6; - -int calorimeter.crateVersion = 2; -int calorimeter.numberOfCrates = 10; -int calorimeter.numberOfBoards = 9; -int calorimeter.nCrateBeforeSpace = 3; -double calorimeter.crateXLength = 190.; -double calorimeter.crateZLength = 350.; -double calorimeter.crateYLength = 183; -double calorimeter.crateFShieldThickness = 8; // front shield thickness -double calorimeter.crateBShieldThickness = 8; // bottom shield thickness -double calorimeter.crateTThickness = 5; // top panel thickness -double calorimeter.crateSThickness = 8; // side panel thickness -double calorimeter.crateFShieldYLength = 160; -double calorimeter.crateFShieldDeltaZ = 60; -double calorimeter.cratephi0 = 30; -double calorimeter.crateDeltaPhi = 16; -double calorimeter.radiatorThickness = 3.0; -double calorimeter.radiatorZLength = 233.0; -double calorimeter.activeStripThickness = 1.0; -double calorimeter.passiveStripThickness = 1.6; - - -string calorimeter.vacuumMaterial = "DSVacuum"; -string calorimeter.crystalMaterial = "G4_CESIUM_IODIDE"; -string calorimeter.crystalFrameMaterial = "Polyethylene092"; -string calorimeter.wrapperMaterial = "Polyethylene092"; -string calorimeter.innerRingMaterial = "CarbonFiber"; -string calorimeter.innerStepMaterial = "AluminumHoneycomb";//"CarbonFiber"; -string calorimeter.outerRingMaterial = "G4_Al"; - -string calorimeter.readoutMaterial = "G4_Si"; -string calorimeter.FEEMaterial = "Electronics"; - -string calorimeter.coolPipeMaterial = "StainlessSteel"; -string calorimeter.pipeMaterial = "G4_Al"; -string calorimeter.FPFoamMaterial = "AluminumHoneycomb";//"PET_P100"; -string calorimeter.FPCarbonMaterial = "CarbonFiber"; - -string calorimeter.BackPlateMaterial = "Polyetheretherketone"; -string calorimeter.FEEBoxMaterial = "G4_Cu"; -string calorimeter.BPStripMaterial = "G4_Cu"; - -string calorimeter.crateMaterial = "G4_Al"; -string calorimeter.shieldMaterial = "CuW1090"; -string calorimeter.radiatorMaterial = "G4_Cu"; -string calorimeter.activeStripMaterial = "G4_Si"; // need to be changed with a mixed material (combination of Copper, Plexiglass and Silicon) -string calorimeter.passiveStripMaterial = "Electronics2"; - - - - -// Control display and debug printout. -int calorimeter.verbosityLevel = 0; -bool calorimeter.envelope.visible = false; -bool calorimeter.envelope.solid = false; -bool calorimeter.case.visible = true; -bool calorimeter.case.solid = false; -bool calorimeter.crystal.visible = true; -bool calorimeter.crystal.solid = false; -bool calorimeter.crate.visible = true; -bool calorimeter.crate.solid = false; -bool calorimeter.crateBoard.visible = true; -bool calorimeter.crateBoard.solid = false; -bool calorimeter.pipe.visible = true; -bool calorimeter.pipe.solid = false; -bool calorimeter.RO.visible = true; -bool calorimeter.RO.solid = false; - - -// This tells emacs to view this file in c++ mode. -// Local Variables: -// mode:c++ -// End: diff --git a/Mu2eG4/geom/geom_2021_PhaseI_v03.txt b/Mu2eG4/geom/geom_2021_PhaseI_v03.txt deleted file mode 100644 index f3257e06fd..0000000000 --- a/Mu2eG4/geom/geom_2021_PhaseI_v03.txt +++ /dev/null @@ -1,121 +0,0 @@ -// Updated to be used in the MDC2020 simulation campaign, based off Mu2eG4/geom/geom_2021_PhaseI.txt -// Updates made to improve the PS endcap implementation - -string detector.name = "g4geom_v00"; - -bool hasHall = true; -bool hasTarget = true; -bool hasProtonAbsorber = true; -bool hasTSdA = true; -bool hasExternalShielding = true; -bool hasDiskCalorimeter = true; -bool hasBFieldManager = true; -bool hasBeamline = true; -bool hasVirtualDetector = true; // some components, e.g. ProtonAbsorber assume vd presence now; -bool hasCosmicRayShield = true; -bool hasSTM = true; -bool hasMBS = true; // note the two subcomponents, see mbs section below; - // no MBS implies no downstream hole in Cosmic Ray Passive Shield - // Magnetic field may be affected as well -bool hasPTM = true; - - - - -#include "Offline/Mu2eG4/geom/g4_visOptions.txt" - -//------------------------------------------- -// Mu2e geometry includes -//------------------------------------------- - -// X-offset of the PS(+x) and DS(-x) from the Mu2e origin. -// The origin of the detector coordinate system is on the DS axis at the specified z. -double mu2e.solenoidOffset = 3904.; // mm -double mu2e.detectorSystemZ0 = 10171.; // mm G4BL: (17730-7292=9801 mm) - -#include "Offline/Mu2eG4/geom/mu2eWorld.txt" -// mu2eHall.txt should be used with protonBeamDump_v02.txt, below -//#include "Mu2eG4/geom/mu2eHall.txt" -// whereas mu2eHall_v*.txt should be used with protonBeamDump_v03.txt, below -#include "Offline/Mu2eG4/geom/mu2eHall_v04.txt" - -// Solenoids -#include "Offline/Mu2eG4/geom/DetectorSolenoid_v05.txt" -#include "Offline/Mu2eG4/geom/DSShielding_v03.txt" -#include "Offline/Mu2eG4/geom/ProductionSolenoid_v02.txt" -#include "Offline/Mu2eG4/geom/psEnclosure_v05.txt" -#include "Offline/Mu2eG4/geom/PSShield_v06.txt" -#include "Offline/Mu2eG4/geom/PSExternalShielding_v01.txt" -#include "Offline/Mu2eG4/geom/TransportSolenoid_v08.txt" - -// External Shielding -#include "Offline/Mu2eG4/geom/ExtShieldUpstream_v06.txt" -#include "Offline/Mu2eG4/geom/ExtShieldDownstream_v06.txt" -#include "Offline/Mu2eG4/geom/Saddle_v03.txt" -#include "Offline/Mu2eG4/geom/Pipe_v04.txt" -#include "Offline/Mu2eG4/geom/ElectronicRack_v01.txt" - -// #include "Mu2eG4/geom/stoppingTargetHoles_DOE_review_2017.txt" // 37 foil muon stopping target with holes -#include "Offline/Mu2eG4/geom/stoppingTargetHoles_v02.txt" // 37 foil muon stopping target with holes and thicker foils (0.1 mm -> 0.1056 mm) - -#include "Offline/Mu2eG4/geom/TSdA_v02.txt" -#include "Offline/Mu2eG4/geom/muonBeamStop_v08.txt" - -#include "Offline/Mu2eG4/geom/STM_v05.txt" // (muon) stopping target monitor - -// Proton Absorber -#include "Offline/Mu2eG4/geom/protonAbsorber_cylindrical_v04.txt" -#include "Offline/Mu2eG4/geom/degrader_v02.txt" // pion degrader. Off by default - -// #include "Mu2eG4/geom/ProductionTarget_Hayman_v2_0.txt" -#include "Offline/Mu2eG4/geom/ProductionTarget_Hayman_v2_1.txt" -#include "Offline/Mu2eG4/geom/protonBeamDump_v03.txt" -#include "Offline/Mu2eG4/geom/extmon_fnal_v02.txt" - -// as-built panel numbering -#include "Offline/Mu2eG4/geom/tracker_v6.txt" - -// Crystal calorimeter -#include "Offline/Mu2eG4/geom/calorimeter_CsI_v02.txt" - -//CRV counters -#include "Offline/Mu2eG4/geom/crv_counters_v08.txt" - -// Production target beam-scanning detectors -#include "Offline/Mu2eG4/geom/PTM.txt" - -// Magnetic field maps -#include "Offline/Mu2eG4/geom/bfgeom_v01.txt" - -//--------------------------------------- -// Virtual detectors -//--------------------------------------- -double vd.halfLength = 0.01; //mm -int vd.verbosityLevel = 0; -bool vd.visible = true; -bool vd.solid = false; - -// // VD right in front of a hall wall -// double vd.ExtMonCommonPlane.z = -11999.99; - - -//--------------------------------------- -// Region visualization -//--------------------------------------- -#include "Offline/Mu2eG4/geom/visualization_regions.txt" - - - - -// -// -// End notes: -// -// 1) Sources of information: -// -// -// -// This tells emacs to view this file in c++ mode. -// Local Variables: -// mode:c++ -// End: diff --git a/Mu2eG4/geom/geom_common_current.txt b/Mu2eG4/geom/geom_common_current.txt index 32afe64c71..399a90fc73 100644 --- a/Mu2eG4/geom/geom_common_current.txt +++ b/Mu2eG4/geom/geom_common_current.txt @@ -2,7 +2,7 @@ // and features that will eventually become default - // the latest for testing.. -#include "Offline/Mu2eG4/geom/geom_2021_PhaseI_v03.txt" +#include "Offline/Mu2eG4/geom/geom_2021_PhaseI_v02.txt" // This tells emacs to view this file in c++ mode. // Local Variables: