Merge pull request #887 from SBNSoftware/feature/BlipBugFix

Had a mislabel on the fcl param

Author: nathanielerowe

sbndcode/JobConfigurations/standard/reco/config/workflow_reco1.fcl

@@ -83,10 +83,11 @@ sbnd_reco1_producers.gaushit.CalDataModuleLabel:
 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_producers.specialblipgaushit.HitFinderToolVec.CandidateHitsPlane0.MinHitHeight: 8
+sbnd_reco1_producers.specialblipgaushit.HitFinderToolVec.CandidateHitsPlane1.MinHitHeight: 20
+sbnd_reco1_producers.specialblipgaushit.HitFinderToolVec.CandidateHitsPlane2.MinHitHeight: 5
+sbnd_reco1_producers.blipgaushitTruthMatch.HitParticleAssociations.HitModuleLabel: "specialblipgaushit"
+sbnd_reco1_producers.blipgaushitTruthMatch.HitParticleAssociations.HitModuleLabelVec: ["specialblipgaushit"]
 sbnd_reco1_filters: {
     #filter events based on the number of reconstructed hits (avoids overly messy data events)
     numberofhitsfilter: @local::sbnd_numberofhitsfilter

sbndcode/JobConfigurations/standard/reco/config/workflow_reco2.fcl

@@ -53,6 +53,8 @@ sbnd_reco2_producers:{
     ### SCE-aware pandora:
     pandoraSCE:          @local::scecorrection
     pandoraSCETrack:     @local::sbnd_pandoraTrackCreation
+    blipPandoraSCE:     @local::scecorrection
+    blipPandoraSCETrack:@local::sbnd_pandoraTrackCreation
     pandoraSCEShower:    @local::sbnd_sce_incremental_pandoraModularShowerCreation
     pandoraSCEShowerSBN: @local::sbnd_sce_sbn_pandoraModularShowerCreation
 
@@ -192,10 +194,15 @@ sbnd_reco2_producers.opt0finderSCE.CaloProducer:   "pandoraSCECalo"
 sbnd_reco2_producers.pandoraSCE.T0Labels: []
 sbnd_reco2_producers.pandoraSCE.T0LabelsCorrectT0: []
 sbnd_reco2_producers.pandoraSCE.CorrectNoT0Tag: true
+sbnd_reco2_producers.blipPandoraSCE.T0Labels: []
+sbnd_reco2_producers.blipPandoraSCE.T0LabelsCorrectT0: []
+sbnd_reco2_producers.blipPandoraSCE.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.blipPandoraSCETrack.PFParticleLabel:               "blipPandoraSCE"
+
 
 sbnd_reco2_producers.crtspacepointmatchingSCE.TPCTrackModuleLabel:       "pandoraSCETrack"
 sbnd_reco2_producers.crtspacepointmatchingSCE.PFPModuleLabel:            "pandoraSCE"

sbndcode/JobConfigurations/standard/reco/reco2_data_blipwdnn.fcl

@@ -0,0 +1,10 @@
+#Nominal configuration uses dnn (ind) + trad (col) for hit finding.
+#Blip requires trad (all) for hit finding. 
+#This fcl configures everything to use the nominal config (dnn + trad)
+
+#include "reco2_data.fcl"
+physics.producers.blipreco.BlipAlg.HitProducer: "gaushit"
+physics.analyzers.blipana.BlipAlg.HitProducer: "gaushit"
+physics.producers.blipreco.BlipAlg.TrkProducer: "pandoraSCETrack"
+physics.analyzers.blipana.BlipAlg.TrkProducer: "pandoraSCETrack"
+physics.reco2: [ pandora, pandoraTrack, pandoraShower, pandoraShowerSBN, pandoraCaloData, pandoraPidData, pandoraLikePidData, cvn, opt0finder, crtveto, crtspacepointmatching, crttrackmatching, tpcpmtbarycentermatching, pandoraSCE, pandoraSCETrack, pandoraSCEShower, pandoraSCEShowerSBN, pandoraSCECaloData, pandoraSCEPidData, pandoraSCELikePidData, cvnSCE, opt0finderSCE, tpcpmtbarycentermatchingSCE, crtspacepointmatchingSCE, crttrackmatchingSCE, caloskimCalorimetry, blipreco, lightpropagationcorrectionSCE, frameshift]

sbndcode/JobConfigurations/standard/reco/reco2_mc_blipwdnn.fcl

@@ -0,0 +1,45 @@
+#Nominal configuration uses dnn (ind) + trad (col) for hit finding.
+#Blip requires trad (all) for hit finding. 
+#This fcl configures everything to use the nominal config (dnn + trad)
+
+#include "standard_reco2_sbnd.fcl"
+physics.producers.blipreco.BlipAlg.HitProducer: "gaushit"
+physics.analyzers.blipana.BlipAlg.HitProducer: "gaushit"
+physics.producers.blipreco.BlipAlg.TrkProducer: "pandoraSCETrack"
+physics.analyzers.blipana.BlipAlg.TrkProducer: "pandoraSCETrack"
+physics.reco2: [ rns
+    , pandora
+    , pandoraTrack
+    , blipPandoraCopy
+    , blipPandoraTrackCopy
+    , pandoraShower
+    , pandoraShowerSBN
+    , pandoraCalo
+    , pandoraPid
+    , pandoraLikePid
+    , crtveto
+    , crtspacepointmatching
+    , crttrackmatching
+    , fmatch
+    , fmatchop
+    , caloskimCalorimetry
+    , opt0finder
+    , tpcpmtbarycentermatching
+    , pandoraSCE
+    , pandoraSCETrack
+    , pandoraSCEShower
+    , pandoraSCEShowerSBN
+    , pandoraSCECalo
+    , pandoraSCEPid
+    , pandoraSCELikePid
+    , crtspacepointmatchingSCE
+    , crttrackmatchingSCE
+    , fmatchSCE
+    , fmatchopSCE
+    , opt0finderSCE
+    , tpcpmtbarycentermatchingSCE
+    , cvn
+    , cvnSCE
+    , blipreco
+    ]
+physics.trigger_paths:  [ reco2 ]