diff --git a/CHANGELOG.md b/CHANGELOG.md index e065ebb5b..76b7e6d65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,20 +20,25 @@ it in future. * Add `.git-blame-ignore-revs` to allow automatic reformatting etc. without polluting git blame * Automatically built documentation using Doxygen * Add CODEOWNERS file to automatically trigger reviews by the relevant experts +* Add different configuration files for vacuum /helium for the Decay Vessel ### Fixed * Remove trailing whitespace and fix line endings * Fix compilation warnings due to deprecations #469 * Fix issue with SST parameters #489 +* Cleaned up Veto Implementation ### Changed * Update getGeoInformation command line interface * Update SST geometry constants #483 +* Decay Vessel configuration now imported from a yaml file +* Geometry of Decay Vessel updated to new design ### Removed * Remove obsolete files related to old ways of installing or testing FairShip * Remove uses of future and past modules #473 * Remove Geant3 dependency + diff --git a/geometry/veto_config_vacuums.yaml b/geometry/veto_config_vacuums.yaml index 4eda807a9..7d07c47b2 100644 --- a/geometry/veto_config_vacuums.yaml +++ b/geometry/veto_config_vacuums.yaml @@ -1,17 +1,17 @@ -# Configuration of Decay Vessel for FairShip ( Naples Design) +#Vacuum Configuration of Decay Vessel for FairShip ( Naples Design) z: 0.0 innerSupport: 2 # cm -innerSupportMed: "Aluminum" +innerSupportMed: "steel" outerSupport: 2 # cm -outerSupportMed: "Aluminum" +outerSupportMed: "steel" lidThickness: 0.0 # cm sensitiveThickness: 20 # cm sensitiveMed: "Scintillator" decayMed: "vacuums" rib: 1.5 # cm -ribMed: "Aluminum" +ribMed: "steel" xstartInner : 100.0 # cm ystartInner : 270.0 # cm xendInner : 400.0 # cm #FocusLineX at z= target.z0 + 16.8m diff --git a/veto/veto.cxx b/veto/veto.cxx index 07eba6406..b149841f8 100644 --- a/veto/veto.cxx +++ b/veto/veto.cxx @@ -1055,6 +1055,7 @@ void veto::ConstructGeometry() InitMedium("Aluminum"); InitMedium("helium"); InitMedium("Scintillator"); + InitMedium("steel"); gGeoManager->SetNsegments(100);