Merge branch 'release/v10_06_00_04'

Author: kjplows

CMakeLists.txt

@@ -16,7 +16,7 @@
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
 find_package(cetmodules 3.20.00 REQUIRED)
-project(sbncode VERSION 10.06.00.03 LANGUAGES CXX)
+project(sbncode VERSION 10.06.00.04 LANGUAGES CXX)
 
 message(STATUS "\n\n  ==========================   ${PROJECT_NAME}   ==========================")
 

sbncode/Calibration/TrackCaloSkimmer_module.cc

@@ -1140,15 +1140,10 @@ void sbn::TrackCaloSkimmer::FillTrack(const recob::Track &track,
     fTrack->start.x = track.Start().X();
     fTrack->end.x = track.End().X();
   } else if (t0Info.hasT0CRTTrack) {
+    int driftDir = geo->TPC(hits[0]->WireID()).DriftDir().X();
     const double driftv(dprop.DriftVelocity(dprop.Efield(), dprop.Temperature()));
-    // Comment from Francesco: I am not sure of the below formula.
-    // SBND has two TPCs with a common cathode like ICARUS, the driftvelocity
-    // returns the absolute value, but the displacement (basically the + below)
-    // depends on the TPC, in one case is + and in the other is negative.
-    // In this way the displacement is always in the same direction, working for
-    // one TPC, but not for the other.
-    fTrack->start.x = track.Start().X() + driftv*t0Info.t0CRTTrack*1e-3;
-    fTrack->end.x = track.End().X() + driftv*t0Info.t0CRTTrack*1e-3;
+    fTrack->start.x = track.Start().X() + driftDir*driftv*t0Info.t0CRTTrack*1e-3;
+    fTrack->end.x = track.End().X() + driftDir*driftv*t0Info.t0CRTTrack*1e-3;
   } else if (t0Info.hasT0CRTHit){ 
     // If the track does not have a a Pandora T0, the tracks will always be either on the left or (ex Or) right of the cathode. 
     int driftDir = geo->TPC(hits[0]->WireID()).DriftDir().X();

ups/product_deps

@@ -254,7 +254,7 @@ libdir	fq_dir		lib
 product			version		qual	flags		<table_format=2>
 genie_xsec		v3_04_00	-
 larcv2			v2_2_6		-
-larsoft			v10_06_00_01	-
+larsoft			v10_06_00_02	-
 sbnalg		        v10_06_00_03	-
 sbndaq_artdaq_core	v1_10_06	-
 sbndata			v01_07		-