Merge branch 'production/v10_06_00' into feature/acastill_springprod_bfm

Author: nathanielerowe

CMakeLists.txt

@@ -15,7 +15,7 @@
 
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
-set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.06.00.05)
+set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.06.00.06)
 find_package(cetmodules REQUIRED)
 project(sbndcode LANGUAGES CXX)
 

sbndcode/Calibration/TPCCalorimetry/NormalizeYZ_tool.cc

@@ -133,7 +133,7 @@ namespace sbnd {
         return dQdx;
       }
 
-      return dQdx / scale;
+      return dQdx*scale;
     }
 
     DEFINE_ART_CLASS_TOOL(NormalizeYZ)

sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_sce.fcl

@@ -24,6 +24,8 @@ physics.producers.pandoraTrackRange.TrackLabel: "pandoraSCETrack"
 
 physics.producers.cafmaker.FlashMatchOpDetSuffixes: ["", "op", "ara", "opara"]
 physics.producers.cafmaker.FlashMatchSCECryoSuffixes: ["SCE"]
+physics.producers.cafmaker.TrackHitFillRRStartCut: 1000
+physics.producers.cafmaker.TrackHitFillRREndCut: 1000
 
 physics.producers.pandoraShowerSelectionVars.PandoraLabel: "pandoraSCE"
 physics.producers.pandoraShowerSelectionVars.ShowerLabel:  "pandoraSCEShowerSBN"

sbndcode/JobConfigurations/standard/reco/reco2_data.fcl

@@ -43,6 +43,8 @@ physics.reco2: [ pandora, pandoraTrack, pandoraShower, pandoraShowerSBN, pandora
                  cvnSCE, opt0finderSCE, tpcpmtbarycentermatchingSCE, crtspacepointmatchingSCE, crttrackmatchingSCE,
                  caloskimCalorimetry, frameshift]
 
+services.DetectorPropertiesService.Electronlifetime: 35.0e3 #microseconds
+
 physics.analyzers.caloskim.G4producer: ""
 physics.analyzers.caloskim.SimChannelproducer: ""
 physics.analyzers.crtana: @local::crtana_data_sbnd

sbndcode/Timing/FrameShift/FrameShift_module.cc

@@ -661,11 +661,21 @@ void sbnd::FrameShift::produce(art::Event& e)
   //    + Data: t = 0 = abitrary. All subsystem electronics time is reference to the last PPS
 
   if(_isBeam){
-    _frame_tdc_rwm += fShiftRWM2Gate; //
-    _frame_apply_at_caf = _frame_tdc_rwm; // +frame_data2mc
+    if (_frame_tdc_rwm != 0){
+      _frame_tdc_rwm += fShiftRWM2Gate; //align RWM signal to gate opening frame
+      _frame_apply_at_caf = _frame_tdc_rwm; // +frame_data2mc
+    }else if(_frame_hlt_gate != 0){
+      _frame_apply_at_caf = _frame_hlt_gate; //+frame_data2mc
+    }else{
+      _frame_apply_at_caf = 0;
+    }
   }
   else if(_isOffbeam){
-    _frame_apply_at_caf = _frame_hlt_gate; //+frame_data2mc
+    if(_frame_hlt_gate != 0){
+      _frame_apply_at_caf = _frame_hlt_gate; //+frame_data2mc
+    }else{
+      _frame_apply_at_caf = 0;
+    }
   }
   else if(_isXmuon){
     _frame_apply_at_caf = 0;

test/ci/sbnd_ci_nucosmics_detsim_quick_test_sbndcode.fcl

@@ -1,3 +1,11 @@
 #include "standard_detsim_sbnd.fcl"
 
 services.NuRandomService.policy: "perEvent"
+
+#Adding these drops because the WireCell Toolkit simulation
+# is not deterministic, but they would like to keep these 
+# in main production to further develop.
+outputs.out1.outputCommands: [ "keep *_*_*_*"
+                               ,"drop *_simtpc2d_badmasks_*"
+                               ,"drop *_simtpc2d_badchannels_*"
+                           ]

test/ci/sbnd_ci_nucosmics_detsim_seq_test_sbndcode.fcl

@@ -1 +1,9 @@
 #include "sbnd_ci_nucosmics_detsim_quick_test_sbndcode.fcl"
+
+#Adding these drops because the WireCell Toolkit simulation
+# is not deterministic, but they would like to keep these 
+# in main production to further develop.
+outputs.out1.outputCommands: [ "keep *_*_*_*"
+                               ,"drop *_simtpc2d_badmasks_*"
+                               ,"drop *_simtpc2d_badchannels_*"
+                           ]

test/ci/sbnd_ci_single_detsim_quick_test_sbndcode.fcl

@@ -2,3 +2,11 @@
 
 services.NuRandomService.policy: "perEvent"
 
+
+#Adding these drops because the WireCell Toolkit simulation
+# is not deterministic, but they would like to keep these 
+# in main production to further develop.
+outputs.out1.outputCommands: [ "keep *_*_*_*"
+                               ,"drop *_simtpc2d_badmasks_*"
+                               ,"drop *_simtpc2d_badchannels_*"
+                           ]

test/ci/sbnd_ci_single_detsim_seq_test_sbndcode.fcl

@@ -1 +1,9 @@
 #include "sbnd_ci_single_detsim_quick_test_sbndcode.fcl"
+
+#Adding these drops because the WireCell Toolkit simulation
+# is not deterministic, but they would like to keep these 
+# in main production to further develop.
+outputs.out1.outputCommands: [ "keep *_*_*_*"
+                               ,"drop *_simtpc2d_badmasks_*"
+                               ,"drop *_simtpc2d_badchannels_*"
+                           ]

ups/product_deps

@@ -253,7 +253,7 @@ wpdir   product_dir     wire-cell-cfg
 #
 ####################################
 product		version		qual	flags		<table_format=2>
-sbncode		v10_06_00_07       -
+sbncode		v10_06_00_08       -
 cetmodules	v3_24_01	-	only_for_build
 sbnd_data	v01_35_00	-	
 sbndutil        v10_06_00_02    -       optional