Introduction of CRTT0Tagging module.

fcl/reco/Definitions/stage1_icarus_defs.fcl

@@ -16,8 +16,11 @@
 #include "flashmatch_simple_icarus.fcl"
 #include "crttrackproducer_icarus.fcl"
 #include "crtbacktracker_icarus.fcl"
+### FPoppi : The following CRT matching algorithms are deprecated.
 #include "crtt0matchingalg_icarus.fcl"
 #include "crtt0producer_icarus.fcl"
+### FPoppi : The following one is mantained.
+#include "crtt0tagging.fcl"
 ## The below can be found from the softlink to Supera in sbncode
 #include "supera_modules.fcl"
 #include "crtpmtmatching_parameters.fcl"
@@ -65,9 +68,11 @@ icarus_stage1_producers:
 
  ## crt producer
   crttrack:          @local::standard_crttrackproducer
-  CRTT0Matching:     @local::standard_crtt0producer
-  CRTT0MatchingW:    @local::standard_crtt0producerW
-  CRTT0MatchingE:    @local::standard_crtt0producerE
+  ### FPoppi: the following are deprecated (and the one above not mantained)
+  ## CRTT0Matching:     @local::standard_crtt0producer
+  ## CRTT0MatchingW:    @local::standard_crtt0producerW
+  ## CRTT0MatchingE:    @local::standard_crtt0producerE
+  CRTT0Tagging:         @local::icarus_crtt0tagging_data
 
   tpcpmtbarycentermatchCryoE: @local::data_tpcpmtbarycentermatchproducer_east
   tpcpmtbarycentermatchCryoW: @local::data_tpcpmtbarycentermatchproducer_west
@@ -223,6 +228,8 @@ icarus_crtt0match:                 [CRTT0Matching]
 
 icarus_crtt0match_eff:             [CRTT0MatchingE, CRTT0MatchingW]
 
+icarus_crtt0tagging:               [CRTT0Tagging]
+
 ### Below we include overrides for the modules above
 
 ## Overrides for filtering of cluster3D hits

fcl/reco/Stage1/Run1/stage1_multiTPC_icarus_gauss.fcl

@@ -6,7 +6,7 @@ physics.reco: [ @sequence::icarus_filter_cluster3D,
 		@sequence::icarus_pandora_Gauss,
 		@sequence::icarus_reco_fm,
                 @sequence::icarus_crttrack,
-		@sequence::icarus_crtt0match,
+		@sequence::icarus_crtt0tagging,
                 caloskimCalorimetryCryoE, caloskimCalorimetryCryoW]
 
 physics.outana:            [ caloskimE, caloskimW, simpleLightAna, CRTDataAnalysis]

fcl/reco/Stage1/Run1/stage1_multiTPC_nofilter_icarus_gauss_crtpmt.fcl

@@ -6,7 +6,7 @@ physics.reco: [ @sequence::icarus_filter_cluster3D,
                 @sequence::icarus_pandora_Gauss,
 		@sequence::icarus_reco_fm,
                 @sequence::icarus_crttrack,
-		@sequence::icarus_crtt0match,
+		@sequence::icarus_crtt0tagging,
                 caloskimCalorimetryCryoE, caloskimCalorimetryCryoW]
 
 physics.outana:            [ caloskimE, caloskimW, simpleLightAna, CRTDataAnalysis, CRTAnalysis]

fcl/reco/Stage1/Run2/stage1_run2_icarus.fcl

@@ -7,7 +7,7 @@ physics.reco: [ @sequence::icarus_filter_cluster3D,
                 @sequence::icarus_reco_fm,
                 @sequence::icarus_tpcpmtbarycentermatch,
                 @sequence::icarus_crttrack,
-                @sequence::icarus_crtt0match,
+                @sequence::icarus_crtt0tagging,
                 caloskimCalorimetryCryoE, caloskimCalorimetryCryoW]
 
 physics.outana:            [ @sequence::icarus_analysis_modules ]

icaruscode/CRT/CMakeLists.txt

@@ -1,7 +1,7 @@
 
 add_subdirectory(CRTUtils)
 add_subdirectory(CRTDecoder)
-
+add_subdirectory(CRTLegacyCode)
 
 art_make(
     NO_PLUGINS
@@ -11,7 +11,6 @@ art_make(
         CRTDetSim_module.cc
         CRTSimHitProducer_module.cc
         CRTTrueHitProducer_module.cc
-        CRTTzeroProducer_module.cc
         CRTTrackProducer_module.cc
         CRTSimAnalysis_module.cc
         CRTDataAnalysis_module.cc
@@ -20,7 +19,6 @@ art_make(
         CRTAutoVeto_module.cc
         FlashResAna_module.cc
         PhotBackground_module.cc
-        CRTT0Matching_module.cc
         CRTTPCMatchingAna_module.cc	
         CRTPMTMatchingAna_module.cc
         CRTTPCTruthEff_module.cc
@@ -62,6 +60,25 @@ art_make_library(
                 cetlib::cetlib
         )
 
+art_make_library(
+        LIBRARY_NAME
+                icaruscode_CRTMatchingUtils
+        SOURCE
+                CRTUtils/CRTMatchingUtils.cxx
+        LIBRARIES
+                fhiclcpp::fhiclcpp
+                canvas::canvas
+                lardataobj::RecoBase
+                lardata::Utilities
+	        lardata::ArtDataHelper
+                larcorealg::Geometry
+                lardataalg::DetectorInfo
+                sbnobj::Common_CRT
+                cetlib::cetlib
+                messagefacility::MF_MessageLogger
+                ROOT::Matrix
+        )
+
 cet_build_plugin(CRTGeometryHelper art::service
      LIBRARIES
         larcorealg::Geometry
@@ -129,23 +146,6 @@ cet_build_plugin( CRTTrueHitProducer art::module
         cetlib::cetlib
         )
 
-cet_build_plugin(CRTTzeroProducer art::module
-     LIBRARIES
-        larcorealg::Geometry
-        icaruscode_CRT
-        sbnobj::ICARUS_CRT
-        sbnobj::Common_CRT
-        art_root_io::TFileService_service
-        lardataalg::DetectorInfo
-        nurandom::RandomUtils_NuRandomService_service
-        art::Framework_Services_Registry
-        art::Framework_Services_Optional_RandomNumberGenerator_service
-        messagefacility::MF_MessageLogger
-        messagefacility::headers
-        CLHEP::CLHEP
-        lardata::Utilities
-        )
-
 cet_build_plugin(CRTTrackProducer art::module
      LIBRARIES
         larcorealg::Geometry
@@ -382,78 +382,6 @@ cet_build_plugin( PhotBackground art::module
         ROOT::Tree
         )
 
-cet_build_plugin(CRTT0Matching art::module
-     LIBRARIES
-              icaruscode_CRTData
-              icaruscode_CRT
-              sbnobj::Common_CRT
-              icaruscode_CRTUtils
-              larcore::Geometry_Geometry_service
-              larsim::Simulation lardataobj::Simulation
-              larsim::MCCheater_BackTrackerService_service
-              larsim::MCCheater_ParticleInventoryService_service
-              lardata::Utilities
-              larevt::Filters
-              lardataobj::RawData
-              lardataobj::RecoBase
-              lardataobj::AnalysisBase
-              lardata::RecoObjects
-              larpandora::LArPandoraInterface
-              larcorealg::Geometry
-              nusimdata::SimulationBase
-              art::Framework_Core
-              art::Framework_Principal
-              art::Framework_Services_Registry
-              art_root_io::tfile_support
-              art_root_io::TFileService_service
-              art::Persistency_Common canvas::canvas
-              art::Persistency_Provenance
-              art::Utilities
-              messagefacility::MF_MessageLogger
-              ROOT::Core
-              ROOT::Geom
-              ROOT::XMLIO
-              ROOT::Gdml
-              ROOT::Tree
-              ROOT::Spectrum
-              ROOT::RooFit
-              ROOT::RooFitCore
-)
-
-
-cet_build_plugin(CRTT0MatchingAna art::module
-     LIBRARIES
-              sbnobj::ICARUS_CRT
-              icaruscode_CRT
-              sbnobj::Common_CRT
-              icaruscode_CRTUtils
-              larcorealg::Geometry
-              larcore::Geometry_Geometry_service
-              larsim::Simulation lardataobj::Simulation
-              larsim::MCCheater_BackTrackerService_service
-              larsim::MCCheater_ParticleInventoryService_service
-              lardata::Utilities
-              larevt::Filters
-              lardataobj::RawData
-              lardataobj::RecoBase
-              lardataobj::AnalysisBase
-              lardata::RecoObjects
-              larpandora::LArPandoraInterface
-              larcorealg::Geometry
-              nusimdata::SimulationBase
-              art::Persistency_Common canvas::canvas
-              art::Persistency_Provenance
-              art::Utilities
-              ROOT::Core
-              ROOT::Tree
-              ROOT::Geom
-              ROOT::XMLIO
-              ROOT::Gdml
-              ROOT::Spectrum
-              ROOT::RooFit
-              ROOT::RooFitCore
-)
-
 cet_build_plugin(CRTTPCMatchingAna art::module
      LIBRARIES
               sbnobj::ICARUS_CRT
@@ -517,6 +445,26 @@ simple_plugin(CRTTPCTruthEff module
 
 )
 
+cet_build_plugin(CRTT0Tagging art::module
+     LIBRARIES
+        icaruscode::IcarusObj
+        icaruscode_CRTMatchingUtils
+        icaruscode_CRTUtils
+        sbnobj::Common_CRT
+        larcorealg::Geometry
+        lardataalg::DetectorInfo
+        larcore::Geometry_Geometry_service
+        larsim::Simulation lardataobj::Simulation
+        larsim::MCCheater_BackTrackerService_service
+        larsim::MCCheater_ParticleInventoryService_service
+        lardata::headers
+        lardataobj::RecoBase
+        lardataobj::AnalysisBase
+        nusimdata::SimulationBase
+        art_root_io::TFileService_service
+        art_root_io::tfile_support
+        ROOT::Tree
+)
 
 install_headers()
 install_fhicl()

icaruscode/CRT/CRTLegacyCode/CMakeLists.txt

@@ -0,0 +1,93 @@
+cet_build_plugin(CRTTzeroProducer art::module
+     LIBRARIES
+        larcorealg::Geometry
+        icaruscode_CRT
+        sbnobj::ICARUS_CRT
+        sbnobj::Common_CRT
+        art_root_io::TFileService_service
+        lardataalg::DetectorInfo
+        nurandom::RandomUtils_NuRandomService_service
+        art::Framework_Services_Registry
+        art::Framework_Services_Optional_RandomNumberGenerator_service
+        messagefacility::MF_MessageLogger
+        messagefacility::headers
+        CLHEP::CLHEP
+        lardata::Utilities
+        )
+
+cet_build_plugin(CRTT0Matching art::module
+     LIBRARIES
+              icaruscode_CRTData
+              icaruscode_CRT
+              sbnobj::Common_CRT
+              icaruscode_CRTUtils
+              larcore::Geometry_Geometry_service
+              larsim::Simulation lardataobj::Simulation
+              larsim::MCCheater_BackTrackerService_service
+              larsim::MCCheater_ParticleInventoryService_service
+              lardata::Utilities
+              larevt::Filters
+              lardataobj::RawData
+              lardataobj::RecoBase
+              lardataobj::AnalysisBase
+              lardata::RecoObjects
+              larpandora::LArPandoraInterface
+              larcorealg::Geometry
+              nusimdata::SimulationBase
+              art::Framework_Core
+              art::Framework_Principal
+              art::Framework_Services_Registry
+              art_root_io::tfile_support
+              art_root_io::TFileService_service
+              art::Persistency_Common canvas::canvas
+              art::Persistency_Provenance
+              art::Utilities
+              messagefacility::MF_MessageLogger
+              ROOT::Core
+              ROOT::Geom
+              ROOT::XMLIO
+              ROOT::Gdml
+              ROOT::Tree
+              ROOT::Spectrum
+              ROOT::RooFit
+              ROOT::RooFitCore
+)
+
+
+cet_build_plugin(CRTT0MatchingAna art::module
+     LIBRARIES
+              sbnobj::ICARUS_CRT
+              icaruscode_CRT
+              sbnobj::Common_CRT
+              icaruscode_CRTUtils
+              larcorealg::Geometry
+              larcore::Geometry_Geometry_service
+              larsim::Simulation lardataobj::Simulation
+              larsim::MCCheater_BackTrackerService_service
+              larsim::MCCheater_ParticleInventoryService_service
+              lardata::Utilities
+              larevt::Filters
+              lardataobj::RawData
+              lardataobj::RecoBase
+              lardataobj::AnalysisBase
+              lardata::RecoObjects
+              larpandora::LArPandoraInterface
+              larcorealg::Geometry
+              nusimdata::SimulationBase
+              art::Persistency_Common canvas::canvas
+              art::Persistency_Provenance
+              art::Utilities
+              ROOT::Core
+              ROOT::Tree
+              ROOT::Geom
+              ROOT::XMLIO
+              ROOT::Gdml
+              ROOT::Spectrum
+              ROOT::RooFit
+              ROOT::RooFitCore
+)
+
+
+install_headers()
+install_fhicl()
+install_source()