diff --git a/fcl/caf/cafmakerjob_icarus_2Xsce_detsim2d_overlay.fcl b/fcl/caf/cafmakerjob_icarus_2Xsce_detsim2d_overlay.fcl new file mode 100644 index 000000000..dfc9c33e9 --- /dev/null +++ b/fcl/caf/cafmakerjob_icarus_2Xsce_detsim2d_overlay.fcl @@ -0,0 +1,6 @@ +#include "cafmakerjob_icarus_sce.fcl" +#include "cafmaker_add_detsim2d_icarus.fcl" +#include "cafmaker_add_overlay_icarus.fcl" + + +services.SpaceChargeService.InputFilename: "SCEoffsets/SCEoffsets_ICARUS_E500_DoubleCharge_voxelTH3.root" diff --git a/fcl/caf/cafmakerjob_icarus_data.fcl b/fcl/caf/cafmakerjob_icarus_data.fcl index 6910b95cd..b91069469 100644 --- a/fcl/caf/cafmakerjob_icarus_data.fcl +++ b/fcl/caf/cafmakerjob_icarus_data.fcl @@ -33,3 +33,6 @@ physics.producers.cafmaker.SystWeightLabels: [] physics.producers.cafmaker.SaveGENIEEventRecord: false physics.producers.cafmaker.TriggerLabel: "daqTrigger" # the general configuration, for MC, has a different one (see also https://github.com/SBNSoftware/icaruscode/issues/556) + +# Disble old blinding scheme-- switch to decimated datasets +physics.producers.cafmaker.CreateBlindedCAF: false diff --git a/fcl/caf/cafmakerjob_icarus_sce_detsim2d_overlay.fcl b/fcl/caf/cafmakerjob_icarus_sce_detsim2d_overlay.fcl new file mode 100644 index 000000000..458edab34 --- /dev/null +++ b/fcl/caf/cafmakerjob_icarus_sce_detsim2d_overlay.fcl @@ -0,0 +1,3 @@ +#include "cafmakerjob_icarus_sce.fcl" +#include "cafmaker_add_detsim2d_icarus.fcl" +#include "cafmaker_add_overlay_icarus.fcl" diff --git a/fcl/detsim/detsim_2d_icarus_refactored_yzsim_Run4.fcl b/fcl/detsim/detsim_2d_icarus_refactored_yzsim_Run4.fcl index 8980ce32a..5a06529ee 100644 --- a/fcl/detsim/detsim_2d_icarus_refactored_yzsim_Run4.fcl +++ b/fcl/detsim/detsim_2d_icarus_refactored_yzsim_Run4.fcl @@ -1,6 +1,9 @@ #include "detsim_2d_icarus_refactored_yzsim.fcl" -physics.producers.daq.wcls_main.params.YZScaleMapJson: "yzmap_gain_icarus_v4_run4.json" +physics.producers.daq0.wcls_main.params.YZScaleMapJson: "yzmap_gain_icarus_v4_run4.json" +physics.producers.daq1.wcls_main.params.YZScaleMapJson: "yzmap_gain_icarus_v4_run4.json" +physics.producers.daq2.wcls_main.params.YZScaleMapJson: "yzmap_gain_icarus_v4_run4.json" +physics.producers.daq3.wcls_main.params.YZScaleMapJson: "yzmap_gain_icarus_v4_run4.json" # Run3/4 optical tune physics.producers.opdaq: @local::icarus_simpmt_run4 diff --git a/fcl/detsim/detsim_2d_icarus_refactored_yzsim_overlay_Run4.fcl b/fcl/detsim/detsim_2d_icarus_refactored_yzsim_overlay_Run4.fcl index 6673bbc90..b77a73512 100644 --- a/fcl/detsim/detsim_2d_icarus_refactored_yzsim_overlay_Run4.fcl +++ b/fcl/detsim/detsim_2d_icarus_refactored_yzsim_overlay_Run4.fcl @@ -1,6 +1,9 @@ #include "detsim_2d_icarus_refactored_yzsim_overlay.fcl" -physics.producers.daq.wcls_main.params.YZScaleMapJson: "yzmap_gain_icarus_v4_run4.json" +physics.producers.daq0.wcls_main.params.YZScaleMapJson: "yzmap_gain_icarus_v4_run4.json" +physics.producers.daq1.wcls_main.params.YZScaleMapJson: "yzmap_gain_icarus_v4_run4.json" +physics.producers.daq2.wcls_main.params.YZScaleMapJson: "yzmap_gain_icarus_v4_run4.json" +physics.producers.daq3.wcls_main.params.YZScaleMapJson: "yzmap_gain_icarus_v4_run4.json" # Run3/4 optical tune (with no noise) physics.producers.opdaq: @local::icarus_simpmt_run4_nonoise diff --git a/fcl/overlays/icarus_siminfomixer.fcl b/fcl/overlays/icarus_siminfomixer.fcl index 4a34922eb..7d515addc 100644 --- a/fcl/overlays/icarus_siminfomixer.fcl +++ b/fcl/overlays/icarus_siminfomixer.fcl @@ -5,29 +5,31 @@ icarus_siminfomixer: module_type : SimInfoOverlayFilter SimInputFileNames : [ "genfile.root.local" ] AuxDetSimChannelInputModuleLabels: [] + AuxDetHitInputModuleLabels: [] SimEnergyDepositInputModuleLabels: [] + SimEnergyDepositLiteInputModuleLabels: [] MCParticleInputModuleLabels: [] + GTruthInputModuleLabels: [] MCTruthGTruthAssnsInputModuleLabels: [] MCTruthInputModuleLabels: [] SimChannelInputModuleLabels: [] SimPhotonsInputModuleLabels: [] - MCTruthMCParticleAssnsMap: [] MCTruthMCParticleAssnsInputModuleLabels: [] BeamGateInputModuleLabels: [] MCParticleLiteInputModuleLabels: [] MCFluxInputModuleLabels: [] MCTruthMCFluxAssnsInputModuleLabels: [] - Verbosity: -1 + Verbosity: 4 FillPOTInfo: false - POTSummaryTag: "generator::GenieGenFiltered" + POTSummaryTag: "generator::GenGenie" detail : {} } icarus_subrunpotinevent: { module_type : SubRunPOTInEvent - InputTag: "generator:SubRunPOT" + InputTag: "generator" } END_PROLOG diff --git a/fcl/reco/Definitions/enable_overlay_stage1.fcl b/fcl/reco/Definitions/enable_overlay_stage1.fcl index 4ae449c1f..62e1a16e6 100644 --- a/fcl/reco/Definitions/enable_overlay_stage1.fcl +++ b/fcl/reco/Definitions/enable_overlay_stage1.fcl @@ -16,11 +16,12 @@ physics.analyzers.simpleLightAna.OpDetWaveformLabels: ["overlayOpWaveforms"] # Set Supera config physics.analyzers.superaMC.supera_params: "supera_icarus_MC_all_cryo_PMT_CRT_overlay.fcl" # don't apply lifetime correction when calculating shower energy in data/overlay -applyLifetime: false physics.producers.SBNShowerGausCryoE.ShowerFinderTools[7].CalorimetryAlg.CaloDoLifeTimeCorrection: false physics.producers.SBNShowerGausCryoW.ShowerFinderTools[7].CalorimetryAlg.CaloDoLifeTimeCorrection: false physics.producers.SBNShowerGausCryoE.ShowerFinderTools[5].CalorimetryAlg.CaloDoLifeTimeCorrection: false physics.producers.SBNShowerGausCryoW.ShowerFinderTools[5].CalorimetryAlg.CaloDoLifeTimeCorrection: false +physics.producers.SBNShowerGausCryoE.ShowerFinderTools[3].ApplyLifetimeCorrection: false +physics.producers.SBNShowerGausCryoW.ShowerFinderTools[3].ApplyLifetimeCorrection: false # overlays need all the same norm tools as data physics.producers.SBNShowerGausCryoE.ShowerFinderTools[7].NormTools: @local::icarus_calonormtools diff --git a/fcl/reco/Definitions/stage1_icarus_defs.fcl b/fcl/reco/Definitions/stage1_icarus_defs.fcl index 4097746cb..70a5cac62 100644 --- a/fcl/reco/Definitions/stage1_icarus_defs.fcl +++ b/fcl/reco/Definitions/stage1_icarus_defs.fcl @@ -456,27 +456,23 @@ applyLifetime: false icarus_stage1_producers.SBNShowerGausCryoE.ShowerFinderTools[7].CalorimetryAlg: @local::icarus_calorimetryalgdata icarus_stage1_producers.SBNShowerGausCryoE.ShowerFinderTools[7].ApplyCorrectionsInNorm: @local::applyNorm icarus_stage1_producers.SBNShowerGausCryoE.ShowerFinderTools[7].NormTools: @local::icarus_calonormtools -icarus_stage1_producers.SBNShowerGausCryoE.ShowerFinderTools[7].ApplyMCLifetimeCorrection: @local::applyLifetime icarus_stage1_producers.SBNShowerGausCryoW.ShowerFinderTools[7].CalorimetryAlg: @local::icarus_calorimetryalgdata icarus_stage1_producers.SBNShowerGausCryoW.ShowerFinderTools[7].ApplyCorrectionsInNorm: @local::applyNorm icarus_stage1_producers.SBNShowerGausCryoW.ShowerFinderTools[7].NormTools: @local::icarus_calonormtools -icarus_stage1_producers.SBNShowerGausCryoW.ShowerFinderTools[7].ApplyMCLifetimeCorrection: @local::applyLifetime icarus_stage1_producers.SBNShowerGausCryoE.ShowerFinderTools[5].CalorimetryAlg: @local::icarus_calorimetryalgdata icarus_stage1_producers.SBNShowerGausCryoE.ShowerFinderTools[5].ApplyCorrectionsInNorm: @local::applyNorm icarus_stage1_producers.SBNShowerGausCryoE.ShowerFinderTools[5].NormTools: @local::icarus_calonormtools -icarus_stage1_producers.SBNShowerGausCryoE.ShowerFinderTools[5].ApplyMCLifetimeCorrection: @local::applyLifetime icarus_stage1_producers.SBNShowerGausCryoW.ShowerFinderTools[5].CalorimetryAlg: @local::icarus_calorimetryalgdata icarus_stage1_producers.SBNShowerGausCryoW.ShowerFinderTools[5].ApplyCorrectionsInNorm: @local::applyNorm icarus_stage1_producers.SBNShowerGausCryoW.ShowerFinderTools[5].NormTools: @local::icarus_calonormtools -icarus_stage1_producers.SBNShowerGausCryoW.ShowerFinderTools[5].ApplyMCLifetimeCorrection: @local::applyLifetime icarus_stage1_producers.SBNShowerGausCryoE.ShowerFinderTools[3].ApplyCorrectionsInNorm: @local::applyNorm icarus_stage1_producers.SBNShowerGausCryoE.ShowerFinderTools[3].NormTools: @local::icarus_calonormtools -icarus_stage1_producers.SBNShowerGausCryoE.ShowerFinderTools[3].ApplyMCLifetimeCorrection: @local::applyLifetime +icarus_stage1_producers.SBNShowerGausCryoE.ShowerFinderTools[3].ApplyLifetimeCorrection: @local::applyLifetime icarus_stage1_producers.SBNShowerGausCryoW.ShowerFinderTools[3].ApplyCorrectionsInNorm: @local::applyNorm icarus_stage1_producers.SBNShowerGausCryoW.ShowerFinderTools[3].NormTools: @local::icarus_calonormtools -icarus_stage1_producers.SBNShowerGausCryoW.ShowerFinderTools[3].ApplyMCLifetimeCorrection: @local::applyLifetime +icarus_stage1_producers.SBNShowerGausCryoW.ShowerFinderTools[3].ApplyLifetimeCorrection: @local::applyLifetime # Set supera input fcl files icarus_stage1_analyzers.superaMC.supera_params: "supera_icarus_MC_all_cryo_PMT_CRT_v10.fcl" diff --git a/fcl/reco/Stage0/data/stage0_purity_only_icarus.fcl b/fcl/reco/Stage0/data/stage0_purity_only_icarus.fcl new file mode 100644 index 000000000..0260b9aad --- /dev/null +++ b/fcl/reco/Stage0/data/stage0_purity_only_icarus.fcl @@ -0,0 +1,43 @@ +### +## This fhicl file is used to run "stage0" processing specifically for the case where all +## TPC data is included in an artdaq data product from a single instance +## +#include "stage0_icarus_driver_common.fcl" + +process_name: stage0 + +## Define the path we'll execute +physics.path: [ daqTPCROI,@sequence::icarus_purity_monitor ] + +## boiler plate... +physics.outana: [ purityinfoana0, purityinfoana1 ] +physics.trigger_paths: [ path ] +physics.end_paths: [ outana, streamROOT ] + +# Drop the artdaq format files on output, +# Drop all output from the TPC decoder stage +# Drop all output from the 1D deconvolution stage +# Drop the recob::Wire output from the roifinder (but keep the ChannelROIs) +# Drop the reconstructed optical hits before the timing correction +# Drop the PMT waveforms (will keep the ones from daqPMTonbeam) +# Keep the Trigger fragment +outputs.rootOutput.outputCommands: [ + "keep *_*_*_*", + "drop artdaq::Fragments_*_*_ICARUSReprocessRaw", + "drop *_*_*_DAQ*", + "drop *_ophituncorrected_*_*", + "drop *_daqPMT_*_*", + "drop *_daqPMTonbeam_*_*", + "drop *_daqTPCROI_*_*", + "drop *_decon2droiEE_*_*", + "drop *_decon2droiEW_*_*", + "drop *_decon2droiWE_*_*", + "drop *_decon2droiWW_*_*", + "drop *_decon1droi_*_*", + "drop recob::Wire*_roifinder_*_*", + "keep *_daq_ICARUSTriggerV*_*"] + +## Modify the event selection for the purity analyzers +physics.analyzers.purityinfoana0.SelectEvents: [ path ] +physics.analyzers.purityinfoana1.SelectEvents: [ path ] + diff --git a/fcl/reco/Stage0/data/stage0_run2_icarus.fcl b/fcl/reco/Stage0/data/stage0_run2_icarus.fcl index 0352e46b3..58d5fd2b6 100644 --- a/fcl/reco/Stage0/data/stage0_run2_icarus.fcl +++ b/fcl/reco/Stage0/data/stage0_run2_icarus.fcl @@ -19,15 +19,14 @@ physics.end_paths: [ outana, streamROOT ] # Drop all output from the 1D deconvolution stage # Drop the recob::Wire output from the roifinder (but keep the ChannelROIs) # Drop the reconstructed optical hits before the timing correction -# Drop the PMT waveforms (will keep the ones from daqPMTonbeam) +# Drop the full PMT waveforms (keep the beam-gate ones from daqPMTonbeam, and daqPMT metadata/time corrections) # Keep the Trigger fragment outputs.rootOutput.outputCommands: [ "keep *_*_*_*", "drop artdaq::Fragments_*_*_ICARUSReprocessRaw", "drop *_*_*_DAQ*", "drop *_ophituncorrected_*_*", - "drop *_daqPMT_*_*", - "drop *_daqPMTonbeam_*_*", + "drop raw::OpDetWaveforms_daqPMT_*_*", "drop *_daqTPCROI_*_*", "drop *_decon2droiEE_*_*", "drop *_decon2droiEW_*_*", diff --git a/fcl/reco/Stage0/data/stage0_run2_raw_icarus.fcl b/fcl/reco/Stage0/data/stage0_run2_raw_icarus.fcl index f1c4925bc..6a5828f45 100644 --- a/fcl/reco/Stage0/data/stage0_run2_raw_icarus.fcl +++ b/fcl/reco/Stage0/data/stage0_run2_raw_icarus.fcl @@ -13,9 +13,7 @@ outputs.rootOutput.outputCommands: [ "drop artdaq::Fragments_*_*_ICARUSReprocessRaw", "drop *_*_*_DAQ*", "drop *_ophituncorrected_*_*", - "drop *_daqPMT_*_*", - "drop *_daqPMTonbeam_*_*", - "drop *_daqCRT_*_*", + "drop raw::OpDetWaveforms_daqPMT_*_*", "drop recob::Wire*_daqTPCROI_*_*", "drop *_decon2droiEE_*_*", "drop *_decon2droiEW_*_*", diff --git a/fcl/reco/Stage0/data/stage0_run2_wc_icarus.fcl b/fcl/reco/Stage0/data/stage0_run2_wc_icarus.fcl index b71ca6afb..905a1abe0 100644 --- a/fcl/reco/Stage0/data/stage0_run2_wc_icarus.fcl +++ b/fcl/reco/Stage0/data/stage0_run2_wc_icarus.fcl @@ -27,9 +27,7 @@ outputs.rootOutput.outputCommands: [ "drop artdaq::Fragments_*_*_ICARUSReprocessRaw", "drop *_*_*_DAQ*", "drop *_ophituncorrected_*_*", - "drop *_daqPMT_*_*", - "drop *_daqPMTonbeam_*_*", - "drop *_daqCRT_*_*", + "drop raw::OpDetWaveforms_daqPMT_*_*", "drop *_daqTPCROI_*_*", "drop *_decon2droiEE_*_*", "drop *_decon2droiEW_*_*", diff --git a/fcl/reco/Stage0/data/stage0_run2_wc_raw_icarus.fcl b/fcl/reco/Stage0/data/stage0_run2_wc_raw_icarus.fcl index 646ec0792..25b7772ec 100644 --- a/fcl/reco/Stage0/data/stage0_run2_wc_raw_icarus.fcl +++ b/fcl/reco/Stage0/data/stage0_run2_wc_raw_icarus.fcl @@ -14,9 +14,7 @@ outputs.rootOutput.outputCommands: [ "drop artdaq::Fragments_*_*_ICARUSReprocessRaw", "drop *_*_*_DAQ*", "drop *_ophituncorrected_*_*", - "drop *_daqPMT_*_*", - "drop *_daqPMTonbeam_*_*", - "drop *_daqCRT_*_*", + "drop raw::OpDetWaveforms_daqPMT_*_*", "drop recob::Wire*_daqTPCROI_*_*", "drop *_decon2droiEE_*_*", "drop *_decon2droiEW_*_*", diff --git a/fcl/reco/Stage1/data/stage1_run2_shwcal_icarus.fcl b/fcl/reco/Stage1/data/stage1_run2_shwcal_icarus.fcl index ff80d462b..23cfa9453 100644 --- a/fcl/reco/Stage1/data/stage1_run2_shwcal_icarus.fcl +++ b/fcl/reco/Stage1/data/stage1_run2_shwcal_icarus.fcl @@ -11,24 +11,20 @@ applyLifetime: false physics.producers.SBNShowerGausCryoE.ShowerFinderTools[7].CalorimetryAlg: @local::icarus_calorimetryalgdata physics.producers.SBNShowerGausCryoE.ShowerFinderTools[7].ApplyCorrectionsInNorm: @local::applyNorm physics.producers.SBNShowerGausCryoE.ShowerFinderTools[7].NormTools: @local::icarus_calonormtools -physics.producers.SBNShowerGausCryoE.ShowerFinderTools[7].ApplyMCLifetimeCorrection: @local::applyLifetime physics.producers.SBNShowerGausCryoW.ShowerFinderTools[7].CalorimetryAlg: @local::icarus_calorimetryalgdata physics.producers.SBNShowerGausCryoW.ShowerFinderTools[7].ApplyCorrectionsInNorm: @local::applyNorm physics.producers.SBNShowerGausCryoW.ShowerFinderTools[7].NormTools: @local::icarus_calonormtools -physics.producers.SBNShowerGausCryoW.ShowerFinderTools[7].ApplyMCLifetimeCorrection: @local::applyLifetime physics.producers.SBNShowerGausCryoE.ShowerFinderTools[5].CalorimetryAlg: @local::icarus_calorimetryalgdata physics.producers.SBNShowerGausCryoE.ShowerFinderTools[5].ApplyCorrectionsInNorm: @local::applyNorm physics.producers.SBNShowerGausCryoE.ShowerFinderTools[5].NormTools: @local::icarus_calonormtools -physics.producers.SBNShowerGausCryoE.ShowerFinderTools[5].ApplyMCLifetimeCorrection: @local::applyLifetime physics.producers.SBNShowerGausCryoW.ShowerFinderTools[5].CalorimetryAlg: @local::icarus_calorimetryalgdata physics.producers.SBNShowerGausCryoW.ShowerFinderTools[5].ApplyCorrectionsInNorm: @local::applyNorm physics.producers.SBNShowerGausCryoW.ShowerFinderTools[5].NormTools: @local::icarus_calonormtools -physics.producers.SBNShowerGausCryoW.ShowerFinderTools[5].ApplyMCLifetimeCorrection: @local::applyLifetime physics.producers.SBNShowerGausCryoE.ShowerFinderTools[3].ApplyCorrectionsInNorm: @local::applyNorm physics.producers.SBNShowerGausCryoE.ShowerFinderTools[3].NormTools: @local::icarus_calonormtools -physics.producers.SBNShowerGausCryoE.ShowerFinderTools[3].ApplyMCLifetimeCorrection: @local::applyLifetime +physics.producers.SBNShowerGausCryoE.ShowerFinderTools[3].ApplyLifetimeCorrection: @local::applyLifetime physics.producers.SBNShowerGausCryoW.ShowerFinderTools[3].ApplyCorrectionsInNorm: @local::applyNorm physics.producers.SBNShowerGausCryoW.ShowerFinderTools[3].NormTools: @local::icarus_calonormtools -physics.producers.SBNShowerGausCryoW.ShowerFinderTools[3].ApplyMCLifetimeCorrection: @local::applyLifetime +physics.producers.SBNShowerGausCryoW.ShowerFinderTools[3].ApplyLifetimeCorrection: @local::applyLifetime diff --git a/fcl/reco/Stage1/mc/stage1_run2_icarus_MC.fcl b/fcl/reco/Stage1/mc/stage1_run2_icarus_MC.fcl index 6eae5baee..266f8a240 100644 --- a/fcl/reco/Stage1/mc/stage1_run2_icarus_MC.fcl +++ b/fcl/reco/Stage1/mc/stage1_run2_icarus_MC.fcl @@ -132,11 +132,11 @@ physics.producers.SBNShowerGausCryoW.ShowerFinderTools[5].NormTools[1].MC: physics.producers.SBNShowerGausCryoE.ShowerFinderTools[3].NormTools: @local::icarus_calonormtoolsMC physics.producers.SBNShowerGausCryoE.ShowerFinderTools[3].NormTools[0].MC: @local::runPeriod physics.producers.SBNShowerGausCryoE.ShowerFinderTools[3].NormTools[1].MC: @local::runPeriod -physics.producers.SBNShowerGausCryoE.ShowerFinderTools[3].ApplyMCLifetimeCorrection: true +physics.producers.SBNShowerGausCryoE.ShowerFinderTools[3].ApplyLifetimeCorrection: true physics.producers.SBNShowerGausCryoW.ShowerFinderTools[3].NormTools: @local::icarus_calonormtoolsMC physics.producers.SBNShowerGausCryoW.ShowerFinderTools[3].NormTools[0].MC: @local::runPeriod physics.producers.SBNShowerGausCryoW.ShowerFinderTools[3].NormTools[1].MC: @local::runPeriod -physics.producers.SBNShowerGausCryoW.ShowerFinderTools[3].ApplyMCLifetimeCorrection: true +physics.producers.SBNShowerGausCryoW.ShowerFinderTools[3].ApplyLifetimeCorrection: true services.message.destinations : { diff --git a/icaruscode/Generators/CMakeLists.txt b/icaruscode/Generators/CMakeLists.txt index a80d94381..80a505382 100644 --- a/icaruscode/Generators/CMakeLists.txt +++ b/icaruscode/Generators/CMakeLists.txt @@ -24,7 +24,8 @@ cet_build_plugin(HepMCFileGen art::module ) cet_build_plugin(SelectCathodeCrossingGenParticles art::module - LIBRARIES sbnalg::Utilities + LIBRARIES icarusalg::Utilities + sbnalg::Utilities larcore::Geometry_Geometry_service larcore::headers lardataalg::MCDumpers diff --git a/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl b/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl index d44db24ea..9722f8585 100644 --- a/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl +++ b/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl @@ -18,7 +18,7 @@ icarus_simwire_wirecell: //loglevels: ["magnify:debug"] plugins: ["WireCellPgraph", "WireCellGen","WireCellSio","WireCellRoot","WireCellLarsoft", "WireCellHio"] // needs to be found via your WIRECELL_PATH - configs: ["pgrapher/experiment/icarus/wcls-multitpc-sim-drift-simchannel-yzsim-refactored.jsonnet"] + configs: ["pgrapher/experiment/icarus/wcls-multitpc-sim-drift-simchannel-refactored.jsonnet"] // Contract note: these exact "type:name" must be used to identify // the configuration data structures for these components in the Jsonnet. inputers: ["wclsSimDepoSetSource:electron"] diff --git a/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_per_TPC_ICARUS.fcl b/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_per_TPC_ICARUS.fcl index 869653c63..139a43070 100644 --- a/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_per_TPC_ICARUS.fcl +++ b/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_per_TPC_ICARUS.fcl @@ -2,6 +2,8 @@ #include "services_basic_icarus.fcl" // We need this for diffusion #include "simulationservices_icarus.fcl" +// lookup calibration tags +#include "calibration_database_GlobalTags_icarus.fcl" BEGIN_PROLOG @@ -34,6 +36,11 @@ icarus_simwire_wirecell: file_rcresp: "icarus_fnal_rc_tail.json" # use the RCResponse by default cathode_input_format: "array" # scalar (flat) or array (bent) SimEnergyDepositLabel: "ionization" + # yz map config -- default to Run 2 + YZScaleMapJson: "yzmap_gain_icarus_v4_run2.json" + YZMapJson: "yzmap_icarus_v3_run2.json" + DBFileName: "tpc_elifetime_data" + DBTag: @local::ICARUS_Calibration_GlobalTags.tpc_elifetime_data } structs: { # load values from simulationservices_icarus.fcl @@ -53,18 +60,18 @@ icarus_simwire_wirecell: overlay_drifter: false # default drifter by default # Gain and shaping time - gain0: 17.05212 # mV/fC - gain1: 12.6181926 # mV/fC - gain2: 13.0261362 # mV/fC + gain0: 18.0839 # mV/fC + gain1: 12.2379 # mV/fC + gain2: 13.8819 # mV/fC shaping0: 1.3 # us shaping1: 1.45 # us shaping2: 1.3 # us - # Time offsets for truth matching - time_offset_u: 0.0 # us - time_offset_v: 0.0 # us - time_offset_y: 0.0 # us + # Time offsets for truth matching -- tuned to 2D deconvolution output + time_offset_u: 2.53 # us + time_offset_v: 2.41 # us + time_offset_y: 2.53 # us } } @@ -208,6 +215,10 @@ icarus_simwire_wirecell_yz_0: { cathode_input_format: "array" file_rcresp: "icarus_fnal_rc_tail.json" tpc_idx: "0" + YZScaleMapJson: @local::icarus_simwire_wirecell.wcls_main.params.YZScaleMapJson + YZMapJson: @local::icarus_simwire_wirecell.wcls_main.params.YZMapJson + DBFileName: @local::icarus_simwire_wirecell.wcls_main.params.DBFileName + DBTag: @local::icarus_simwire_wirecell.wcls_main.params.DBTag files_fields: "\"icarus_final_fit_dqdx0.json.bz2\",\n \"icarus_final_fit_dqdx1.json.bz2\",\n \"icarus_final_fit_dqdx2.json.bz2\",\n \"icarus_final_fit_dqdx3.json.bz2\",\n \"icarus_final_fit_dqdx4.json.bz2\",\n \"icarus_final_fit_dqdx5.json.bz2\",\n \"icarus_final_fit_dqdx6.json.bz2\",\n \"icarus_final_fit_dqdx7.json.bz2\",\n \"icarus_final_fit_dqdx8.json.bz2\",\n \"icarus_final_fit_dqdx9.json.bz2\",\n \"icarus_final_fit_dqdx10.json.bz2\",\n \"icarus_final_fit_dqdx11.json.bz2\",\n \"icarus_final_fit_dqdx12.json.bz2\",\n \"icarus_final_fit_dqdx13.json.bz2\",\n \"icarus_final_fit_dqdx14.json.bz2\"" } plugins: [ @@ -219,25 +230,25 @@ icarus_simwire_wirecell_yz_0: { "WireCellHio" ] structs: { - DL: 4e-9 - DT: 8.8e-9 + DL: @local::icarus_simwire_wirecell.wcls_main.structs.DL + DT: @local::icarus_simwire_wirecell.wcls_main.structs.DT coh_noise_scale: 1 - gain0: 1.705212e1 - gain1: 1.26181926e1 - gain2: 1.30261362e1 + gain0: @local::icarus_simwire_wirecell.wcls_main.structs.gain0 + gain1: @local::icarus_simwire_wirecell.wcls_main.structs.gain1 + gain2: @local::icarus_simwire_wirecell.wcls_main.structs.gain2 int_noise_scale: 1 - lifetime: 3000 - lifetime_TPCEE: 3000 - lifetime_TPCEW: 3000 - lifetime_TPCWE: 3000 - lifetime_TPCWW: 3000 + lifetime: @local::icarus_simwire_wirecell.wcls_main.structs.lifetime + lifetime_TPCEE: @local::icarus_simwire_wirecell.wcls_main.structs.lifetime + lifetime_TPCEW: @local::icarus_simwire_wirecell.wcls_main.structs.lifetime + lifetime_TPCWE: @local::icarus_simwire_wirecell.wcls_main.structs.lifetime + lifetime_TPCWW: @local::icarus_simwire_wirecell.wcls_main.structs.lifetime overlay_drifter: false shaping0: 1.3 shaping1: 1.45 shaping2: 1.3 - time_offset_u: 0 - time_offset_v: 0 - time_offset_y: 0 + time_offset_u: @local::icarus_simwire_wirecell.wcls_main.structs.time_offset_u + time_offset_v: @local::icarus_simwire_wirecell.wcls_main.structs.time_offset_v + time_offset_y: @local::icarus_simwire_wirecell.wcls_main.structs.time_offset_y } tool_type: "WCLS" } @@ -355,6 +366,10 @@ icarus_simwire_wirecell_yz_1: { cathode_input_format: "array" file_rcresp: "icarus_fnal_rc_tail.json" tpc_idx: "1" + YZScaleMapJson: @local::icarus_simwire_wirecell.wcls_main.params.YZScaleMapJson + YZMapJson: @local::icarus_simwire_wirecell.wcls_main.params.YZMapJson + DBFileName: @local::icarus_simwire_wirecell.wcls_main.params.DBFileName + DBTag: @local::icarus_simwire_wirecell.wcls_main.params.DBTag files_fields: "\"icarus_final_fit_dqdx0.json.bz2\",\n \"icarus_final_fit_dqdx1.json.bz2\",\n \"icarus_final_fit_dqdx2.json.bz2\",\n \"icarus_final_fit_dqdx3.json.bz2\",\n \"icarus_final_fit_dqdx4.json.bz2\",\n \"icarus_final_fit_dqdx5.json.bz2\",\n \"icarus_final_fit_dqdx6.json.bz2\",\n \"icarus_final_fit_dqdx7.json.bz2\",\n \"icarus_final_fit_dqdx8.json.bz2\",\n \"icarus_final_fit_dqdx9.json.bz2\",\n \"icarus_final_fit_dqdx10.json.bz2\",\n \"icarus_final_fit_dqdx11.json.bz2\",\n \"icarus_final_fit_dqdx12.json.bz2\",\n \"icarus_final_fit_dqdx13.json.bz2\",\n \"icarus_final_fit_dqdx14.json.bz2\"" } plugins: [ @@ -366,25 +381,25 @@ icarus_simwire_wirecell_yz_1: { "WireCellHio" ] structs: { - DL: 4e-9 - DT: 8.8e-9 + DL: @local::icarus_simwire_wirecell.wcls_main.structs.DL + DT: @local::icarus_simwire_wirecell.wcls_main.structs.DT coh_noise_scale: 1 - gain0: 1.705212e1 - gain1: 1.26181926e1 - gain2: 1.30261362e1 + gain0: @local::icarus_simwire_wirecell.wcls_main.structs.gain0 + gain1: @local::icarus_simwire_wirecell.wcls_main.structs.gain1 + gain2: @local::icarus_simwire_wirecell.wcls_main.structs.gain2 int_noise_scale: 1 - lifetime: 3000 - lifetime_TPCEE: 3000 - lifetime_TPCEW: 3000 - lifetime_TPCWE: 3000 - lifetime_TPCWW: 3000 + lifetime: @local::icarus_simwire_wirecell.wcls_main.structs.lifetime + lifetime_TPCEE: @local::icarus_simwire_wirecell.wcls_main.structs.lifetime + lifetime_TPCEW: @local::icarus_simwire_wirecell.wcls_main.structs.lifetime + lifetime_TPCWE: @local::icarus_simwire_wirecell.wcls_main.structs.lifetime + lifetime_TPCWW: @local::icarus_simwire_wirecell.wcls_main.structs.lifetime overlay_drifter: false shaping0: 1.3 shaping1: 1.45 shaping2: 1.3 - time_offset_u: 0 - time_offset_v: 0 - time_offset_y: 0 + time_offset_u: @local::icarus_simwire_wirecell.wcls_main.structs.time_offset_u + time_offset_v: @local::icarus_simwire_wirecell.wcls_main.structs.time_offset_v + time_offset_y: @local::icarus_simwire_wirecell.wcls_main.structs.time_offset_y } tool_type: "WCLS" } @@ -502,6 +517,10 @@ icarus_simwire_wirecell_yz_2: { cathode_input_format: "array" file_rcresp: "icarus_fnal_rc_tail.json" tpc_idx: "2" + YZScaleMapJson: @local::icarus_simwire_wirecell.wcls_main.params.YZScaleMapJson + YZMapJson: @local::icarus_simwire_wirecell.wcls_main.params.YZMapJson + DBFileName: @local::icarus_simwire_wirecell.wcls_main.params.DBFileName + DBTag: @local::icarus_simwire_wirecell.wcls_main.params.DBTag files_fields: "\"icarus_final_fit_dqdx0.json.bz2\",\n \"icarus_final_fit_dqdx1.json.bz2\",\n \"icarus_final_fit_dqdx2.json.bz2\",\n \"icarus_final_fit_dqdx3.json.bz2\",\n \"icarus_final_fit_dqdx4.json.bz2\",\n \"icarus_final_fit_dqdx5.json.bz2\",\n \"icarus_final_fit_dqdx6.json.bz2\",\n \"icarus_final_fit_dqdx7.json.bz2\",\n \"icarus_final_fit_dqdx8.json.bz2\",\n \"icarus_final_fit_dqdx9.json.bz2\",\n \"icarus_final_fit_dqdx10.json.bz2\",\n \"icarus_final_fit_dqdx11.json.bz2\",\n \"icarus_final_fit_dqdx12.json.bz2\",\n \"icarus_final_fit_dqdx13.json.bz2\",\n \"icarus_final_fit_dqdx14.json.bz2\"" } plugins: [ @@ -513,25 +532,25 @@ icarus_simwire_wirecell_yz_2: { "WireCellHio" ] structs: { - DL: 4e-9 - DT: 8.8e-9 + DL: @local::icarus_simwire_wirecell.wcls_main.structs.DL + DT: @local::icarus_simwire_wirecell.wcls_main.structs.DT coh_noise_scale: 1 - gain0: 1.705212e1 - gain1: 1.26181926e1 - gain2: 1.30261362e1 + gain0: @local::icarus_simwire_wirecell.wcls_main.structs.gain0 + gain1: @local::icarus_simwire_wirecell.wcls_main.structs.gain1 + gain2: @local::icarus_simwire_wirecell.wcls_main.structs.gain2 int_noise_scale: 1 - lifetime: 3000 - lifetime_TPCEE: 3000 - lifetime_TPCEW: 3000 - lifetime_TPCWE: 3000 - lifetime_TPCWW: 3000 + lifetime: @local::icarus_simwire_wirecell.wcls_main.structs.lifetime + lifetime_TPCEE: @local::icarus_simwire_wirecell.wcls_main.structs.lifetime + lifetime_TPCEW: @local::icarus_simwire_wirecell.wcls_main.structs.lifetime + lifetime_TPCWE: @local::icarus_simwire_wirecell.wcls_main.structs.lifetime + lifetime_TPCWW: @local::icarus_simwire_wirecell.wcls_main.structs.lifetime overlay_drifter: false shaping0: 1.3 shaping1: 1.45 shaping2: 1.3 - time_offset_u: 0 - time_offset_v: 0 - time_offset_y: 0 + time_offset_u: @local::icarus_simwire_wirecell.wcls_main.structs.time_offset_u + time_offset_v: @local::icarus_simwire_wirecell.wcls_main.structs.time_offset_v + time_offset_y: @local::icarus_simwire_wirecell.wcls_main.structs.time_offset_y } tool_type: "WCLS" } @@ -648,6 +667,10 @@ icarus_simwire_wirecell_yz_3: { cathode_input_format: "array" file_rcresp: "icarus_fnal_rc_tail.json" tpc_idx: "3" + YZScaleMapJson: @local::icarus_simwire_wirecell.wcls_main.params.YZScaleMapJson + YZMapJson: @local::icarus_simwire_wirecell.wcls_main.params.YZMapJson + DBFileName: @local::icarus_simwire_wirecell.wcls_main.params.DBFileName + DBTag: @local::icarus_simwire_wirecell.wcls_main.params.DBTag files_fields: "\"icarus_final_fit_dqdx0.json.bz2\",\n \"icarus_final_fit_dqdx1.json.bz2\",\n \"icarus_final_fit_dqdx2.json.bz2\",\n \"icarus_final_fit_dqdx3.json.bz2\",\n \"icarus_final_fit_dqdx4.json.bz2\",\n \"icarus_final_fit_dqdx5.json.bz2\",\n \"icarus_final_fit_dqdx6.json.bz2\",\n \"icarus_final_fit_dqdx7.json.bz2\",\n \"icarus_final_fit_dqdx8.json.bz2\",\n \"icarus_final_fit_dqdx9.json.bz2\",\n \"icarus_final_fit_dqdx10.json.bz2\",\n \"icarus_final_fit_dqdx11.json.bz2\",\n \"icarus_final_fit_dqdx12.json.bz2\",\n \"icarus_final_fit_dqdx13.json.bz2\",\n \"icarus_final_fit_dqdx14.json.bz2\"" } plugins: [ @@ -659,25 +682,25 @@ icarus_simwire_wirecell_yz_3: { "WireCellHio" ] structs: { - DL: 4e-9 - DT: 8.8e-9 + DL: @local::icarus_simwire_wirecell.wcls_main.structs.DL + DT: @local::icarus_simwire_wirecell.wcls_main.structs.DT coh_noise_scale: 1 - gain0: 1.705212e1 - gain1: 1.26181926e1 - gain2: 1.30261362e1 + gain0: @local::icarus_simwire_wirecell.wcls_main.structs.gain0 + gain1: @local::icarus_simwire_wirecell.wcls_main.structs.gain1 + gain2: @local::icarus_simwire_wirecell.wcls_main.structs.gain2 int_noise_scale: 1 - lifetime: 3000 - lifetime_TPCEE: 3000 - lifetime_TPCEW: 3000 - lifetime_TPCWE: 3000 - lifetime_TPCWW: 3000 + lifetime: @local::icarus_simwire_wirecell.wcls_main.structs.lifetime + lifetime_TPCEE: @local::icarus_simwire_wirecell.wcls_main.structs.lifetime + lifetime_TPCEW: @local::icarus_simwire_wirecell.wcls_main.structs.lifetime + lifetime_TPCWE: @local::icarus_simwire_wirecell.wcls_main.structs.lifetime + lifetime_TPCWW: @local::icarus_simwire_wirecell.wcls_main.structs.lifetime overlay_drifter: false shaping0: 1.3 shaping1: 1.45 shaping2: 1.3 - time_offset_u: 0 - time_offset_v: 0 - time_offset_y: 0 + time_offset_u: @local::icarus_simwire_wirecell.wcls_main.structs.time_offset_u + time_offset_v: @local::icarus_simwire_wirecell.wcls_main.structs.time_offset_v + time_offset_y: @local::icarus_simwire_wirecell.wcls_main.structs.time_offset_y } tool_type: "WCLS" } diff --git a/icaruscode/TPC/ICARUSWireCell/icarus/wcls-multitpc-sim-drift-simchannel-yzsim-refactored.jsonnet b/icaruscode/TPC/ICARUSWireCell/icarus/wcls-multitpc-sim-drift-simchannel-yzsim-refactored.jsonnet index c3976b36d..af8a2839a 100644 --- a/icaruscode/TPC/ICARUSWireCell/icarus/wcls-multitpc-sim-drift-simchannel-yzsim-refactored.jsonnet +++ b/icaruscode/TPC/ICARUSWireCell/icarus/wcls-multitpc-sim-drift-simchannel-yzsim-refactored.jsonnet @@ -220,7 +220,7 @@ local setdrifters = [g.pnode({ local yzmap_filter = { type: "YZMap", name: "yzmap_filter", data: { - filename: 'yzmap_icarus_v3_run1.json', + filename: std.extVar('YZMapJson'), bin_width: 10*wc.cm, bin_height: 10*wc.cm, yoffset: 180*wc.cm, @@ -233,7 +233,7 @@ local yzmap_filter = { local yzmap_gain = { type: "YZMap", name: "yzmap_gain", data: { - filename: 'yzmap_gain_icarus_v3_run1.json', + filename: std.extVar('YZScaleMapJson'), bin_width: 10*wc.cm, bin_height: 10*wc.cm, yoffset: 180*wc.cm, diff --git a/icaruscode/TPC/ICARUSWireCell/icarus/wcls-per-tpc-sim-drift-simchannel-yzsim.jsonnet b/icaruscode/TPC/ICARUSWireCell/icarus/wcls-per-tpc-sim-drift-simchannel-yzsim.jsonnet index b87ad7fdb..4c5cd0686 100644 --- a/icaruscode/TPC/ICARUSWireCell/icarus/wcls-per-tpc-sim-drift-simchannel-yzsim.jsonnet +++ b/icaruscode/TPC/ICARUSWireCell/icarus/wcls-per-tpc-sim-drift-simchannel-yzsim.jsonnet @@ -172,7 +172,7 @@ local setdrifters = [g.pnode({ local yzmap_filter = { type: "YZMap", name: "yzmap_filter", data: { - filename: 'yzmap_icarus_v3_run1.json', + filename: std.extVar('YZMapJson'), bin_width: 10*wc.cm, bin_height: 10*wc.cm, yoffset: 180*wc.cm, zoffset: 900*wc.cm, nbinsy: 31, nbinsz: 180, @@ -182,7 +182,7 @@ local yzmap_filter = { local yzmap_gain = { type: "YZMap", name: "yzmap_gain", data: { - filename: 'yzmap_gain_icarus_v3_run1.json', + filename: std.extVar('YZScaleMapJson'), bin_width: 10*wc.cm, bin_height: 10*wc.cm, yoffset: 180*wc.cm, zoffset: 900*wc.cm, nbinsy: 31, nbinsz: 180,