Merge branch 'develop' into feature/bearc_mlreco_wc_cfg

fjnicolas · web-flow · commit fa964dcddeb6 · 2024-03-07T18:55:04.000+01:00
diff --git a/CMakeLists.txt b/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}   =================================")
diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd.fcl b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_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
@@ -139,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.
diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_3drift_sce_runfmatch_geniewgt.fcl b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_3drift_sce_runfmatch_geniewgt.fcl
diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_3drift_sce_runfmatch_systtools.fcl b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_3drift_sce_runfmatch_systtools.fcl
@@ -0,0 +1,4 @@
+#include "cafmakerjob_sbnd_3drift_sce_runfmatch.fcl"
+
+physics.runprod: [rns, systtools, @sequence::physics.runprod]
+physics.producers.cafmaker.SystWeightLabels: [ "systtools" ]
diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_fluxwgt.fcl b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_fluxwgt.fcl
@@ -1,4 +1,4 @@
 #include "cafmakerjob_sbnd.fcl"
 
-physics.runprod: [rns, genieweight, fluxweight, @sequence::physics.runprod]
-physics.producers.cafmaker.SystWeightLabels: ["fluxweight"]
+physics.runprod: [rns, fluxweight, @sequence::physics.runprod]
+physics.producers.cafmaker.SystWeightLabels: [ "fluxweight" ]
diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_genie_and_fluxwgt.fcl b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_genie_and_fluxwgt.fcl
diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_geniewgt.fcl b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_geniewgt.fcl
diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_sce_genie_and_fluxwgt.fcl b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_sce_genie_and_fluxwgt.fcl
diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_sce_systtools_and_fluxwgt.fcl b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_sce_systtools_and_fluxwgt.fcl
@@ -0,0 +1,4 @@
+#include "cafmakerjob_sbnd_sce.fcl"
+
+physics.runprod: [rns, systtools, fluxweight, @sequence::physics.runprod]
+physics.producers.cafmaker.SystWeightLabels: [ "systtools", "fluxweight" ]
diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_systtools.fcl b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_systtools.fcl
@@ -0,0 +1,4 @@
+#include "cafmakerjob_sbnd.fcl"
+
+physics.runprod: [rns, systtools, @sequence::physics.runprod]
+physics.producers.cafmaker.SystWeightLabels: [ "systtools" ]
diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_systtools_and_fluxwgt.fcl b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_systtools_and_fluxwgt.fcl
@@ -0,0 +1,4 @@
+#include "cafmakerjob_sbnd.fcl"
+
+physics.runprod: [rns, systtools, fluxweight, @sequence::physics.runprod]
+physics.producers.cafmaker.SystWeightLabels: [ "systtools", "fluxweight" ]
diff --git a/sbndcode/OpDetSim/digi_arapuca_sbnd.fcl b/sbndcode/OpDetSim/digi_arapuca_sbnd.fcl
@@ -9,9 +9,11 @@ sbnd_digiarapuca_alg:
   #Assume 25v bias with sensl c series SiPM. Values should be changed if SiPMs are to be ganged and/or of different manufacturer
   #Values of MaxAmplitude and BackTime to be confirmed
 
+  # For details in the values measured at CIEMAT: https://sbn-docdb.fnal.gov/cgi-bin/sso/ShowDocument?docid=35183
+
   ArapucaBaselineRMS:        0.65     # 2.6/4 as PMTs with 14bits ADC have 4 ADC counts and most XA channels will be 12 bits
   ArapucaDarkNoiseRate:      10.0    #in Hz
-  CrossTalk:                 0.2     #20% probability
+  CrossTalk:                 0.424   #measured at CIEMAT, SensL SiPMs at 5.75 OV
   ArapucaBaseline:           700     #supposing a 12-bits ADC and 20% overshoot, 4069/6 ~700 
   ArapucaPulseLength:        4000.0  #ns
   ArapucaPeakTime:           260.0   #ns
@@ -20,9 +22,9 @@ sbnd_digiarapuca_alg:
   ArapucaFallTime:	         476.0   #ns
   ArapucaSaturationHigh:     4095    #ADC saturation for 12 bit ADCs, high limit (2**12-1, ADC starts at 0)
   ArapucaSaturationLow:      0.      #ADC saturation for 12 bit ADCs, low limit
-  XArapucaVUVEffVUV:         0.021   #VUV XArapuca efficiency to VUV light
-  XArapucaVUVEffVis:         0.007   #VUV XArapuca efficiency to vis light (half the visible efficiency)
-  XArapucaVISEff:            0.014   #XArapuca VIS efficiency (taking into account 70% mesh transparency 0.02*0.7)
+  XArapucaVUVEffVUV:         0.01752  # 2.19% x 0.8(APA mesh transparency not simulated in G4) VUV XArapuca efficiency to VUV light, measured at CIEMAT
+  XArapucaVUVEffVis:         0.00271  # 0.43% x 0.8 x 0.79 (APA mesh transparency + CPA  TPB area factor): VUV XArapuca efficiency to vis light, measured at CIEMAT
+  XArapucaVISEff:            0.01264  # 2.00% x 0.8 x 0.79 (APA mesh transparency + CPA  TPB area factor): XArapuca VIS efficiency (taking into account 70% mesh transparency 0.02*0.7)
   DecayTXArapucaVIS:         8.5     # decay time of EJ280 in ns
   ArapucaDataFile:           "OpDetSim/digi_arapuca_sbnd.root" # located in sbnd_data
   ArapucaSinglePEmodel:      true    # false for ideal response true for response from XTDBoard cold tests
diff --git a/test/ci/fcl_file_checks.list b/test/ci/fcl_file_checks.list
@@ -10,4 +10,4 @@ g4_sce_dirt_filter.fcl
 detsim_sce.fcl
 reco1_sce.fcl
 reco2_sce.fcl
-cafmakerjob_sbnd_sce_genie_and_fluxwgt.fcl
+cafmakerjob_sbnd_sce_systtools_and_fluxwgt.fcl
diff --git a/test/ci/sbnd_ci_nucosmics_caf_quick_test_sbndcode.fcl b/test/ci/sbnd_ci_nucosmics_caf_quick_test_sbndcode.fcl
@@ -1,13 +1,14 @@
-#include "cafmakerjob_sbnd_sce_genie_and_fluxwgt.fcl"
+#include "eventweight_genie_systtools_test.fcl"
+#include "cafmakerjob_sbnd_sce_systtools_and_fluxwgt.fcl"
 
 services.NuRandomService.policy: "perEvent"
 
 # Have to specify the caf name to match what the CI expects,
 # currently no way of controlling this from the command line
 
-physics.producers.cafmaker.CAFFilename: "nucosmics_caf_test_sbndcode_Current.caf.root"
+physics.producers.systtools: @local::sbn_systtools_test
 
-physics.producers.genieweight.multisim.number_of_multisims: 5
+physics.producers.cafmaker.CAFFilename: "nucosmics_caf_test_sbndcode_Current.caf.root"
 
 physics.producers.fluxweight.horncurrent.number_of_multisims: 5
 physics.producers.fluxweight.expskin.number_of_multisims: 5
diff --git a/ups/product_deps b/ups/product_deps
@@ -253,10 +253,10 @@ wpdir   product_dir     wire-cell-cfg
 #
 ####################################
 product		version		qual	flags		<table_format=2>
-sbncode		v09_83_01       -
+sbncode		v09_84_00_01   -
 cetmodules	v3_21_01	-	only_for_build
 sbnd_data	v01_23_00	-	optional
-sbndutil	v09_83_01	-	optional
+sbndutil	v09_84_00_01	-	optional
 end_product_list
 ####################################
 
