resetting to d49df9d -- where all tvector3 is removed but the geo::vector util functions are not used

Author: Jacob McLaughlin

sbndcode/BlipRecoSBND/Alg/BlipRecoAlg.cc

@@ -1072,7 +1072,7 @@ namespace blip {
               TVector3 p2(b.X(), b.Y(), b.Z() );
               // TO-DO: if this track starts or ends at a TPC boundary, 
               // we should extend p1 or p2 to outside the AV to avoid blind spots
-              TVector3 bp(newBlip.Position.X(), newBlip.Position.Y(), newBlip.Position.Z());
+              TVector3 bp = geo::vect::convertTo<TVector3>(newBlip.Position);
               float d = BlipUtils::DistToLine(p1,p2,bp);
               if( d > 0 ) {
                 // update closest trkdist

sbndcode/BlipRecoSBND/Alg/BlipRecoAlg.h

@@ -38,10 +38,11 @@
 #include "larcore/Geometry/Geometry.h"
 #include "larcorealg/Geometry/WireReadoutGeom.h"
 #include "larcorealg/Geometry/GeometryCore.h"
+#include "larcorealg/Geometry/geo_vectors_utils.h"
 #include "larreco/Calorimetry/CalorimetryAlg.h"
 #include "art/Framework/Principal/Event.h"
 #include "larcore/Geometry/WireReadout.h"
-//#include "larcoreobj/SimpleTypesAndConstants/geo_vectors.h"
+#include "larcoreobj/SimpleTypesAndConstants/geo_vectors.h"
 
 // Microboone includes
 //#include "ubevt/Database/TPCEnergyCalib/TPCEnergyCalibService.h"

sbndcode/BlipRecoSBND/BlipAna_module.cc

@@ -32,7 +32,7 @@
 #include "lardataobj/AnalysisBase/Calorimetry.h"
 #include "larevt/SpaceChargeServices/SpaceChargeService.h"
 #include "cetlib/search_path.h"
-//#include "larcoreobj/SimpleTypesAndConstants/geo_vectors.h"
+#include "larcoreobj/SimpleTypesAndConstants/geo_vectors.h"
 
 // SBND-specific includes
 #include "sbndcode/BlipRecoSBND/Alg/BlipRecoAlg.h"

sbndcode/BlipRecoSBND/BlipRecoProducer_module.cc

@@ -33,7 +33,7 @@
 #include "lardataobj/RawData/RawDigit.h"
 #include "lardataobj/RawData/raw.h"
 #include "lardata/Utilities/AssociationUtil.h"
-//#include "larcoreobj/SimpleTypesAndConstants/geo_vectors.h"
+#include "larcoreobj/SimpleTypesAndConstants/geo_vectors.h"
 
 // C++ includes
 #include <vector>

sbndcode/BlipRecoSBND/Utils/BlipUtils.cc

@@ -55,9 +55,7 @@ namespace BlipUtils {
     pinfo.pathLength  = PathLength( part, pinfo.startPoint, pinfo.endPoint);
 
     // Central position of trajectory
-    pinfo.Position.SetXYZ(0.5*(pinfo.startPoint.X()+pinfo.endPoint.X()),
-                         0.5*(pinfo.startPoint.Y()+pinfo.endPoint.Y()),
-                         0.5*(pinfo.startPoint.Z()+pinfo.endPoint.Z()) );
+    pinfo.Position = geo::vect::middlePoint({ pinfo.startPoint, pinfo.endPoint });
 
     // Energy/charge deposited by this particle, found using SimEnergyDeposits 
     pinfo.depEnergy     = 0;
@@ -200,7 +198,7 @@ namespace BlipUtils {
         // check that the times are similar (we don't want to merge
         // together a blip that happened much later but in the same spot)
         if( fabs(blip_i.Time - blip_j.Time) > 5 ) continue;
-        float d = TMath::Sqrt((blip_i.Position-blip_j.Position).Mag2());
+        float d = (blip_i.Position-blip_j.Position).R(); //Size of vector spanning two blips
         if( d < dmin ) {
           isGrouped.at(j) = true;
           //float totE = blip_i.Energy + blip_j.Energy;
@@ -381,7 +379,7 @@ namespace BlipUtils {
     // ------------------------------------------------
     /// Look for valid wire intersections between 
     // central-most hits in each cluster
-    std::vector<TVector3> wirex;
+    std::vector<geo::Point_t> wirex;
     for(size_t i=0; i<hcs.size(); i++) {
       int pli = hcs[i].Plane;
       auto const& planegeo = wireReadoutGeom->Get().Plane(geo::PlaneID{(unsigned int)hcs[i].Cryostat, (unsigned int)hcs[i].TPC, (unsigned int)hcs[i].Plane}); 
@@ -410,7 +408,7 @@ namespace BlipUtils {
         }
 
         if( match3d ) {
-          TVector3 a(0., intsec_p.Y(), intsec_p.Z());
+          geo::Point_t a{0., intsec_p.Y(), intsec_p.Z()};
           wirex.push_back(a);
           newblip.clusters[pli] = hcs[i];
           newblip.clusters[plj] = hcs[j];

sbndcode/BlipRecoSBND/Utils/BlipUtils.h

@@ -27,7 +27,8 @@
 #include "larcore/CoreUtils/ServiceUtil.h"
 #include "larcore/Geometry/Geometry.h"
 #include "larcore/Geometry/WireReadout.h"
-//#include "larcoreobj/SimpleTypesAndConstants/geo_vectors.h"
+#include "larcorealg/Geometry/geo_vectors_utils.h"
+#include "larcoreobj/SimpleTypesAndConstants/geo_vectors.h"
 
 // c++
 #include <vector>

sbndcode/BlipRecoSBND/Utils/CMakeLists.txt

@@ -40,7 +40,6 @@ cet_make_library(
                 sbnobj::SBND_Blip
 )
 
-art_dictionary(DICTIONARY_LIBRARIES sbndcode_BlipUtils)
 install_headers()
 install_source()
 install_fhicl()