Merge pull request #848 from SBNSoftware/feature/separate_blip_hitfinding_fcl

nathanielerowe · web-flow · commit 2e61dc58820b · 2025-11-14T08:27:51.000-06:00
changes for special blip processing
diff --git a/sbndcode/BlipRecoSBND/blipreco_configs.fcl b/sbndcode/BlipRecoSBND/blipreco_configs.fcl
@@ -5,8 +5,8 @@ BEGIN_PROLOG
 # Main BlipAlg settings
 sbnd_blipalg:
 {
-  HitProducer:          "gaushit"       #// input recob::Hits to use for blip reconstruction
-  TrkProducer:          "pandoraTrack"       #// input recob::Tracks to use for blip reconstruction
+  HitProducer:          "specialblipgaushit"       #// input recob::Hits to use for blip reconstruction
+  TrkProducer:          "blipPandoraTrackCopy"       #// input recob::Tracks to use for blip reconstruction
   GeantProducer:        "largeant"      #// input sim::MCParticles (getting true particle info)
   SimEDepProducer:      "ionandscint"   #// input sim::SimEnergyDeposits (getting energy/electrons deposited)
   SimChanProducer:      "simdrift"      #// label for sim::SimChannels (getting drifted charge; optional)
diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_sce.fcl b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_sce.fcl
@@ -14,6 +14,7 @@ physics.producers.cafmaker.OpT0Label: "opt0finderSCE"
 physics.producers.cafmaker.TPCPMTBarycenterMatchLabel: "tpcpmtbarycentermatchingSCE"
 physics.producers.cafmaker.CVNLabel: "cvnSCE"
 physics.producers.cafmaker.CorrectedOpFlashLabel: "lightpropagationcorrectionSCE"
+physics.producers.cnnid.WireLabel: "sptpc2d:dnnsp"
 
 physics.producers.cnnid.ClusterModuleLabel:        "pandoraSCE"
 physics.producers.cnnid.PFParticleModuleLabel:     "pandoraSCE"
diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_sce.fcl b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_sce.fcl
@@ -18,6 +18,7 @@ physics.producers.cafmaker.CVNLabel: "cvnSCE"
 
 physics.producers.cnnid.ClusterModuleLabel:        "pandoraSCE"
 physics.producers.cnnid.PFParticleModuleLabel:     "pandoraSCE"
+physics.producers.cnnid.WireLabel: "simtpc2d:dnnsp"
 
 physics.producers.pandoraTrackMCS.TrackLabel: "pandoraSCETrack"
 physics.producers.pandoraTrackRange.TrackLabel: "pandoraSCETrack"
diff --git a/sbndcode/JobConfigurations/standard/reco/config/drops_reco1.fcl b/sbndcode/JobConfigurations/standard/reco/config/drops_reco1.fcl
@@ -15,6 +15,7 @@ sbnd_reco1_drops: [
   , "drop raw::OpDetWaveforms_*_*_*" 
   , "drop *_fasthit_*_*"
   , "drop recob::Wires_*_wiener_*"  #drop wiener wires
+  , "drop recob::Wires_*_gauss_*"
   , @sequence::sbnd_reco1_ml_drops
 ]
 
diff --git a/sbndcode/JobConfigurations/standard/reco/config/drops_reco2.fcl b/sbndcode/JobConfigurations/standard/reco/config/drops_reco2.fcl
diff --git a/sbndcode/JobConfigurations/standard/reco/config/workflow_reco1.fcl b/sbndcode/JobConfigurations/standard/reco/config/workflow_reco1.fcl
@@ -40,10 +40,12 @@ sbnd_reco1_producers:{
 
     ### hit-finder producers
     gaushit:             @local::sbnd_gaushitfinder
+    specialblipgaushit:  @local::sbnd_gaushitfinder
     fasthit:             @local::sbnd_fasthitfinder
 
     ### Truth-matich for hits
     gaushitTruthMatch:   @local::standard_mcparticlehitmatching
+    blipgaushitTruthMatch:   @local::standard_mcparticlehitmatching
 
     ### CRT reconstruction
     crtstrips:      @local::crtstriphitproducer_sbnd
@@ -67,6 +69,8 @@ sbnd_reco1_producer_sequence: [
   #, opflashtpc1xarapuca
   , gaushit
   , gaushitTruthMatch
+  , specialblipgaushit
+  , blipgaushitTruthMatch
   , crtstrips
   , crtclustering
   , crtspacepoints
@@ -75,10 +79,14 @@ sbnd_reco1_producer_sequence: [
  ]
 
 #FIXME override the producer labels.  This should really happen in the module's config fcl
-sbnd_reco1_producers.gaushit.CalDataModuleLabel:                                           "simtpc2d:gauss"
+sbnd_reco1_producers.gaushit.CalDataModuleLabel:                                           "simtpc2d:dnnsp"
 sbnd_reco1_producers.fasthit.DigitModuleLabel:                                             "simtpc2d:daq"
 sbnd_reco1_producers.gaushitTruthMatch.HitParticleAssociations.HitModuleLabel:             "gaushit"
-
+sbnd_reco1_producers.specialblipgaushit.CalDataModuleLabel:  "simtpc2d:gauss"
+sbnd_reco1_producers.specialblipgaushit.MinHitHeightPlane0: 8
+sbnd_reco1_producers.specialblipgaushit.MinHitHeightPlane1: 15
+sbnd_reco1_producers.specialblipgaushit.MinHitHeightPlane2: 5
+sbnd_reco1_producers.blipgaushitTruthMatch.HitParticleAssociations.HitModuleLabel:         "specialblipgaushit"
 sbnd_reco1_filters: {
     #filter events based on the number of reconstructed hits (avoids overly messy data events)
     numberofhitsfilter: @local::sbnd_numberofhitsfilter
diff --git a/sbndcode/JobConfigurations/standard/reco/config/workflow_reco2.fcl b/sbndcode/JobConfigurations/standard/reco/config/workflow_reco2.fcl
@@ -30,6 +30,8 @@ sbnd_reco2_producers:{
     ### pandora
     pandora:             @local::sbnd_pandora
     pandoraTrack:        @local::sbnd_pandoraTrackCreation
+    blipPandoraCopy:     @local::sbnd_pandora
+    blipPandoraTrackCopy:@local::sbnd_pandoraTrackCreation
     pandoraShower:       @local::sbnd_incremental_pandoraModularShowerCreation
     pandoraShowerSBN:    @local::sbnd_sbn_pandoraModularShowerCreation
     pandoraCalo:         @local::sbnd_gnewcalomc
@@ -96,6 +98,8 @@ sbnd_reco2_producer_sequence: [
     rns
     , pandora
     , pandoraTrack
+    , blipPandoraCopy
+    , blipPandoraTrackCopy
     , pandoraShower
     , pandoraShowerSBN
     , pandoraCalo
@@ -200,7 +204,8 @@ sbnd_reco2_producers.crtspacepointmatchingSCE.MatchingAlg.TPCTrackLabel: "pandor
 sbnd_reco2_producers.crttrackmatchingSCE.TPCTrackModuleLabel:            "pandoraSCETrack"
 sbnd_reco2_producers.crttrackmatchingSCE.PFPModuleLabel:                 "pandoraSCE"
 sbnd_reco2_producers.crttrackmatchingSCE.MatchingAlg.TPCTrackLabel:      "pandoraSCETrack"
-
+sbnd_reco2_producers.blipPandoraCopy.HitFinderModuleLabel:          "specialblipgaushit"
+sbnd_reco2_producers.blipPandoraTrackCopy.PFParticleLabel: "blipPandoraCopy"
 sbnd_reco2_analyzers: {
     caloskim: @local::caloskim_nodigits_goldentracks
     crtana:   @local::crtana_sbnd
diff --git a/sbndcode/JobConfigurations/standard/reco/reco1_data.fcl b/sbndcode/JobConfigurations/standard/reco/reco1_data.fcl
@@ -1,3 +1,4 @@
+#include "drops_reco1.fcl"
 #include "wcsp_data_sbnd.fcl"
 #include "opdeconvolution_sbnd_data.fcl"
 #include "sbnd_ophitfinder_deco_data.fcl"
@@ -19,7 +20,7 @@ services:
 physics.producers:
 {
     @table::physics.producers
-    sptpc2d:   @local::sbnd_wcls_sp_data
+    sptpc2d:   @local::sbnd_wcls_sp_data_bothrois
     crtstrips: @local::crtstriphitproducer_data_sbnd
     crtclustering:  @local::crtclusterproducer_data_sbnd
     crtspacepoints: @local::crtspacepointproducer_data_sbnd
@@ -31,10 +32,11 @@ physics.producers:
     opflashtpc1:   @local::SBNDDecoSimpleFlashTPC1_data
 }
 
-physics.reco1: [sptpc2d, gaushit, numberofhitsfilter, cluster3d, crtstrips, 
+physics.reco1: [sptpc2d, gaushit, specialblipgaushit, numberofhitsfilter, cluster3d, crtstrips, 
     crtclustering, crtspacepoints, crttracks, wfalign, opdecopmt, ophitpmt, opflashtpc0, opflashtpc1]
 physics.ana: [superadata]
 
 outputs.out1.SelectEvents: [ "reco1" ]
 
-physics.producers.gaushit.CalDataModuleLabel: "sptpc2d:gauss"
+physics.producers.gaushit.CalDataModuleLabel: "sptpc2d:dnnsp"
+physics.producers.specialblipgaushit.CalDataModuleLabel: "sptpc2d:gauss"
diff --git a/sbndcode/JobConfigurations/standard/reco/reco2_data.fcl b/sbndcode/JobConfigurations/standard/reco/reco2_data.fcl
@@ -41,7 +41,7 @@ physics.producers:
     frameshift: @local::frameshift_data
 }
 
-physics.reco2: [ pandora, pandoraTrack, pandoraShower, pandoraShowerSBN, pandoraCaloData, pandoraPidData, pandoraLikePidData,
+physics.reco2: [ pandora, pandoraTrack, blipPandoraCopy, blipPandoraTrackCopy, pandoraShower, pandoraShowerSBN, pandoraCaloData, pandoraPidData, pandoraLikePidData,
                  cvn, opt0finder, crtveto, crtspacepointmatching, crttrackmatching, tpcpmtbarycentermatching,
                  pandoraSCE, pandoraSCETrack, pandoraSCEShower, pandoraSCEShowerSBN, pandoraSCECaloData, pandoraSCEPidData, pandoraSCELikePidData,
                  cvnSCE, opt0finderSCE, tpcpmtbarycentermatchingSCE, crtspacepointmatchingSCE, crttrackmatchingSCE,
diff --git a/sbndcode/JobConfigurations/standard/standard_detsim_sbnd.fcl b/sbndcode/JobConfigurations/standard/standard_detsim_sbnd.fcl
@@ -63,7 +63,7 @@ physics:
   producers:
   {
     rns:       { module_type: "RandomNumberSaver" }
-    simtpc2d:  @local::sbnd_wcls_simsp
+    simtpc2d:  @local::sbnd_wcls_simsp_bothrois
     crtsim:    @local::sbnd_crtsim
     opdaq:     @local::sbnd_opdetdigitizer
   }
@@ -93,4 +93,4 @@ outputs:
                     ]
   }
 }
-physics.producers.simtpc2d.wcls_main.structs.enableLowROIThresholds: false
+physics.producers.simtpc2d.wcls_main.structs.enableLowROIThresholds: true
diff --git a/sbndcode/JobConfigurations/standard/standard_reco1_sbnd.fcl b/sbndcode/JobConfigurations/standard/standard_reco1_sbnd.fcl
diff --git a/sbndcode/WireCell/wcsimsp_sbnd.fcl b/sbndcode/WireCell/wcsimsp_sbnd.fcl
@@ -35,7 +35,8 @@ sbnd_wcls_simsp.wcls_main.configs:  ["pgrapher/experiment/sbnd/wcls-sim-drift-de
 sbnd_wcls_simsp.wcls_main.inputers: ["wclsSimDepoSetSource:"]
 sbnd_wcls_simsp.wcls_main.outputers:["wclsDepoFluxWriter:postdrift",
                                      # "wclsFrameSaver:simdigits" , # <- by default, do not save RawDigits. Uncomment this line to save RawDigits and set
-                                     "wclsFrameSaver:spsaver"
+                                     "wclsFrameSaver:spsaver",
+				     "wclsFrameSaver:dnnsaver"
                                     ]
 sbnd_wcls_simsp.wcls_main.params:   {
                                      ## This locates the input SimEnergyDeposits in the art::Event
@@ -64,7 +65,7 @@ sbnd_wcls_simsp.wcls_main.params:   {
 
                                      dnnroi_model_p0: "DNN_ROI/plane0.ts"
                                      dnnroi_model_p1: "DNN_ROI/plane1.ts"
-                                     roi: "trad"
+                                     roi: "both"
                                     }
                                     
 sbnd_wcls_simsp.wcls_main.structs:  {
@@ -81,7 +82,7 @@ sbnd_wcls_simsp.wcls_main.structs:  {
                                      nticks: 3427
                                      nchunks: 2 # dummy for trad
                                      tick_per_slice: 4 # dummy for trad
-				     enableLowROIThresholds: "false"
+				     enableLowROIThresholds: "true"
                                     }
 
 # ------------------------------------------------------------------------------------ #
@@ -232,8 +233,8 @@ sbnd_wcls_samples_tru.wcls_main.structs:  {
                                     }
 #---------------------------------------------------Low threshold setting ----------------
 sbnd_wcls_simsp_low: @local::sbnd_wcls_simsp
-sbnd_wcls_simsp_low.wcls_main.outputers: ["wclsDepoFluxWriter:postdrift", "wclsFrameSaver:dnnsaver"]
-sbnd_wcls_simsp_low.wcls_main.params.roi: "dnn"
+sbnd_wcls_simsp_low.wcls_main.outputers: ["wclsDepoFluxWriter:postdrift", "wclsFrameSaver:spsaver", "wclsFrameSaver:dnnsaver"]
+sbnd_wcls_simsp_low.wcls_main.params.roi: "both"
 sbnd_wcls_simsp_low.wcls_main.structs.nchunks: 2 # should match training config
 sbnd_wcls_simsp_low.wcls_main.structs.tick_per_slice: 4 # should match training config
 sbnd_wcls_simsp_low.wcls_main.structs.enableLowROIThresholds: "true"
diff --git a/sbndcode/WireCell/wcsp_data_sbnd.fcl b/sbndcode/WireCell/wcsp_data_sbnd.fcl
@@ -66,7 +66,7 @@ sbnd_wcls_sp_data.wcls_main.structs:   {
                                         nticks: 3427
                                         nchunks: 2 # dummy for trad
                                         tick_per_slice: 4 # dummy for trad
-					enableLowROIThresholds: "false"
+					enableLowROIThresholds: "true"
                                        }
 #----------------------------------------------------------------------------------#
 ## Low threshold configuration 
diff --git a/test/ci/sbnd_ci_data_offBeamZeroBias_caf_quick_test_sbndcode.fcl b/test/ci/sbnd_ci_data_offBeamZeroBias_caf_quick_test_sbndcode.fcl
@@ -1,4 +1,4 @@
-#include "cafmakerjob_sbnd_data_base.fcl"
+#include "cafmakerjob_sbnd_data_sce.fcl"
 
 services.NuRandomService.policy: "perEvent"
 

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ sbnd_reco1_drops: [`
`15`	`15`	`, "drop raw::OpDetWaveforms___*"`
`16`	`16`	`, "drop _fasthit__*"`
`17`	`17`	`, "drop recob::Wires__wiener_" #drop wiener wires`
	`18`	`+ , "drop recob::Wires__gauss_"`
`18`	`19`	`, @sequence::sbnd_reco1_ml_drops`
`19`	`20`	`]`
`20`	`21`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ physics.producers:`
`41`	`41`	`frameshift: @local::frameshift_data`
`42`	`42`	`}`
`43`	`43`
`44`		`-physics.reco2: [ pandora, pandoraTrack, pandoraShower, pandoraShowerSBN, pandoraCaloData, pandoraPidData, pandoraLikePidData,`
	`44`	`+physics.reco2: [ pandora, pandoraTrack, blipPandoraCopy, blipPandoraTrackCopy, pandoraShower, pandoraShowerSBN, pandoraCaloData, pandoraPidData, pandoraLikePidData,`
`45`	`45`	`cvn, opt0finder, crtveto, crtspacepointmatching, crttrackmatching, tpcpmtbarycentermatching,`
`46`	`46`	`pandoraSCE, pandoraSCETrack, pandoraSCEShower, pandoraSCEShowerSBN, pandoraSCECaloData, pandoraSCEPidData, pandoraSCELikePidData,`
`47`	`47`	`cvnSCE, opt0finderSCE, tpcpmtbarycentermatchingSCE, crtspacepointmatchingSCE, crttrackmatchingSCE,`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ physics:`
`63`	`63`	`producers:`
`64`	`64`	`{`
`65`	`65`	`rns: { module_type: "RandomNumberSaver" }`
`66`		`- simtpc2d: @local::sbnd_wcls_simsp`
	`66`	`+ simtpc2d: @local::sbnd_wcls_simsp_bothrois`
`67`	`67`	`crtsim: @local::sbnd_crtsim`
`68`	`68`	`opdaq: @local::sbnd_opdetdigitizer`
`69`	`69`	`}`
`@@ -93,4 +93,4 @@ outputs:`
`93`	`93`	`]`
`94`	`94`	`}`
`95`	`95`	`}`
`96`		`-physics.producers.simtpc2d.wcls_main.structs.enableLowROIThresholds: false`
	`96`	`+physics.producers.simtpc2d.wcls_main.structs.enableLowROIThresholds: true`