Merge branch 'develop' into feature/gputnam-crt-hit-truth-dev

Author: kjplows

sbncode/CAFMaker/CAFMakerParams.h

@@ -423,6 +423,30 @@ namespace caf
       "emuTriggerUnshifted"
     };
 
+    Atom<art::InputTag> MonPulsesTriggerLabel {
+      Name("MonPulsesTriggerLabel"),
+      Comment("Label of trigger emulation product MonPulses (number of PMT pairs above threshold for all channels) for all flashes."),
+      art::InputTag("opdaq", "MonPulses", "DetSim")
+    };
+
+    Atom<art::InputTag> MonPulseSizesTriggerLabel {
+      Name("MonPulseSizesTriggerLabel"),
+      Comment("Label of trigger emulation product MonPulses Sizes, which gives the length of each trigger response in MonPulses."),
+      art::InputTag("opdaq", "MonPulseSizes", "DetSim")
+    };
+
+    Atom<art::InputTag> PairsTriggerLabel {
+      Name("PairsTriggerLabel"),
+      Comment("Label of number of PMT pairs over threshold."),
+      art::InputTag("opdaq", "pairsOverThreshold", "DetSim")
+    };
+
+    Atom<art::InputTag> EmulatedTriggerLabel {
+      Name("EmulatedTriggerLabel"),
+      Comment("Label of bool of passing the trigger."),
+      art::InputTag("opdaq", "triggerEmulation", "DetSim")
+    };
+
     Atom<string> FlashTrigLabel {
       Name("FlashTrigLabel"),
       Comment("Label of bool of passing flash trigger."),

sbncode/CAFMaker/CAFMaker_module.cc

@@ -1640,7 +1640,7 @@ void CAFMaker::produce(art::Event& evt) noexcept {
   //#######################################################
   // Fill detector & reco
   //#######################################################
-
+  
   //Beam gate and Trigger info
   art::Handle<sbn::ExtraTriggerInfo> extratrig_handle;
   GetByLabelStrict(evt, fParams.TriggerLabel().encode(), extratrig_handle);
@@ -1652,16 +1652,40 @@ void CAFMaker::produce(art::Event& evt) noexcept {
   if (!isRealData)
     GetByLabelStrict(evt, fParams.UnshiftedTriggerLabel().encode(), unshifted_trig_handle);
 
+  //Trigger emulation handles
+  art::Handle<std::vector<int>> monpulses_handle;
+  GetByLabelStrict(evt, fParams.MonPulsesTriggerLabel().encode(), monpulses_handle);
+
+  art::Handle<std::vector<int>> monpulse_sizes_handle;
+  GetByLabelStrict(evt, fParams.MonPulseSizesTriggerLabel().encode(), monpulse_sizes_handle);
+
+  art::Handle<int> pairs_handle;
+  GetByLabelStrict(evt, fParams.PairsTriggerLabel().encode(), pairs_handle);
+
+  art::Handle<bool> trigemu_handle;
+  GetByLabelStrict(evt, fParams.EmulatedTriggerLabel().encode(), trigemu_handle);
+
+  // Check trigger handles
   const bool isValidTrigger = extratrig_handle.isValid() && trig_handle.isValid() && trig_handle->size() == 1;
   const bool isValidUnshiftedTrigger = unshifted_trig_handle.isValid() && unshifted_trig_handle->size() == 1;
+  const bool isValidEmulationTrigger = monpulses_handle.isValid() && monpulse_sizes_handle.isValid() && pairs_handle.isValid() && trigemu_handle.isValid();
 
   const double triggerShift = (isValidUnshiftedTrigger && isValidTrigger)?
     unshifted_trig_handle->at(0).TriggerTime() - trig_handle->at(0).TriggerTime() : 0.;
 
+  // Fill local ExtraTriggerInfo struct
+  sbn::ExtraTriggerInfo extratrig;
+  if (extratrig_handle.isValid()) extratrig = *extratrig_handle;
+
   caf::SRTrigger srtrigger;
   if (isValidTrigger) {
       FillTrigger(*extratrig_handle, trig_handle->at(0), srtrigger, triggerShift);
   }
+  // Fill trigger emulation information
+  if (isValidEmulationTrigger) { 
+      FillTriggerEmulation(monpulses_handle, monpulse_sizes_handle, pairs_handle, trigemu_handle, srtrigger);
+  }
+
   // If not real data, fill in enough of the SRTrigger to make (e.g.) the CRT
   // time referencing work. TODO: add more stuff to a "MC"-Trigger?
   // No longer needed with incorporation of trigger emulation in the MC.

sbncode/CAFMaker/CMakeLists.txt

@@ -36,6 +36,7 @@ art_make_library( LIBRARY_NAME sbncode_CAFMaker
                   sbnobj::Common_Reco
                   sbnobj::Common_Analysis
                   sbnobj::Common_PMT_Data
+                  sbnobj::Common_Trigger
                   sbnobj::SBND_CRT
                   sbnobj::SBND_Timing
                   lardataalg::DetectorInfo

sbncode/CAFMaker/FillTrigger.cxx

@@ -26,6 +26,7 @@ namespace caf
     triggerInfo.trigger_count = addltrig_info.triggerCount;
     triggerInfo.gate_count = addltrig_info.gateCount;
     triggerInfo.gate_delta = addltrig_info.gateCountFromPreviousTrigger;
+
   }
 
   void FillTriggerMC(double absolute_time, caf::SRTrigger& triggerInfo) {
@@ -35,7 +36,6 @@ namespace caf
     // Set this to 0 since the "MC" trigger is (for now) always at the spill time
     triggerInfo.trigger_within_gate = 0.;
 
-    // TODO: fill others?
   }
 
   void FillTriggerSBND(caf::SRSBNDTimingInfo& timingInfo, caf::SRTrigger& triggerInfo){
@@ -49,4 +49,17 @@ namespace caf
     triggerInfo.trigger_within_gate = diff_ts;
   }
 
+  void FillTriggerEmulation(art::Handle<std::vector<int>> const& monpulsesFlat,
+                             art::Handle<std::vector<int>> const& monpulseSizes,
+                             art::Handle<int> const& numPairs,
+                             art::Handle<bool> const& passedTrig,
+                             caf::SRTrigger& triggerInfo) {
+
+    triggerInfo.monpulses_flat = *monpulsesFlat;
+    triggerInfo.monpulse_sizes = *monpulseSizes;
+    triggerInfo.num_pairs_over_threshold = *numPairs;
+    triggerInfo.passed_trigger = *passedTrig;
+
+  }
+
 }

sbncode/CAFMaker/FillTrigger.h

@@ -6,6 +6,7 @@
 #include "sbnanaobj/StandardRecord/SRTrigger.h"
 #include "sbnanaobj/StandardRecord/SRSBNDTimingInfo.h"
 #include "lardataobj/RawData/TriggerData.h"
+#include "art/Framework/Principal/Handle.h"
 
 #include <vector>
 
@@ -20,6 +21,12 @@ namespace caf
   void FillTriggerMC(double absolute_time, caf::SRTrigger& triggerInfo);
 
   void FillTriggerSBND(caf::SRSBNDTimingInfo& timingInfo, caf::SRTrigger& triggerInfo);
+
+  void FillTriggerEmulation(art::Handle<std::vector<int>> const& monpulsesFlat,
+                             art::Handle<std::vector<int>> const& monpulseSizes,
+                             art::Handle<int> const& numPairs,
+                             art::Handle<bool> const& passedTrig,
+                             caf::SRTrigger& triggerInfo);
 }
 
 #endif

sbncode/Calibration/CMakeLists.txt

@@ -70,6 +70,16 @@ cet_build_plugin(TrackCaloSkimmerSelectAllTrack art::tool
                             ROOT::X3d
 )
 
+cet_build_plugin(TrackCaloSkimmerSelectClearCosmicMuon art::tool
+                      LIBRARIES
+			    sbnobj::Common_Calibration_dict
+                            art::Persistency_Common
+                            art::Utilities canvas::canvas
+                            larcore::Geometry_Geometry_service
+                            cetlib::cetlib cetlib_except::cetlib_except
+                            ROOT::X3d
+)
+
 cet_build_plugin ( DataSelect art::module
            LIBRARIES
                ifdh_art::IFDH_service

sbncode/Calibration/TrackCaloSkimmerSelectClearCosmicMuon_tool.cc

@@ -0,0 +1,30 @@
+// Framework Includes
+#include "art/Utilities/ToolMacros.h"
+#include "fhiclcpp/ParameterSet.h"
+
+#include "ITCSSelectionTool.h"
+
+namespace sbn {
+
+class TrackCaloSkimmerSelectClearCosmicMuon: public ITCSSelectionTool {
+public:
+
+  TrackCaloSkimmerSelectClearCosmicMuon(const fhicl::ParameterSet &p);
+  ~TrackCaloSkimmerSelectClearCosmicMuon() {}
+
+  bool Select(const TrackInfo &t) override;
+
+private:
+};
+
+TrackCaloSkimmerSelectClearCosmicMuon::TrackCaloSkimmerSelectClearCosmicMuon(const fhicl::ParameterSet &p):
+  ITCSSelectionTool(p)
+{}
+
+bool TrackCaloSkimmerSelectClearCosmicMuon::Select(const TrackInfo &t) {
+  return t.clear_cosmic_muon;
+}
+
+DEFINE_ART_CLASS_TOOL(TrackCaloSkimmerSelectClearCosmicMuon)
+
+} // end namespace sbn

sbncode/EventGenerator/CMakeLists.txt

@@ -1,2 +1,3 @@
 add_subdirectory(MeVPrtl)
 add_subdirectory(MultiPart)
+add_subdirectory(WireModGen)

sbncode/EventGenerator/WireModGen/CMakeLists.txt

@@ -0,0 +1,52 @@
+cet_build_plugin(WireModMuon art::EDProducer
+  SOURCE CORSIKAGenSBN.cc WireModMuon_module.cc
+  LIBRARIES PRIVATE
+  larcore::Geometry_Geometry_service
+  larcorealg::Geometry
+  larcoreobj::SummaryData
+  nurandom::RandomUtils_NuRandomService_service
+  nusimdata::SimulationBase
+  art::Framework_Principal
+  art::Framework_Services_Registry
+  messagefacility::MF_MessageLogger
+  fhiclcpp::fhiclcpp
+  ifdh::ifdh
+  messagefacility::MF_MessageLogger
+  ROOT::Core
+  ROOT::EG
+  CLHEP::Random
+  SQLite::SQLite3
+  lardata::DetectorInfoServices_DetectorPropertiesServiceStandard_service
+  lardata::DetectorInfoServices_DetectorClocksServiceStandard_service
+  lardata::DetectorClocksService
+)
+
+cet_build_plugin(FilterPrimarySimChannel art::EDProducer
+  LIBRARIES PRIVATE
+  larsim::Simulation
+  art::Framework_Principal
+  art::Framework_Services_Registry
+  messagefacility::MF_MessageLogger
+  fhiclcpp::fhiclcpp
+  messagefacility::MF_MessageLogger
+)
+
+cet_build_plugin(FilterPrimarySimEnergyDepo art::EDProducer
+  LIBRARIES PRIVATE
+  art::Framework_Services_Registry
+  larsim::Simulation
+  art::Framework_Principal
+  art::Framework_Services_Registry
+  messagefacility::MF_MessageLogger
+  fhiclcpp::fhiclcpp
+  messagefacility::MF_MessageLogger
+  larcore::Geometry_Geometry_service
+  larcorealg::Geometry
+  lardata::DetectorInfoServices_DetectorPropertiesServiceStandard_service
+  lardata::DetectorInfoServices_DetectorClocksServiceStandard_service
+  lardata::DetectorClocksService
+)
+
+install_headers()
+install_fhicl()
+install_source()