Refactor reco2 workflow, and promote standard_reco2_sbnd.fcl back to the main workflow again #528
+226
−47
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| #outputs configuration | ||
| # | ||
| #include "drops_reco1.fcl" | ||
|
|
||
| BEGIN_PROLOG | ||
|
|
||
| sbnd_reco2_drops: [ | ||
| @sequence::sbnd_reco1_drops | ||
| ] | ||
|
|
||
| END_PROLOG |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,169 @@ | ||
| # module configuration | ||
| # | ||
| #include "pandoramodules_sbnd.fcl" | ||
| #include "calorimetry_sbnd.fcl" | ||
| #include "sbnd_flashfinder_deco.fcl" | ||
| #include "crtrecoproducers_sbnd.fcl" | ||
| #include "particleid_sbnd.fcl" | ||
| #include "crttpcmatchingproducers_sbnd.fcl" | ||
|
|
||
| #include "scecorrections.fcl" | ||
| #include "flashmatch_sbnd.fcl" | ||
|
|
||
| #include "opt0finder_sbnd.fcl" | ||
|
|
||
| #include "sbnd_trackcalo_skimmer.fcl" | ||
| #include "crtskim_sbnd.fcl" | ||
| #include "pmtskim_sbnd.fcl" | ||
|
|
||
| BEGIN_PROLOG | ||
|
|
||
| sbnd_reco2_producers:{ | ||
| ### random number saver | ||
| rns: { module_type: RandomNumberSaver } | ||
|
|
||
| ### pandora | ||
| pandora: @local::sbnd_pandora | ||
| pandoraTrack: @local::sbnd_pandoraTrackCreation | ||
| pandoraShower: @local::sbnd_incremental_pandoraModularShowerCreation | ||
| pandoraShowerSBN: @local::sbnd_sbn_pandoraModularShowerCreation | ||
| pandoraCalo: @local::sbnd_gnewcalomc | ||
| pandoraPid: @local::sbnd_chi2pid | ||
|
|
||
| pandoraSCECalo: @local::sbnd_gnewcalomc | ||
| pandoraSCEPid: @local::sbnd_chi2pid | ||
|
|
||
| pandoraCaloData: @local::sbnd_gnewcalodata | ||
| pandoraPidData: @local::sbnd_chi2pid | ||
|
|
||
| ### SCE-aware pandora: | ||
| pandoraSCE: @local::scecorrection | ||
| pandoraSCETrack: @local::sbnd_pandoraTrackCreation | ||
| pandoraSCEShower: @local::sbnd_sce_incremental_pandoraModularShowerCreation | ||
| pandoraSCEShowerSBN: @local::sbnd_sce_sbn_pandoraModularShowerCreation | ||
|
|
||
| ### CRT reconstruction | ||
| crtclustering: @local::crtclusterproducer_sbnd | ||
| crtspacepoints: @local::crtspacepointproducer_sbnd | ||
| crttracks: @local::crttrackproducer_sbnd | ||
|
|
||
| ### CRT-TPC matching | ||
| crtspacepointmatching: @local::crtspacepointmatchproducer_sbnd | ||
| crttrackmatching: @local::crttrackmatchproducer_sbnd | ||
| crtspacepointmatchingSCE: @local::crtspacepointmatchproducer_sbnd | ||
| crttrackmatchingSCE: @local::crttrackmatchproducer_sbnd | ||
|
|
||
| ### flash-matching | ||
| fmatch: @local::sbnd_simple_flashmatch | ||
| fmatchSCE: @local::sbnd_simple_flashmatch_sce | ||
| fmatchop: @local::sbnd_simple_flashmatch_op | ||
| fmatchopSCE: @local::sbnd_simple_flashmatch_op_sce | ||
| fmatchara: @local::sbnd_simple_flashmatch_ara | ||
| fmatcharaSCE: @local::sbnd_simple_flashmatch_ara_sce | ||
| fmatchopara: @local::sbnd_simple_flashmatch_opara | ||
| fmatchoparaSCE: @local::sbnd_simple_flashmatch_opara_sce | ||
| opt0finder: @local::sbnd_opt0_finder_one_to_many | ||
| opt0finderSCE: @local::sbnd_opt0_finder_one_to_many | ||
|
|
||
| ### Uncalibrated calorimetry producer for calibration caloskimmer | ||
| caloskimCalorimetry: @local::caloskim_calorimetry | ||
| } | ||
|
|
||
| sbnd_reco2_producer_sequence: [ | ||
| rns | ||
| , pandora | ||
| , pandoraTrack | ||
| , pandoraShower | ||
| , pandoraShowerSBN | ||
| , pandoraCalo | ||
| , pandoraPid | ||
| , crtclustering | ||
| , crtspacepoints | ||
| , crttracks | ||
| , crtspacepointmatching | ||
| , crttrackmatching | ||
| , fmatch | ||
| , fmatchop | ||
| , fmatchara | ||
| , fmatchopara | ||
| , caloskimCalorimetry | ||
| , opt0finder | ||
| , pandoraSCE | ||
| , pandoraSCETrack | ||
| , pandoraSCEShower | ||
| , pandoraSCEShowerSBN | ||
| , pandoraSCECalo | ||
| , pandoraSCEPid | ||
| , crtspacepointmatchingSCE | ||
| , crttrackmatchingSCE | ||
| , fmatchSCE | ||
| , fmatchopSCE | ||
| , fmatcharaSCE | ||
| , fmatchoparaSCE | ||
| , opt0finderSCE | ||
| ] | ||
|
There was a problem hiding this comment. I'm just going to mention here that we've often talked about moving a lot of the producers currently run in the CAF stage into reco2 (CRUMBS, stubs, the MCS tool, the PID BDTs etc). This shouldn't be part of this PR as this is meant to reorganise whilst maintaining behaviour. But now that this workflow fcl is nice & clean, we should look at doing this soon. |
||
|
|
||
| #FIXME override the producer labels. This should really happen in the module's config fcl | ||
| sbnd_reco2_producers.pandoraCalo.TrackModuleLabel: "pandoraTrack" | ||
| sbnd_reco2_producers.pandoraCalo.FieldDistortion: false | ||
| sbnd_reco2_producers.pandoraCalo.FieldDistortionEfield: false | ||
| sbnd_reco2_producers.pandoraCalo.TrackIsFieldDistortionCorrected: false | ||
| sbnd_reco2_producers.pandoraPid.TrackModuleLabel: "pandoraTrack" | ||
| sbnd_reco2_producers.pandoraPid.CalorimetryModuleLabel: "pandoraCalo" | ||
|
|
||
| sbnd_reco2_producers.pandoraSCECalo.TrackModuleLabel: "pandoraSCETrack" | ||
| sbnd_reco2_producers.pandoraSCECalo.FieldDistortion: true | ||
| sbnd_reco2_producers.pandoraSCECalo.FieldDistortionEfield: true | ||
| sbnd_reco2_producers.pandoraSCECalo.TrackIsFieldDistortionCorrected:true | ||
| sbnd_reco2_producers.pandoraSCEPid.TrackModuleLabel: "pandoraSCETrack" | ||
| sbnd_reco2_producers.pandoraSCEPid.CalorimetryModuleLabel: "pandoraSCECalo" | ||
|
|
||
| sbnd_reco2_producers.pandoraCaloData.TrackModuleLabel: "pandoraTrack" | ||
| sbnd_reco2_producers.pandoraCaloData.FieldDistortion: false | ||
| sbnd_reco2_producers.pandoraCaloData.FieldDistortionEfield: false | ||
| sbnd_reco2_producers.pandoraCaloData.TrackIsFieldDistortionCorrected: false | ||
| sbnd_reco2_producers.pandoraPidData.TrackModuleLabel: "pandoraTrack" | ||
| sbnd_reco2_producers.pandoraPidData.CalorimetryModuleLabel: "pandoraCaloData" | ||
|
|
||
| physics.analyzers.caloskim.SimChannelproducer: "simtpc2d:simpleSC" | ||
|
|
||
| sbnd_reco2_producers.opt0finderSCE.SliceProducer: "pandoraSCE" | ||
| sbnd_reco2_producers.opt0finderSCE.TrackProducer: "pandoraSCETrack" | ||
| sbnd_reco2_producers.opt0finderSCE.ShowerProducer: "pandoraSCEShowerSBN" | ||
| sbnd_reco2_producers.opt0finderSCE.CaloProducer: "pandoraSCECalo" | ||
|
|
||
| # Configure the SCE corrections | ||
| # For now: always assume t = 0 | ||
| sbnd_reco2_producers.pandoraSCE.T0Labels: [] | ||
| sbnd_reco2_producers.pandoraSCE.T0LabelsCorrectT0: [] | ||
| sbnd_reco2_producers.pandoraSCE.CorrectNoT0Tag: true | ||
| # point track/shower creation to the SCE pandora | ||
| sbnd_reco2_producers.pandoraSCETrack.PFParticleLabel: "pandoraSCE" | ||
| sbnd_reco2_producers.pandoraSCEShower.PFParticleLabel: "pandoraSCE" | ||
| sbnd_reco2_producers.pandoraSCEShowerSBN.PFParticleLabel: "pandoraSCE" | ||
|
|
||
| sbnd_reco2_producers.crtspacepointmatchingSCE.TPCTrackModuleLabel: "pandoraSCETrack" | ||
| sbnd_reco2_producers.crtspacepointmatchingSCE.PFPModuleLabel: "pandoraSCE" | ||
| sbnd_reco2_producers.crtspacepointmatchingSCE.MatchingAlg.TPCTrackLabel: "pandoraSCETrack" | ||
|
|
||
| sbnd_reco2_producers.crttrackmatchingSCE.TPCTrackModuleLabel: "pandoraSCETrack" | ||
| sbnd_reco2_producers.crttrackmatchingSCE.PFPModuleLabel: "pandoraSCE" | ||
| sbnd_reco2_producers.crttrackmatchingSCE.MatchingAlg.TPCTrackLabel: "pandoraSCETrack" | ||
|
|
||
| sbnd_reco2_analyzers: { | ||
| caloskim: @local::caloskim_nodigits_goldentracks | ||
| crtskim: @local::crtskim_sbnd | ||
| pmtskim: @local::pmtskim_sbnd | ||
| } | ||
|
|
||
| sbnd_reco2_analyzer_sequence: [ | ||
| caloskim | ||
| , pmtskim | ||
| , crtskim | ||
| ] | ||
|
|
||
| #FIXME override the analyzer labels. This should really happen in the module's config fcl | ||
| sbnd_reco2_analyzers.caloskim.SimChannelproducer: "simtpc2d:simpleSC" | ||
|
|
||
| END_PROLOG | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,37 @@ | ||
| # job configuration | ||
| # | ||
| #include "workflow_reco2.fcl" | ||
| #include "drops_reco2.fcl" | ||
| #include "simulationservices_sbnd.fcl" | ||
| #include "generic_job_sbnd.fcl" | ||
|
|
||
| process_name: Reco2 | ||
|
|
||
| #services overrides | ||
| services: | ||
| { | ||
| @table::services | ||
| @table::sbnd_random_services | ||
| @table::sbnd_g4_services | ||
| # FIXME The following services are temporarily included here to test tht the workflow is unchanged | ||
| LArFFT: @local::sbnd_larfft | ||
| SignalShapingServiceSBND: @local::sbnd_signalshapingservice | ||
| BackTrackerService: @local::sbnd_backtrackerservice | ||
| ParticleInventoryService: @local::sbnd_particleinventoryservice | ||
|
Comment on lines
+16
to
+20
There was a problem hiding this comment. And the longer term plan would be to move these into a table? |
||
| } | ||
|
|
||
| #physics table overrides | ||
| physics.producers: @local::sbnd_reco2_producers | ||
| physics.reco2: @local::sbnd_reco2_producer_sequence | ||
| physics.trigger_paths: [ reco2 ] | ||
| #analysers | ||
| physics.analyzers: @local::sbnd_reco2_analyzers | ||
| physics.ana: @local::sbnd_reco2_analyzer_sequence | ||
| physics.end_paths: [ @sequence::physics.end_paths, ana ] | ||
|
|
||
| #outputs table overrides | ||
| outputs.out1.dataTier: "reconstructed" | ||
| outputs.out1.outputCommands: [@sequence::outputs.out1.outputCommands, @sequence::sbnd_reco2_drops] | ||
|
|
||
| #FIXME permanently enable SCE in a service rather than override specific params in this way... | ||
|
There was a problem hiding this comment. maybe we can delete this There was a problem hiding this comment. I think Dom just means make it the default right? Rather than overrides at the bottom? |
||
| #include "enable_spacecharge_services_sbnd.fcl" | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| #include "standard_reco2_sbnd.fcl" | ||
|
|
||
| services.NuRandomService.policy: "perEvent" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As with the reco1 changes, the name should be
reco2_comm.fcl