Merge branch 'release/v09_84_00_01'

Author: fjnicolas

CMakeLists.txt

@@ -15,12 +15,12 @@
 
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
-set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 09.83.01)
+set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 09.84.00.01)
 find_package(cetmodules REQUIRED)
 project(sbndcode LANGUAGES CXX)
 
 # for CI:
-# project(sbndcode VERSION 09.83.01)
+# project(sbndcode VERSION 09.84.00.01)
 
 message(STATUS "\n")
 message(STATUS "=================================   ${PROJECT_NAME}   =================================")

sbndcode/Commissioning/fcls/detsim_comm_sbnd.fcl

@@ -11,3 +11,9 @@
 
 # Do not apply optical triggers (done to save the full waveform)
 physics.producers.opdaq.ApplyTriggers: false
+
+## need both of the below lines to save rawdigits! 
+physics.producers.simtpc2d.wcls_main.outputers: [ "wclsDepoFluxWriter:postdrift",
+                                                  "wclsFrameSaver:simdigits" , # adding this line asks wcls to save raw digits
+                                                  "wclsFrameSaver:spsaver"]
+physics.producers.simtpc2d.wcls_main.params.save_simdigits: "true" # needs to be a string!!

sbndcode/Commissioning/fcls/detsim_comm_sce_sbnd.fcl

@@ -1,3 +1,3 @@
 #include "detsim_comm_sbnd.fcl"
 
-#include "enable_spacecharge_services_sbnd.fcl"
+#include "enable_spacecharge_services_sbnd_2D_DriftSimOnly.fcl"

sbndcode/Commissioning/fcls/run_hitdumper.fcl

@@ -132,6 +132,7 @@ physics.producers.fasthit.SkipInd: false
 #  this many widths to each side.   Original window is above threshold.
 #  Both thresh and larger window in this file are appropriate only when
 #  noise is turned off.
+physics.producers.fasthit.DigitModuleLabel: "simtpc2d:daq"
 physics.producers.fasthit.IncludeMoreTail: 3.0
 physics.producers.fasthit.ColMinWidth: 100.0
 physics.producers.fasthit.UncompressWithPed: false

sbndcode/Commissioning/fcls/run_muontrack.fcl

@@ -106,6 +106,7 @@ physics.analyzers.hitdumper.readMuonHits:  true
 physics.analyzers.hitdumper.SelectEvents:  [reco] 
 
 # set thresholds 
+physics.producers.fasthit.DigitModuleLabel: "simtpc2d:daq"
 physics.producers.fasthit.MinSigInd: 15.0
 physics.producers.fasthit.MinSigCol: 15.0
 physics.producers.fasthit.SkipInd: false

sbndcode/JobConfigurations/README

@@ -0,0 +1,19 @@
+# SBND Core FHiCL Files
+
+The intended operation of the fcl workflows is that the `standard-*` fcls run the standard workflow. This isn't currently true and should be acknowledged here. The WireCell 2D TPC simulation/signal processing workflow has now been implemented into the `standard-*` fcls, and the 1D simulation is now deprecated. The main deviation of the *core* workflow (described below) from the `standard-*` fcls is the inclusion of the space charge simulation. The *core* workflow also includes the dropping of some heavy data products (hence the `lite` suffix).
+
+At the time of writing, the core workflow (for BNB + Dirt + Cosmics) is the following:
+
+- `prodoverlay_corsika_cosmics_proton_genie_rockbox_sce.fcl`
+- `g4_sce_dirt_filter_lite.fcl` (does not include TPC electron drift simulation)
+- `detsim_sce_lite.fcl` (includes TPC drift simulation, TPC electronics simulation, and signal processing)
+- `reco1_sce_lite.fcl`
+- `reco2_sce.fcl`
+
+This may well change over the coming months, and this README should be updated to reflect this.
+
+** ALERT **
+
+Due to changes implemented in sbndcode PRs #408 and #409 the 1D simulation fcls will not work out of the box, they will need editing by experts!
+
+Henry Lay & Lynn Tung - Feb 2024

sbndcode/JobConfigurations/README.md

@@ -202,10 +202,10 @@ physics:
          , opflashtpc1
          , opflashtpc0xarapuca
          , opflashtpc1xarapuca
-         , caldata
+        #  , caldata
          , gaushit
-         , fasthit
-   #         , linecluster
+        # , fasthit
+        # , linecluster
          , gaushitTruthMatch
    #      , rffhit
    #      , corner
@@ -301,10 +301,11 @@ physics.trigger_paths: [ fullreco ]
 #physics.producers.opflash.InputModule:                          "optreadout"
 #physics.producers.opflash.GenModule:                            "generator"
 
-physics.producers.caldata.DigitModuleLabel:                     "daq"
+# physics.producers.caldata.DigitModuleLabel:                     "daq"
 
-physics.producers.gaushit.CalDataModuleLabel:                   "caldata"
-physics.producers.fasthit.DigitModuleLabel:                     "daq"
+# physics.producers.gaushit.CalDataModuleLabel:                   "caldata"
+physics.producers.gaushit.CalDataModuleLabel:                   "simtpc2d:gauss"
+physics.producers.fasthit.DigitModuleLabel:                     "simtpc2d:daq"
 #physics.producers.rffhit.CalDataModuleLabel:                    "caldata"
 
 #physics.producers.corner.CornerAlgParamSet.RawDataModuleLabel:  "daq"
@@ -333,6 +334,8 @@ physics.producers.pandoraSCECalo.TrackIsFieldDistortionCorrected:true
 physics.producers.pandoraSCEPid.TrackModuleLabel:                   "pandoraSCETrack"
 physics.producers.pandoraSCEPid.CalorimetryModuleLabel:             "pandoraSCECalo"
 
+physics.analyzers.caloskim.SimChannelproducer: "simtpc2d:simpleSC"
+
 physics.producers.opt0finderSCE.SliceProducer:  "pandoraSCE"
 physics.producers.opt0finderSCE.TrackProducer:  "pandoraSCETrack"
 physics.producers.opt0finderSCE.ShowerProducer: "pandoraSCEShowerSBN"
@@ -390,5 +393,3 @@ physics.producers.crtspacepointmatchingSCE.MatchingAlg.TPCTrackLabel: "pandoraSC
 physics.producers.crttrackmatchingSCE.TPCTrackModuleLabel:            "pandoraSCETrack"
 physics.producers.crttrackmatchingSCE.PFPModuleLabel:                 "pandoraSCE"
 physics.producers.crttrackmatchingSCE.MatchingAlg.TPCTrackLabel:      "pandoraSCETrack"
-
-services.BackTrackerService.BackTracker.SimChannelModuleLabel: "simdrift"

sbndcode/JobConfigurations/base/reco_sbnd.fcl

@@ -30,6 +30,8 @@
 
 #include "cafmaker_common_defs.fcl"
 
+#include "eventweight_genie_systtools.fcl"
+
 process_name: CAFmaker
 
 services:
@@ -80,7 +82,7 @@ physics:
 #  cosmictrack:          @local::standard_cosmictrack         #reco
 #  windowtrack:          @local::window_cosmictrack           #reco
 
-   # Includes: pandoraTrackMCS, pandoraTrackRange, rns, genieweight, fluxweight
+   # Includes: pandoraTrackMCS, pandoraTrackRange, rns, fluxweight
    @table::cafmaker_common_producers
 
    flashtrig: @local::pmtflashtrigmaker_sbnd
@@ -100,6 +102,8 @@ physics:
    pandoraShowerRazzle:         @local::razzle_sbnd
 
    pandoraRazzled: @local::razzled_sbnd
+
+   systtools: @local::sbn_systtools
 }
   filters:{
     flashtrigfilter: @local::pmtflashtrigfilter_sbnd
@@ -120,6 +124,11 @@ physics:
   end_paths:     [ stream1 ]
 }
 
+# change tools in sbn to have 2D TPC sim/sp input
+physics.producers.pandoraShowerRazzle.SimChannelLabel: "simtpc2d:simpleSC"
+physics.producers.pandoraTrackDazzle.SimChannelLabel: "simtpc2d:simpleSC"
+physics.producers.cnnid.WireLabel: "simtpc2d:gauss"
+
 physics.producers.vertexCharge.CaloAlg: @local::sbnd_calorimetryalgmc
 physics.producers.vertexStub.CaloAlg: @local::sbnd_calorimetryalgmc
 
@@ -134,7 +143,6 @@ physics.producers.cafmaker.FlashMatchOpDetSuffixes: ["", "op", "ara", "opara"]
 physics.producers.cafmaker.FlashMatchSCECryoSuffixes: [""]
 
 # Overwrite weight_functions label:
-physics.producers.genieweight.weight_functions: @local::physics.producers.genieweight.weight_functions_genie
 physics.producers.fluxweight.weight_functions: @local::physics.producers.fluxweight.weight_functions_flux
 
 # input art file.