add fcl param on whether to fill TTree, add more comments, remove unused headers

Author: lynnt20

sbndcode/Calorimetry/LightCaloProducer_module.cc

@@ -63,11 +63,9 @@
 #include "TTree.h"
 
 // C++ includes
-#include <numeric>
 #include <memory>
 #include <algorithm> // sort 
 #include <cmath>
-#include <functional>
 #include <map>
 #include <string> 
 
@@ -98,6 +96,9 @@ class sbnd::LightCaloProducer : public art::EDProducer {
                             std::unique_ptr< art::Assns<recob::Slice, sbn::LightCalo> >& slice_assn_v,
                             std::unique_ptr< art::Assns<recob::OpFlash, sbn::LightCalo> >& flash_assn_v);
 
+  // Templated member function to collect matched slices and opflashes
+  // The CheckFunc is a callable that takes a Ptr<MatchT> and returns bool
+  // to determine if the match passes selection criteria
   template <typename MatchT, typename CheckFunc>
   void CollectMatches(const art::Handle<std::vector<MatchT>> &handle,
                       const std::vector<art::Ptr<MatchT>> &fm_v,
@@ -108,6 +109,7 @@ class sbnd::LightCaloProducer : public art::EDProducer {
                       std::vector<art::Ptr<recob::OpFlash>> &match_op1,
                       CheckFunc check);
 
+  // Finds the opflash in flash_v that is closest in time to ref_time                      
   art::Ptr<recob::OpFlash> FindMatchingFlash(const std::vector<art::Ptr<recob::OpFlash>> &flash_v,
                                              double ref_time);                      
   // Returns visibility vector for all opdets given charge/position information 
@@ -134,6 +136,7 @@ class sbnd::LightCaloProducer : public art::EDProducer {
   bool fuse_bcfm;
   bool fuse_opt0;
   bool fverbose;
+  bool ffill_tree;
 
   float fbcfmscore_cut; 
   float fopt0score_cut;
@@ -211,6 +214,7 @@ sbnd::LightCaloProducer::LightCaloProducer(fhicl::ParameterSet const& p)
   fuse_bcfm     = p.get<bool>("UseBCFM");
 
   fverbose = p.get<bool>("Verbose");
+  ffill_tree = p.get<bool>("FillTree");
 
   fbcfmscore_cut = p.get<float>("bcfmScoreCut");
   fopt0score_cut = p.get<float>("opt0ScoreCut");
@@ -608,7 +612,8 @@ void sbnd::LightCaloProducer::CalculateCalorimetry(art::Event& e,
     util::CreateAssn(*this, e, *lightcalo_v, opflash0, *flash_assn_v);
     util::CreateAssn(*this, e, *lightcalo_v, opflash1, *flash_assn_v);
 
-    _tree->Fill();
+    if (ffill_tree)
+      _tree->Fill();
   } // end slice loop
 } // end produce 
 

sbndcode/Calorimetry/lightcalo_sbnd.fcl

@@ -13,31 +13,32 @@ sbnd_lightcalo:
     VIVHits: @local::sbnd_vis_RS100cm_hits_parameterization
     OpticalPathTool:  @local::SBNDOpticalPath
 
-    OpFlashProducers:    ["opflashtpc0", "opflashtpc1"]
-    OpFlashAraProducers: ["opflashtpc0xarapuca", "opflashtpc1xarapuca"]
+    OpFlashProducers:     ["opflashtpc0", "opflashtpc1"]
+    OpFlashAraProducers:  ["opflashtpc0xarapuca", "opflashtpc1xarapuca"]
     # only validated for coated PMTs for now
-    PDTypes:             ["pmt_coated"] # "pmt_uncoated", "xarapuca_vuv", "xarapuca_vis"
+    PDTypes:              ["pmt_coated"] # "pmt_uncoated", "xarapuca_vuv", "xarapuca_vis"
 
-    SliceProducer:       "pandora"
-    OpT0FinderProducer:  "opt0finder"
-    BCFMProducer:        "tpcpmtbarycentermatching"
+    SliceProducer:        "pandora"
+    OpT0FinderProducer:   "opt0finder"
+    BCFMProducer:         "tpcpmtbarycentermatching"
 
-    UseBCFM:             true
-    UseOpT0Finder:       false
-    Verbose:             false 
+    UseBCFM:              true
+    UseOpT0Finder:        false
+    Verbose:              false
+    FillTree:             false  
 
-    bcfmScoreCut:        0.02 # default: accept bcfm match > bcfmScoreCut
-    opt0ScoreCut:        200 # default: accept opt0 match > opt0ScoreCut
-    opt0FractionalCut:   0.5 
+    bcfmScoreCut:         0.02 # default: accept bcfm match > bcfmScoreCut
+    opt0ScoreCut:         200 # default: accept opt0 match > opt0ScoreCut
+    opt0FractionalCut:    0.5 
 
-    OpFlashMin: 0.0 # in us, simulation [0.0], light-triggered data [-0.8]
-    OpFlashMax: 2.0 # in us, simulation [2.0], light-triggered data [2.0]
+    OpFlashMin:           0.0 # in us, simulation [0.0], light-triggered data [-0.8]
+    OpFlashMax:           2.0 # in us, simulation [2.0], light-triggered data [2.0]
 
     # flash parameters    
-    FlashOffset:         0.05 # in us, acceptable offset between the t0 between TPCs or between PMTs/X-ARAPUCAs
-    FlashNoiseThreshold: [ 600., 1500. ] # in PE, {PMT, xARAPUCA}, flash total PE threshold to ignore a flash
-    OpDetMaxPEThreshold: [4000., 1e9] # in PE, PE in a single opdet to ignore (due to saturation effects)
-    OpDetMask:           [] # list of opdet channels to ignore (off/non-reconstructable PMTs are already identified via calibration db)
+    FlashOffset:          0.05 # in us, acceptable offset between the t0 between TPCs or between PMTs/X-ARAPUCAs
+    FlashNoiseThreshold:  [ 600., 1500. ] # in PE, {PMT, xARAPUCA}, flash total PE threshold to ignore a flash
+    OpDetMaxPEThreshold:  [4000., 1e9] # in PE, PE in a single opdet to ignore (due to saturation effects)
+    OpDetMask:            [] # list of opdet channels to ignore (off/non-reconstructable PMTs are already identified via calibration db)
 
     # calibration constants & simulation parameters  
     CalAreaConstants:     @local::sbnd_calorimetryalgmc.CalAreaConstants
@@ -48,9 +49,9 @@ sbnd_lightcalo:
     PMTCoatedVUVEff_tpc1: @local::sbnd_digipmt_alg.PMTCoatedVUVEff_tpc1
     PMTUncoatedEff_tpc1:  @local::sbnd_digipmt_alg.PMTUncoatedEff_tpc1
 
-    XArapucaVUVVUVEff: @local::sbnd_digiarapuca_alg.XArapucaVUVEffVUV
-    XArapucaVUVVISEff: @local::sbnd_digiarapuca_alg.XArapucaVUVEffVis
-    XArapucaVISEff:    @local::sbnd_digiarapuca_alg.XArapucaVISEff
+    XArapucaVUVVUVEff:    @local::sbnd_digiarapuca_alg.XArapucaVUVEffVUV
+    XArapucaVUVVISEff:    @local::sbnd_digiarapuca_alg.XArapucaVUVEffVis
+    XArapucaVISEff:       @local::sbnd_digiarapuca_alg.XArapucaVISEff
 }
 
 sbnd_lightcalo_sce: @local::sbnd_lightcalo

sbndcode/Calorimetry/run_lightcalo.fcl

@@ -54,4 +54,6 @@ 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]
-}
+}
+
+physics.producers.lightcalo.FillTree: true