Merge branch 'develop' into feature/hlay_crt_calibration_database_interface

Author: nathanielerowe

CMakeLists.txt

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

sbndcode/BlipRecoSBND/blipreco_configs.fcl

@@ -5,8 +5,8 @@ BEGIN_PROLOG
 # Main BlipAlg settings
 sbnd_blipalg:
 {
-  HitProducer:          "gaushit"       #// input recob::Hits to use for blip reconstruction
-  TrkProducer:          "pandoraTrack"       #// input recob::Tracks to use for blip reconstruction
+  HitProducer:          "specialblipgaushit"       #// input recob::Hits to use for blip reconstruction
+  TrkProducer:          "blipPandoraTrackCopy"       #// input recob::Tracks to use for blip reconstruction
   GeantProducer:        "largeant"      #// input sim::MCParticles (getting true particle info)
   SimEDepProducer:      "ionandscint"   #// input sim::SimEnergyDeposits (getting energy/electrons deposited)
   SimChanProducer:      "simdrift"      #// label for sim::SimChannels (getting drifted charge; optional)

sbndcode/CRT/CRTAna/CRTAnalysis_module.cc

@@ -1746,9 +1746,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>();
 

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
 

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)

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};

sbndcode/Decoders/PMT/CMakeLists.txt

@@ -3,6 +3,7 @@ cet_build_plugin( SBNDPMTDecoder art::module
     LIBRARIES 
 	sbndaq_artdaq_core::sbndaq-artdaq-core_Overlays_SBND
 	sbnobj::SBND_Timing
+        sbndcode_OpDetSim
     lardata::Utilities
     canvas::canvas
     lardataobj::RecoBase

sbndcode/Decoders/PMT/SBNDPMTDecoder_module.cc

@@ -49,6 +49,8 @@
 #include <bitset>
 #include <memory>
 
+#include "sbndcode/OpDetSim/TriggerEmulationService.h"
+
 namespace sbndaq {
     class SBNDPMTDecoder;
 }
@@ -123,6 +125,8 @@ class sbndaq::SBNDPMTDecoder : public art::EDProducer {
 
     std::vector<uint> fch_map;
 
+    int fmon_threshold;
+
     // histogram info  
     std::stringstream histname; //raw waveform hist name
     art::ServiceHandle<art::TFileService> tfs;
@@ -177,6 +181,8 @@ sbndaq::SBNDPMTDecoder::SBNDPMTDecoder(fhicl::ParameterSet const& p)
 
     fch_map          = p.get<std::vector<uint>>("ch_map",{});
 
+    fmon_threshold   = p.get<int>("mon_threshold", 15);
+ 
     produces< std::vector< raw::OpDetWaveform > >(fpmt_instance_name); 
     produces< std::vector< raw::OpDetWaveform > >(fflt_instance_name);
     produces< std::vector< raw::OpDetWaveform > >(ftim_instance_name);
@@ -186,6 +192,9 @@ sbndaq::SBNDPMTDecoder::SBNDPMTDecoder(fhicl::ParameterSet const& p)
     produces< art::Assns<  raw::pmt::BoardTimingInfo, raw::OpDetWaveform > >(fpmt_timing_instance_name);
     produces< art::Assns<  raw::pmt::BoardTimingInfo, raw::OpDetWaveform > >(fflt_timing_instance_name);
     produces< art::Assns<  raw::pmt::BoardTimingInfo, raw::OpDetWaveform > >(ftim_timing_instance_name);
+
+    produces< std::vector<int> >("MonPulses");
+    produces< std::vector<int> >("MonPulseSizes"); 
 }
 
 void sbndaq::SBNDPMTDecoder::produce(art::Event& evt)
@@ -264,6 +273,11 @@ void sbndaq::SBNDPMTDecoder::produce(art::Event& evt)
         evt.put(std::move(pmtTimingAssns),fpmt_timing_instance_name);
         evt.put(std::move(fltTimingAssns),fflt_timing_instance_name);
         evt.put(std::move(timTimingAssns),ftim_timing_instance_name);
+ 
+        auto flatPtr = std::make_unique<std::vector<int>>();
+        auto sizesPtr = std::make_unique<std::vector<int>>();
+        evt.put(std::move(flatPtr), "MonPulses");
+        evt.put(std::move(sizesPtr), "MonPulseSizes");
         return;
     }
 
@@ -597,6 +611,43 @@ void sbndaq::SBNDPMTDecoder::produce(art::Event& evt)
             }
         }  
     } // end board loop
+
+    // loop through flashes
+    art::ServiceHandle<art::TFileService> tfs;
+    art::ServiceHandle<calib::TriggerEmulationService> fTriggerService;
+    int PMTPerBoard = fTriggerService->getPMTPerBoard();
+    // int fTotalCAENBoards = fTriggerService->getTotalCAENBoards();
+    //std::vector< std::vector<int> > MonPulsesAll;
+    //MonPulseAll.clear();
+    std::vector<int> MonPulsesFlat;
+    std::vector<int> pulseSizes;
+    MonPulsesFlat.clear();
+    pulseSizes.clear();
+    int TotalFlash = pmtwvfmVec->size()/((int)fn_caenboards*PMTPerBoard); // pmtwvfmVec = waveHandle ???
+    for (int FlashCounter=0; FlashCounter<TotalFlash; FlashCounter++)
+    {
+      int WaveIndex = FlashCounter*PMTPerBoard;
+      int WaveformSize = (*pmtwvfmVec)[WaveIndex].size();
+      std::vector<int> *MonPulse = new std::vector<int>(WaveformSize);
+      fTriggerService->ConstructMonPulse(*pmtwvfmVec, fmon_threshold, MonPulse, FlashCounter);
+      //MonPulsesAll.push_back(std::move(MonPulse));
+      MonPulsesFlat.insert(MonPulsesFlat.end(), (*MonPulse).begin(), (*MonPulse).end());
+      pulseSizes.push_back(MonPulse->size());
+      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>();
+    */ 
+
     board_frag_v.clear();
 
     evt.put(std::move(pmtwvfmVec),fpmt_instance_name);  
@@ -609,6 +660,9 @@ void sbndaq::SBNDPMTDecoder::produce(art::Event& evt)
     evt.put(std::move(pmtTimingAssns),fpmt_timing_instance_name);
     evt.put(std::move(fltTimingAssns),fflt_timing_instance_name);
     evt.put(std::move(timTimingAssns),ftim_timing_instance_name);
+
+    evt.put(std::move(flatPtr), "MonPulses");
+    evt.put(std::move(sizesPtr), "MonPulseSizes");
 }
 
 void sbndaq::SBNDPMTDecoder::get_fragments(artdaq::Fragment & frag, std::vector<std::vector<artdaq::Fragment>> & board_frag_v){

sbndcode/Decoders/PMT/pmtdecoder.fcl

@@ -47,6 +47,9 @@ pmtdecoder:
     fragid_offset:   40960 # the offset to subtract to get single digit fragids; if use_set_map is true, should set this to 0
     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
+
     # 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!!!
     use_set_map: false
@@ -66,4 +69,4 @@ pmtdecoder:
              900,901,902,903,904,905,906,907,908,909,910,911,912,913,914] # digitizer 8 (TIMING CAEN)
 }
 
-END_PROLOG
+END_PROLOG

sbndcode/Decoders/PMT/run_pmtdecoder.fcl

@@ -6,6 +6,14 @@ process_name: PMTDecoder
 
 services: {
   TFileService : {fileName: "decoder_hist.root"}
+  TriggerEmulationService: {
+    service_type: TriggerEmulationService
+    MonWidth: 12
+    TotalCAENBoards: 8
+    PMTPerBoard: 15
+    Baseline: 14250
+    MC: false
+  }
 }
 
 #source is a root file
@@ -51,4 +59,4 @@ physics:
   # end_paths is a keyword and contains the paths that do not modify the art::Event,
   # ie analyzers and output streams.  these all run simultaneously
   end_paths: [stream1]
-}
+}