Merge branch 'develop' into feature/hlay_crt_ana

Author: nathanielerowe

sbndcode/CRT/CRTReco/CRTStripHitProducer_module.cc

@@ -62,6 +62,7 @@ class sbnd::crt::CRTStripHitProducer : public art::EDProducer {
 
   std::string           fFEBDataModuleLabel;
   uint16_t              fADCThreshold;
+  uint16_t              fADCSaturation;
   std::vector<double>   fErrorCoeff;
   bool                  fAllowFlag1;
   bool                  fApplyTs0Window;
@@ -88,6 +89,7 @@ sbnd::crt::CRTStripHitProducer::CRTStripHitProducer(fhicl::ParameterSet const& p
   : EDProducer{p}
   , fFEBDataModuleLabel(p.get<std::string>("FEBDataModuleLabel"))
   , fADCThreshold(p.get<uint16_t>("ADCThreshold"))
+  , fADCSaturation(p.get<uint16_t>("ADCSaturation"))
   , fErrorCoeff(p.get<std::vector<double>>("ErrorCoeff"))
   , fAllowFlag1(p.get<bool>("AllowFlag1"))
   , fApplyTs0Window(p.get<bool>("ApplyTs0Window"))
@@ -273,6 +275,10 @@ std::vector<sbnd::crt::CRTStripHit> sbnd::crt::CRTStripHitProducer::CreateStripH
       const uint16_t adc1 = sipm1.pedestal < sipm_adcs[adc_i]   ? sipm_adcs[adc_i] - sipm1.pedestal   : 0;
       const uint16_t adc2 = sipm2.pedestal < sipm_adcs[adc_i+1] ? sipm_adcs[adc_i+1] - sipm2.pedestal : 0;
 
+      // Saturated?
+      const bool sat1 = sipm_adcs[adc_i]   >= fADCSaturation;
+      const bool sat2 = sipm_adcs[adc_i+1] >= fADCSaturation;
+
       // Keep hit if both SiPMs above threshold
       if(adc1 > fADCThreshold && adc2 > fADCThreshold)
         {
@@ -290,7 +296,7 @@ std::vector<sbnd::crt::CRTStripHit> sbnd::crt::CRTStripHitProducer::CreateStripH
           if(pos - err < 0)
             err = pos;
 
-          stripHits.emplace_back(offline_channel_id, t0, t1, ref_time_s, pos, err, adc1, adc2);
+          stripHits.emplace_back(offline_channel_id, t0, t1, ref_time_s, pos, err, adc1, adc2, sat1, sat2);
         }
     }
 

sbndcode/CRT/CRTReco/crtrecoproducers_sbnd.fcl

@@ -6,6 +6,7 @@ crtstriphitproducer_sbnd:
 {
    FEBDataModuleLabel:        "crtsim"
    ADCThreshold:              60
+   ADCSaturation:             @local::sbnd_crtsim.DetSimParams.AdcSaturation
    ErrorCoeff:                [ 0.26, -0.27, 0.025 ]
    AllowFlag1:                false
    ApplyTs0Window:            false

sbndcode/CRT/CRTSimulation/crtsimmodules_sbnd.fcl

@@ -58,7 +58,7 @@ standard_sbnd_crtsimparams: {
   # Minimum time between energy deposits that SiPMs can resolve [ns]
   SipmTimeResponse: 2.0
 
-  AdcSaturation: 4095
+  AdcSaturation: 4089
 
   DeadTime: 22000
 

sbndcode/Decoders/XARAPUCA/SBNDXARAPUCADecoder_module.cc

@@ -33,13 +33,18 @@ xarapucadecoder:
     waveforms_instance_name: "XARAPUCAChannels"                 # Name for the instance product containing the raw decoded waveforms.
     timing_ref_instance_name: ""                                # Name for the instance product containing the timing reference information.
     store_debug_waveforms: 0                                    # Number of waveforms to store (0: none, -1: all, n: first n waveforms).
+    # Combination of extended fragments.
+    combine_ext_frag: true                                      # (De)activates the combination of extended fragments into a single raw::OpDetWaveform object.
+    allowed_jittering: 64                                       # Allowed jittering (in ns) between fragments to be combined.
     # - Debug options.
     debug_tdc_handle: false                                     # (De)activates SPEC-TDC art::Handle information printing.
     debug_ptb_handle: false                                     # (De)activates PTB art::Handle information printing.
     debug_fragments_handle: false                               # (De)activates V1740B CAEN fragments art::Handle information 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.
+    debug_extended_fragments: false                             # (De)activates extended fragments information printing.
+    debug_jittering: false                                      # (De)activates trigger jittering information printing.
     # - Verbose option.
     verbose: false                                              # (De)activates verbosity.
 }

sbndcode/Decoders/XARAPUCA/xarapucadecoder.fcl

@@ -4,5 +4,6 @@ FILE(GLOB fcl_files *.fcl)
 install_source(EXTRAS  ${fcl_files} )
 
 add_subdirectory(detector_variations)
-add_subdirectory(legacy)
+# LegacyLArG4 is not supported when using geant4 4.11
+##add_subdirectory(legacy)
 

sbndcode/JobConfigurations/standard/detsim/CMakeLists.txt

@@ -7,4 +7,5 @@ add_subdirectory(recomb_variations)
 add_subdirectory(crt_filter)
 add_subdirectory(optical_sim)
 
-add_subdirectory(legacy)
+# LegacyLArG4 is not supported when using geant4 4.11
+##add_subdirectory(legacy)

sbndcode/JobConfigurations/standard/g4/CMakeLists.txt

@@ -447,6 +447,39 @@
     <DaughterListNames>TrackParticles3D ShowerParticles3D DaughterVertices3D ClustersU ClustersV ClustersW TrackClusters3D ShowerClusters3D</DaughterListNames>
   </algorithm>
 
+  <!-- Shower Merging -->
+  <algorithm type = "LArShowerMergingPfoMopUp">
+    <InputPfoListNames>TrackParticles3D ShowerParticles3D</InputPfoListNames>
+    <DaughterListNames>TrackParticles3D ShowerParticles3D DaughterVertices3D ClustersU ClustersV ClustersW TrackClusters3D ShowerClusters3D</DaughterListNames>
+  </algorithm>
+
+  <!-- Re-run the PFO Characterisation to recalculate the scores after primary electron merging -->
+  <algorithm type = "LArBdtPfoCharacterisation">
+    <TrackPfoListName>TrackParticles3D</TrackPfoListName>
+    <ShowerPfoListName>ShowerParticles3D</ShowerPfoListName>
+    <UseThreeDInformation>true</UseThreeDInformation>
+    <MvaFileName>PandoraMVAs/PandoraBdt_SBND.xml</MvaFileName>
+    <MvaName>PfoCharBDT2</MvaName>
+    <MvaFileNameNoChargeInfo>PandoraMVAs/PandoraBdt_SBND.xml</MvaFileNameNoChargeInfo>
+    <MvaNameNoChargeInfo>PfoCharBDTNoChargeInfo2</MvaNameNoChargeInfo>
+    <MinProbabilityCut>0.51</MinProbabilityCut>
+    <PersistFeatures>true</PersistFeatures>
+    <FeatureTools>
+      <tool type = "LArThreeDLinearFitFeatureTool"/>
+      <tool type = "LArThreeDVertexDistanceFeatureTool"/>
+      <tool type = "LArThreeDPCAFeatureTool"/>
+      <tool type = "LArThreeDOpeningAngleFeatureTool"/>
+      <tool type = "LArThreeDChargeFeatureTool"/>
+      <tool type = "LArConeChargeFeatureTool"/>
+    </FeatureTools>
+    <FeatureToolsNoChargeInfo>
+      <tool type = "LArThreeDLinearFitFeatureTool"/>
+      <tool type = "LArThreeDVertexDistanceFeatureTool"/>
+      <tool type = "LArThreeDPCAFeatureTool"/>
+      <tool type = "LArThreeDOpeningAngleFeatureTool"/>
+    </FeatureToolsNoChargeInfo>
+  </algorithm>
+
   <algorithm type = "LArNeutrinoProperties">
     <NeutrinoPfoListName>NeutrinoParticles3D</NeutrinoPfoListName>
   </algorithm>