Combine crt services for better maintenance

henrylay97 · henrylay97 · commit 1acd310d95e0 · 2025-10-02T04:57:02.000-05:00
diff --git a/sbndcode/CRT/crt_services_sbnd.fcl b/sbndcode/CRT/crt_services_sbnd.fcl
@@ -0,0 +1,17 @@
+#include "crt_geo_service_sbnd.fcl"
+#include "crt_channel_map_service_sbnd.fcl"
+#include "crt_calibration_database_service_sbnd.fcl"
+
+BEGIN_PROLOG
+
+crt_services_sbnd:
+{
+  CRTGeoService:          @local::crt_geo_service_sbnd
+  CRTChannelMapService:   @local::crt_channel_map_sbnd
+  CRTCalibrationDatabase: @local::crt_calibration_database_service_sbnd
+}
+
+crt_services_data_sbnd: @local::crt_services_sbnd
+crt_services_data_sbnd.CRTGeoService: @local::crt_geo_service_data_sbnd
+
+END_PROLOG
diff --git a/sbndcode/Calibration/CRTDatabaseInterface/crt_calibration_database_service_sbnd.fcl b/sbndcode/Calibration/CRTDatabaseInterface/crt_calibration_database_service_sbnd.fcl
@@ -1,6 +1,6 @@
 BEGIN_PROLOG
 
-sbnd_crtcalibrationdatabaseservice:
+crt_calibration_database_service_sbnd:
 {
   service_provider: "CRTCalibrationDatabaseService" 
 
@@ -12,7 +12,7 @@ sbnd_crtcalibrationdatabaseservice:
     ChannelTableName:  "crt_channel_calibration"
   }
 
-  Verbose: true
+  Verbose: false
 }
 
 END_PROLOG
diff --git a/sbndcode/ChannelMaps/CRT/crt_channel_map_service_sbnd.fcl b/sbndcode/ChannelMaps/CRT/crt_channel_map_service_sbnd.fcl
@@ -1,6 +1,6 @@
 BEGIN_PROLOG
 
-crt_channel_map_standard:
+crt_channel_map_sbnd:
 {
   FileName: "SBNDCRTChannelMap_Commissioning_v5.txt"
 }
diff --git a/sbndcode/Geometry/GeometryWrappers/crt_geo_service_sbnd.fcl b/sbndcode/Geometry/GeometryWrappers/crt_geo_service_sbnd.fcl
@@ -1,12 +1,12 @@
 BEGIN_PROLOG
 
-crtgeoservice_sbnd:
+crt_geo_service_sbnd:
 {
   DefaultGain: 0.025
   MC:          true
 }
 
-crtgeoservice_data_sbnd:
+crt_geo_service_data_sbnd:
 {
   DefaultGain: 0.025
   MC:          false

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`BEGIN_PROLOG`
`2`	`2`
`3`		`-sbnd_crtcalibrationdatabaseservice:`
	`3`	`+crt_calibration_database_service_sbnd:`
`4`	`4`	`{`
`5`	`5`	`service_provider: "CRTCalibrationDatabaseService"`
`6`	`6`
`@@ -12,7 +12,7 @@ sbnd_crtcalibrationdatabaseservice:`
`12`	`12`	`ChannelTableName: "crt_channel_calibration"`
`13`	`13`	`}`
`14`	`14`
`15`		`- Verbose: true`
	`15`	`+ Verbose: false`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`END_PROLOG`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`BEGIN_PROLOG`
`2`	`2`
`3`		`-crt_channel_map_standard:`
	`3`	`+crt_channel_map_sbnd:`
`4`	`4`	`{`
`5`	`5`	`FileName: "SBNDCRTChannelMap_Commissioning_v5.txt"`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`BEGIN_PROLOG`
`2`	`2`
`3`		`-crtgeoservice_sbnd:`
	`3`	`+crt_geo_service_sbnd:`
`4`	`4`	`{`
`5`	`5`	`DefaultGain: 0.025`
`6`	`6`	`MC: true`
`7`	`7`	`}`
`8`	`8`
`9`		`-crtgeoservice_data_sbnd:`
	`9`	`+crt_geo_service_data_sbnd:`
`10`	`10`	`{`
`11`	`11`	`DefaultGain: 0.025`
`12`	`12`	`MC: false`