Merge branch 'develop' into HNL_masses_gen_fcls

nathanielerowe · web-flow · commit 7004d9aacb07 · 2025-11-14T08:26:49.000-06:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,7 @@
 
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
-set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.10.03.03)
+set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.11.01.01)
 find_package(cetmodules REQUIRED)
 project(sbndcode LANGUAGES CXX)
 
diff --git a/sbndcode/CRT/CRTAna/CRTAnalysis_module.cc b/sbndcode/CRT/CRTAna/CRTAnalysis_module.cc
@@ -1748,9 +1748,9 @@ void sbnd::crt::CRTAnalysis::AnalyseTPCMatching(const art::Event &e, const art::
           _tpc_tr_ts1[nActualTracks]     = crttrack->Ts1();
           _tpc_tr_score[nActualTracks]   = trackMatch.TriggerConfidence();
 
-          const std::set<CRTTagger> taggers = crttrack->Taggers();
-          const geo::Point_t start          = crttrack->Start();
-          const geo::Point_t end            = crttrack->End();
+          const std::vector<CRTTagger> taggers = crttrack->Taggers();
+          const geo::Point_t start             = crttrack->Start();
+          const geo::Point_t end               = crttrack->End();
 
           _tpc_tr_taggers[nActualTracks] = std::vector<int>();
 
diff --git a/sbndcode/CRT/CRTAna/crtana_sbnd.fcl b/sbndcode/CRT/CRTAna/crtana_sbnd.fcl
@@ -17,7 +17,6 @@ crtana_sbnd:
 crtana_data_sbnd: @local::crtana_sbnd
 crtana_data_sbnd.FEBDataModuleLabel: "crtdecoder"
 crtana_data_sbnd.DataMode:           true
-crtana_data_sbnd.NoTPC:              true
 crtana_data_sbnd.HasPTB:             true
 crtana_data_sbnd.HasTDC:             true
 
diff --git a/sbndcode/CRT/CRTEventDisplay/CRTEventDisplayAlg.cc b/sbndcode/CRT/CRTEventDisplay/CRTEventDisplayAlg.cc
@@ -597,7 +597,7 @@ namespace sbnd::crt {
             if(trackTime < fMinTime || trackTime > fMaxTime)
               continue;
 
-            std::set<CRTTagger> taggers = track->Taggers();
+            std::vector<CRTTagger> taggers = track->Taggers();
 
             bool none = fChoseTaggers;
             for(auto const& tagger : taggers)
diff --git a/sbndcode/CRT/CRTReco/CRTTrackProducer_module.cc b/sbndcode/CRT/CRTReco/CRTTrackProducer_module.cc
@@ -238,7 +238,7 @@ std::vector<std::pair<sbnd::crt::CRTTrack, std::set<unsigned>>> sbnd::crt::CRTTr
 
                       const double pe = primarySpacePoint->PE() + secondarySpacePoint->PE() + tertiarySpacePoint->PE();
 
-                      const std::set<CRTTagger> used_taggers = {primaryCluster->Tagger(), secondaryCluster->Tagger(), tertiaryCluster->Tagger()};
+                      const std::vector<CRTTagger> used_taggers = {primaryCluster->Tagger(), secondaryCluster->Tagger(), tertiaryCluster->Tagger()};
  
                       geo::Point_t fitStart, fitMid, fitEnd;
                       double gof;
@@ -264,7 +264,7 @@ std::vector<std::pair<sbnd::crt::CRTTrack, std::set<unsigned>>> sbnd::crt::CRTTr
 
           const double pe = primarySpacePoint->PE() + secondarySpacePoint->PE();
 
-          const std::set<CRTTagger> used_taggers = {primaryCluster->Tagger(), secondaryCluster->Tagger()};
+          const std::vector<CRTTagger> used_taggers = {primaryCluster->Tagger(), secondaryCluster->Tagger()};
 
           const CRTTrack track(start, end, t0, et0, t1, et1, pe, tof, used_taggers);
           const std::set<unsigned> used_spacepoints = {i, ii};
diff --git a/sbndcode/JobConfigurations/standard/gen/genie_corsika/prodgenie_corsika_proton_rockbox0p1_sbnd.fcl b/sbndcode/JobConfigurations/standard/gen/genie_corsika/prodgenie_corsika_proton_rockbox0p1_sbnd.fcl
@@ -0,0 +1,3 @@
+#include "prodgenie_corsika_proton_rockbox_sbnd.fcl"
+
+physics.filters.dirtfilter.EnergyDeposit: 0.1 # MeV
diff --git a/sbndcode/JobConfigurations/standard/reco/config/workflow_reco2.fcl b/sbndcode/JobConfigurations/standard/reco/config/workflow_reco2.fcl
@@ -34,16 +34,19 @@ sbnd_reco2_producers:{
     pandoraShowerSBN:    @local::sbnd_sbn_pandoraModularShowerCreation
     pandoraCalo:         @local::sbnd_gnewcalomc
     pandoraPid:          @local::sbnd_chi2pid
-
+    pandoraLikePid:      @local::sbnd_likepid
 
     pandoraSCECalo:      @local::sbnd_gnewcalomc
     pandoraSCEPid:       @local::sbnd_chi2pid
+    pandoraSCELikePid:   @local::sbnd_likepid
 
     pandoraCaloData:     @local::sbnd_gnewcalodata
     pandoraPidData:      @local::sbnd_chi2pid
+    pandoraLikePidData:  @local::sbnd_likepid
 
     pandoraSCECaloData:     @local::sbnd_gnewcalodata
     pandoraSCEPidData:      @local::sbnd_chi2pid
+    pandoraSCELikePidData:  @local::sbnd_likepid
 
     ### SCE-aware pandora:
     pandoraSCE:          @local::scecorrection
@@ -97,6 +100,7 @@ sbnd_reco2_producer_sequence: [
     , pandoraShowerSBN
     , pandoraCalo
     , pandoraPid
+    , pandoraLikePid
     , crtveto
     , crtspacepointmatching
     , crttrackmatching
@@ -113,6 +117,7 @@ sbnd_reco2_producer_sequence: [
     , pandoraSCEShowerSBN
     , pandoraSCECalo
     , pandoraSCEPid
+    , pandoraSCELikePid
     , crtspacepointmatchingSCE
     , crttrackmatchingSCE
     , fmatchSCE
@@ -133,27 +138,35 @@ 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.pandoraLikePid.TrackModuleLabel:               "pandoraTrack"
+sbnd_reco2_producers.pandoraLikePid.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.pandoraSCELikePid.TrackModuleLabel:               "pandoraSCETrack"
+sbnd_reco2_producers.pandoraSCELikePid.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"
+sbnd_reco2_producers.pandoraLikePidData.TrackModuleLabel:               "pandoraTrack"
+sbnd_reco2_producers.pandoraLikePidData.CalorimetryModuleLabel:         "pandoraCaloData"
 
 sbnd_reco2_producers.pandoraSCECaloData.TrackModuleLabel:                  "pandoraSCETrack"
 sbnd_reco2_producers.pandoraSCECaloData.FieldDistortion:                   true
 sbnd_reco2_producers.pandoraSCECaloData.FieldDistortionEfield:             true
 sbnd_reco2_producers.pandoraSCECaloData.TrackIsFieldDistortionCorrected:   true
 sbnd_reco2_producers.pandoraSCEPidData.TrackModuleLabel:                   "pandoraSCETrack"
 sbnd_reco2_producers.pandoraSCEPidData.CalorimetryModuleLabel:             "pandoraSCECaloData"
+sbnd_reco2_producers.pandoraSCELikePidData.TrackModuleLabel:               "pandoraSCETrack"
+sbnd_reco2_producers.pandoraSCELikePidData.CalorimetryModuleLabel:         "pandoraSCECaloData"
 
 sbnd_reco2_producers.cvn.SliceLabel: "pandora"
 sbnd_reco2_producers.cvn.PFParticleModuleLabel: "pandora"
diff --git a/sbndcode/JobConfigurations/standard/reco/reco2_data.fcl b/sbndcode/JobConfigurations/standard/reco/reco2_data.fcl
@@ -41,9 +41,9 @@ physics.producers:
     frameshift: @local::frameshift_data
 }
 
-physics.reco2: [ pandora, pandoraTrack, pandoraShower, pandoraShowerSBN, pandoraCaloData, pandoraPidData, 
+physics.reco2: [ pandora, pandoraTrack, pandoraShower, pandoraShowerSBN, pandoraCaloData, pandoraPidData, pandoraLikePidData,
                  cvn, opt0finder, crtveto, crtspacepointmatching, crttrackmatching, tpcpmtbarycentermatching,
-                 pandoraSCE, pandoraSCETrack, pandoraSCEShower, pandoraSCEShowerSBN, pandoraSCECaloData, pandoraSCEPidData,
+                 pandoraSCE, pandoraSCETrack, pandoraSCEShower, pandoraSCEShowerSBN, pandoraSCECaloData, pandoraSCEPidData, pandoraSCELikePidData,
                  cvnSCE, opt0finderSCE, tpcpmtbarycentermatchingSCE, crtspacepointmatchingSCE, crttrackmatchingSCE,
                  caloskimCalorimetry, blipreco, lightpropagationcorrectionSCE, frameshift]
 
diff --git a/sbndcode/LArSoftConfigurations/particleid_sbnd.fcl b/sbndcode/LArSoftConfigurations/particleid_sbnd.fcl
@@ -9,4 +9,12 @@ sbnd_chi2pid:
  Chi2PIDAlg:             @local::standard_chi2pidalg
 }
 
+sbnd_likepid:
+{
+ module_type:            "LikelihoodParticleID"
+ TrackModuleLabel:       "spacepts"
+ CalorimetryModuleLabel: "calo"
+ LikelihoodPIDAlg:       @local::standard_likelihoodpidalg
+}
+
 END_PROLOG
diff --git a/sbndcode/TPCPMTBarycenterMatching/job/sbnd_tpcpmt3dbarycentermatching_config.fcl b/sbndcode/TPCPMTBarycenterMatching/job/sbnd_tpcpmt3dbarycentermatching_config.fcl
@@ -24,7 +24,7 @@ TPCPMTBarycenterMatchProducer:
     YError: 23 // cm
     ZError: 23 // cm
     AngleError: 27 // deg
-    FlashVetoWindow: [-1500000,1500000] // ns
+    FlashVetoWindow: [-5,5] // ns
     OpticalPathTool:  @local::SBNDOpticalPath
     module_type: "TPCPMTBarycenterMatchProducer"
 }
diff --git a/sbndcode/Utilities/CMakeLists.txt b/sbndcode/Utilities/CMakeLists.txt
@@ -28,9 +28,15 @@ cet_build_plugin( SignalShapingServiceSBND  art::service SOURCE SignalShapingSer
         )
 
 cet_build_plugin( DigitalNoiseChannelStatus art::service SOURCE DigitalNoiseChannelStatus_service.cc LIBRARIES
-	${sbnd_util_lib_list}
+  ${sbnd_util_lib_list}
 	)
-      
+
+cet_build_plugin( DigitalNoiseEventFilter art::module SOURCE DigitalNoiseEventFilter_module.cc LIBRARIES
+  ${sbnd_util_lib_list}
+  sbnobj::Common_Analysis
+  larevt::CalibrationDBI_Providers
+	)
+	
 cet_build_plugin ( SBNDGeoHelper art::module
                      larcorealg::Geometry
                      larcore::Geometry_Geometry_service
diff --git a/sbndcode/Utilities/DigitalNoiseEventFilter.fcl b/sbndcode/Utilities/DigitalNoiseEventFilter.fcl
@@ -0,0 +1,16 @@
+BEGIN_PROLOG
+
+digital_noise_event_filter: {
+
+  module_type:                 "DigitalNoiseEventFilter"
+  TPCChannelInfoDataLabel:     "daq"
+  EvenFractionHighCut:         0.6
+  EvenFractionLowCut:          0.4
+  EvenFractionNumChannelCut:   10
+  RMSCut:                      1100.0
+  RMSNumChannelCut:            50
+  KeepIfNoChannelInfo:         true
+  UseBadChanStatus:            true
+}
+
+END_PROLOG
diff --git a/sbndcode/Utilities/DigitalNoiseEventFilter_module.cc b/sbndcode/Utilities/DigitalNoiseEventFilter_module.cc
@@ -0,0 +1,98 @@
+////////////////////////////////////////////////////////////////////////
+// Class:       DigitalNoiseEventFilter
+// Plugin Type: filter (Unknown Unknown)
+// File:        DigitalNoiseEventFilter_module.cc
+//
+// Generated at Tue Oct  7 14:28:27 2025 by Thomas Junk using cetskelgen
+// from cetlib version 3.18.02.
+////////////////////////////////////////////////////////////////////////
+
+#include "art/Framework/Core/EDFilter.h"
+#include "art/Framework/Core/ModuleMacros.h"
+#include "art/Framework/Principal/Event.h"
+#include "art/Framework/Principal/Handle.h"
+#include "art/Framework/Principal/Run.h"
+#include "art/Framework/Principal/SubRun.h"
+#include "canvas/Utilities/InputTag.h"
+#include "fhiclcpp/ParameterSet.h"
+#include "messagefacility/MessageLogger/MessageLogger.h"
+#include "sbnobj/Common/Analysis/TPCChannelInfo.hh"
+#include "larevt/CalibrationDBI/Interface/ChannelStatusProvider.h"
+#include "larevt/CalibrationDBI/Interface/ChannelStatusService.h"
+
+#include <memory>
+
+class DigitalNoiseEventFilter;
+
+
+class DigitalNoiseEventFilter : public art::EDFilter {
+public:
+  explicit DigitalNoiseEventFilter(fhicl::ParameterSet const& p);
+  // The compiler-generated destructor is fine for non-base
+  // classes without bare pointers or other resource use.
+
+  // Plugins should not be copied or assigned.
+  DigitalNoiseEventFilter(DigitalNoiseEventFilter const&) = delete;
+  DigitalNoiseEventFilter(DigitalNoiseEventFilter&&) = delete;
+  DigitalNoiseEventFilter& operator=(DigitalNoiseEventFilter const&) = delete;
+  DigitalNoiseEventFilter& operator=(DigitalNoiseEventFilter&&) = delete;
+
+  // Required functions.
+  bool filter(art::Event& e) override;
+
+private:
+
+  std::string   fTag;                          // input tag for reading TPCChannelInfo data
+  float         fEvenFractionHighCut;          // upper cut on the fraction of ADC samples that are even
+  float         fEvenFractionLowCut;           // lower cut on the fraction of ADC samples that are even
+  int           fEvenFractionNumChannelCut;    // max # of channels with suspect even fractions to keep event. Otherwise suspect CE noise
+  float         fRMSCut;                       // how noisy a channel has to be before we think it might have CE noise
+  int           fRMSNumChannelCut;             // keep event if this many channels or fewer have RMS>fRMSCut.  Otherwise suspect CE noise
+  bool          fKeepIfNoChannelInfo;          // If we do not find TPCChannelInfo, do we keep or reject the event?
+  bool          fUseBadChanStatus;             // true if we skip over bad channels in calculating numbers of suspect CE noise channels
+
+};
+
+
+DigitalNoiseEventFilter::DigitalNoiseEventFilter(fhicl::ParameterSet const& p)
+  : EDFilter{p}  // ,
+    // More initializers here.
+{
+  fTag                       = p.get<std::string>("TPCChannelInfoDataLabel","daq");
+  fEvenFractionHighCut       = p.get<float>("EvenFractionHighCut",0.6);
+  fEvenFractionLowCut        = p.get<float>("EvenFractionLowCut",0.4);
+  fEvenFractionNumChannelCut = p.get<int>("EvenFractionNumChannelCut",10);
+  fRMSCut                    = p.get<float>("RMSCut",1100.0);
+  fRMSNumChannelCut         = p.get<int>("RMSNumChannelCut",50);
+  fKeepIfNoChannelInfo       = p.get<bool>("KeepIfNoChannelInfo",true);
+  fUseBadChanStatus          = p.get<bool>("UseBadChanStatus",true);
+  
+  consumes<std::vector<anab::TPCChannelInfo>>(fTag);
+}
+
+bool DigitalNoiseEventFilter::filter(art::Event& e)
+{
+  lariov::ChannelStatusProvider const& channelStatus(art::ServiceHandle<lariov::ChannelStatusService const>()->GetProvider());
+  
+  auto channelinfos = e.getHandle<std::vector<anab::TPCChannelInfo>>(fTag);
+  if (!channelinfos || channelinfos->empty()) return fKeepIfNoChannelInfo;
+
+  int neven_suspect = 0;
+  int nrms_suspect = 0;
+  double fevdiff = (fEvenFractionHighCut - fEvenFractionLowCut)/2.0;
+  for (const auto &ci : *channelinfos) {
+    if (fUseBadChanStatus && channelStatus.IsBad(ci.channel)) continue;
+    if (ci.even_fraction > fEvenFractionHighCut || ci.even_fraction < fEvenFractionLowCut) ++neven_suspect;
+    if (ci.rms > fRMSCut) {
+      ++nrms_suspect;
+    }
+    else { // try a diagonal cut in case a waveform is noisy and then becomes stuck partway through
+      if (fRMSCut > 0 && fevdiff > 0) {
+	if ( (ci.rms/fRMSCut + std::abs(ci.even_fraction - 0.5)/fevdiff) > 1) ++nrms_suspect;
+      }
+    }
+  }
+  return (neven_suspect <= fEvenFractionNumChannelCut && nrms_suspect <= fRMSNumChannelCut);
+}
+
+DEFINE_ART_MODULE(DigitalNoiseEventFilter)
diff --git a/sbndcode/Utilities/run_DigitalNoiseEventFilter.fcl b/sbndcode/Utilities/run_DigitalNoiseEventFilter.fcl
@@ -0,0 +1,49 @@
+#include "DigitalNoiseEventFilter.fcl"
+#include "services_sbnd.fcl"
+#include "simulationservices_sbnd.fcl"
+
+process_name: DigitalNoiseEventFilter
+
+source:
+{
+  module_type: RootInput
+  maxEvents:   -1        # Number of events to create
+}
+
+outputs:
+{
+  out1:
+  {
+    module_type: RootOutput
+    fileName:    "digitalnoisefiltered.root"
+    dataTier:    "digitalnoisefiltered"
+  }
+}
+
+services:
+{
+  AuxDetGeometry:            @local::sbnd_auxdetgeo
+  WireReadout:               @local::sbnd_wire_readout
+  GeometryConfigurationWriter: {}
+  Geometry:                  @local::sbnd_geo
+  AuxDetGeometry:            @local::sbnd_auxdetgeo
+  ChannelStatusService: @local::sbnd_channelstatus
+}
+
+physics:
+{
+  producers: {}
+  filters:
+  {
+    digitalnoisefilter: @local::digital_noise_event_filter
+  }
+  analyzers:{}
+
+  reco: [digitalnoisefilter]
+  stream1: [out1]
+  trigger_paths: [reco]
+  end_paths: [stream1]
+}
+
+outputs.out1.SelectEvents: [ "reco" ]
+
diff --git a/sbndcode/WireCell/wcsimsp_sbnd.fcl b/sbndcode/WireCell/wcsimsp_sbnd.fcl
@@ -73,7 +73,7 @@ sbnd_wcls_simsp.wcls_main.structs:  {
                                      ## Transverse diffusion constant [cm2/s]
                                      DT: 8.8
                                      ## Electron lifetime [ms]
-                                     lifetime: 100.0
+                                     lifetime: 35.0
                                      ## Electron drift speed, assumes 0.5 kV/cm and 88.4 K. Units: mm/us
                                      driftSpeed: 1.563
                                      ## simulated front porch size [us]
diff --git a/test/ci/sbnd_ci_nucosmics_detsim_quick_test_sbndcode.fcl b/test/ci/sbnd_ci_nucosmics_detsim_quick_test_sbndcode.fcl
@@ -1,3 +1,11 @@
 #include "standard_detsim_sbnd.fcl"
 
 services.NuRandomService.policy: "perEvent"
+
+#Adding these drops because the WireCell Toolkit simulation
+# is not deterministic, but they would like to keep these 
+# in main production to further develop.
+outputs.out1.outputCommands: [ "keep *_*_*_*"
+                               ,"drop *_simtpc2d_badmasks_*"
+                               ,"drop *_simtpc2d_badchannels_*"
+                           ]
diff --git a/test/ci/sbnd_ci_nucosmics_detsim_seq_test_sbndcode.fcl b/test/ci/sbnd_ci_nucosmics_detsim_seq_test_sbndcode.fcl
@@ -1 +1,9 @@
 #include "sbnd_ci_nucosmics_detsim_quick_test_sbndcode.fcl"
+
+#Adding these drops because the WireCell Toolkit simulation
+# is not deterministic, but they would like to keep these 
+# in main production to further develop.
+outputs.out1.outputCommands: [ "keep *_*_*_*"
+                               ,"drop *_simtpc2d_badmasks_*"
+                               ,"drop *_simtpc2d_badchannels_*"
+                           ]
diff --git a/test/ci/sbnd_ci_single_detsim_quick_test_sbndcode.fcl b/test/ci/sbnd_ci_single_detsim_quick_test_sbndcode.fcl
@@ -2,3 +2,11 @@
 
 services.NuRandomService.policy: "perEvent"
 
+
+#Adding these drops because the WireCell Toolkit simulation
+# is not deterministic, but they would like to keep these 
+# in main production to further develop.
+outputs.out1.outputCommands: [ "keep *_*_*_*"
+                               ,"drop *_simtpc2d_badmasks_*"
+                               ,"drop *_simtpc2d_badchannels_*"
+                           ]
diff --git a/test/ci/sbnd_ci_single_detsim_seq_test_sbndcode.fcl b/test/ci/sbnd_ci_single_detsim_seq_test_sbndcode.fcl
diff --git a/ups/product_deps b/ups/product_deps

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#include "prodgenie_corsika_proton_rockbox_sbnd.fcl"`
	`2`	`+`
	`3`	`+physics.filters.dirtfilter.EnergyDeposit: 0.1 # MeV`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ TPCPMTBarycenterMatchProducer:`
`24`	`24`	`YError: 23 // cm`
`25`	`25`	`ZError: 23 // cm`
`26`	`26`	`AngleError: 27 // deg`
`27`		`- FlashVetoWindow: [-1500000,1500000] // ns`
	`27`	`+ FlashVetoWindow: [-5,5] // ns`
`28`	`28`	`OpticalPathTool: @local::SBNDOpticalPath`
`29`	`29`	`module_type: "TPCPMTBarycenterMatchProducer"`
`30`	`30`	`}`