Merge branch 'develop' into feature/sungbin_dirt_th_0p1MeV

Author: nathanielerowe

sbndcode/CRT/CRTAna/CRTAnalysis_module.cc

@@ -1748,9 +1748,9 @@ void sbnd::crt::CRTAnalysis::AnalyseTPCMatching(const art::Event &e, const art::
           _tpc_tr_ts1[nActualTracks]     = crttrack->Ts1();
           _tpc_tr_score[nActualTracks]   = trackMatch.TriggerConfidence();
 
-          const std::set<CRTTagger> taggers = crttrack->Taggers();
-          const geo::Point_t start          = crttrack->Start();
-          const geo::Point_t end            = crttrack->End();
+          const std::vector<CRTTagger> taggers = crttrack->Taggers();
+          const geo::Point_t start             = crttrack->Start();
+          const geo::Point_t end               = crttrack->End();
 
           _tpc_tr_taggers[nActualTracks] = std::vector<int>();
 

sbndcode/CRT/CRTEventDisplay/CRTEventDisplayAlg.cc

@@ -597,7 +597,7 @@ namespace sbnd::crt {
             if(trackTime < fMinTime || trackTime > fMaxTime)
               continue;
 
-            std::set<CRTTagger> taggers = track->Taggers();
+            std::vector<CRTTagger> taggers = track->Taggers();
 
             bool none = fChoseTaggers;
             for(auto const& tagger : taggers)

sbndcode/CRT/CRTReco/CRTTrackProducer_module.cc

@@ -238,7 +238,7 @@ std::vector<std::pair<sbnd::crt::CRTTrack, std::set<unsigned>>> sbnd::crt::CRTTr
 
                       const double pe = primarySpacePoint->PE() + secondarySpacePoint->PE() + tertiarySpacePoint->PE();
 
-                      const std::set<CRTTagger> used_taggers = {primaryCluster->Tagger(), secondaryCluster->Tagger(), tertiaryCluster->Tagger()};
+                      const std::vector<CRTTagger> used_taggers = {primaryCluster->Tagger(), secondaryCluster->Tagger(), tertiaryCluster->Tagger()};
 
                       geo::Point_t fitStart, fitMid, fitEnd;
                       double gof;
@@ -264,7 +264,7 @@ std::vector<std::pair<sbnd::crt::CRTTrack, std::set<unsigned>>> sbnd::crt::CRTTr
 
           const double pe = primarySpacePoint->PE() + secondarySpacePoint->PE();
 
-          const std::set<CRTTagger> used_taggers = {primaryCluster->Tagger(), secondaryCluster->Tagger()};
+          const std::vector<CRTTagger> used_taggers = {primaryCluster->Tagger(), secondaryCluster->Tagger()};
 
           const CRTTrack track(start, end, t0, et0, t1, et1, pe, tof, used_taggers);
           const std::set<unsigned> used_spacepoints = {i, ii};

ups/product_deps

@@ -253,7 +253,7 @@ wpdir   product_dir     wire-cell-cfg
 #
 ####################################
 product		version		qual	flags		<table_format=2>
-sbncode		v10_11_01_01       -
+sbncode		v10_12_02       -
 cetmodules	v3_24_01	-	only_for_build
 sbnd_data	v01_36_00	-	
 sbndutil        v10_06_01    -       optional