Make compatible with current develop

Author: henrylay97

sbndcode/CRT/CRTEventDisplay/CRTChannelMappingEventDisplay_module.cc

@@ -55,17 +55,16 @@ class sbnd::crt::CRTChannelMappingEventDisplay : public art::EDAnalyzer {
 
 private:
 
-  CRTEventDisplayAlg fCRTEventDisplayAlg;
-  CRTGeoAlg          fCRTGeoAlg;
-  std::string        fSaveDir;
-  std::vector<int>   fChosenTaggers;
+  CRTEventDisplayAlg                fCRTEventDisplayAlg;
+  art::ServiceHandle<CRTGeoService> fCRTGeoService;
+  std::string                       fSaveDir;
+  std::vector<int>                  fChosenTaggers;
 };
 
 
 sbnd::crt::CRTChannelMappingEventDisplay::CRTChannelMappingEventDisplay(Parameters const& config)
   : EDAnalyzer{config}
   , fCRTEventDisplayAlg(config().EventDisplayConfig())
-  , fCRTGeoAlg(config().EventDisplayConfig().GeoAlgConfig())
   , fSaveDir(config().SaveDir())
   , fChosenTaggers(config().EventDisplayConfig().ChosenTaggers())
   {
@@ -76,7 +75,7 @@ void sbnd::crt::CRTChannelMappingEventDisplay::analyze(art::Event const& e)
 {
   auto const clockData = art::ServiceHandle<detinfo::DetectorClocksService const>()->DataFor(e);
 
-  for(auto const& [ name, module ] : fCRTGeoAlg.GetModules())
+  for(auto const& [ name, module ] : fCRTGeoService->GetModules())
     {
       if(std::find(fChosenTaggers.begin(), fChosenTaggers.end(), CRTCommonUtils::GetTaggerEnum(module.taggerName)) == fChosenTaggers.end())
         continue;

sbndcode/CRT/CRTEventDisplay/run_crteventdisplay_channel_mapping_all.fcl

@@ -1,17 +1,16 @@
 #include "services_sbnd.fcl"
 #include "particleinventoryservice.fcl"
 #include "crteventdisplay_sbnd.fcl"
-#include "crt_channel_map_service.fcl"
-#include "crt_calib_service.fcl"
+#include "crt_services_sbnd.fcl"
 
 process_name: CRTEventDisplay
 
 services:
 {
   @table::sbnd_services
+  @table::crt_services_sbnd
   ParticleInventoryService: @local::standard_particleinventoryservice
-  CRTChannelMapService:     @local::crt_channel_map_standard
-  CRTCalibService:          @local::crt_calib_service
+  CRTChannelMapService:     @local::crt_channel_map_no_inversion
 }
 
 source: