diff --git a/sbndcode/JobConfigurations/standard/reco/config/workflow_reco1.fcl b/sbndcode/JobConfigurations/standard/reco/config/workflow_reco1.fcl index 7542e9f93..2d6e47024 100644 --- a/sbndcode/JobConfigurations/standard/reco/config/workflow_reco1.fcl +++ b/sbndcode/JobConfigurations/standard/reco/config/workflow_reco1.fcl @@ -47,6 +47,9 @@ sbnd_reco1_producers:{ ### CRT reconstruction crtstrips: @local::crtstriphitproducer_sbnd + crtclustering: @local::crtclusterproducer_sbnd + crtspacepoints: @local::crtspacepointproducer_sbnd + crttracks: @local::crttrackproducer_sbnd ### ML reco inputs cluster3d: @local::sbnd_cluster3d @@ -65,6 +68,9 @@ sbnd_reco1_producer_sequence: [ , gaushit , gaushitTruthMatch , crtstrips + , crtclustering + , crtspacepoints + , crttracks , cluster3d ] diff --git a/sbndcode/JobConfigurations/standard/reco/config/workflow_reco2.fcl b/sbndcode/JobConfigurations/standard/reco/config/workflow_reco2.fcl index 565555be8..eaddaeca0 100644 --- a/sbndcode/JobConfigurations/standard/reco/config/workflow_reco2.fcl +++ b/sbndcode/JobConfigurations/standard/reco/config/workflow_reco2.fcl @@ -3,7 +3,6 @@ #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" @@ -44,11 +43,6 @@ sbnd_reco2_producers:{ 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 @@ -82,9 +76,6 @@ sbnd_reco2_producer_sequence: [ , pandoraShowerSBN , pandoraCalo , pandoraPid - , crtclustering - , crtspacepoints - , crttracks , crtspacepointmatching , crttrackmatching , fmatch diff --git a/sbndcode/JobConfigurations/standard/reco/reco1_data.fcl b/sbndcode/JobConfigurations/standard/reco/reco1_data.fcl index c84085498..f3cc6997e 100644 --- a/sbndcode/JobConfigurations/standard/reco/reco1_data.fcl +++ b/sbndcode/JobConfigurations/standard/reco/reco1_data.fcl @@ -18,13 +18,17 @@ physics.producers: @table::physics.producers sptpc2d: @local::sbnd_wcls_sp_data crtstrips: @local::crtstriphitproducer_data_sbnd + crtclustering: @local::crtclusterproducer_data_sbnd + crtspacepoints: @local::crtspacepointproducer_data_sbnd + crttracks: @local::crttrackproducer_data_sbnd opdecopmt: @local::SBNDOpDeconvolutionPMT_data ophitpmt: @local::SBNDDecoOpHitFinderPMT_data opflashtpc0: @local::SBNDDecoSimpleFlashTPC0 opflashtpc1: @local::SBNDDecoSimpleFlashTPC1 } -physics.reco1: [sptpc2d, gaushit, numberofhitsfilter, cluster3d, crtstrips, opdecopmt, ophitpmt, opflashtpc0, opflashtpc1] +physics.reco1: [sptpc2d, gaushit, numberofhitsfilter, cluster3d, crtstrips, + crtclustering, crtspacepoints, crttracks, opdecopmt, ophitpmt, opflashtpc0, opflashtpc1] physics.ana: [superadata] outputs.out1.SelectEvents: [ "reco1" ] diff --git a/sbndcode/JobConfigurations/standard/reco/reco2_data.fcl b/sbndcode/JobConfigurations/standard/reco/reco2_data.fcl index 14803d26f..b8e1098a5 100644 --- a/sbndcode/JobConfigurations/standard/reco/reco2_data.fcl +++ b/sbndcode/JobConfigurations/standard/reco/reco2_data.fcl @@ -15,18 +15,11 @@ services: physics.producers: { @table::physics.producers - crtclustering: @local::crtclusterproducer_data_sbnd - crtspacepoints: @local::crtspacepointproducer_data_sbnd - crttracks: @local::crttrackproducer_data_sbnd - crtspacepointmatching: @local::crtspacepointmatchproducer_data_sbnd - crttrackmatching: @local::crttrackmatchproducer_data_sbnd - opt0finder: @local::sbnd_opt0_finder_data - tpcpmtbarycentermatching: @local::TPCPMTBarycenterMatchProducer - opt0finder: @local::sbnd_opt0_finder_data + opt0finder: @local::sbnd_opt0_finder_data } physics.reco2: [ pandora, pandoraTrack, pandoraShower, pandoraShowerSBN, pandoraCaloData, pandoraPidData, caloskimCalorimetry, - crtclustering, crtspacepoints, crttracks, crtspacepointmatching, crttrackmatching, cvn, opt0finder, tpcpmtbarycentermatching ] + cvn, opt0finder] #The next 3 lines need to be commented out once data use pandoraSCE by default. physics.producers.cvn.SliceLabel: "pandora"