From f1eb1294cc7dbb6ffd32d870bad5e94b753f0d45 Mon Sep 17 00:00:00 2001 From: Gianluca Petrillo Date: Thu, 4 May 2023 16:42:48 -0500 Subject: [PATCH 1/4] Removed flash filter from Stage1 standard configuration. Configuration of that ilter throughout the repository has been fixed. --- fcl/reco/Definitions/stage0_icarus_defs.fcl | 6 +----- .../Definitions/stage0_icarus_defs_run1.fcl | 6 +----- fcl/reco/Definitions/stage1_icarus_defs.fcl | 8 -------- .../Run1/stage1_multiTPC_icarus_gauss.fcl | 3 +-- fcl/reco/Stage1/Run2/stage1_run2_icarus.fcl | 3 +-- icaruscode/Filters/run_flashfilter_data.fcl | 20 +++++-------------- 6 files changed, 9 insertions(+), 37 deletions(-) diff --git a/fcl/reco/Definitions/stage0_icarus_defs.fcl b/fcl/reco/Definitions/stage0_icarus_defs.fcl index 7d536a780..2303c17f9 100644 --- a/fcl/reco/Definitions/stage0_icarus_defs.fcl +++ b/fcl/reco/Definitions/stage0_icarus_defs.fcl @@ -119,11 +119,7 @@ icarus_stage0_filters: # flashfilterBNB: { module_type: "FilterOpFlash" OpFlashProducerList: ["opflashCryoE","opflashCryoW"] -# WindowStartTime: -1489.6 # -1489.4 - 0.2us safe margin -# WindowEndTime: -1487.6 # -1487.8 + 0.2us safe margin -# WindowStartTime: -1490.8 # 9.6 us - 1500 us offset - 0.4us safe margin -# WindowEndTime: -1488.4 # 11.2 -1500 us offset + 0.4us safe margin - WindowStartTime: -0.2 # Gate is now recentered by Gianluca/Andrea + WindowStartTime: -0.2 # 0.2us safe margin WindowEndTime: 1.8 } flashfilterNuMI: { module_type: "FilterOpFlash" diff --git a/fcl/reco/Definitions/stage0_icarus_defs_run1.fcl b/fcl/reco/Definitions/stage0_icarus_defs_run1.fcl index 37a5e2c2c..d1f857693 100644 --- a/fcl/reco/Definitions/stage0_icarus_defs_run1.fcl +++ b/fcl/reco/Definitions/stage0_icarus_defs_run1.fcl @@ -126,11 +126,7 @@ icarus_stage0_filters: # flashfilterBNB: { module_type: "FilterOpFlash" OpFlashProducerList: ["opflashCryoE","opflashCryoW"] -# WindowStartTime: -1489.6 # -1489.4 - 0.2us safe margin -# WindowEndTime: -1487.6 # -1487.8 + 0.2us safe margin -# WindowStartTime: -1490.8 # 9.6 us - 1500 us offset - 0.4us safe margin -# WindowEndTime: -1488.4 # 11.2 -1500 us offset + 0.4us safe margin - WindowStartTime: -0.2 # Gate is now recentered by Gianluca/Andrea + WindowStartTime: -0.2 # 0.2us safe margin WindowEndTime: 1.8 } flashfilterNuMI: { module_type: "FilterOpFlash" diff --git a/fcl/reco/Definitions/stage1_icarus_defs.fcl b/fcl/reco/Definitions/stage1_icarus_defs.fcl index 5b96ba316..c6fc08c5c 100644 --- a/fcl/reco/Definitions/stage1_icarus_defs.fcl +++ b/fcl/reco/Definitions/stage1_icarus_defs.fcl @@ -69,14 +69,6 @@ icarus_stage1_producers: icarus_stage1_filters: { - flashfilter: { module_type: "FilterOpFlash" - OpFlashProducerList: ["opflashCryoW","opflashCryoE"] -# WindowStartTime: -1489.6 # -1489.4 - 0.2us safe margin -# WindowEndTime: -1487.6 # -1487.8 + 0.2us safe margin - WindowStartTime: -1490.8 # 9.6 us - 1500 us offset - 0.4us safe margin - WindowEndTime: -1488.4 # 11.2 -1500 us offset + 0.4us safe margin - } - TPCHitFilterCryoW: @local::icarus_FilterNumberTPCHits TPCHitFilterCryoE: @local::icarus_FilterNumberTPCHits } diff --git a/fcl/reco/Stage1/Run1/stage1_multiTPC_icarus_gauss.fcl b/fcl/reco/Stage1/Run1/stage1_multiTPC_icarus_gauss.fcl index 78c91493a..d9ad45958 100644 --- a/fcl/reco/Stage1/Run1/stage1_multiTPC_icarus_gauss.fcl +++ b/fcl/reco/Stage1/Run1/stage1_multiTPC_icarus_gauss.fcl @@ -2,8 +2,7 @@ process_name: stage1 -physics.reco: [ flashfilter, - @sequence::icarus_filter_cluster3D, +physics.reco: [ @sequence::icarus_filter_cluster3D, @sequence::icarus_pandora_Gauss, @sequence::icarus_reco_fm, @sequence::icarus_crttrack, diff --git a/fcl/reco/Stage1/Run2/stage1_run2_icarus.fcl b/fcl/reco/Stage1/Run2/stage1_run2_icarus.fcl index e8d37d918..45fc0d295 100644 --- a/fcl/reco/Stage1/Run2/stage1_run2_icarus.fcl +++ b/fcl/reco/Stage1/Run2/stage1_run2_icarus.fcl @@ -2,8 +2,7 @@ process_name: stage1 -physics.reco: [ flashfilter, - @sequence::icarus_filter_cluster3D, +physics.reco: [ @sequence::icarus_filter_cluster3D, @sequence::icarus_pandora_Gauss, @sequence::icarus_reco_fm, @sequence::icarus_crttrack, diff --git a/icaruscode/Filters/run_flashfilter_data.fcl b/icaruscode/Filters/run_flashfilter_data.fcl index 399732bf5..0246b5b48 100644 --- a/icaruscode/Filters/run_flashfilter_data.fcl +++ b/icaruscode/Filters/run_flashfilter_data.fcl @@ -5,15 +5,7 @@ process_name: OpReco -services: -{ - @table::icarus_basic_services -} - -source: -{ - module_type: RootInput -} +services: @local::icarus_minimum_services # from services_common_icarus.fcl physics: { @@ -22,8 +14,8 @@ physics: { ophit: @local::icarus_ophit_data ophitfull: @local::icarus_ophitdebugger_data - opflashCryo0: @local::ICARUSSimpleFlashDataCryo0 - opflashCryo1: @local::ICARUSSimpleFlashDataCryo1 + opflashCryo0: @local::ICARUSSimpleFlashDataCryoE + opflashCryo1: @local::ICARUSSimpleFlashDataCryoW } analyzers: { @@ -33,10 +25,8 @@ physics: filters: { flashfilter: { module_type: "FilterOpFlash" OpFlashProducerList: ["opflashCryo0","opflashCryo1"] -# WindowStartTime: -1489.6 # -1489.4 - 0.2us safe margin -# WindowEndTime: -1487.6 # -1487.8 + 0.2us safe margin - WindowStartTime: -1490.8 # 9.6 us - 1500 us offset - 0.4us safe margin - WindowEndTime: -1488.4 # 11.2 -1500 us offset + 0.4us safe margin + WindowStartTime: -0.2 # 0.2us safe margin + WindowEndTime: 1.8 } } From eb596f5bfa1c7274e9d44ebafa78b9a798ebb95b Mon Sep 17 00:00:00 2001 From: Gianluca Petrillo Date: Thu, 4 May 2023 16:43:38 -0500 Subject: [PATCH 2/4] Updated list of FHiCL to be skipped by unit test --- fcl/SkipTesting.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/fcl/SkipTesting.txt b/fcl/SkipTesting.txt index 771897663..ab365ff85 100644 --- a/fcl/SkipTesting.txt +++ b/fcl/SkipTesting.txt @@ -37,7 +37,6 @@ set_caf_calconst.fcl # This should at least allow the issues not to grow. # -job/OnlineDecoder.fcl job/bnbanaicarus21apr21.fcl job/dirtanaicarus21apr21.fcl job/icarus_ci_nucosmics_anatree_quick_test_icaruscode.fcl @@ -55,13 +54,9 @@ job/prodcosmics_corsika_proton_21apr21_ob.fcl job/prodgenie_nu_spill_indirt.fcl job/prodsingle_full_optical_electronic.fcl job/prodsingle_optical_electronic.fcl -job/run_flashfilter_data.fcl job/run_icarus_flashfinder.fcl job/run_opreco.fcl job/run_opreco_data.fcl -job/stage0_EastCryo_icarus.fcl -job/stage0_multiTPC_splitstream_east_icarus.fcl -job/stage0_multiTPC_splitstream_west_icarus.fcl job/standard_g4_icarus_21apr21_noob.fcl job/standard_g4_icarus_21apr21_ob.fcl job/study_ophit_singlep.fcl @@ -72,7 +67,6 @@ job/study_ophit_singlep_290.fcl job/study_ophit_singlep_310.fcl job/study_ophit_singlep_330.fcl job/study_ophit_singlep_350.fcl -job/testDecoderFilter.fcl job/var_10pe_5hits_1us_020ns.fcl job/var_20pe_5hits_1us_020ns.fcl job/var_30pe_5hits_1us_020ns.fcl From cb3f9ced07a2a673e6077d4a08ca3d605f8f156e Mon Sep 17 00:00:00 2001 From: Gianluca Petrillo Date: Tue, 9 May 2023 23:45:07 -0500 Subject: [PATCH 3/4] Removed 'nofilter' configurations They are equivalent to the mainline configurations, by which they are now replaced. --- .../stage1_multiTPC_nofilter_icarus_gauss.fcl | 52 -------------- ....fcl => stage1_singleTPC_icarus_gauss.fcl} | 0 .../Run2/stage1_run2_nofilter_icarus.fcl | 69 ------------------- 3 files changed, 121 deletions(-) delete mode 100644 fcl/reco/Stage1/Run1/stage1_multiTPC_nofilter_icarus_gauss.fcl rename fcl/reco/Stage1/Run1/{stage1_singleTPC_nofilter_icarus_gauss.fcl => stage1_singleTPC_icarus_gauss.fcl} (100%) delete mode 100644 fcl/reco/Stage1/Run2/stage1_run2_nofilter_icarus.fcl diff --git a/fcl/reco/Stage1/Run1/stage1_multiTPC_nofilter_icarus_gauss.fcl b/fcl/reco/Stage1/Run1/stage1_multiTPC_nofilter_icarus_gauss.fcl deleted file mode 100644 index 1eb3d261d..000000000 --- a/fcl/reco/Stage1/Run1/stage1_multiTPC_nofilter_icarus_gauss.fcl +++ /dev/null @@ -1,52 +0,0 @@ -#include "stage1_icarus_driver_common.fcl" - -process_name: stage1 - -physics.reco: [ @sequence::icarus_filter_cluster3D, - @sequence::icarus_pandora_Gauss, - @sequence::icarus_reco_fm, - @sequence::icarus_crttrack, - @sequence::icarus_crtt0match, - caloskimCalorimetryCryoE, caloskimCalorimetryCryoW] - -physics.outana: [ caloskimE, caloskimW, simpleLightAna, CRTDataAnalysis] -physics.trigger_paths: [ reco ] -physics.end_paths: [ outana, stream1 ] -outputs.out1.fileName: "%ifb_%tc-%p.root" -outputs.out1.dataTier: "reconstructed" -outputs.out1.SelectEvents: [ reco ] -outputs.out1.outputCommands: [ - "keep *_*_*_*", - "drop *_caloskimCalorimetryCryoE_*_*", - "drop *_caloskimCalorimetryCryoW_*_*" -] - -# Disabled Space-Charge service for calorimetry -services.SpaceChargeService: { - EnableCalEfieldSCE: false - EnableCalSpatialSCE: false - EnableCorrSCE: false - EnableSimEfieldSCE: false - EnableSimSpatialSCE: false - InputFilename: "SCEoffsets/SCEoffsets_ICARUS_E500_voxelTH3.root" - RepresentationType: "Voxelized_TH3" - service_provider: "SpaceChargeServiceICARUS" -} - -services.message.destinations : -{ - STDCOUT: - { - type: "cout" #tells the message service to output this destination to cout - threshold: "WARNING" #tells the message service that this destination applies to WARNING and higher level messages - categories: - { - Cluster3D: - { - limit: -1 - reportEvery: 1 - } - } - } -} - diff --git a/fcl/reco/Stage1/Run1/stage1_singleTPC_nofilter_icarus_gauss.fcl b/fcl/reco/Stage1/Run1/stage1_singleTPC_icarus_gauss.fcl similarity index 100% rename from fcl/reco/Stage1/Run1/stage1_singleTPC_nofilter_icarus_gauss.fcl rename to fcl/reco/Stage1/Run1/stage1_singleTPC_icarus_gauss.fcl diff --git a/fcl/reco/Stage1/Run2/stage1_run2_nofilter_icarus.fcl b/fcl/reco/Stage1/Run2/stage1_run2_nofilter_icarus.fcl deleted file mode 100644 index 8fa57a650..000000000 --- a/fcl/reco/Stage1/Run2/stage1_run2_nofilter_icarus.fcl +++ /dev/null @@ -1,69 +0,0 @@ -#include "stage1_icarus_driver_common.fcl" - -process_name: stage1 - -physics.reco: [ @sequence::icarus_filter_cluster3D, - @sequence::icarus_pandora_Gauss, - @sequence::icarus_reco_fm, - @sequence::icarus_crttrack, - @sequence::icarus_crtt0match, - caloskimCalorimetryCryoE, caloskimCalorimetryCryoW] - -physics.outana: [ @sequence::icarus_analysis_modules ] -physics.trigger_paths: [ reco ] -physics.end_paths: [ outana, stream1 ] -outputs.out1.fileName: "%ifb_%tc-%p.root" -outputs.out1.dataTier: "reconstructed" -outputs.out1.outputCommands: [ - "keep *_*_*_*", - "drop *_caloskimCalorimetryCryoE_*_*", - "drop *_caloskimCalorimetryCryoW_*_*" -] - -physics.analyzers.supera.unique_filename: true - -# Disabled Space-Charge service for calorimetry -services.SpaceChargeService: { - EnableCalEfieldSCE: false - EnableCalSpatialSCE: false - EnableCorrSCE: false - EnableSimEfieldSCE: false - EnableSimSpatialSCE: false - InputFilename: "SCEoffsets/SCEoffsets_ICARUS_E500_voxelTH3.root" - RepresentationType: "Voxelized_TH3" - service_provider: "SpaceChargeServiceICARUS" -} - -# Note there is a selection on the number of hits at the cluster3D level -physics.analyzers.caloskimE.SelectEvents: [ reco ] -physics.analyzers.caloskimW.SelectEvents: [ reco ] -physics.analyzers.simpleLightAna.SelectEvents: [ reco ] -physics.analyzers.supera.SelectEvents: [ reco ] - -services.message.destinations : -{ - STDCOUT: - { - type: "cout" #tells the message service to output this destination to cout - threshold: "DEBUG" #tells the message service that this destination applies to WARNING and higher level messages - categories: - { - Cluster3DICARUS: - { - limit: 5 - reportEvery: 1 - } - SnippetHit3D: - { - limit: 5 - reportEvery: 1 - } - default: - { - limit: 0 #don't print anything at the infomsg level except the explicitly named categories - reportEvery: 0 - } - } - } -} - From 73b36260643b47b85b689076e423ef6211295b3a Mon Sep 17 00:00:00 2001 From: Gianluca Petrillo Date: Thu, 18 May 2023 16:45:59 -0500 Subject: [PATCH 4/4] Fixed configuration using a renamed one. --- ...lter_icarus_nosupera.fcl => stage1_runA_icarus_nosupera.fcl} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename fcl/reco/Stage1/RunA/{stage1_runA_nofilter_icarus_nosupera.fcl => stage1_runA_icarus_nosupera.fcl} (72%) diff --git a/fcl/reco/Stage1/RunA/stage1_runA_nofilter_icarus_nosupera.fcl b/fcl/reco/Stage1/RunA/stage1_runA_icarus_nosupera.fcl similarity index 72% rename from fcl/reco/Stage1/RunA/stage1_runA_nofilter_icarus_nosupera.fcl rename to fcl/reco/Stage1/RunA/stage1_runA_icarus_nosupera.fcl index d0c42890c..b6778b06c 100644 --- a/fcl/reco/Stage1/RunA/stage1_runA_nofilter_icarus_nosupera.fcl +++ b/fcl/reco/Stage1/RunA/stage1_runA_icarus_nosupera.fcl @@ -1,4 +1,4 @@ -#include "stage1_run2_nofilter_icarus.fcl" +#include "stage1_run2_icarus.fcl" # don't run supera -- crashes on old files physics.outana: [