diff --git a/sbndcode/BlipRecoSBND/Alg/BlipRecoAlg.cc b/sbndcode/BlipRecoSBND/Alg/BlipRecoAlg.cc index eb9a3b810..d013f778c 100644 --- a/sbndcode/BlipRecoSBND/Alg/BlipRecoAlg.cc +++ b/sbndcode/BlipRecoSBND/Alg/BlipRecoAlg.cc @@ -1072,7 +1072,7 @@ namespace blip { TVector3 p2(b.X(), b.Y(), b.Z() ); // TO-DO: if this track starts or ends at a TPC boundary, // we should extend p1 or p2 to outside the AV to avoid blind spots - TVector3 bp = newBlip.Position; + TVector3 bp(newBlip.Position.X(), newBlip.Position.Y(), newBlip.Position.Z()); float d = BlipUtils::DistToLine(p1,p2,bp); if( d > 0 ) { // update closest trkdist diff --git a/sbndcode/BlipRecoSBND/Alg/BlipRecoAlg.h b/sbndcode/BlipRecoSBND/Alg/BlipRecoAlg.h index 59d125999..1851ae4b9 100644 --- a/sbndcode/BlipRecoSBND/Alg/BlipRecoAlg.h +++ b/sbndcode/BlipRecoSBND/Alg/BlipRecoAlg.h @@ -40,7 +40,8 @@ #include "larcorealg/Geometry/GeometryCore.h" #include "larreco/Calorimetry/CalorimetryAlg.h" #include "art/Framework/Principal/Event.h" - +#include "larcore/Geometry/WireReadout.h" +#include "larcoreobj/SimpleTypesAndConstants/geo_vectors.h" // Microboone includes //#include "ubevt/Database/TPCEnergyCalib/TPCEnergyCalibService.h" @@ -54,6 +55,7 @@ // Blip-specific utils #include "sbndcode/BlipRecoSBND/Utils/BlipUtils.h" +#include "sbnobj/SBND/Blip/BlipDataTypes.h" // ROOT stuff #include "TH1D.h" diff --git a/sbndcode/BlipRecoSBND/Alg/CMakeLists.txt b/sbndcode/BlipRecoSBND/Alg/CMakeLists.txt index e62631aa7..1be1ed923 100644 --- a/sbndcode/BlipRecoSBND/Alg/CMakeLists.txt +++ b/sbndcode/BlipRecoSBND/Alg/CMakeLists.txt @@ -11,6 +11,7 @@ art_make_library(LIBRARY_NAME sbndcode_BlipRecoAlg lardataobj::RawData lardataobj::RecoBase lardata::RecoObjects + larreco::Calorimetry larpandora::LArPandoraInterface nusimdata::SimulationBase cetlib::cetlib @@ -33,8 +34,8 @@ art_make_library(LIBRARY_NAME sbndcode_BlipRecoAlg ROOT::Gdml sbndcode_CRTUtils sbnobj::Common_CRT - #sbndcode_CosmicIdUtils sbndcode_BlipUtils + sbnobj::SBND_Blip ) install_headers() diff --git a/sbndcode/BlipRecoSBND/BlipAna_module.cc b/sbndcode/BlipRecoSBND/BlipAna_module.cc index b9ca904e8..a8590b131 100644 --- a/sbndcode/BlipRecoSBND/BlipAna_module.cc +++ b/sbndcode/BlipRecoSBND/BlipAna_module.cc @@ -32,6 +32,7 @@ #include "lardataobj/AnalysisBase/Calorimetry.h" #include "larevt/SpaceChargeServices/SpaceChargeService.h" #include "cetlib/search_path.h" +#include "larcoreobj/SimpleTypesAndConstants/geo_vectors.h" // SBND-specific includes #include "sbndcode/BlipRecoSBND/Alg/BlipRecoAlg.h" @@ -75,7 +76,8 @@ const int kMaxTrks = 1000; const int kMaxBlips = 5000; const int kMaxG4 = 30000; const int kMaxEDeps = 10000; -const int kMaxTrkPts = 2000; +const int kMaxTrkPts = 2000; +const int kNplanes = blip::kNplanes; class BlipAna; diff --git a/sbndcode/BlipRecoSBND/BlipRecoProducer_module.cc b/sbndcode/BlipRecoSBND/BlipRecoProducer_module.cc index 962367af5..7fde766e8 100644 --- a/sbndcode/BlipRecoSBND/BlipRecoProducer_module.cc +++ b/sbndcode/BlipRecoSBND/BlipRecoProducer_module.cc @@ -33,6 +33,7 @@ #include "lardataobj/RawData/RawDigit.h" #include "lardataobj/RawData/raw.h" #include "lardata/Utilities/AssociationUtil.h" +#include "larcoreobj/SimpleTypesAndConstants/geo_vectors.h" // C++ includes #include diff --git a/sbndcode/BlipRecoSBND/CMakeLists.txt b/sbndcode/BlipRecoSBND/CMakeLists.txt index 13ccdac63..16d8dece1 100644 --- a/sbndcode/BlipRecoSBND/CMakeLists.txt +++ b/sbndcode/BlipRecoSBND/CMakeLists.txt @@ -8,7 +8,7 @@ set( MODULE_LIBRARIES larcorealg::Geometry larevt::Filters lardataobj::RawData lardataobj::RecoBase - larreco::Calorimetry + larreco::Calorimetry larreco::RecoAlg lardata::RecoObjects larpandora::LArPandoraInterface @@ -34,12 +34,12 @@ set( MODULE_LIBRARIES larcorealg::Geometry sbndcode_RecoUtils sbndcode_OpDetSim sbndcode_BlipUtils + sbnobj::SBND_Blip sbndcode_BlipRecoAlg ) -add_subdirectory(Utils) add_subdirectory(Alg) - +add_subdirectory(Utils) cet_build_plugin(BlipAna art::Module SOURCE BlipAna_module.cc LIBRARIES ${MODULE_LIBRARIES} ) cet_build_plugin(BlipRecoProducer art::Module SOURCE BlipRecoProducer_module.cc LIBRARIES ${MODULE_LIBRARIES} ) diff --git a/sbndcode/BlipRecoSBND/Utils/BlipUtils.cc b/sbndcode/BlipRecoSBND/Utils/BlipUtils.cc index e1b8b1b48..d0afdea48 100644 --- a/sbndcode/BlipRecoSBND/Utils/BlipUtils.cc +++ b/sbndcode/BlipRecoSBND/Utils/BlipUtils.cc @@ -55,7 +55,9 @@ namespace BlipUtils { pinfo.pathLength = PathLength( part, pinfo.startPoint, pinfo.endPoint); // Central position of trajectory - pinfo.position = 0.5*(pinfo.startPoint+pinfo.endPoint); + pinfo.position.SetXYZ(0.5*(pinfo.startPoint.X()+pinfo.endPoint.X()), + 0.5*(pinfo.startPoint.Y()+pinfo.endPoint.Y()), + 0.5*(pinfo.startPoint.Z()+pinfo.endPoint.Z()) ); // Energy/charge deposited by this particle, found using SimEnergyDeposits pinfo.depEnergy = 0; @@ -155,7 +157,9 @@ namespace BlipUtils { float totE = tblip.Energy + pinfo.depEnergy; float w1 = tblip.Energy/totE; float w2 = pinfo.depEnergy/totE; - tblip.Position = w1*tblip.Position + w2*pinfo.position; + tblip.Position.SetXYZ( w1*tblip.Position.X() + w2*pinfo.position.X(), + w1*tblip.Position.Y() + w2*pinfo.position.Y(), + w1*tblip.Position.Z() + w2*pinfo.position.Z()); tblip.Time = w1*tblip.Time + w2*pinfo.time; tblip.LeadCharge = pinfo.depElectrons; // ... if the particle isn't a match, show's over @@ -196,7 +200,7 @@ namespace BlipUtils { // check that the times are similar (we don't want to merge // together a blip that happened much later but in the same spot) if( fabs(blip_i.Time - blip_j.Time) > 5 ) continue; - float d = (blip_i.Position-blip_j.Position).Mag(); + float d = TMath::Sqrt((blip_i.Position-blip_j.Position).Mag2()); if( d < dmin ) { isGrouped.at(j) = true; //float totE = blip_i.Energy + blip_j.Energy; @@ -204,7 +208,9 @@ namespace BlipUtils { float w1 = blip_i.DepElectrons/totQ; float w2 = blip_j.DepElectrons/totQ; blip_i.Energy += blip_j.Energy; - blip_i.Position = w1*blip_i.Position + w2*blip_j.Position; + blip_i.Position.SetXYZ( w1*blip_i.Position.X() + w2*blip_j.Position.X(), + w1*blip_i.Position.Y() + w2*blip_j.Position.Y(), + w1*blip_i.Position.Z() + w2*blip_j.Position.Z()); blip_i.DriftTime = w1*blip_i.DriftTime+ w2*blip_j.DriftTime; blip_i.Time = w1*blip_i.Time + w2*blip_j.Time; blip_i.DepElectrons += blip_j.DepElectrons; @@ -419,12 +425,16 @@ namespace BlipUtils { // YZ-plane, as well as the mean difference between intersection points. newblip.Position.SetXYZ(0,0,0); if( wirex.size() == 1 ) { - newblip.Position= wirex[0]; + newblip.Position = wirex[0]; } else { newblip.SigmaYZ = 0; double fact = 1./wirex.size(); - for(auto& v : wirex ) newblip.Position += v * fact; - for(auto& v : wirex ) newblip.SigmaYZ += (v-newblip.Position).Mag() * fact; + for(auto& v : wirex ) newblip.Position.SetXYZ( newblip.Position.X() + v.X() * fact, + newblip.Position.Y() + v.Y() * fact, + newblip.Position.Z() + v.Z() * fact); + for(auto& v : wirex ) newblip.SigmaYZ += TMath::Sqrt( pow(v.X()-newblip.Position.X(), 2) + + pow(v.Y()-newblip.Position.Y(), 2) + + pow(v.Z()-newblip.Position.Z(), 2)) * fact; // Ensure that difference between intersection points is // consistent with the maximal wire extent if( newblip.SigmaYZ > std::max(1.,0.5*newblip.dYZ) ) return newblip; @@ -613,7 +623,7 @@ namespace BlipUtils { //============================================================================= // Length of particle trajectory - double PathLength(const simb::MCParticle& part, TVector3& start, TVector3& end) + double PathLength(const simb::MCParticle& part, geo::Point_t& start, geo::Point_t& end) { int n = part.NumberTrajectoryPoints(); if( n <= 1 ) return 0.; @@ -633,7 +643,7 @@ namespace BlipUtils { return L; } double PathLength(const simb::MCParticle& part){ - TVector3 a,b; + geo::Point_t a,b; return PathLength(part,a,b); } diff --git a/sbndcode/BlipRecoSBND/Utils/BlipUtils.h b/sbndcode/BlipRecoSBND/Utils/BlipUtils.h index 0584c9792..bff152637 100644 --- a/sbndcode/BlipRecoSBND/Utils/BlipUtils.h +++ b/sbndcode/BlipRecoSBND/Utils/BlipUtils.h @@ -27,6 +27,7 @@ #include "larcore/CoreUtils/ServiceUtil.h" #include "larcore/Geometry/Geometry.h" #include "larcore/Geometry/WireReadout.h" +#include "larcoreobj/SimpleTypesAndConstants/geo_vectors.h" //#include "larcorealg/Geometry/GeometryCore.h" //#include "larcorealg/Geometry/WireReadoutGeom.h" @@ -34,7 +35,7 @@ #include #include -#include "sbndcode/BlipRecoSBND/Utils/DataTypes.h" +#include "sbnobj/SBND/Blip/BlipDataTypes.h" #include "TH1D.h" @@ -76,7 +77,7 @@ namespace BlipUtils { //void HitTruth(art::Ptr const&, int&, float&, float&, float&); //si_t HitTruthIds( art::Ptr const&); //bool G4IdToMCTruth( int const, art::Ptr&); - double PathLength(const simb::MCParticle&, TVector3&, TVector3&); + double PathLength(const simb::MCParticle&, geo::Point_t&, geo::Point_t&); double PathLength(const simb::MCParticle&); bool IsAncestorOf(int, int, bool); double DistToBoundary(const recob::Track::Point_t&); diff --git a/sbndcode/BlipRecoSBND/Utils/CMakeLists.txt b/sbndcode/BlipRecoSBND/Utils/CMakeLists.txt index da1dcdd20..f54a2d605 100644 --- a/sbndcode/BlipRecoSBND/Utils/CMakeLists.txt +++ b/sbndcode/BlipRecoSBND/Utils/CMakeLists.txt @@ -4,7 +4,6 @@ cet_make_library( LIBRARY_NAME sbndcode_BlipUtils LIBRARIES - PUBLIC larcorealg::Geometry larcore::Geometry_Geometry_service larsim::Simulation @@ -38,7 +37,7 @@ cet_make_library( ROOT::Gdml sbndcode_CRTUtils sbnobj::Common_CRT - #sbndcode_CosmicIdUtils + sbnobj::SBND_Blip ) art_dictionary(DICTIONARY_LIBRARIES sbndcode_BlipUtils) diff --git a/sbndcode/BlipRecoSBND/Utils/DataTypes.h b/sbndcode/BlipRecoSBND/Utils/DataTypes.h deleted file mode 100644 index 023eb99ce..000000000 --- a/sbndcode/BlipRecoSBND/Utils/DataTypes.h +++ /dev/null @@ -1,174 +0,0 @@ - -#include "lardataobj/RecoBase/Hit.h" -#include "nusimdata/SimulationBase/MCParticle.h" - -#include - -typedef std::vector vint_t; -typedef std::vector vbool_t; -typedef std::vector vfloat_t; -typedef std::set si_t; -typedef std::map mif_t; - -const int kNplanes = 3; -const int kNTPCs = 2; - -namespace blip { - - //################################################### - // Data structures - //################################################### - - struct ParticleInfo { - simb::MCParticle particle; - int trackId = -9; - int index = -9; - int isPrimary = -9; - int numTrajPts = -9; - double depEnergy = -9; - int depElectrons = -9; - double numElectrons = -9; - double mass = -9; - double E = -9; - double endE = -9; - double KE = -9; - double endKE = -9; - double P = -9; - double Px = -9; - double Py = -9; - double Pz = -9; - double pathLength = -9; - double time = -9; - double endtime = -9; - TVector3 startPoint; - TVector3 endPoint; - TVector3 position; - }; - - // True energy depositions - struct TrueBlip { - int ID = -9; // unique blip ID - int Cryostat = -9; // Cryostat ID - int TPC = -9; // TPC ID - float Time = -9; // time of particle interaction - int TimeTick = -9; // time tick - float DriftTime = -9; // drift time [us] - float Energy = 0; // energy dep [MeV] - int DepElectrons = 0; // deposited electrons - int NumElectrons = 0; // electrons reaching wires - int LeadG4ID = -9; // lead G4 track ID - int LeadG4Index = -9; // lead G4 track index - int LeadG4PDG = -9; // lead G4 PDG - float LeadCharge = -9; // lead G4 charge dep - TVector3 Position; // XYZ position - mif_t G4ChargeMap; - mif_t G4PDGMap; - }; - - struct HitInfo { - int hitid = -9; - int cryo = -9; - int tpc = -9; - int plane = -9; - int wire = -9; - int chan = -9; - float amp = -9; - float rms = -9; - int trkid = -9; - int shwrid = -9; - int clustid = -9; - int blipid = -9; - bool ismatch = false; - float integralADC = -999; // [ADCs] from integral - float sigmaintegral = -999; - float sumADC = -999; // [ADCs] from sum - float charge = -999; // [e-] - float peakTime = -999999; - float driftTime = -999999; // [tick] - float gof = -9; - int g4trkid = -9; - int g4pdg = -999; - int g4charge = -999; // [e-] - float g4frac = -99; - float g4energy = -999; // [MeV] - }; - - struct HitClust { - int ID = -9; - bool isValid = false; - int CenterChan = -999; - int CenterWire = -999; - bool isTruthMatched = false; - bool isMerged = false; - bool isMatched = false; - int DeadWireSep = 99; - int Cryostat = -9; - int TPC = -9; - int Plane = -9; - int NHits = -9; - int NWires = -9; - float ADCs = -999; - float Amplitude = -999; - float Charge = -999; - float SigmaCharge = -999; - float TimeTick = -999; - float Time = -999; - float StartHitTime = -999; - float EndHitTime = -999; - float StartTime = -999; - float EndTime = -999; - float Timespan = -999; - float RMS = -999; - int StartWire = -999; - int EndWire = -999; - int NPulseTrainHits = -9; - float GoodnessOfFit = -999; - int BlipID = -9; - int EdepID = -9; - si_t HitIDs; - si_t Wires; - si_t Chans; - si_t G4IDs; - - std::map IntersectLocations; - }; - - struct Blip { - - int ID = -9; // Blip ID / index - bool isValid = false; // Blip passes basic checks - int Cryostat = -9; // Cryostat - int TPC = -9; // TPC - int NPlanes = -9; // Num. matched planes - int MaxWireSpan = -9; // Maximum span of wires on any plane cluster - float TimeTick = -999; // Readout time [ticks] - float Time = -999; // Drift time [us] - float Charge = -9; // Charge on calorimetry plane - float Energy = -999; // Energy (const dE/dx, fcl-configurable) - float EnergyESTAR = -999; // Energy (ESTAR method from ArgoNeuT) - float EnergyPSTAR = -999; // Energy (PSTAR method similar with ESTAR method from ArgoNeuT) - float ProxTrkDist = -9; // Distance to cloest track - int ProxTrkID = -9; // ID of closest track - bool inCylinder = false; // Is it in a cone/cylinder region? - - TVector3 Position; // 3D position TVector3 - float SigmaYZ = -9.; // Uncertainty in YZ intersect [cm] - float dX = -9; // Equivalent length along drift direction [cm] - float dYZ = -9; // Approximate length scale in YZ space [cm] - - // Plane/cluster-specific information - blip::HitClust clusters[kNplanes]; - - // Truth-matched energy deposition - blip::TrueBlip truth; - - // Prototype getter functions - double X() { return Position.X(); } - double Y() { return Position.Y(); } - double Z() { return Position.Z(); } - - }; - -} - - diff --git a/sbndcode/BlipRecoSBND/Utils/classes.h b/sbndcode/BlipRecoSBND/Utils/classes.h index 403af300f..e69de29bb 100644 --- a/sbndcode/BlipRecoSBND/Utils/classes.h +++ b/sbndcode/BlipRecoSBND/Utils/classes.h @@ -1,36 +0,0 @@ -// -// Build a dictionary. -// -// $Id: classes.h,v 1.8 2010/04/12 18:12:28 Exp $ -// $Author: $ -// $Date: 2010/04/12 18:12:28 $ -// -// Original author Rob Kutschke, modified by wes -// - -#include "canvas/Persistency/Common/Wrapper.h" - -// data-products -// lardataobj -//#include "lardata/Utilities/AssociationUtil.h" -#include "canvas/Persistency/Common/Assns.h" -#include "lardataobj/RecoBase/PFParticle.h" -#include "lardataobj/RecoBase/Hit.h" -#include "nusimdata/SimulationBase/MCTruth.h" -#include "sbndcode/BlipRecoSBND/Utils/DataTypes.h" -#include "lardataobj/RecoBase/SpacePoint.h" - -// -// Only include objects that we would like to be able to put into the event. -// Do not include the objects they contain internally. -// - -template class art::Assns; -template class art::Wrapper >; -template class std::vector; -template class art::Wrapper >; -template class std::map; -template class art::Assns; -template class art::Wrapper >; -template class art::Assns; -template class art::Wrapper >; diff --git a/sbndcode/BlipRecoSBND/Utils/classes_def.xml b/sbndcode/BlipRecoSBND/Utils/classes_def.xml index f737c0046..2eff49dff 100644 --- a/sbndcode/BlipRecoSBND/Utils/classes_def.xml +++ b/sbndcode/BlipRecoSBND/Utils/classes_def.xml @@ -1,16 +1,2 @@ - - - - - - - - - - - - - - diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd.fcl b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd.fcl index 5c54e6118..cd92e0814 100644 --- a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd.fcl +++ b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd.fcl @@ -126,9 +126,9 @@ physics: # change tools in sbn to have 2D TPC sim/sp input physics.producers.pandoraShowerRazzle.SimChannelLabel: "simtpc2d:simpleSC" physics.producers.pandoraTrackDazzle.SimChannelLabel: "simtpc2d:simpleSC" -physics.producers.cnnid.WireLabel: "simtpc2d:gauss" +#physics.producers.cnnid.WireLabel: "simtpc2d:gauss" # uncomment below line for to use DNN ROI SP for CNNID scores -#physics.producers.cnnid.WireLabel: "simtpc2d:dnnsp" +physics.producers.cnnid.WireLabel: "simtpc2d:dnnsp" physics.producers.vertexCharge.CaloAlg: @local::sbnd_calorimetryalgmc physics.producers.vertexStub.CaloAlg: @local::sbnd_calorimetryalgmc @@ -136,6 +136,7 @@ physics.producers.vertexStub.CaloAlg: @local::sbnd_calorimetryalgmc physics.producers.cafmaker: @local::standard_cafmaker physics.producers.cafmaker.CosmicGenLabel: "corsika" physics.producers.cafmaker.SimChannelLabel: "simtpc2d:simpleSC" +physics.producers.cafmaker.BlipTag: "blipreco" # Blinding not needed for MC physics.producers.cafmaker.CreateBlindedCAF: false diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_sce.fcl b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_sce.fcl index 6520f36bd..55a168186 100644 --- a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_sce.fcl +++ b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_sce.fcl @@ -16,6 +16,7 @@ physics.producers.cafmaker.TPCPMTBarycenterMatchLabel: "tpcpmtbarycentermatching physics.producers.cafmaker.CVNLabel: "cvnSCE" physics.producers.cafmaker.CorrectedOpFlashLabel: "lightpropagationcorrectionSCE" physics.producers.cnnid.WireLabel: "sptpc2d:dnnsp" +physics.producers.cafmaker.BlipTag: "blipreco" physics.producers.cnnid.ClusterModuleLabel: "pandoraSCE" physics.producers.cnnid.PFParticleModuleLabel: "pandoraSCE" @@ -36,7 +37,7 @@ physics.producers.pandoraShowerCosmicDist.PandoraLabel: "pandoraSCE" physics.producers.pandoraShowerCosmicDist.ShowerLabel: "pandoraSCEShowerSBN" physics.producers.pandoraShowerRazzle.PFPLabel: "pandoraSCE" physics.producers.pandoraShowerRazzle.ShowerLabel: "pandoraSCEShowerSBN" - +physics.producers.pandoraShowerRazzle.SimChannelLabel: "sptpc2d:dnnsp" physics.producers.pandoraRazzled: @local::razzled_sbnd_sce physics.producers.pandoraTrackClosestApproach.TrackLabel: "pandoraSCETrack" @@ -54,6 +55,8 @@ physics.producers.pandoraTrackDazzle.PFPLabel: "pandoraSCE" physics.producers.pandoraTrackDazzle.TrackLabel: "pandoraSCETrack" physics.producers.pandoraTrackDazzle.CaloLabel: "pandoraSCECaloData" physics.producers.pandoraTrackDazzle.Chi2Label: "pandoraSCEPidData" +physics.producers.pandoraTrackDazzle.SimChannelLabel: "sptpc2d:dnnsp" + physics.producers.fmatchSCE: @local::transfer_flashmatch_sce_sbnd physics.producers.fmatchopSCE: @local::transfer_flashmatch_sce_sbnd diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_sce.fcl b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_sce.fcl index fb4a26030..aa8bf1fe0 100644 --- a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_sce.fcl +++ b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_sce.fcl @@ -16,6 +16,7 @@ physics.producers.cafmaker.CRTTrackMatchLabel: "pandoraSCETrackCRTTrack" physics.producers.cafmaker.OpT0Label: "opt0finderSCE" physics.producers.cafmaker.TPCPMTBarycenterMatchLabel: "tpcpmtbarycentermatchingSCE" physics.producers.cafmaker.CVNLabel: "cvnSCE" +physics.producers.cafmaker.BlipTag: "blipreco" physics.producers.cnnid.ClusterModuleLabel: "pandoraSCE" physics.producers.cnnid.PFParticleModuleLabel: "pandoraSCE" diff --git a/sbndcode/JobConfigurations/standard/reco/config/workflow_reco1.fcl b/sbndcode/JobConfigurations/standard/reco/config/workflow_reco1.fcl index d9b166996..f7acf84d0 100755 --- a/sbndcode/JobConfigurations/standard/reco/config/workflow_reco1.fcl +++ b/sbndcode/JobConfigurations/standard/reco/config/workflow_reco1.fcl @@ -83,9 +83,9 @@ 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.specialblipgaushit.HitFinderToolVec.CandidateHitsPlane0.MinHitHeight: 8 +sbnd_reco1_producers.specialblipgaushit.HitFinderToolVec.CandidateHitsPlane1.MinHitHeight: 15 +sbnd_reco1_producers.specialblipgaushit.HitFinderToolVec.CandidateHitsPlane2.MinHitHeight: 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)