diff --git a/sbndcode/JobConfigurations/standard/detsim/CMakeLists.txt b/sbndcode/JobConfigurations/standard/detsim/CMakeLists.txt index 0b3773a0c..5803f01d3 100644 --- a/sbndcode/JobConfigurations/standard/detsim/CMakeLists.txt +++ b/sbndcode/JobConfigurations/standard/detsim/CMakeLists.txt @@ -4,5 +4,6 @@ FILE(GLOB fcl_files *.fcl) install_source(EXTRAS ${fcl_files} ) add_subdirectory(detector_variations) -add_subdirectory(legacy) +# LegacyLArG4 is not supported when using geant4 4.11 +##add_subdirectory(legacy) diff --git a/sbndcode/JobConfigurations/standard/g4/CMakeLists.txt b/sbndcode/JobConfigurations/standard/g4/CMakeLists.txt index 91660cfa0..a82cc1a6b 100644 --- a/sbndcode/JobConfigurations/standard/g4/CMakeLists.txt +++ b/sbndcode/JobConfigurations/standard/g4/CMakeLists.txt @@ -7,4 +7,5 @@ add_subdirectory(recomb_variations) add_subdirectory(crt_filter) add_subdirectory(optical_sim) -add_subdirectory(legacy) +# LegacyLArG4 is not supported when using geant4 4.11 +##add_subdirectory(legacy) diff --git a/sbndcode/LArG4/legacy_largeantmodules_sbnd.fcl b/sbndcode/LArG4/legacy_largeantmodules_sbnd.fcl deleted file mode 100644 index c6fe393c6..000000000 --- a/sbndcode/LArG4/legacy_largeantmodules_sbnd.fcl +++ /dev/null @@ -1,8 +0,0 @@ -#include "largeantmodules.fcl" - -BEGIN_PROLOG - -sbnd_largeant: @local::standard_largeant -sbnd_largeantana: @local::standard_largeantana - -END_PROLOG diff --git a/sbndcode/LArG4/legacy_simulationservices_sbnd.fcl b/sbndcode/LArG4/legacy_simulationservices_sbnd.fcl deleted file mode 100644 index d359ac6e6..000000000 --- a/sbndcode/LArG4/legacy_simulationservices_sbnd.fcl +++ /dev/null @@ -1,146 +0,0 @@ -# -# File: simulationservices_sbnd.fcl -# Purpose: collection of standard simulation service settings for SBND -# Version: 1.3 -# -# Provides: -# -# - sbnd_g4_services: services needed by LArG4 -# - sbnd_detsim_services: services needed by readout simulation -# - sbnd_simulation_services: bundle of services including Geant4, optical -# and electronics simulation (also includes the core ones) -# -# Use as: -# -# services: { -# @table::sbnd_simulation_services -# # ... -# } -# -# Changes: -# 20160601 (petrillo@fnal.gov) [v1.1] -# content moved from services_sbnd.fcl -# -# 20190807 (dbrailsf@fnal.gov) [v1.2] -# PhotonVisibilityService included in g4 servces table -# OpDetResponseInterface included in detsim services table -# Disabled sbnd_opsimulation_services table -# Enabled 'FastOptical' in the custom physics list (in largeantparameters) -# 20190807 (dbrailsf@fnal.gov) [v1.3] -# Added an optional largeantparameters config which does not run the optical sim -# 20200616 (ascarff@fnal.gov) [v1.4] -# Change diffusion constants to match ProtoDUNE data - - -#include "services_sbnd.fcl" -#include "simulationservices.fcl" -#include "spacecharge_sbnd.fcl" -#include "larfft_sbnd.fcl" -#include "signalservices_sbnd.fcl" -#include "magfield_larsoft.fcl" -#include "particleinventoryservice.fcl" -#include "backtrackerservice.fcl" -#include "spacecharge.fcl" -#include "noiseservices_sbnd.fcl" -#include "photpropservices_sbnd.fcl" - -BEGIN_PROLOG - -sbnd_largeantparameters: @local::standard_largeantparameters # from simulationservices.fcl -sbnd_largeantparameters.ElectronClusterSize: 20.0 -#Brailsford 27/10/09: Enable the custom physics list and disable its neutron killer -sbnd_largeantparameters.UseCustomPhysics: true -sbnd_largeantparameters.EnabledPhysics: [ "Em", "FastOptical", "SynchrotronAndGN", "Ion", "Hadron", "Decay", "HadronElastic", "Stopping" ] #Removed the neutron killer -sbnd_largeantparameters.UseLitePhotons: true -sbnd_largeantparameters.UseModBoxRecomb: false -sbnd_largeantparameters.UseEllipsModBoxRecomb: true - -#Define a largeantparameters which doesn't use the optical simulation -sbnd_largeantparameters_noopticalsim: @local::sbnd_largeantparameters -sbnd_largeantparameters_noopticalsim.EnabledPhysics: [ "Em", "SynchrotronAndGN", "Ion", "Hadron", "Decay", "HadronElastic", "Stopping" ] -sbnd_largeantparameters_noopticalsim.UseModBoxRecomb: false -sbnd_largeantparameters_noopticalsim.UseEllipsModBoxRecomb: true - -# ascarff 16Jun2020: Change the diffusion constants to match ProtoDUNE results -sbnd_largeantparameters.LongitudinalDiffusion: 4.0e-9 #in cm^2/ns (was 6.2e-9) -sbnd_largeantparameters.TransverseDiffusion: 8.8e-9 #in cm^2/ns (was 16.3e-9) -sbnd_largeantparameters_noopticalsim.LongitudinalDiffusion: 4.0e-9 #in cm^2/ns (was 6.2e-9) -sbnd_largeantparameters_noopticalsim.TransverseDiffusion: 8.8e-9 #in cm^2/ns (was 16.3e-9) - -# gputnam 19Aug2024: Add in service configuration without EMB recombination -sbnd_largeantparameters_modbox: @local::sbnd_largeantparameters -sbnd_largeantparameters_modbox.UseModBoxRecomb: true -sbnd_largeantparameters_modbox.UseEllipsModBoxRecomb: false - - -sbnd_larvoxelcalculator: @local::standard_larvoxelcalculator # from simulationservices.fcl - -sbnd_backtrackerservice: @local::standard_backtrackerservice # from backtrackerservice.fcl - -sbnd_backtrackerservice.BackTracker.G4ModuleLabel: "largeant" -sbnd_backtrackerservice.BackTracker.MinimumHitEnergyFraction: 1e-1 -sbnd_backtrackerservice.BackTracker.OverrideRealData: true - -sbnd_particleinventoryservice: @local::standard_particleinventoryservice - -# Define sbnd_g4_services -sbnd_g4_services: -{ - @table::sbnd_services - @table::sbnd_random_services - LArG4Parameters: @local::sbnd_largeantparameters - LArVoxelCalculator: @local::sbnd_larvoxelcalculator - MagneticField: @local::no_mag_larsoft - PhotonVisibilityService: @local::sbnd_Nhits_vuv_vis_prop_timing_photonvisibilityservice -} # sbnd_g4_services - - - -# Define sbnd_detsim_services -sbnd_detsim_services: -{ - @table::sbnd_services - @table::sbnd_random_services - LArFFT: @local::sbnd_larfft - SignalShapingServiceSBND: @local::sbnd_signalshapingservice # from signalservices_sbnd.fcl - NoiseModel: @local::sbnd_uboonedatadrivennoiseservice - OpDetResponseInterface: @local::sbnd_opdetresponse -} # sbnd_detsim_services - - -# Define sbnd_simulation_services -sbnd_simulation_services: -{ - @table::sbnd_services - @table::sbnd_random_services - @table::sbnd_g4_services - @table::sbnd_detsim_services - SignalShapingServiceSBND: @local::sbnd_signalshapingservice # from signalservices_sbnd.fcl - SpaceCharge: @local::sbnd_spacecharge -} - - -#sbnd_opsimulation_services: -#{ -# @table::sbnd_simulation_services -# OpDetResponseInterface: @local::sbnd_opdetresponse -## PhotonVisibilityService: @local::sbnd_photonvisibilityservice -## OpDigiProperties: @local::sbnd_opdigiproperties -#} - - -# Define sbnd_optical_simulation_services -#sbnd_optical_simulation_services.LArPropertiesService.ScintYield: 24000 -#sbnd_optical_simulation_services.LArPropertiesService.EnableCerenkovLight: false -#sbnd_optical_simulation_services.LArG4Parameters.UseCustomPhysics: true -#sbnd_optical_simulation_services.LArG4Parameters.EnabledPhysics: [ "Em", -# "FastOptical", -# "SynchrotronAndGN", -# "Ion", -# "Hadron", -# "Decay", -# "HadronElastic", -# "Stopping", -# "NeutronTrackingCut" ] - -END_PROLOG diff --git a/test/fcl/testFHiCLfiles_sbnd.sh b/test/fcl/testFHiCLfiles_sbnd.sh index b9eda6ec0..b2f1695a2 100755 --- a/test/fcl/testFHiCLfiles_sbnd.sh +++ b/test/fcl/testFHiCLfiles_sbnd.sh @@ -46,13 +46,14 @@ if [[ -n "$MRB_BUILDDIR" ]]; then fi fi -if [[ -n "$MRB_SOURCE" ]]; then - SourceFHiCLdir="${MRB_SOURCE}/sbndcode/sbndcode/JobConfigurations" - if [[ -d "$SourceFHiCLdir" ]]; then - echo "Will test the job configuration directory in MRB source area ('${SourceFHiCLdir}')" - TestDirs+=( "$SourceFHiCLdir" ) - fi -fi +# DO NOT test files that are not installed +#if [[ -n "$MRB_SOURCE" ]]; then +# SourceFHiCLdir="${MRB_SOURCE}/sbndcode/sbndcode/JobConfigurations" +# if [[ -d "$SourceFHiCLdir" ]]; then +# echo "Will test the job configuration directory in MRB source area ('${SourceFHiCLdir}')" +# TestDirs+=( "$SourceFHiCLdir" ) +# fi +#fi if [[ "${#TestDirs[@]}]" == 0 ]]; then echo "FATAL: no suitable FHiCL directory found to be tested!" >&2