Cerati/feature nugraph2

CMakeLists.txt

@@ -66,6 +66,7 @@ find_package(lardata REQUIRED )
 find_package(larsim REQUIRED )
 find_package(larevt REQUIRED )
 find_package(larreco REQUIRED )
+find_package(larrecodnn REQUIRED )
 find_package(larana REQUIRED )
 find_package(larpandora REQUIRED )
 find_package(larpandoracontent REQUIRED )

fcl/caf/cafmaker_defs.fcl

@@ -334,6 +334,9 @@ cafmaker.SystWeightLabels: ["genieweight", "fluxweight"]
 cafmaker.SaveGENIEEventRecord: true # save GENIE event record by default. Turn this off for data cafmaker fcl
 cafmaker.TPCPMTBarycenterMatchLabel: "tpcpmtbarycentermatch"
 cafmaker.TrackHitFillRREndCut: 30 # include entire PID region
+cafmaker.NuGraphSliceHitLabel: "nuslhits"
+cafmaker.NuGraphFilterLabel: "NuGraph:filter"
+cafmaker.NuGraphSemanticLabel: "NuGraph:semantic"
 
 # Add CAFMaker to the list of producers
 caf_preprocess_producers.cafmaker: @local::cafmaker

fcl/reco/Definitions/stage1_icarus_defs.fcl

@@ -22,6 +22,7 @@
 #include "supera_modules.fcl"
 #include "crtpmtmatching_parameters.fcl"
 #include "tpcpmtbarycentermatch_config.fcl"
+#include "nugraph_icarus.fcl"
 
 BEGIN_PROLOG
 
@@ -71,6 +72,13 @@ icarus_stage1_producers:
 
   tpcpmtbarycentermatchCryoE: @local::data_tpcpmtbarycentermatchproducer_east
   tpcpmtbarycentermatchCryoW: @local::data_tpcpmtbarycentermatchproducer_west
+
+  ## NuGraph
+  nuslhitsCryoE: @local::nuslhitsCryoE
+  nuslhitsCryoW: @local::nuslhitsCryoW
+  NuGraphCryoE: @local::NuGraphCryoE
+  NuGraphCryoW: @local::NuGraphCryoW
+
 }
 
 icarus_stage1_filters:
@@ -179,13 +187,19 @@ icarus_reco_cluster3DCryoW:        [ cluster3DCryoW ]
 
 icarus_reco_cluster3DCryoE:        [ cluster3DCryoE ]
 
-icarus_reco_pandoraGausCryoW:      [ pandoraGausCryoW,
+icarus_reco_pandoraGausCryoW:      [ pandoraGausCryoW ]
+
+icarus_reco_pandoraGausCryoE:      [ pandoraGausCryoE ]
+
+icarus_reco_postPandoraGausCryoW:  [ nuslhitsCryoW,
+                                     NuGraphCryoW,
                                      pandoraTrackGausCryoW,
                                      pandoraKalmanTrackGausCryoW,
                                      SBNShowerGausCryoW
                                    ]
 
-icarus_reco_pandoraGausCryoE:      [ pandoraGausCryoE,
+icarus_reco_postPandoraGausCryoE:  [ nuslhitsCryoE,
+                                     NuGraphCryoE,
                                      pandoraTrackGausCryoE,
                                      pandoraKalmanTrackGausCryoE,
                                      SBNShowerGausCryoE
@@ -206,6 +220,11 @@ icarus_pandora_Gauss:              [
                                      @sequence::icarus_reco_pandoraGausCryoW
                                    ]
 
+icarus_postPandora_Gauss:          [
+                                     @sequence::icarus_reco_postPandoraGausCryoE,
+                                     @sequence::icarus_reco_postPandoraGausCryoW
+                                   ]
+
 #Add flash matching
 icarus_reco_fm:                    [ fmatchCryoE,
                                      fmatchCryoW,
@@ -224,7 +243,6 @@ icarus_crtt0match:                 [CRTT0Matching]
 icarus_crtt0match_eff:             [CRTT0MatchingE, CRTT0MatchingW]
 
 ### Below we include overrides for the modules above
-
 ## Overrides for filtering of cluster3D hits
 icarus_stage1_filters.TPCHitFilterCryoW.HitDataLabelVec: ["cluster3DCryoW"]
 icarus_stage1_filters.TPCHitFilterCryoW.MaximumHits:     60000 

fcl/reco/Stage1/Run2/stage1_run2_icarus.fcl

@@ -6,6 +6,7 @@ physics.reco: [ @sequence::icarus_filter_cluster3D,
                 @sequence::icarus_pandora_Gauss,
                 @sequence::icarus_reco_fm,
                 @sequence::icarus_tpcpmtbarycentermatch,
+                @sequence::icarus_postPandora_Gauss,
                 @sequence::icarus_crttrack,
                 @sequence::icarus_crtt0match,
                 caloskimCalorimetryCryoE, caloskimCalorimetryCryoW]

fcl/reco/Stage1/Run2/stage1_run2_icarus_MC.fcl

@@ -48,10 +48,10 @@ physics.producers: {
 }
 
 physics.reco: [ 
-                @sequence::icarus_reco_Gauss_CryoE ,
-                @sequence::icarus_reco_Gauss_CryoW ,
+                @sequence::icarus_pandora_Gauss ,
                 @sequence::icarus_reco_fm,
                 @sequence::icarus_tpcpmtbarycentermatch,
+                @sequence::icarus_postPandora_Gauss ,
                 caloskimCalorimetryCryoE, caloskimCalorimetryCryoW,
                 mcassociationsGausCryoE,  mcassociationsGausCryoW
               ]

icaruscode/CMakeLists.txt

@@ -10,6 +10,7 @@ add_subdirectory(Filters)
 add_subdirectory(Generators)
 add_subdirectory(Geometry)
 add_subdirectory(LArG4)
+add_subdirectory(NuGraphIcarus)
 add_subdirectory(PMT)
 add_subdirectory(RecoUtils)
 add_subdirectory(TPC)

icaruscode/NuGraphIcarus/CMakeLists.txt

@@ -0,0 +1,65 @@
+cet_enable_asserts()
+
+set( nugraph_tool_lib_list
+       lardataobj::RecoBase
+       lardataobj::AnalysisBase
+       larrecodnn::NuGraphBaseTools
+       TorchScatter::TorchScatter
+       art::Framework_Core
+       hep_concurrency::hep_concurrency
+       art_plugin_types::tool
+)
+
+include_directories($ENV{HEP_HPC_INC})
+
+cet_build_plugin(IcarusNuGraphLoader art::tool
+  LIBRARIES PRIVATE
+  ${nugraph_tool_lib_list}
+)
+
+simple_plugin(IcarusNuSliceHitsProducer "module"
+    LIBRARIES PRIVATE
+    art::Framework_Core
+    nusimdata::SimulationBase
+    lardataobj::RecoBase
+    lardataalg::DetectorInfo
+    lardata::DetectorInfoServices_DetectorClocksServiceStandard_service
+    larcore::Geometry_Geometry_service
+    sbnobj::Common_Reco
+)
+
+simple_plugin(IcarusTrueNuSliceHitsProducer "module"
+    LIBRARIES PRIVATE
+    art::Framework_Core
+    nusimdata::SimulationBase
+    lardataobj::RecoBase
+    lardataalg::DetectorInfo
+    lardata::DetectorInfoServices_DetectorClocksServiceStandard_service
+    larcore::Geometry_Geometry_service
+    sbnobj::Common_Reco
+    larsim::MCCheater_BackTrackerService_service           
+    larsim::MCCheater_ParticleInventoryService_service
+)
+
+simple_plugin(IcarusHDF5Maker "module"
+    LIBRARIES PRIVATE
+    art::Framework_Core
+    nusimdata::SimulationBase
+    larsim::MCCheater_BackTrackerService_service           
+    larsim::MCCheater_ParticleInventoryService_service
+    hep_hpc_hdf5
+    #hep::hpc_Utilities
+    lardata::RecoBaseProxy
+    lardataobj::RecoBase
+    lardataalg::DetectorInfo
+    lardata::DetectorInfoServices_DetectorClocksServiceStandard_service
+    larcore::Geometry_Geometry_service
+    ${HDF5_LIBRARIES}
+)
+
+add_subdirectory(scripts)
+
+install_headers()
+install_fhicl()
+install_source()
+