Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions fcl/caf/cafmakerjob_icarus_2Xsce_detsim2d_overlay.fcl
Original file line number Diff line number Diff line change
@@ -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"
3 changes: 3 additions & 0 deletions fcl/caf/cafmakerjob_icarus_data.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions fcl/caf/cafmakerjob_icarus_sce_detsim2d_overlay.fcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#include "cafmakerjob_icarus_sce.fcl"
#include "cafmaker_add_detsim2d_icarus.fcl"
#include "cafmaker_add_overlay_icarus.fcl"
5 changes: 4 additions & 1 deletion fcl/detsim/detsim_2d_icarus_refactored_yzsim_Run4.fcl
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 6 additions & 4 deletions fcl/overlays/icarus_siminfomixer.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion fcl/reco/Definitions/enable_overlay_stage1.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 2 additions & 6 deletions fcl/reco/Definitions/stage1_icarus_defs.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
43 changes: 43 additions & 0 deletions fcl/reco/Stage0/data/stage0_purity_only_icarus.fcl
Original file line number Diff line number Diff line change
@@ -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 ]

5 changes: 2 additions & 3 deletions fcl/reco/Stage0/data/stage0_run2_icarus.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -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_*_*",
Expand Down
4 changes: 1 addition & 3 deletions fcl/reco/Stage0/data/stage0_run2_raw_icarus.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -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_*_*",
Expand Down
4 changes: 1 addition & 3 deletions fcl/reco/Stage0/data/stage0_run2_wc_icarus.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -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_*_*",
Expand Down
4 changes: 1 addition & 3 deletions fcl/reco/Stage0/data/stage0_run2_wc_raw_icarus.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -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_*_*",
Expand Down
8 changes: 2 additions & 6 deletions fcl/reco/Stage1/data/stage1_run2_shwcal_icarus.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions fcl/reco/Stage1/mc/stage1_run2_icarus_MC.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -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 :
{
Expand Down
3 changes: 2 additions & 1 deletion icaruscode/Generators/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
Loading