Merge branch 'develop' into feature/CAF_fcl_for_MeVPRTL

Author: nathanielerowe

CMakeLists.txt

@@ -15,7 +15,7 @@
 
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
-set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.14.00)
+set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.14.02)
 find_package(cetmodules REQUIRED)
 project(sbndcode LANGUAGES CXX)
 

sbndcode/Calibration/configurations/calibration_database_PDS_TagSets_sbnd.fcl

@@ -10,8 +10,8 @@ BEGIN_PROLOG
 
 # For SBND 2025 Fall production
 PDS_CalibrationTags_Nov2025: {
-  PMTCalibrationDatabaseTag:    "v2r1"
-  DatabaseTimeStamp: 1763157679000000000
+  PMTCalibrationDatabaseTag:    "v3r1"
+  DatabaseTimeStamp: 1765487620000000000
 }
 
 END_PROLOG

sbndcode/Decoders/PMT/SBNDPMTDecoder_module.cc

@@ -195,6 +195,7 @@ sbndaq::SBNDPMTDecoder::SBNDPMTDecoder(fhicl::ParameterSet const& p)
 
     produces< std::vector<int> >("MonPulses");
     produces< std::vector<int> >("MonPulseSizes"); 
+    produces<int>("pairsOverThreshold");
 }
 
 void sbndaq::SBNDPMTDecoder::produce(art::Event& evt)
@@ -278,6 +279,9 @@ void sbndaq::SBNDPMTDecoder::produce(art::Event& evt)
         auto sizesPtr = std::make_unique<std::vector<int>>();
         evt.put(std::move(flatPtr), "MonPulses");
         evt.put(std::move(sizesPtr), "MonPulseSizes");
+
+        auto pairFlag = std::make_unique<int>(-1);
+        evt.put(std::move(pairFlag), "pairsOverThreshold");
         return;
     }
 
@@ -623,30 +627,27 @@ void sbndaq::SBNDPMTDecoder::produce(art::Event& evt)
     std::vector<int> pulseSizes;
     MonPulsesFlat.clear();
     pulseSizes.clear();
-    int TotalFlash = pmtwvfmVec->size()/((int)fn_caenboards*PMTPerBoard); // pmtwvfmVec = waveHandle ???
+    int pmt_caenboards = (int)fn_caenboards-1;
+    int TotalFlash = pmtwvfmVec->size()/(pmt_caenboards*PMTPerBoard);
+
+    int numPairsOverThreshold = 0;
     for (int FlashCounter=0; FlashCounter<TotalFlash; FlashCounter++)
     {
       int WaveIndex = FlashCounter*PMTPerBoard;
       int WaveformSize = (*pmtwvfmVec)[WaveIndex].size();
+      int pairThisFlash = 0;
       std::vector<int> *MonPulse = new std::vector<int>(WaveformSize);
-      fTriggerService->ConstructMonPulse(*pmtwvfmVec, fmon_threshold, MonPulse, FlashCounter);
+      fTriggerService->ConstructMonPulse(*pmtwvfmVec, fmon_threshold, MonPulse, FlashCounter, &pairThisFlash);
       //MonPulsesAll.push_back(std::move(MonPulse));
       MonPulsesFlat.insert(MonPulsesFlat.end(), (*MonPulse).begin(), (*MonPulse).end());
       pulseSizes.push_back(MonPulse->size());
+      numPairsOverThreshold = numPairsOverThreshold + pairThisFlash;
       delete MonPulse;
     }
     // make ptrs
     auto flatPtr = std::make_unique<std::vector<int>>(std::move(MonPulsesFlat));
     auto sizesPtr = std::make_unique<std::vector<int>>(std::move(pulseSizes));
-
-    /*std::unique_ptr< std::vector< std::vector<int> > >  MonPulsesPtr(std::make_unique< std::vector< std::vector<int> > > ());
-    for (auto &pulse : MonPulsesAll) {
-      MonPulsesPtr->reserve(MonPulsesPtr->size() + pulse.size());
-      std::move(pulse.begin(), pulse.end(), std::back_inserter(*MonPulsesPtr));
-    }
-    // clean up the vector
-    for (unsigned i = 0; i < MonPulsesAll.size(); i++) MonPulsesAll[i] = std::vector<int>();
-    */ 
+    auto pairFlag = std::make_unique<int>(numPairsOverThreshold);
 
     board_frag_v.clear();
 
@@ -663,6 +664,7 @@ void sbndaq::SBNDPMTDecoder::produce(art::Event& evt)
 
     evt.put(std::move(flatPtr), "MonPulses");
     evt.put(std::move(sizesPtr), "MonPulseSizes");
+    evt.put(std::move(pairFlag), "pairsOverThreshold");
 }
 
 void sbndaq::SBNDPMTDecoder::get_fragments(artdaq::Fragment & frag, std::vector<std::vector<artdaq::Fragment>> & board_frag_v){

sbndcode/Decoders/PMT/pmtdecoder.fcl

@@ -48,7 +48,7 @@ pmtdecoder:
     hist_evt:        1  # the # of the event used to generate the histograms, 1st event by default 
 
     # trigger configurable
-    mon_threshold:   15 # ADC channel value threshold to add 1 to the trigger response MON pulse
+    mon_threshold:   50 # ADC channel value threshold to add 1 to the trigger response MON pulse
 
     # for when the fragIDs are mapped to the old configuration or you need to hardcode fragids...
     ## to use this, must set `fragid_offset` to 0!!!

sbndcode/Decoders/PMT/run_pmtdecoder.fcl

@@ -11,7 +11,7 @@ services: {
     MonWidth: 12
     TotalCAENBoards: 8
     PMTPerBoard: 15
-    Baseline: 14250
+    Baseline: 14250 #Run 1: 14250, Run 2: 14257
     MC: false
   }
 }

sbndcode/JobConfigurations/base/detsim_drops.fcl

@@ -25,7 +25,8 @@ detsim_drops: [ @sequence::g4_drops
                 , "drop sim::SimEnergyDeposits_ionandscintout__*"
                 , "drop sim::SimEnergyDeposits_ionandscint_*_*"
                 , "drop sim::SimEnergyDeposits_largeant_*_*"
-				, "keep sim::SimEnergyDeposits_ionandscint_priorSCE_*"]
+				, "keep sim::SimEnergyDeposits_ionandscint_priorSCE_*"
+                , "drop raw::OpDetWaveforms_opdaq_*_*"]
 
 END_PROLOG
 

sbndcode/JobConfigurations/standard/gen/MultiPart/run_mpvmpr_exotics_sbnd.fcl

@@ -0,0 +1,14 @@
+# Description: an override for the default SBND MPV/MPR generator that
+# adds kaons (charged and neutral), lambdas, and the neutral sigma
+# baryon to the MPV generator.
+# Author: mueller@fnal.gov
+
+#include "run_mpvmpr_sbnd.fcl"
+
+physics.producers.generator.ParticleParameter.PDGCode    : [[-11,11,-13,13],   [111]   , [211,-211],  [2212]   ,    [22]   ,   [310]   , [321,-321] , [3212,3122] ]
+physics.producers.generator.ParticleParameter.MinMulti   : [       0       ,     0     ,     0     ,     0     ,     0     ,     0     ,     0      ,      0      ]
+physics.producers.generator.ParticleParameter.MaxMulti   : [       1       ,     2     ,     2     ,     4     ,     2     ,     1     ,     1      ,      1      ]
+physics.producers.generator.ParticleParameter.ProbWeight : [       3       ,     1     ,     1     ,     3     ,     1     ,     1     ,     1      ,      1      ]
+physics.producers.generator.ParticleParameter.KERange    : [   [0.0,3.0]   , [0.0,1.0] , [0.0,1.0] , [0.0,1.0] , [0.0,1.0] , [0.0,1.5] ,  [0.0,1.5] ,  [0.0,0.7]  ]
+
+outputs.out1.fileName: "prodmpvmpr_exotics_sbnd_%p-%tc.root"

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
 
@@ -77,8 +79,8 @@ sbnd_reco2_producers:{
     fmatchoparaSCE:      @local::sbnd_simple_flashmatch_opara_sce
     opt0finder:          @local::sbnd_opt0_finder_one_to_many
     opt0finderSCE:       @local::sbnd_opt0_finder_one_to_many
-    tpcpmtbarycentermatching: @local::TPCPMTBarycenterMatchProducer
-    tpcpmtbarycentermatchingSCE: @local::TPCPMTBarycenterMatchProducerSCE
+    tpcpmtbarycentermatching: @local::TPCPMTBarycenterMatchProducerMC
+    tpcpmtbarycentermatchingSCE: @local::TPCPMTBarycenterMatchProducerSCEMC
 
     ### Uncalibrated calorimetry producer for calibration caloskimmer
     caloskimCalorimetry: @local::caloskim_calorimetry
@@ -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]