Merge branch 'develop' into feature/munjung-ellips_recomb_var_fcls

Author: bear-is-asleep

sbndcode/CMakeLists.txt

@@ -21,6 +21,7 @@ add_subdirectory(OpT0Finder)
 add_subdirectory(ShowerAna)
 add_subdirectory(Commissioning)
 add_subdirectory(Trigger)
+add_subdirectory(Timing)
 add_subdirectory(PTBAna)
 
 # subdirectory for gallery stuff

sbndcode/Commissioning/fcls/hitdumpermodule.fcl

@@ -29,8 +29,8 @@ hitdumper:
     MCShowerModuleLabel:      "mcreco"
 
     KeepCRTStripHits:         true
-    KeepCRTSpacePoints:       false
-    KeepCRTTracks:            false
+    KeepCRTSpacePoints:       true
+    KeepCRTTracks:            true
     readOpHits:               true
     readpmtTrigger:           true
     readpmtSoftTrigger:       true

sbndcode/Decoders/CMakeLists.txt

@@ -4,3 +4,4 @@ add_subdirectory(SPECTDC)
 add_subdirectory(PMT)
 add_subdirectory(CRT)
 install_fhicl()
+add_subdirectory(XARAPUCA)

sbndcode/Decoders/XARAPUCA/CMakeLists.txt

@@ -0,0 +1,17 @@
+art_make(
+	MODULE_LIBRARIES 
+	sbndaq_artdaq_core::sbndaq-artdaq-core_Overlays_SBND
+	sbnobj::SBND_Timing
+
+    lardataobj::RecoBase
+  
+    art_root_io::TFileService_service
+    art_root_io::tfile_support
+	artdaq_core::artdaq-core_Data
+
+    ROOT::Core
+    ROOT::Tree
+
+)
+
+install_fhicl()

sbndcode/Decoders/XARAPUCA/SBNDXARAPUCADecoder_module.cc

@@ -0,0 +1,45 @@
+#include "xarapucadecoder.fcl"
+
+process_name: XARAPUCADecoder
+
+services: {
+    TFileService : {fileName: "decoder_hist.root"}  # Output file containing the histograms with the extracted waveforms.
+}
+
+source: {
+    module_type: RootInput
+    maxEvents:   -1       
+}
+
+outputs: {
+    out1: {
+        module_type: RootOutput
+        fileName:    "xarapucadecoder-art.root"     # Output file containing the module products.
+    }
+}
+
+physics: {
+
+    producers: {
+        xarapucadecoder: @local::xarapucadecoder    
+    }
+
+    filters:{}
+
+    analyzers:{}
+
+
+    reco: [xarapucadecoder]
+
+
+    # Defines the output stream, there could be more than one if using filters.
+    stream1: [out1]
+
+    # trigger_paths is a keyword and contains the paths that modify the art::Event.
+    # ie filters and producer.
+    trigger_paths: [reco]
+
+    # 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]
+}

sbndcode/Decoders/XARAPUCA/run_xarapucadecoder.fcl

@@ -0,0 +1,33 @@
+BEGIN_PROLOG 
+
+xarapucadecoder: 
+{
+    # Module name.
+    module_type: "SBNDXARAPUCADecoder"                          # The name to be assigne to this art::EDProducer module.
+
+    # INPUT configuration:
+    # - CAEN Fragments.
+    caen_module_label: "daq"                                    # Label identifying the CAEN fragments module.
+    caen_fragment_names: [ "CAENV1740", "ContainerCAENV1740" ]  # Valid CAEN fragments for this decoder.
+    # - Boards configuration.
+    num_caen_boards: 4                                          # Maximum number of boards to be considered.
+    fragment_id_offset: 41216                                   # Offset to be applied to the fragment IDs (0xA100).
+    board_id_list: [7, 13, 16, 19]                              # Slots where the boards are installed.
+    # - Timing configuration.
+    ns_per_sample: 16                                           # Nanoseconds per sample.
+
+    # OUTPUT configuration:
+    # - Output data product instance name.
+    product_instance_name: "XARAPUCAChannels"                   # Name for the instance product created.
+    store_debug_waveforms: 0                                   # Number of waveforms to store (0: none, -1: all, n: first n waveforms).
+    # - Debug options.
+    debug_all: false                                            # (De)activates all debug options.
+    debug_handle: false                                         # (De)activates art::Handle data printing.
+    debug_timing: false                                         # (De)activates timing data printing. 
+    debug_buffer: false                                         # (De)activates buffer status printing.
+    debug_waveforms: false                                      # (De)activates waveforms decoding printing.
+    # - Verbose option.
+    verbose: false                                              # (De)activates verbosity.
+}
+
+END_PROLOG

sbndcode/Decoders/XARAPUCA/xarapucadecoder.fcl

@@ -12,13 +12,13 @@
 // framework
 #include "art/Framework/Principal/Event.h"
 #include "art/Framework/Core/ModuleMacros.h"
-#include "fhiclcpp/ParameterSet.h" 
+#include "fhiclcpp/ParameterSet.h"
 #include "fhiclcpp/types/Atom.h"
-#include "art/Framework/Principal/Handle.h" 
-#include "canvas/Persistency/Common/Ptr.h" 
-#include "canvas/Persistency/Common/PtrVector.h" 
-#include "art/Framework/Services/Registry/ServiceHandle.h" 
-#include "messagefacility/MessageLogger/MessageLogger.h" 
+#include "art/Framework/Principal/Handle.h"
+#include "canvas/Persistency/Common/Ptr.h"
+#include "canvas/Persistency/Common/PtrVector.h"
+#include "art/Framework/Services/Registry/ServiceHandle.h"
+#include "messagefacility/MessageLogger/MessageLogger.h"
 
 // LArSoft
 #include "larcore/Geometry/Geometry.h"
@@ -68,7 +68,7 @@ namespace sbnd::crt {
 
   // CRT strip geometry struct contains dimensions and mother module
   struct CRTStripGeo{
-    CRTStripGeo(const TGeoNode *stripNode, const geo::AuxDetSensitiveGeo &auxDetSensitive, 
+    CRTStripGeo(const TGeoNode *stripNode, const geo::AuxDetSensitiveGeo &auxDetSensitive,
                 const uint16_t _adsID, const std::string &_moduleName,
                 const uint16_t _channel0, const uint16_t _channel1)
     {
@@ -271,7 +271,7 @@ namespace sbnd::crt {
         fhicl::Name("MC")
       };
     };
-    
+
     CRTGeoAlg(const Config& config, geo::GeometryCore const *geometry,
               geo::AuxDetGeometryCore const *auxdet_geometry);
 

sbndcode/Geometry/GeometryWrappers/CRTGeoAlg.h

@@ -8,5 +8,5 @@ services: {
 services.RawDrawingOptions.SeeBadChannels: true
 services.RawDrawingOptions.MinimumSignal: 0
 services.RawDrawingOptions.PedestalOption: 1
-Services.RawDrawingOptions.TotalTicks: 3415
+services.RawDrawingOptions.TotalTicks: 3427
 services.ColorDrawingOptions.ColorOrGrayScale: 0

sbndcode/JobConfigurations/base/evd_sbnd_data.fcl

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