Feature/adding blip to caf

CMakeLists.txt

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

sbndcode/BlipRecoSBND/Alg/BlipRecoAlg.h

@@ -39,7 +39,7 @@
 #include "larcorealg/Geometry/GeometryCore.h"
 #include "larreco/Calorimetry/CalorimetryAlg.h"
 #include "art/Framework/Principal/Event.h"
-
+#include "larcore/Geometry/WireReadout.h"
 
 // Microboone includes
 //#include "ubevt/Database/TPCEnergyCalib/TPCEnergyCalibService.h"
@@ -53,6 +53,7 @@
 
 // Blip-specific utils
 #include "sbndcode/BlipRecoSBND/Utils/BlipUtils.h"
+#include "sbnobj/SBND/Blip/BlipDataTypes.h"
 
 // ROOT stuff
 #include "TH1D.h"

sbndcode/BlipRecoSBND/Alg/CMakeLists.txt

@@ -11,6 +11,7 @@ art_make_library(LIBRARY_NAME  sbndcode_BlipRecoAlg
                            lardataobj::RawData
                            lardataobj::RecoBase
                            lardata::RecoObjects
+			   larreco::Calorimetry
                            larpandora::LArPandoraInterface
                            nusimdata::SimulationBase
                            cetlib::cetlib
@@ -34,7 +35,8 @@ art_make_library(LIBRARY_NAME  sbndcode_BlipRecoAlg
                            sbndcode_CRTUtils
                            sbnobj::Common_CRT
                            #sbndcode_CosmicIdUtils
-                           sbndcode_BlipUtils
+			   sbndcode_BlipUtils
+			   sbndobj_BlipDataTypes
 )
 
 install_headers()

sbndcode/BlipRecoSBND/BlipAna_module.cc

@@ -75,7 +75,8 @@ const int kMaxTrks    =   1000;
 const int kMaxBlips   =   5000;
 const int kMaxG4      =   30000;
 const int kMaxEDeps   =   10000;
-const int kMaxTrkPts  =   2000;  
+const int kMaxTrkPts  =   2000; 
+const int kNplanes = blip::kNplanes;
 
 class BlipAna;
 

sbndcode/BlipRecoSBND/CMakeLists.txt

@@ -34,12 +34,12 @@ set(      MODULE_LIBRARIES larcorealg::Geometry
                            sbndcode_RecoUtils
                            sbndcode_OpDetSim
                            sbndcode_BlipUtils
+			   sbndobj_BlipDataTypes
                            sbndcode_BlipRecoAlg
 )
 
-add_subdirectory(Utils)
 add_subdirectory(Alg)
-
+add_subdirectory(Utils)
 cet_build_plugin(BlipAna art::Module SOURCE BlipAna_module.cc LIBRARIES ${MODULE_LIBRARIES} )
 cet_build_plugin(BlipRecoProducer art::Module SOURCE BlipRecoProducer_module.cc LIBRARIES ${MODULE_LIBRARIES} )
 

sbndcode/BlipRecoSBND/Utils/BlipUtils.h

@@ -34,7 +34,7 @@
 #include <vector>
 #include <map>
 
-#include "sbndcode/BlipRecoSBND/Utils/DataTypes.h"
+#include "sbnobj/SBND/Blip/BlipDataTypes.h"
 #include "TH1D.h"
 
 

sbndcode/BlipRecoSBND/Utils/CMakeLists.txt

@@ -38,6 +38,7 @@ cet_make_library(
                 ROOT::Gdml
                 sbndcode_CRTUtils
                 sbnobj::Common_CRT
+		sbndobj_BlipDataTypes
                 #sbndcode_CosmicIdUtils
 )
 

sbndcode/BlipRecoSBND/Utils/classes.h

@@ -1,36 +0,0 @@
-//
-// Build a dictionary.
-//
-// $Id: classes.h,v 1.8 2010/04/12 18:12:28  Exp $
-// $Author:  $
-// $Date: 2010/04/12 18:12:28 $
-// 
-// Original author Rob Kutschke, modified by wes
-//
-
-#include "canvas/Persistency/Common/Wrapper.h"
-
-// data-products
-// lardataobj
-//#include "lardata/Utilities/AssociationUtil.h"
-#include "canvas/Persistency/Common/Assns.h"
-#include "lardataobj/RecoBase/PFParticle.h"
-#include "lardataobj/RecoBase/Hit.h"
-#include "nusimdata/SimulationBase/MCTruth.h"
-#include "sbndcode/BlipRecoSBND/Utils/DataTypes.h"
-#include "lardataobj/RecoBase/SpacePoint.h"
-
-//
-// Only include objects that we would like to be able to put into the event.
-// Do not include the objects they contain internally.
-//
-
-template class art::Assns<recob::Hit,blip::Blip,void>;
-template class art::Wrapper<art::Assns<recob::Hit,blip::Blip,void> >;
-template class std::vector<blip::Blip>;
-template class art::Wrapper<std::vector<blip::Blip> >;
-template class std::map<int, TVector3>;
-template class art::Assns<blip::Blip,recob::Hit,void>;
-template class art::Wrapper<art::Assns<blip::Blip,recob::Hit,void> >;
-template class art::Assns<blip::Blip,recob::SpacePoint,void>;
-template class art::Wrapper<art::Assns<blip::Blip,recob::SpacePoint,void> >;

sbndcode/BlipRecoSBND/Utils/classes_def.xml

@@ -1,14 +1,2 @@
 <lcgdict>
-<class name="art::Wrapper<std::vector<blip::Blip> >"/>
-<class name="blip::Blip"/>
-<class name="std::vector<blip::Blip>"/>
-<class name="blip::HitClust"/>
-<class name="blip::TrueBlip"/>
-<class name="std::map<int,TVector3>"/>
-<class name="art::Assns<blip::Blip,recob::Hit,void>"/>
-<class name="art::Assns<recob::Hit, blip::Blip,void>"/>
-<class name="art::Assns<blip::Blip,recob::SpacePoint,void>"/>
-<class name="art::Wrapper<art::Assns<blip::Blip,recob::Hit,void> >"/>
-<class name="art::Wrapper<art::Assns<recob::Hit,blip::Blip,void> >"/>
-<class name="art::Wrapper<art::Assns<blip::Blip,recob::SpacePoint,void> >"/>
 </lcgdict>

sbndcode/CRT/CRTReco/CRTTrackProducer_module.cc

@@ -35,7 +35,6 @@
 
 #include <memory>
 
-
 namespace geo {
   using Point2D_t = ROOT::Math::PositionVector2D<ROOT::Math::Cartesian2D<double>,
                                                  ROOT::Math::GlobalCoordinateSystemTag>;
@@ -245,8 +244,11 @@ std::vector<std::pair<sbnd::crt::CRTTrack, std::set<unsigned>>> sbnd::crt::CRTTr
 
                       BestFitLine(primarySpacePoint->Pos(), secondarySpacePoint->Pos(), tertiarySpacePoint->Pos(), primaryCluster->Tagger(), 
                                   secondaryCluster->Tagger(), tertiaryCluster->Tagger(), fitStart, fitMid, fitEnd, gof);
-
-                      const CRTTrack track({fitStart, fitMid, fitEnd}, t0, et0, t1, et1, pe, tof, used_taggers);
+		      const double _t0 = t0;
+		      const double _et0 = et0;
+		      const double _t1 = t1;
+		      const double _et1 = et1;
+                      const CRTTrack track({fitStart, fitMid, fitEnd}, _t0, _et0, _t1, _et1, pe, tof, used_taggers);
                       const std::set<unsigned> used_spacepoints = {i, ii, iii};
 
                       candidates.emplace_back(track, used_spacepoints);
@@ -265,7 +267,6 @@ std::vector<std::pair<sbnd::crt::CRTTrack, std::set<unsigned>>> sbnd::crt::CRTTr
           const double pe = primarySpacePoint->PE() + secondarySpacePoint->PE();
 
           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};
 

sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd.fcl

@@ -126,16 +126,17 @@ physics:
 # change tools in sbn to have 2D TPC sim/sp input
 physics.producers.pandoraShowerRazzle.SimChannelLabel: "simtpc2d:simpleSC"
 physics.producers.pandoraTrackDazzle.SimChannelLabel: "simtpc2d:simpleSC"
-physics.producers.cnnid.WireLabel: "simtpc2d:gauss"
+#physics.producers.cnnid.WireLabel: "simtpc2d:gauss"
 # uncomment below line for to use DNN ROI SP for CNNID scores
-#physics.producers.cnnid.WireLabel: "simtpc2d:dnnsp"
+physics.producers.cnnid.WireLabel: "simtpc2d:dnnsp"
 
 physics.producers.vertexCharge.CaloAlg: @local::sbnd_calorimetryalgmc
 physics.producers.vertexStub.CaloAlg: @local::sbnd_calorimetryalgmc
 
 physics.producers.cafmaker: @local::standard_cafmaker
 physics.producers.cafmaker.CosmicGenLabel: "corsika"
 physics.producers.cafmaker.SimChannelLabel: "simtpc2d:simpleSC"
+physics.producers.cafmaker.BlipTag: "blipreco"
 
 # Blinding not needed for MC
 physics.producers.cafmaker.CreateBlindedCAF: false

sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_sce.fcl

@@ -15,6 +15,7 @@ physics.producers.cafmaker.TPCPMTBarycenterMatchLabel: "tpcpmtbarycentermatching
 physics.producers.cafmaker.CVNLabel: "cvnSCE"
 physics.producers.cafmaker.CorrectedOpFlashLabel: "lightpropagationcorrectionSCE"
 physics.producers.cnnid.WireLabel: "sptpc2d:dnnsp"
+physics.producers.cafmaker.BlipTag: "blipreco"
 
 physics.producers.cnnid.ClusterModuleLabel:        "pandoraSCE"
 physics.producers.cnnid.PFParticleModuleLabel:     "pandoraSCE"
@@ -35,7 +36,7 @@ physics.producers.pandoraShowerCosmicDist.PandoraLabel: "pandoraSCE"
 physics.producers.pandoraShowerCosmicDist.ShowerLabel:  "pandoraSCEShowerSBN"
 physics.producers.pandoraShowerRazzle.PFPLabel: "pandoraSCE"
 physics.producers.pandoraShowerRazzle.ShowerLabel: "pandoraSCEShowerSBN"
-
+physics.producers.pandoraShowerRazzle.SimChannelLabel: "sptpc2d:dnnsp"
 physics.producers.pandoraRazzled: @local::razzled_sbnd_sce
 
 physics.producers.pandoraTrackClosestApproach.TrackLabel: "pandoraSCETrack"
@@ -53,6 +54,8 @@ physics.producers.pandoraTrackDazzle.PFPLabel: "pandoraSCE"
 physics.producers.pandoraTrackDazzle.TrackLabel: "pandoraSCETrack"
 physics.producers.pandoraTrackDazzle.CaloLabel: "pandoraSCECaloData"
 physics.producers.pandoraTrackDazzle.Chi2Label: "pandoraSCEPidData"
+physics.producers.pandoraTrackDazzle.SimChannelLabel: "sptpc2d:dnnsp"
+
 
 physics.producers.fmatchSCE: @local::transfer_flashmatch_sce_sbnd
 physics.producers.fmatchopSCE: @local::transfer_flashmatch_sce_sbnd

sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_sce.fcl

@@ -15,6 +15,7 @@ physics.producers.cafmaker.CRTTrackMatchLabel: "pandoraSCETrackCRTTrack"
 physics.producers.cafmaker.OpT0Label: "opt0finderSCE"
 physics.producers.cafmaker.TPCPMTBarycenterMatchLabel: "tpcpmtbarycentermatchingSCE"
 physics.producers.cafmaker.CVNLabel: "cvnSCE"
+physics.producers.cafmaker.BlipTag: "blipreco"
 
 physics.producers.cnnid.ClusterModuleLabel:        "pandoraSCE"
 physics.producers.cnnid.PFParticleModuleLabel:     "pandoraSCE"