More whitespace changes

art-daq · Feb 18, 2025 · ad5445c · ad5445c
1 parent eecaa49
commit ad5445c
Show file tree

Hide file tree

Showing 40 changed files with 275 additions and 282 deletions.
diff --git a/.clang-format b/.clang-format
@@ -20,7 +20,7 @@ AlwaysBreakBeforeMultilineStrings: true
 AlwaysBreakTemplateDeclarations: true
 BinPackArguments: true
 BinPackParameters: true
-BraceWrapping:   
+BraceWrapping:
   AfterClass:      true
   AfterControlStatement: true
   AfterEnum:       true
@@ -54,11 +54,11 @@ DerivePointerAlignment: true
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 FixNamespaceComments: true
-ForEachMacros:   
+ForEachMacros:
   - foreach
   - Q_FOREACH
   - BOOST_FOREACH
-IncludeCategories: 
+IncludeCategories:
   - Regex:           '^<.*\.h>'
     Priority:        1
   - Regex:           '^<.*'
@@ -105,4 +105,3 @@ Standard:        Auto
 TabWidth:        4
 UseTab:          ForIndentation
 ...
-
diff --git a/.github/workflows/artdaq-build-single-pkg.yml b/.github/workflows/artdaq-build-single-pkg.yml
@@ -2,7 +2,7 @@ name: Build Single Pkg Workflow
 
 on:
   push:
-    branches: 
+    branches:
       - develop
     paths-ignore:
       - 'docs/**'

diff --git a/.github/workflows/artdaq-develop-cpp-ci.yml b/.github/workflows/artdaq-develop-cpp-ci.yml
@@ -4,7 +4,7 @@ name: build-develop
 # or API.
 on:
   push:
-    branches-ignore: 
+    branches-ignore:
       - develop
       - stable
     paths-ignore:
@@ -20,5 +20,5 @@ on:
 
 jobs:
   build_against_dev_release:
-    name: Build against develop  
-    uses: art-daq/.github/.github/workflows/artdaq-develop-cpp-ci.yml@stable
+    name: Build against develop
+    uses: art-daq/.github/.github/workflows/artdaq-develop-cpp-ci.yml@stable
diff --git a/.github/workflows/artdaq-format-single-pkg.yml b/.github/workflows/artdaq-format-single-pkg.yml
@@ -2,7 +2,7 @@ name: Format Single Pkg Workflow
 
 on:
   push:
-    branches: 
+    branches:
       - develop
     paths-ignore:
       - 'docs/**'

diff --git a/.github/workflows/artdaq-test-single-pkg.yml b/.github/workflows/artdaq-test-single-pkg.yml
@@ -2,7 +2,7 @@ name: Test Single Pkg Workflow
 
 on:
   push:
-    branches: 
+    branches:
       - develop
     paths-ignore:
       - 'docs/**'

diff --git a/.github/workflows/artdaq-tidy-single-pkg.yml b/.github/workflows/artdaq-tidy-single-pkg.yml
@@ -2,7 +2,7 @@ name: Tidy Single Pkg Workflow
 
 on:
   push:
-    branches: 
+    branches:
       - develop
     paths-ignore:
       - 'docs/**'

diff --git a/.github/workflows/auto_approve.yml b/.github/workflows/auto_approve.yml
@@ -2,7 +2,7 @@ name: Auto approve
 
 on:
   workflow_dispatch:
-    inputs: 
+    inputs:
       pullRequestNumber:
         description: Pull request number to auto-approve
         required: false

diff --git a/.github/workflows/git-whitespace.yml b/.github/workflows/git-whitespace.yml
@@ -2,7 +2,7 @@ name: Git Whitespace Check Workflow
 
 on:
   push:
-    branches: 
+    branches:
       - develop
     paths-ignore:
       - 'docs/**'

diff --git a/.github/workflows/track_new_issues.yml b/.github/workflows/track_new_issues.yml
@@ -24,7 +24,7 @@ jobs:
             }' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
 
           echo 'PROJECT_ID='$(jq '.data.organization.projectV2.id' project_data.json) >> $GITHUB_ENV
-                    
+
       - name: Add issue to project
         env:
           GITHUB_TOKEN: ${{ secrets.BOT_CI_ISSUES }}
@@ -37,4 +37,4 @@ jobs:
                   id
                 }
               }
-            }' -f project=$PROJECT_ID -f issue=$ISSUE_ID --jq '.data.addProjectV2ItemById.item.id')"        
+            }' -f project=$PROJECT_ID -f issue=$ISSUE_ID --jq '.data.addProjectV2ItemById.item.id')"
diff --git a/.github/workflows/track_new_prs.yml b/.github/workflows/track_new_prs.yml
@@ -23,7 +23,7 @@ jobs:
             }' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
 
           echo 'PROJECT_ID='$(jq '.data.organization.projectV2.id' project_data.json) >> $GITHUB_ENV
-                    
+
       - name: Add issue to project
         env:
           GITHUB_TOKEN: ${{ secrets.BOT_CI_ISSUES }}
@@ -37,4 +37,4 @@ jobs:
                   id
                 }
               }
-            }' -f project=$PROJECT_ID -f issue=$node_id --jq '.data.addProjectV2ItemById.item.id')"    
+            }' -f project=$PROJECT_ID -f issue=$node_id --jq '.data.addProjectV2ItemById.item.id')"
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,7 +22,7 @@ cet_set_compiler_flags(DIAGS VIGILANT
  NO_UNDEFINED
  EXTRA_FLAGS -pedantic
  )
- 
+
 # Debug streamer.
 string(TOUPPER ${CMAKE_BUILD_TYPE} BTYPE_UC)
 if(BTYPE_UC STREQUAL DEBUG)

diff --git a/CreateNewFragmentGenerator.rb b/CreateNewFragmentGenerator.rb
@@ -3,19 +3,19 @@
 require 'fileutils'
 
 if ARGV.length != 2
-  puts "Usage: " + __FILE__ + " <Fragment generator token> <Fragment token>" 
+  puts "Usage: " + __FILE__ + " <Fragment generator token> <Fragment token>"
   exit 1
 end
 
 fraggentoken = ARGV[0]
 fragtoken = ARGV[1]
 
-if ! ENV['ARTDAQDEMO_REPO'] 
+if ! ENV['ARTDAQDEMO_REPO']
   puts "Couldn\'t find ARTDAQDEMO_REPO variable; have you sourced setupARTDAQDEMO?"
   exit 1
 end
 
-basedir = ENV['ARTDAQDEMO_REPO'] 
+basedir = ENV['ARTDAQDEMO_REPO']
 gendir = basedir + "/artdaq-demo/Generators/"
 overlaydir = basedir + "/artdaq-demo/Overlays/"
 
@@ -55,19 +55,18 @@
 # Add in the new generator to the CMakeLists.txt file for compilation
 
 sourcetext = File.read( gendir + "CMakeLists.txt" )
-sourcetext += "\n\n" 
+sourcetext += "\n\n"
 sourcetext += "simple_plugin(" + fraggentoken + " \"generator\"\n"
 sourcetext += <<-'EOS'
   artdaq-demo_Overlays
   artdaq_Application
   artdaq_DAQdata
   artdaq_Utilities
   art_Utilities
-  ${FHICLCPP} 
-  ${CETLIB} 
+  ${FHICLCPP}
+  ${CETLIB}
   )
 EOS
 
 outf = File.open( gendir + "CMakeLists.txt", 'w')
 outf.puts sourcetext
-
diff --git a/artdaq-demo/ArtModules/CMakeLists.txt b/artdaq-demo/ArtModules/CMakeLists.txt
@@ -1,7 +1,7 @@
 include(BuildPlugins) # Art Module
 
-cet_build_plugin(ArtdaqDemoBuildInfo art::module 
-  LIBRARIES REG 
+cet_build_plugin(ArtdaqDemoBuildInfo art::module
+  LIBRARIES REG
   TRACE::MF
   artdaq_demo::artdaq-demo_BuildInfo
   artdaq_core::artdaq-core_BuildInfo
@@ -22,7 +22,7 @@ cet_build_plugin(WFViewer art::module LIBRARIES REG artdaq_core_demo::artdaq-cor
 cet_build_plugin(DemoViewer art::module LIBRARIES REG artdaq_core_demo::artdaq-core-demo_Overlays ROOT::Core ROOT::Gui)
 
 cet_build_plugin(CheckIntegrity art::module LIBRARIES REG artdaq_core_demo::artdaq-core-demo_Overlays)
-  
+
 cet_build_plugin(EventReporterOutput art::module LIBRARIES REG artdaq::DAQdata ROOT::Core artdaq_core::artdaq-core_Data_ParentageMap)
 
 install_headers(SUBDIRS detail)

diff --git a/artdaq-demo/BuildInfo/CMakeLists.txt b/artdaq-demo/BuildInfo/CMakeLists.txt
@@ -25,9 +25,9 @@ string( STRIP ${rawUTCDate} utcDateTime )
 
 execute_process(COMMAND git describe --tags
 				WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-				RESULT_VARIABLE GIT_DESCRIBE_RESULT 
-                OUTPUT_VARIABLE GIT_DESCRIBE_VERSION 
-                ERROR_QUIET
+				RESULT_VARIABLE GIT_DESCRIBE_RESULT
+				OUTPUT_VARIABLE GIT_DESCRIBE_VERSION
+				ERROR_QUIET
 				OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 message("${GIT_DESCRIBE_RESULT}: ${GIT_DESCRIBE_VERSION} || $ENV{CETPKG_VERSION}")
@@ -42,10 +42,10 @@ configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/GetPackageBuildInfo.cc.in
   ${CMAKE_CURRENT_BINARY_DIR}/GetPackageBuildInfo.cc @ONLY )
 
 cet_make_library( LIBRARY_NAME artdaq-demo_BuildInfo
-                  SOURCE
+				  SOURCE
 		  ${CMAKE_CURRENT_BINARY_DIR}/GetPackageBuildInfo.cc
 			LIBRARIES artdaq_core::artdaq-core_Data
-                 )
+				 )
 
 install_headers()
 install_source()
diff --git a/artdaq-demo/BuildInfo/GetPackageBuildInfo.cc.in b/artdaq-demo/BuildInfo/GetPackageBuildInfo.cc.in
@@ -16,4 +16,3 @@ namespace demo {
   }
 
 }
-
diff --git a/artdaq-demo/Generators/ToyHardwareInterface/CMakeLists.txt b/artdaq-demo/Generators/ToyHardwareInterface/CMakeLists.txt
@@ -1,12 +1,11 @@
 cet_make_library(
-    SOURCE
-    ToyHardwareInterface.cc
-        LIBRARIES
-  artdaq::DAQdata
+	SOURCE
+	ToyHardwareInterface.cc
+	LIBRARIES
+	artdaq::DAQdata
 	artdaq_core::artdaq-core_Data
 	artdaq_core_demo::artdaq-core-demo_Overlays
-
-        )
-
+)
+
 install_headers()
-install_source()
+install_source()
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -16,11 +16,9 @@ cet_make_exec(NAME read_fhicl SOURCE readfhicl.cc
   LIBRARIES
   fhiclcpp::fhiclcpp
   Boost::program_options
-  )  
-  
+  )
+
 # Is this necessary?
-#install_source()
 install_fhicl(SUBDIRS fcl)
 install_headers()
 install_source()
-
diff --git a/tools/fcl/driver_test3.fcl b/tools/fcl/driver_test3.fcl
@@ -42,7 +42,7 @@ buffer_count: 20
 
 art: {
 services: {
-   ArtdaqSharedMemoryServiceInterface: { 
+   ArtdaqSharedMemoryServiceInterface: {
      service_provider: ArtdaqSharedMemoryService
      waiting_time: 900
      resume_after_timeout: true

diff --git a/tools/fcl/driver_test4.fcl b/tools/fcl/driver_test4.fcl
@@ -43,7 +43,7 @@ buffer_count: 20
 
 art: {
 services: {
-   ArtdaqSharedMemoryServiceInterface: { 
+   ArtdaqSharedMemoryServiceInterface: {
      service_provider: ArtdaqSharedMemoryService
      waiting_time: 900
      resume_after_timeout: true

diff --git a/tools/fcl/test_10Mx3000000_nodisk3.fcl b/tools/fcl/test_10Mx3000000_nodisk3.fcl
@@ -50,7 +50,7 @@ metrics: {
 ######################################################################
 art: {
 services: {
-   ArtdaqSharedMemoryServiceInterface: { 
+   ArtdaqSharedMemoryServiceInterface: {
      service_provider: ArtdaqSharedMemoryService
      waiting_time: 900
      resume_after_timeout: true

diff --git a/tools/fcl/test_10Mx300000_nodisk4.fcl b/tools/fcl/test_10Mx300000_nodisk4.fcl
@@ -50,7 +50,7 @@ metrics: {
 ######################################################################
 art: {
 services: {
-   ArtdaqSharedMemoryServiceInterface: { 
+   ArtdaqSharedMemoryServiceInterface: {
      service_provider: ArtdaqSharedMemoryService
      waiting_time: 900
      resume_after_timeout: true

diff --git a/tools/fcl/test_10Mx30000_binbuf3.fcl b/tools/fcl/test_10Mx30000_binbuf3.fcl
@@ -50,7 +50,7 @@ metrics: {
 ######################################################################
 art: {
 services: {
-   ArtdaqSharedMemoryServiceInterface: { 
+   ArtdaqSharedMemoryServiceInterface: {
      service_provider: ArtdaqSharedMemoryService
      waiting_time: 900
      resume_after_timeout: true

diff --git a/tools/fcl/test_10Mx30000_binbuf4.fcl b/tools/fcl/test_10Mx30000_binbuf4.fcl
@@ -50,7 +50,7 @@ metrics: {
 ######################################################################
 art: {
 services: {
-   ArtdaqSharedMemoryServiceInterface: { 
+   ArtdaqSharedMemoryServiceInterface: {
      service_provider: ArtdaqSharedMemoryService
      waiting_time: 900
      resume_after_timeout: true

diff --git a/tools/fcl/test_10Mx30000_bindirect3.fcl b/tools/fcl/test_10Mx30000_bindirect3.fcl
@@ -50,7 +50,7 @@ metrics: {
 ######################################################################
 art: {
 services: {
-   ArtdaqSharedMemoryServiceInterface: { 
+   ArtdaqSharedMemoryServiceInterface: {
      service_provider: ArtdaqSharedMemoryService
      waiting_time: 900
      resume_after_timeout: true

diff --git a/tools/fcl/test_10Mx30000_binnull3.fcl b/tools/fcl/test_10Mx30000_binnull3.fcl
@@ -51,7 +51,7 @@ metrics: {
 ######################################################################
 art: {
 services: {
-   ArtdaqSharedMemoryServiceInterface: { 
+   ArtdaqSharedMemoryServiceInterface: {
      service_provider: ArtdaqSharedMemoryService
      waiting_time: 900
      resume_after_timeout: true

diff --git a/tools/fcl/test_10Mx30000_binnull4.fcl b/tools/fcl/test_10Mx30000_binnull4.fcl
@@ -49,7 +49,7 @@ metrics: {
 ######################################################################
 art: {
 services: {
-   ArtdaqSharedMemoryServiceInterface: { 
+   ArtdaqSharedMemoryServiceInterface: {
      service_provider: ArtdaqSharedMemoryService
      waiting_time: 900
      resume_after_timeout: true

diff --git a/tools/fcl/test_10Mx30000_root2.fcl b/tools/fcl/test_10Mx30000_root2.fcl
@@ -50,7 +50,7 @@ metrics: {
 ######################################################################
 art: {
 services: {
-   ArtdaqSharedMemoryServiceInterface: { 
+   ArtdaqSharedMemoryServiceInterface: {
      service_provider: ArtdaqSharedMemoryService
      waiting_time: 900
      resume_after_timeout: true

diff --git a/tools/fcl/test_10Mx30000_root3.fcl b/tools/fcl/test_10Mx30000_root3.fcl
@@ -50,7 +50,7 @@ metrics: {
 ######################################################################
 art: {
 services: {
-   ArtdaqSharedMemoryServiceInterface: { 
+   ArtdaqSharedMemoryServiceInterface: {
      service_provider: ArtdaqSharedMemoryService
      waiting_time: 900
      resume_after_timeout: true

diff --git a/tools/fcl/test_10Mx30000_root3null.fcl b/tools/fcl/test_10Mx30000_root3null.fcl
@@ -49,7 +49,7 @@ metrics: {
 ######################################################################
 art: {
 services: {
-   ArtdaqSharedMemoryServiceInterface: { 
+   ArtdaqSharedMemoryServiceInterface: {
      service_provider: ArtdaqSharedMemoryService
      waiting_time: 900
      resume_after_timeout: true

diff --git a/tools/fcl/test_10Mx30000_root4.fcl b/tools/fcl/test_10Mx30000_root4.fcl
@@ -50,7 +50,7 @@ metrics: {
 ######################################################################
 art: {
 services: {
-   ArtdaqSharedMemoryServiceInterface: { 
+   ArtdaqSharedMemoryServiceInterface: {
      service_provider: ArtdaqSharedMemoryService
      waiting_time: 900
      resume_after_timeout: true

diff --git a/tools/fcl/test_1Mx300000_binnull4.fcl b/tools/fcl/test_1Mx300000_binnull4.fcl
@@ -51,7 +51,7 @@ metrics: {
 ######################################################################
 art: {
 services: {
-   ArtdaqSharedMemoryServiceInterface: { 
+   ArtdaqSharedMemoryServiceInterface: {
      service_provider: ArtdaqSharedMemoryService
      waiting_time: 900
      resume_after_timeout: true