Merge branch 'develop' into feature/tjyang_cvn

Author: bear-is-asleep

sbndcode/LArSoftConfigurations/mlreco_sbnd.fcl

@@ -17,7 +17,7 @@ sbnd_supera_mpvmpr: {
     module_type:     "LArSoftSuperaDriver"
     supera_params:   "supera_sbnd_mpvmpr.fcl"
     out_filename:    "larcv.root"
-    unique_filename: false
+    unique_filename: true
     stream:          "mc"
     StrictDataLoading: false
 }
@@ -27,7 +27,7 @@ sbnd_supera_data: {
     module_type:     "LArSoftSuperaDriver"
     supera_params:   "supera_sbnd_data.fcl"
     out_filename:    "larcv.root"
-    unique_filename: false
+    unique_filename: true
     stream:          "data"
     StrictDataLoading: false
 }
@@ -37,7 +37,7 @@ sbnd_supera: {
     module_type:     "LArSoftSuperaDriver"
     supera_params:   "supera_sbnd_corsika.fcl"
     out_filename:    "larcv.root"
-    unique_filename: false
+    unique_filename: true
     stream:          "mc"
     StrictDataLoading: false
 }

sbndcode/LArSoftConfigurations/services_sbnd.fcl

@@ -85,7 +85,7 @@ sbnd_services:
   DetectorClocksService:          @local::sbnd_detectorclocks
   DetectorPropertiesService:      @local::sbnd_detproperties 
 # OpDigiProperties:               @local::sbnd_opdigiproperties
-  ChannelStatusService:           @local::sbnd_channelstatus
+  ChannelStatusService:           @local::sbnd_data_channelstatus
   DetPedestalService:             @local::sbnd_detpedestalservice  # from database_sbnd.fcl
   SpaceCharge:                    @local::sbnd_spacecharge
 } # sbnd_services