Merge remote-tracking branch 'upstream/develop' into feature/tjyang_omevd

Author: yangtj207

sbndcode/Commissioning/fcls/run_hitdumper.fcl

@@ -14,12 +14,7 @@
 #
 #include "caldata_sbnd.fcl"
 #include "hitfindermodules_sbnd.fcl"
-#include "cluster_sbnd.fcl"
-#include "trackfindermodules_sbnd.fcl"
-#include "calorimetry_sbnd.fcl"
-#include "showerfindermodules.fcl"
 #include "databaseutil_sbnd.fcl"
-#include "vertexfindermodules.fcl"
 #include "hitdumpermodule.fcl"
 #include "muontrackmodule.fcl"
 #include "ophit_finder_sbnd.fcl"

sbndcode/Commissioning/fcls/run_muontrack.fcl

@@ -13,12 +13,7 @@
 #
 #include "caldata_sbnd.fcl"
 #include "hitfindermodules_sbnd.fcl"
-#include "cluster_sbnd.fcl"
-#include "trackfindermodules_sbnd.fcl"
-#include "calorimetry_sbnd.fcl"
-#include "showerfindermodules.fcl"
 #include "databaseutil_sbnd.fcl"
-#include "vertexfindermodules.fcl"
 
 #include "muontrackmodule.fcl"
 #include "hitdumpermodule.fcl"

sbndcode/Decoders/TPC/SBNDTPCDecoder_module.cc

@@ -101,9 +101,6 @@ daq::SBNDTPCDecoder::Config::Config(fhicl::ParameterSet const & param) {
 void daq::SBNDTPCDecoder::produce(art::Event & event)
 {
   auto daq_handle = event.getHandle<artdaq::Fragments>(_tag);
-  if ( !daq_handle.isValid() ) {
-    throw cet::exception("SBNDTPCDecoder_module ") << " invalid fragment handle";
-  }
 
   RDPmkr rdpm(event);
   TSPmkr tspm(event);
@@ -114,10 +111,17 @@ void daq::SBNDTPCDecoder::produce(art::Event & event)
   std::unique_ptr<RDTsAssocs> rdtsassoc_collection(new RDTsAssocs);
   std::unique_ptr<std::vector<tpcAnalysis::TPCDecodeAna>> header_collection(new std::vector<tpcAnalysis::TPCDecodeAna>);
 
-  for (auto const &rawfrag: *daq_handle) {
-    process_fragment(event, rawfrag, rawdigit_collection, header_collection, rdpm, tspm, rdts_collection, rdtsassoc_collection);
+  if ( daq_handle.isValid() ) {
+    for (auto const &rawfrag: *daq_handle) {
+      process_fragment(event, rawfrag, rawdigit_collection, header_collection, rdpm, tspm, rdts_collection, rdtsassoc_collection);
+    }
   }
+  else
+    {
+      mf::LogWarning("SBNDTPCDecoder_module") <<  " Invalid fragment handle: Skipping TPC digit decoding";
+    }
 
+  
   event.put(std::move(rawdigit_collection));
   event.put(std::move(rdts_collection));
   event.put(std::move(rdtsassoc_collection));

sbndcode/JobConfigurations/README.md

@@ -10,10 +10,26 @@ At the time of writing, the core workflow (for BNB + Dirt + Cosmics) is the foll
 - `reco1_sce_lite.fcl`
 - `reco2_sce.fcl`
 
+The intime workflow is as follows:
+
+- `prodcorsika_proton_intime_filter_sce.fcl`
+- `g4_sce_simphotontime_filter_lite.fcl`
+- `detsim_sce_lite.fcl`
+- `reco1_sce_lite.fcl`
+- `reco2_sce.fcl`
+
+For single generator workflows (like intrinsic neutrino samples) the workflow is the following:
+
+- `<your-gen>.fcl`
+- `g4_sce_lite.fcl`
+- `detsim_sce_lite.fcl`
+- `reco1_sce_lite.fcl`
+- `reco2_sce.fcl`
+
 This may well change over the coming months, and this README should be updated to reflect this.
 
 ** ALERT **
 
 Due to changes implemented in sbndcode PRs #408 and #409 the 1D simulation fcls will not work out of the box, they will need editing by experts!
 
-Henry Lay & Lynn Tung - Feb 2024
+Henry Lay, Lynn Tung, Bear Carlson - Feb 2024

sbndcode/JobConfigurations/base/evd_sbnd_data.fcl

@@ -0,0 +1,6 @@
+#include "evd_sbnd.fcl"
+services.RawDrawingOptions.SeeBadChannels: true
+services.RawDrawingOptions.MinimumSignal: 0
+services.RawDrawingOptions.PedestalOption: 1
+Services.RawDrawingOptions.TotalTicks: 3415
+services.ColorDrawingOptions.ColorOrGrayScale: 0

sbndcode/JobConfigurations/base/prodgenie_rockbox_sbnd.fcl

@@ -33,6 +33,7 @@
 
 #include "genie_sbnd.fcl"
 #include "larg4_sbnd.fcl"
+#include "mlreco_sbnd.fcl"
 
 
 process_name: GenieGen
@@ -84,11 +85,14 @@ physics:
 
     # The geant4 step
     largeant: @local::sbnd_larg4
+
+    # Merge dropped and nominal MCParticle into separate list
+    simplemerge: @local::sbnd_simplemerge
   }
 
   #define the producer and filter modules for this path, order matters,
-  simulatetpc:  [ rns, generator, loader, largeant, tpcfilter ]
-  simulatedirt: [ rns, generator, loader, largeant, "!tpcfilter", dirtfilter ]
+  simulatetpc:  [ rns, generator, loader, largeant, simplemerge, tpcfilter ]
+  simulatedirt: [ rns, generator, loader, largeant, simplemerge, "!tpcfilter", dirtfilter ]
 
   #define the output stream, there could be more than one if using filters
   # By deault Keep everything in one file:

sbndcode/JobConfigurations/base/reco_drops.fcl

@@ -19,7 +19,11 @@ BEGIN_PROLOG
 
 reco_drops: [ @sequence::detsim_drops,
               "drop raw::RawDigits_*_*_*",
-              "drop raw::OpDetWaveforms_*_*_*" ]
+              "drop raw::OpDetWaveforms_*_*_*",
+              "drop *_cluster3d_*_*", #drop all mlreco output
+              "drop *_simplemerge_*_*", #drop all mlreco output
+              "drop *_sedlite_*_*" #drop all mlreco output
+               ]
 
 END_PROLOG
 

sbndcode/JobConfigurations/base/reco_sbnd.fcl

@@ -24,7 +24,6 @@
 
 #include "caldata_sbnd.fcl"
 #include "hitfindermodules_sbnd.fcl"
-#include "cluster_sbnd.fcl"
 #include "trackfindermodules_sbnd.fcl"
 #include "calorimetry_sbnd.fcl"
 #include "showerfindermodules_sbnd.fcl"
@@ -48,12 +47,14 @@
 #include "scecorrections.fcl"
 #include "flashmatch_sbnd.fcl"
 
-###include "hitparticleassociations.fcl"
+#include "mlreco_sbnd.fcl"
+#include "cluster_sbnd.fcl"
 
 #include "sbnd_trackcalo_skimmer.fcl"
 #include "crtskim_sbnd.fcl"
 #include "pmtskim_sbnd.fcl"
 
+
 process_name: Reco
 
 services:
@@ -124,10 +125,10 @@ physics:
 
   ### cluster-finder producers
   #fuzzycluster:        @local::sbnd_fuzzycluster
-  linecluster:         @local::sbnd_linecluster
+  #linecluster:         @local::sbnd_linecluster
   #cccluster:           @local::sbnd_clustercrawler
   #spacepts:            @local::sbnd_spacepts
-  blurredcluster:      @local::sbnd_blurredcluster
+  #blurredcluster:      @local::sbnd_blurredcluster
 
   ### pandora
   pandora:             @local::sbnd_pandora
@@ -192,6 +193,9 @@ physics:
   ### Uncalibrated calorimetry producer for calibration caloskimmer
   caloskimCalorimetry: @local::caloskim_calorimetry
 
+  #ML Reco
+  cluster3d: @local::sbnd_cluster3d
+
  }
 
  #define the producer and filter modules for this path, order matters,
@@ -214,6 +218,7 @@ physics:
    #      , corner
    #      , fuzzycluster
          , crtstrips
+         , cluster3d  
  ]
 
  reco2_no_opt0finder: [
@@ -250,9 +255,11 @@ physics:
   caloskim: @local::caloskim_nodigits_goldentracks
   crtskim: @local::crtskim_sbnd
   pmtskim: @local::pmtskim_sbnd
+  supera: @local::sbnd_supera
  }
 
-caloskimana: [ caloskim, crtskim, pmtskim ]
+ caloskimana: [ caloskim, crtskim, pmtskim ]
+ superaana: [ supera ] #outputs larcv.root for use in mlreco
 
  #define the output stream, there could be more than one if using filters
  stream1:  [ out1 ]
@@ -280,8 +287,10 @@ outputs:
          "drop *raw::RawDigits*_*_*_*",
          #"drop sim::SimChannels_*_*_*",
          "drop sim::OpDetBacktrackerRecords_*_*_*",
-         "drop *_linecluster_*_*",
-         "drop *_fasthit_*_*"
+         #"drop *_linecluster_*_*",
+         "drop *_fasthit_*_*",
+         "drop *_cluster3d_*_*", #drop all mlreco output
+         "drop *_simplemerge_*_*" #drop all mlreco output
      ]
 
 
@@ -316,7 +325,7 @@ physics.producers.fasthit.DigitModuleLabel:                     "simtpc2d:daq"
 #physics.producers.corner.CornerAlgParamSet.RawDataModuleLabel:  "daq"
 #physics.producers.corner.CornerAlgParamSet.CalDataModuleLabel:  "caldata"
 #
-physics.producers.linecluster.HitFinderModuleLabel:              "gaushit"
+#physics.producers.linecluster.HitFinderModuleLabel:              "gaushit"
 
 #physics.producers.fuzzycluster.HitsModuleLabel:                 "gaushit"
 #physics.producers.fuzzycluster.CalDataModuleLabel:              "caldata"

sbndcode/JobConfigurations/standard/g4/g4_dirt_filter.fcl

@@ -3,6 +3,7 @@
 #include "standard_g4_sbnd.fcl"
 
 physics.simulate: [ rns
+                  , sedlite #SEDLite reduces info from SED
                   , ionandscint
                   , ionandscintout
                   , pdfastsim

sbndcode/JobConfigurations/standard/g4/g4_enterstpc_filter.fcl

@@ -5,6 +5,8 @@
 physics.simulate: [ rns
                   , loader
                   , largeant
+                  , simplemerge #merges dropped and nominal MCParticle
+                  , sedlite
                   , ionandscint
                   , ionandscintout
                   , pdfastsim