Channel mapping interface change

fcl/reco/Definitions/CAEN_V1730_setup_icarus.fcl

@@ -27,8 +27,8 @@ BEGIN_PROLOG
 #   the offset measured against a (supposedly) common reference via the
 #   Trigger Time Tag counter of the readout board settles to 48 ns
 #   (the counter tick is worth 16 ns).
-# Archeology research suggests that these delays might be outdated even for Run0
-# but there is no definitive evidence.
+# Archaeology research suggests that these delays might be outdated even for
+# Run0 but there is no definitive evidence.
 #
 icarus_V1730_West_setup_Run0: [
 

icaruscode/CRT/CRTUtils/CRTHitRecoAlg.h

@@ -41,8 +41,6 @@
 #include "sbnobj/Common/CRT/CRTHit.hh"
 #include "sbnobj/ICARUS/CRT/CRTData.hh"
 
-#include "icaruscode/Decode/ChannelMapping/ICARUSChannelMapProvider.h"
-#include "icaruscode/Decode/ChannelMapping/IChannelMapping.h"
 #include "icaruscode/Decode/ChannelMapping/IICARUSChannelMap.h"
 // c++
 #include <stdio.h>

icaruscode/Decode/ChannelMapping/CMakeLists.txt

@@ -1,79 +1,67 @@
 cet_enable_asserts()
 
 art_make_library(
-	EXCLUDE "PMTChannelMapDumper.cxx"
-	LIBRARIES
-		art::Utilities
-		canvas::canvas
-		fhiclcpp::fhiclcpp
-		messagefacility::MF_MessageLogger
-		cetlib_except::cetlib_except
-		cetlib::cetlib
-		larcorealg::CoreUtils
+  EXCLUDE "ChannelMapDumper.cxx"
+  LIBRARIES
+    icarusalg::Utilities
+    larcorealg::CoreUtils
+    art::Framework_Services_Registry
+    fhiclcpp::fhiclcpp
+    messagefacility::MF_MessageLogger
+    cetlib::cetlib
+    cetlib_except::cetlib_except
+
+    # for PostgreSQL algorithm and service provider (includes duplicates above)
+    icarusalg::Utilities
+    larcorealg::CoreUtils
+    messagefacility::MF_MessageLogger
+    fhiclcpp::fhiclcpp
+    cetlib_except::cetlib_except
+    wda::wda
+
+    # for SQLite algorithm and service provider (includes duplicates above)
+    icarusalg::Utilities
+    larevt::CalibrationDBI_Providers
+    larcorealg::CoreUtils
+    messagefacility::MF_MessageLogger
+    fhiclcpp::fhiclcpp
+    cetlib::cetlib
+    cetlib_except::cetlib_except
+    SQLite::SQLite3
+    Microsoft.GSL::GSL
+
 )
 
-set(	SERVICE_LIBRARIES
-		icaruscode::Decode_ChannelMapping
-		lardata::Utilities
-		lardata::ArtDataHelper
-		larcorealg::CoreUtils
-		wda::wda
-		art::Framework_Core
-		art::Framework_Principal
-		art::Framework_Services_Registry
-		art_root_io::tfile_support
-		art_root_io::TFileService_service
-		art::Utilities
-		art::Persistency_Common
-		art::Persistency_Provenance
-		art::Utilities canvas::canvas
-		messagefacility::MF_MessageLogger
-		messagefacility::headers
-		fhiclcpp::fhiclcpp
-		cetlib::cetlib cetlib_except::cetlib_except
-		larevt::CalibrationDBI_IOVData
-		larevt::CalibrationDBI_Providers
-)
-set(	TOOL_LIBRARIES
-		larcorealg::CoreUtils
-		lardata::Utilities
-		lardata::ArtDataHelper
-		wda::wda
-		art::Framework_Core
-		art::Framework_Principal
-		art::Framework_Services_Registry
-		art_root_io::tfile_support
-		art_root_io::TFileService_service
-		art::Utilities
-		art::Persistency_Common canvas::canvas
-		art::Persistency_Provenance
-		art::Utilities
-		messagefacility::MF_MessageLogger
-		messagefacility::headers
-		fhiclcpp::fhiclcpp
-		cetlib::cetlib cetlib_except::cetlib_except
-		SQLite::SQLite3
-		larevt::CalibrationDBI_IOVData
-		larevt::CalibrationDBI_Providers
-	)
+cet_build_plugin(ICARUSChannelMapSQLite art::service
+  LIBRARIES
+    icaruscode::Decode_ChannelMapping
+    art::Framework_Principal
+    messagefacility::MF_MessageLogger
+    messagefacility::headers
+  )
 
-cet_build_plugin(ChannelMapPostGres art::tool LIBRARIES ${TOOL_LIBRARIES})
-cet_build_plugin(ChannelMapSQLite art::tool LIBRARIES ${TOOL_LIBRARIES})
-cet_build_plugin(ICARUSChannelMap art::service LIBRARIES ${SERVICE_LIBRARIES})
+cet_build_plugin(ICARUSChannelMapPostGres art::service
+  LIBRARIES
+    icaruscode::Decode_ChannelMapping
+    art::Framework_Principal
+    messagefacility::MF_MessageLogger
+    messagefacility::headers
+  )
 
+add_subdirectory("Legacy")
 
-cet_make_exec(NAME "PMTChannelMapDumper"
-	LIBRARIES
-		icaruscode::Decode_ChannelMapping
-		larevt::CalibrationDBI_IOVData
-		messagefacility::MF_MessageLogger
-		fhiclcpp::fhiclcpp
-		cetlib::cetlib
-		cetlib_except::cetlib_except
-		Boost::filesystem
-	) 
+cet_make_exec(NAME "ChannelMapDumper"
+  LIBRARIES
+    icaruscode::Decode_ChannelMapping_Legacy
+    icaruscode::Decode_ChannelMapping
+    larevt::CalibrationDBI_IOVData
+    messagefacility::MF_MessageLogger
+    fhiclcpp::fhiclcpp
+    cetlib::cetlib
+    cetlib_except::cetlib_except
+    Boost::filesystem
+  )
 
 install_headers()
 install_fhicl()
 install_source()
-