And make use of that

henrylay97 · henrylay97 · commit b3e7576f0f3b · 2025-10-02T05:00:09.000-05:00
diff --git a/sbndcode/CRT/CRTAna/run_crtana.fcl b/sbndcode/CRT/CRTAna/run_crtana.fcl
@@ -1,5 +1,4 @@
-#include "crtgeoservice_sbnd.fcl"
-#include "crt_channel_map_service.fcl"
+#include "crt_services_sbnd.fcl"
 #include "crtana_sbnd.fcl"
 #include "simulationservices_sbnd.fcl"
 
@@ -9,13 +8,12 @@ services:
 {
   TFileService: { fileName: "crtana_sbnd.root" }
   @table::sbnd_basic_services
+  @table::crt_services_sbnd
   ParticleInventoryService:  @local::sbnd_particleinventoryservice
   BackTrackerService:        @local::sbnd_backtrackerservice
   DetectorClocksService:     @local::sbnd_detectorclocks
   LArPropertiesService:      @local::sbnd_properties
   DetectorPropertiesService: @local::sbnd_detproperties
-  CRTGeoService:             @local::crtgeoservice_sbnd
-  CRTChannelMapService:      @local::crt_channel_map_standard
 }
 
 source:
diff --git a/sbndcode/CRT/CRTAna/run_crtana_calibntuples_data.fcl b/sbndcode/CRT/CRTAna/run_crtana_calibntuples_data.fcl
@@ -3,7 +3,11 @@
 services.ParticleInventoryService: @erase
 services.BackTrackerService:       @erase
 
-services.CRTGeoService:        @local::crtgeoservice_data_sbnd
+services:
+{
+  @table::services
+  @table::crt_services_data_sbnd
+}
 
 physics.analyzers.caloskim.G4producer: ""
 physics.analyzers.caloskim.SimChannelproducer: ""
diff --git a/sbndcode/CRT/CRTAna/run_crtana_data.fcl b/sbndcode/CRT/CRTAna/run_crtana_data.fcl
@@ -3,6 +3,10 @@
 services.ParticleInventoryService: @erase
 services.BackTrackerService:       @erase
 
-services.CRTGeoService:        @local::crtgeoservice_data_sbnd
+services:
+{
+  @table::services
+  @table::crt_services_data_sbnd
+}
 
 physics.analyzers.crtana: @local::crtana_data_sbnd
diff --git a/sbndcode/CRT/CRTEventDisplay/run_crteventdisplay.fcl b/sbndcode/CRT/CRTEventDisplay/run_crteventdisplay.fcl
@@ -1,16 +1,14 @@
 #include "simulationservices_sbnd.fcl"
-#include "crtgeoservice_sbnd.fcl"
-#include "crt_channel_map_service.fcl"
+#include "crt_services_sbnd.fcl"
 #include "crteventdisplay_sbnd.fcl"
 
 process_name: CRTEventDisplay
 
 services:
 {
   @table::sbnd_services
+  @table::crt_services_sbnd
   ParticleInventoryService: @local::sbnd_particleinventoryservice
-  CRTGeoService:            @local::crtgeoservice_sbnd
-  CRTChannelMapService:     @local::crt_channel_map_standard
 }
 
 source:
@@ -24,7 +22,7 @@ physics:
 {
   analyzers:
   {
-    crtevd:   @local::crteventdisplay_sbnd
+    crtevd: @local::crteventdisplay_sbnd
   }
 
   ana: [ crtevd ]
diff --git a/sbndcode/CRT/CRTEventDisplay/run_crteventdisplay_data.fcl b/sbndcode/CRT/CRTEventDisplay/run_crteventdisplay_data.fcl
@@ -1,13 +1,13 @@
 #include "services_sbnd.fcl"
+#include "crt_services_sbnd.fcl"
 #include "crteventdisplay_sbnd.fcl"
-#include "crtgeoservice_sbnd.fcl"
 
 process_name: CRTEventDisplay
 
 services:
 {
   @table::sbnd_services
-  CRTGeoService:        @local::crtgeoservice_data_sbnd
+  @table::crt_services_data_sbnd
 }
 
 source:
@@ -20,7 +20,7 @@ physics:
 {
   analyzers:
   {
-    crtevd:   @local::crteventdisplay_sbnd_data
+    crtevd: @local::crteventdisplay_sbnd_data
   }
 
   ana: [ crtevd ]
diff --git a/sbndcode/CRT/CRTReco/run_crtclustering.fcl b/sbndcode/CRT/CRTReco/run_crtclustering.fcl
@@ -1,16 +1,14 @@
 #include "services_sbnd.fcl"
 #include "rootoutput_sbnd.fcl"
 #include "crtrecoproducers_sbnd.fcl"
-#include "crtgeoservice_sbnd.fcl"
-#include "crt_channel_map_service.fcl"
+#include "crt_services_sbnd.fcl"
 
 process_name: CRTClustering
 
 services:
 {
   @table::sbnd_services
-  CRTGeoService:        @local::crtgeoservice_sbnd
-  CRTChannelMapService: @local::crt_channel_map_standard
+  @table::crt_services_sbnd
 }
 
 source:
diff --git a/sbndcode/CRT/CRTReco/run_crtreco.fcl b/sbndcode/CRT/CRTReco/run_crtreco.fcl
@@ -1,16 +1,14 @@
 #include "services_sbnd.fcl"
 #include "rootoutput_sbnd.fcl"
 #include "crtrecoproducers_sbnd.fcl"
-#include "crtgeoservice_sbnd.fcl"
-#include "crt_channel_map_service.fcl"
+#include "crt_services_sbnd.fcl"
 
 process_name: CRTReco
 
 services:
 {
   @table::sbnd_services
-  CRTGeoService:        @local::crtgeoservice_sbnd
-  CRTChannelMapService: @local::crt_channel_map_standard
+  @table::crt_services_sbnd
 }
 
 source:
diff --git a/sbndcode/CRT/CRTReco/run_crtreco_data.fcl b/sbndcode/CRT/CRTReco/run_crtreco_data.fcl
@@ -1,7 +1,10 @@
 #include "run_crtreco.fcl"
 
-services.message:              @local::sbnd_message_services
-services.CRTGeoService:        @local::crtgeoservice_data_sbnd
+services:
+{
+  @table::services
+  @table::crt_services_data_sbnd
+}
 
 physics.producers.crtstrips:      @local::crtstriphitproducer_data_sbnd
 physics.producers.crtclustering:  @local::crtclusterproducer_data_sbnd
diff --git a/sbndcode/CRT/CRTReco/run_crtrecoana.fcl b/sbndcode/CRT/CRTReco/run_crtrecoana.fcl
@@ -3,18 +3,16 @@
 #include "rootoutput_sbnd.fcl"
 #include "crtrecoproducers_sbnd.fcl"
 #include "crtana_sbnd.fcl"
-#include "crtgeoservice_sbnd.fcl"
-#include "crt_channel_map_service.fcl"
+#include "crt_services_sbnd.fcl"
 
 process_name: CRTRecoAna
 
 services:
 {
   TFileService: { fileName: "crtana_sbnd.root" }
   @table::sbnd_basic_services
+  @table::crt_services_sbnd
   ParticleInventoryService: @local::standard_particleinventoryservice
-  CRTGeoService:            @local::crtgeoservice_sbnd
-  CRTChannelMapService:     @local::crt_channel_map_standard
 }
 
 source:
diff --git a/sbndcode/CRT/CRTReco/run_crtrecoana_data.fcl b/sbndcode/CRT/CRTReco/run_crtrecoana_data.fcl
@@ -1,6 +1,10 @@
 #include "run_crtrecoana.fcl"
 
-services.CRTGeoService:        @local::crtgeoservice_data_sbnd
+services:
+{
+  @table::services
+  @table::crt_services_data_sbnd
+}
 
 physics.producers.crtstrips:      @local::crtstriphitproducer_data_sbnd
 physics.producers.crtclustering:  @local::crtclusterproducer_data_sbnd
diff --git a/sbndcode/CRT/CRTReco/run_crtspacepointreco.fcl b/sbndcode/CRT/CRTReco/run_crtspacepointreco.fcl
@@ -1,16 +1,14 @@
 #include "services_sbnd.fcl"
 #include "rootoutput_sbnd.fcl"
 #include "crtrecoproducers_sbnd.fcl"
-#include "crtgeoservice_sbnd.fcl"
-#include "crt_channel_map_service.fcl"
+#include "crt_services_sbnd.fcl"
 
 process_name: CRTSpacePointReco
 
 services:
 {
   @table::sbnd_services
-  CRTGeoService:        @local::crtgeoservice_sbnd
-  CRTChannelMapService: @local::crt_channel_map_standard
+  @table::crt_services_sbnd
 }
 
 source:
diff --git a/sbndcode/CRT/CRTReco/run_crtstriphitreco.fcl b/sbndcode/CRT/CRTReco/run_crtstriphitreco.fcl
@@ -1,16 +1,14 @@
 #include "services_sbnd.fcl"
 #include "rootoutput_sbnd.fcl"
 #include "crtrecoproducers_sbnd.fcl"
-#include "crtgeoservice_sbnd.fcl"
-#include "crt_channel_map_service.fcl"
+#include "crt_services_sbnd.fcl"
 
 process_name: CRTStripHitReco
 
 services:
 {
   @table::sbnd_services
-  CRTGeoService:        @local::crtgeoservice_sbnd
-  CRTChannelMapService: @local::crt_channel_map_standard
+  @table::crt_services_sbnd
 }
 
 source:
diff --git a/sbndcode/CRT/CRTReco/run_crttrackreco.fcl b/sbndcode/CRT/CRTReco/run_crttrackreco.fcl
@@ -1,16 +1,14 @@
 #include "services_sbnd.fcl"
 #include "rootoutput_sbnd.fcl"
 #include "crtrecoproducers_sbnd.fcl"
-#include "crtgeoservice_sbnd.fcl"
-#include "crt_channel_map_service.fcl"
+#include "crt_services_sbnd.fcl"
 
 process_name: CRTTrackReco
 
 services:
 {
   @table::sbnd_services
-  CRTGeoService:        @local::crtgeoservice_sbnd
-  CRTChannelMapService: @local::crt_channel_map_standard
+  @table::crt_services_sbnd
 }
 
 source:
diff --git a/sbndcode/CRT/CRTSimulation/crtsim_sbnd.fcl b/sbndcode/CRT/CRTSimulation/crtsim_sbnd.fcl
@@ -6,8 +6,7 @@
 
 #include "simulationservices_sbnd.fcl"
 #include "messages_sbnd.fcl"
-#include "crtgeoservice_sbnd.fcl"
-#include "crt_channel_map_service.fcl"
+#include "crt_services_sbnd.fcl"
 
 #
 # modules
@@ -25,8 +24,7 @@ services:
   FileCatalogMetadata: @local::sbnd_file_catalog_mc
   AuxDetGeometry: @local::sbnd_auxdetgeo
   @table::sbnd_g4_services
-  CRTGeoService: @local::crtgeoservice_sbnd
-  CRTChannelMapService: @local::crt_channel_map_standard
+  @table::crt_services_sbnd
 }
 
 
diff --git a/sbndcode/CRT/CRTVeto/run_crtveto_data.fcl b/sbndcode/CRT/CRTVeto/run_crtveto_data.fcl
@@ -1,8 +1,8 @@
-#include "crt_channel_map_service.fcl"
+#include "crt_channel_map_service_sbnd.fcl"
 #include "run_crtveto.fcl"
 
 services.message:              @local::sbnd_message_services
-services.CRTChannelMapService: @local::crt_channel_map_standard
+services.CRTChannelMapService: @local::crt_channel_map_sbnd
 
 physics.producers.crtveto:     @local::crtvetoproducer_data_sbnd
 
diff --git a/sbndcode/CRT/CRTVeto/run_crtveto_data_tophat.fcl b/sbndcode/CRT/CRTVeto/run_crtveto_data_tophat.fcl
@@ -1,8 +1,8 @@
-#include "crt_channel_map_service.fcl"
+#include "crt_channel_map_service_sbnd.fcl"
 #include "run_crtveto.fcl"
 
 services.message:              @local::sbnd_message_services
-services.CRTChannelMapService: @local::crt_channel_map_standard
+services.CRTChannelMapService: @local::crt_channel_map_sbnd
 
 physics.producers.crtveto:     @local::crtvetoproducer_data_sbnd_tophat
 
diff --git a/sbndcode/Commissioning/fcls/run_muontrack_crtreco.fcl b/sbndcode/Commissioning/fcls/run_muontrack_crtreco.fcl
@@ -1,10 +1,12 @@
 #include "crtrecoproducers_sbnd.fcl"
-#include "crtgeoservice_sbnd.fcl"
-#include "crt_channel_map_service.fcl"
+#include "crt_services_sbnd.fcl"
 #include "run_muontrack.fcl"
 
-services.CRTGeoService:        @local::crtgeoservice_sbnd
-services.CRTChannelMapService: @local::crt_channel_map_standard
+services:
+{
+  @table::services
+  @table::crt_services_sbnd
+}
 
 physics.producers.crtclustering:  @local::crtclusterproducer_sbnd
 physics.producers.crtspacepoints: @local::crtspacepointproducer_sbnd
diff --git a/sbndcode/Decoders/CRT/run_crt_decoder_sbnd.fcl b/sbndcode/Decoders/CRT/run_crt_decoder_sbnd.fcl
@@ -1,14 +1,14 @@
 #include "crt_decoder_sbnd.fcl"
 #include "services_sbnd.fcl"
 #include "rootoutput_sbnd.fcl"
-#include "crt_channel_map_service.fcl"
+#include "crt_channel_map_service_sbnd.fcl"
 
 process_name: CRTDecoder
 
 services:
 {
   @table::sbnd_services
-  CRTChannelMapService: @local::crt_channel_map_standard
+  CRTChannelMapService: @local::crt_channel_map_sbnd
 }
 
 source:
diff --git a/sbndcode/Decoders/CRT/run_crt_ptb_decoder_sbnd.fcl b/sbndcode/Decoders/CRT/run_crt_ptb_decoder_sbnd.fcl
@@ -1,15 +1,15 @@
 #include "crt_decoder_sbnd.fcl"
 #include "services_sbnd.fcl"
 #include "rootoutput_sbnd.fcl"
-#include "crt_channel_map_service.fcl"
+#include "crt_channel_map_service_sbnd.fcl"
 #include "SBNDPTBDecoderDefaults.fcl"
 
 process_name: Decoders
 
 services:
 {
   @table::sbnd_services
-  CRTChannelMapService: @local::crt_channel_map_standard
+  CRTChannelMapService: @local::crt_channel_map_sbnd
 }
 
 source:
diff --git a/sbndcode/Decoders/CRT/run_crt_ptb_tdc_decoder_sbnd.fcl b/sbndcode/Decoders/CRT/run_crt_ptb_tdc_decoder_sbnd.fcl
@@ -1,7 +1,7 @@
 #include "crt_decoder_sbnd.fcl"
 #include "services_sbnd.fcl"
 #include "rootoutput_sbnd.fcl"
-#include "crt_channel_map_service.fcl"
+#include "crt_channel_map_service_sbnd.fcl"
 #include "SBNDPTBDecoderDefaults.fcl"
 #include "spectdc_decoder_sbnd.fcl"
 
@@ -10,7 +10,7 @@ process_name: Decoders
 services:
 {
   @table::sbnd_services
-  CRTChannelMapService: @local::crt_channel_map_standard
+  CRTChannelMapService: @local::crt_channel_map_sbnd
 }
 
 source:
diff --git a/sbndcode/Decoders/CRT/run_crt_ptb_tdc_pmt_decoder_sbnd.fcl b/sbndcode/Decoders/CRT/run_crt_ptb_tdc_pmt_decoder_sbnd.fcl
@@ -1,7 +1,7 @@
 #include "crt_decoder_sbnd.fcl"
 #include "services_sbnd.fcl"
 #include "rootoutput_sbnd.fcl"
-#include "crt_channel_map_service.fcl"
+#include "crt_channel_map_service_sbnd.fcl"
 #include "SBNDPTBDecoderDefaults.fcl"
 #include "spectdc_decoder_sbnd.fcl"
 #include "pmtdecoder.fcl"
@@ -11,7 +11,7 @@ process_name: Decoders
 services:
 {
   @table::sbnd_services
-  CRTChannelMapService: @local::crt_channel_map_standard
+  CRTChannelMapService: @local::crt_channel_map_sbnd
   TFileService :        { fileName: "decoder_hist.root" }
 }
 
diff --git a/sbndcode/Decoders/run_decoders_job.fcl b/sbndcode/Decoders/run_decoders_job.fcl
@@ -35,7 +35,7 @@
 #include "NTBDecoderDefaults.fcl"
 
 #include "crt_decoder_sbnd.fcl"
-#include "crt_channel_map_service.fcl"
+#include "crt_channel_map_service_sbnd.fcl"
 
 
 process_name: DECODE
@@ -44,7 +44,7 @@ services:
 {
     @table::sbnd_services
     TPCChannelMapService: @local::SBNDTPCChannelMapServiceDefaults
-    CRTChannelMapService: @local::crt_channel_map_standard
+    CRTChannelMapService: @local::crt_channel_map_sbnd
     TFileService: {
         fileName: "decoder_hist.root"
     }
diff --git a/sbndcode/JobConfigurations/standard/reco/reco1_data.fcl b/sbndcode/JobConfigurations/standard/reco/reco1_data.fcl
diff --git a/sbndcode/JobConfigurations/standard/reco/reco2_data.fcl b/sbndcode/JobConfigurations/standard/reco/reco2_data.fcl
diff --git a/sbndcode/JobConfigurations/standard/standard_detsim_sbnd.fcl b/sbndcode/JobConfigurations/standard/standard_detsim_sbnd.fcl
diff --git a/sbndcode/JobConfigurations/standard/standard_reco1_sbnd.fcl b/sbndcode/JobConfigurations/standard/standard_reco1_sbnd.fcl
diff --git a/sbndcode/JobConfigurations/standard/standard_reco1reco2_sbnd.fcl b/sbndcode/JobConfigurations/standard/standard_reco1reco2_sbnd.fcl
diff --git a/sbndcode/JobConfigurations/standard/standard_reco2_sbnd.fcl b/sbndcode/JobConfigurations/standard/standard_reco2_sbnd.fcl
diff --git a/sbndcode/Trigger/CRT/run_CRTArtdaqFragmentProducer.fcl b/sbndcode/Trigger/CRT/run_CRTArtdaqFragmentProducer.fcl
diff --git a/sbndcode/Trigger/run_fragmentproducers.fcl b/sbndcode/Trigger/run_fragmentproducers.fcl

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,14 @@`
`1`	`1`	`#include "simulationservices_sbnd.fcl"`
`2`		`-#include "crtgeoservice_sbnd.fcl"`
`3`		`-#include "crt_channel_map_service.fcl"`
	`2`	`+#include "crt_services_sbnd.fcl"`
`4`	`3`	`#include "crteventdisplay_sbnd.fcl"`
`5`	`4`
`6`	`5`	`process_name: CRTEventDisplay`
`7`	`6`
`8`	`7`	`services:`
`9`	`8`	`{`
`10`	`9`	`@table::sbnd_services`
	`10`	`+ @table::crt_services_sbnd`
`11`	`11`	`ParticleInventoryService: @local::sbnd_particleinventoryservice`
`12`		`- CRTGeoService: @local::crtgeoservice_sbnd`
`13`		`- CRTChannelMapService: @local::crt_channel_map_standard`
`14`	`12`	`}`
`15`	`13`
`16`	`14`	`source:`
`@@ -24,7 +22,7 @@ physics:`
`24`	`22`	`{`
`25`	`23`	`analyzers:`
`26`	`24`	`{`
`27`		`- crtevd: @local::crteventdisplay_sbnd`
	`25`	`+ crtevd: @local::crteventdisplay_sbnd`
`28`	`26`	`}`
`29`	`27`
`30`	`28`	`ana: [ crtevd ]`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`#include "services_sbnd.fcl"`
	`2`	`+#include "crt_services_sbnd.fcl"`
`2`	`3`	`#include "crteventdisplay_sbnd.fcl"`
`3`		`-#include "crtgeoservice_sbnd.fcl"`
`4`	`4`
`5`	`5`	`process_name: CRTEventDisplay`
`6`	`6`
`7`	`7`	`services:`
`8`	`8`	`{`
`9`	`9`	`@table::sbnd_services`
`10`		`- CRTGeoService: @local::crtgeoservice_data_sbnd`
	`10`	`+ @table::crt_services_data_sbnd`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`source:`
`@@ -20,7 +20,7 @@ physics:`
`20`	`20`	`{`
`21`	`21`	`analyzers:`
`22`	`22`	`{`
`23`		`- crtevd: @local::crteventdisplay_sbnd_data`
	`23`	`+ crtevd: @local::crteventdisplay_sbnd_data`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`ana: [ crtevd ]`