Merge pull request #417 from SBNSoftware/feature/hlay_updated_systtools_fcls

fjnicolas · web-flow · commit ef38296fc8bf · 2024-03-01T14:41:15.000+01:00
Systtools Implementation for SBND
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/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
