Format all Python files

.github/workflows/pre-commit.yml

@@ -0,0 +1,26 @@
+name: pre-commit
+
+on: [push, pull_request]
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: cvmfs-contrib/github-action-cvmfs@v4
+    - uses: aidasoft/run-lcg-view@v4
+      with:
+        container: el9
+        view-path: /cvmfs/sw-nightlies.hsf.org/key4hep
+        run: |
+          python -m venv /root/pre-commit-venv
+          source /root/pre-commit-venv/bin/activate
+          pip install pre-commit
+          export PYTHONPATH=$VIRTUAL_ENV/lib/python3.$(python3 -c 'import sys; print(f"{sys.version_info[1]}")')/site-packages:$PYTHONPATH
+          # Newer versions of git are more cautious around the github runner
+          # environment and without this git rev-parse --show-cdup in pre-commit
+          # fails
+          git config --global --add safe.directory $(pwd)
+          pre-commit run --show-diff-on-failure \
+            --color=always \
+            --all-files

.pre-commit-config.yaml

@@ -0,0 +1,13 @@
+repos:
+  - repo: local
+    hooks:
+      - id: ruff-format
+        name: ruff-format
+        entry: ruff format --force-exclude
+        types: [python]
+        language: system
+      - id: ruff-isort
+        name: ruff-isort
+        entry: ruff check --select I --fix --force-exclude
+        types: [python]
+        language: system

.ruff.toml

@@ -0,0 +1,10 @@
+target-version = "py311"
+
+line-length = 99
+
+[format]
+# Make things format the same way as black
+quote-style = "double"
+indent-style = "space"
+skip-magic-trailing-comma = false
+line-ending = "auto"

StandardConfig/production/CaloDigi/FcalDigi.py

@@ -2,7 +2,6 @@
 
 from Configurables import MarlinProcessorWrapper
 
-
 MySimpleBCalDigi = MarlinProcessorWrapper("MySimpleBCalDigi")
 MySimpleBCalDigi.ProcessorType = "SimpleFCalDigi"
 MySimpleBCalDigi.Parameters = {

StandardConfig/production/CaloDigi/SiWEcalDigi.py

@@ -2,18 +2,14 @@
 
 from Configurables import MarlinProcessorWrapper
 
-MergeCollectionsEcalBarrelHits = MarlinProcessorWrapper(
-    "MergeCollectionsEcalBarrelHits"
-)
+MergeCollectionsEcalBarrelHits = MarlinProcessorWrapper("MergeCollectionsEcalBarrelHits")
 MergeCollectionsEcalBarrelHits.ProcessorType = "MergeCollections"
 MergeCollectionsEcalBarrelHits.Parameters = {
     "InputCollections": ["ECalBarrelSiHitsEven", "ECalBarrelSiHitsOdd"],
     "OutputCollection": ["EcalBarrelCollection"],
 }
 
-MergeCollectionsEcalEndcapHits = MarlinProcessorWrapper(
-    "MergeCollectionsEcalEndcapHits"
-)
+MergeCollectionsEcalEndcapHits = MarlinProcessorWrapper("MergeCollectionsEcalEndcapHits")
 MergeCollectionsEcalEndcapHits.ProcessorType = "MergeCollections"
 MergeCollectionsEcalEndcapHits.Parameters = {
     "InputCollections": ["ECalEndcapSiHitsEven", "ECalEndcapSiHitsOdd"],

StandardConfig/production/HighLevelReco/HighLevelReco.py

@@ -13,9 +13,7 @@
     "PFOCollectionName": ["PandoraPFOs"],
 }
 
-MyComputeShowerShapesProcessor = MarlinProcessorWrapper(
-    "MyComputeShowerShapesProcessor"
-)
+MyComputeShowerShapesProcessor = MarlinProcessorWrapper("MyComputeShowerShapesProcessor")
 MyComputeShowerShapesProcessor.ProcessorType = "ComputeShowerShapesProcessor"
 MyComputeShowerShapesProcessor.Parameters = {
     "ClusterCollectionName": ["PandoraClusters"],
@@ -291,9 +289,7 @@
     "BuildUpVertexCollectionName": ["BuildUpVertex"],
     "PFOCollection": ["PandoraPFOs"],
     "PrimaryVertexCollectionName": ["PrimaryVertex"],
-    "PrimaryVertexFinder.BeamspotConstraint": [
-        cms_energy_config["LCFIPlusBeamspotConstraint"]
-    ],
+    "PrimaryVertexFinder.BeamspotConstraint": [cms_energy_config["LCFIPlusBeamspotConstraint"]],
     "PrimaryVertexFinder.BeamspotSmearing": ["0"],
     "PrimaryVertexFinder.Chi2Threshold": ["25."],
     "PrimaryVertexFinder.TrackMaxD0": ["20."],

StandardConfig/production/ILDReconstruction.py

@@ -222,9 +222,7 @@ def get_cms_energy_config(
 geoSvc.EnableGeant4Geo = False
 svcList.append(geoSvc)
 
-is_FCCee_model, cms_e, cms_energy_config = get_cms_energy_config(
-    compact_file, reco_args.cmsEnergy
-)
+is_FCCee_model, cms_e, cms_energy_config = get_cms_energy_config(compact_file, reco_args.cmsEnergy)
 CONSTANTS = {
     "CMSEnergy": str(cms_e),
     "BeamCalCalibrationFactor": str(reco_args.beamCalCalibFactor),
@@ -303,9 +301,7 @@ def get_cms_energy_config(
             "BCalCollections": ["BCAL"],
             "BCalCollectionsSimCaloHit": ["BeamCalCollection"],
             "CollectCalibrationDetails": ["0"],
-            "ECalBarrelCollectionsSimCaloHit": [
-                CONSTANTS["ECalBarrelSimHitCollections"]
-            ],
+            "ECalBarrelCollectionsSimCaloHit": [CONSTANTS["ECalBarrelSimHitCollections"]],
             "ECalCollections": [
                 "EcalBarrelCollectionRec",
                 "EcalBarrelCollectionGapHits",
@@ -314,21 +310,15 @@ def get_cms_energy_config(
                 "EcalEndcapRingCollectionRec",
             ],
             "ECalCollectionsSimCaloHit": [CONSTANTS["ECalSimHitCollections"]],
-            "ECalEndCapCollectionsSimCaloHit": [
-                CONSTANTS["ECalEndcapSimHitCollections"]
-            ],
+            "ECalEndCapCollectionsSimCaloHit": [CONSTANTS["ECalEndcapSimHitCollections"]],
             "ECalOtherCollectionsSimCaloHit": [CONSTANTS["ECalRingSimHitCollections"]],
-            "HCalBarrelCollectionsSimCaloHit": [
-                CONSTANTS["HCalBarrelSimHitCollections"]
-            ],
+            "HCalBarrelCollectionsSimCaloHit": [CONSTANTS["HCalBarrelSimHitCollections"]],
             "HCalCollections": [
                 "HcalBarrelCollectionRec",
                 "HcalEndcapsCollectionRec",
                 "HcalEndcapRingCollectionRec",
             ],
-            "HCalEndCapCollectionsSimCaloHit": [
-                CONSTANTS["HCalEndcapSimHitCollections"]
-            ],
+            "HCalEndCapCollectionsSimCaloHit": [CONSTANTS["HCalEndcapSimHitCollections"]],
             "HCalOtherCollectionsSimCaloHit": [CONSTANTS["HCalRingSimHitCollections"]],
             "LCalCollections": ["LCAL"],
             "LCalCollectionsSimCaloHit": ["LumiCalCollection"],
@@ -352,9 +342,7 @@ def get_cms_energy_config(
 
 # Make sure that all collections are always available by patching in missing
 # ones on-the-fly
-collPatcherRec = MarlinProcessorWrapper(
-    "CollPatcherREC", ProcessorType="PatchCollections"
-)
+collPatcherRec = MarlinProcessorWrapper("CollPatcherREC", ProcessorType="PatchCollections")
 collPatcherRec.Parameters = {
     "PatchCollections": parse_collection_patch_file(REC_COLLECTION_CONTENTS_FILE)
 }
@@ -365,9 +353,7 @@ def get_cms_energy_config(
     output_commands.extend(get_drop_collections(CONSTANTS, True))
     # get_drop_collections incorrectly splits "type edm4hep::..." into two separate drops
     output_commands.append("drop type edm4hep::RecDqdxCollection")
-    io_handler.add_edm4hep_writer(
-        f"{reco_args.outputFileBase}_REC.edm4hep.root", output_commands
-    )
+    io_handler.add_edm4hep_writer(f"{reco_args.outputFileBase}_REC.edm4hep.root", output_commands)
 
 
 if reco_args.lcioOutput in ("on", "only"):
@@ -419,9 +405,7 @@ def get_cms_energy_config(
 svcList.append(auditorSvc)
 auditorSvc.Auditors = [AlgTimingAuditor()]
 
-app_mgr = ApplicationMgr(
-    TopAlg=algList, EvtSel="NONE", EvtMax=3, ExtSvc=svcList, OutputLevel=INFO
-)
+app_mgr = ApplicationMgr(TopAlg=algList, EvtSel="NONE", EvtMax=3, ExtSvc=svcList, OutputLevel=INFO)
 
 app_mgr.AuditAlgorithms = True
 app_mgr.AuditTools = True

StandardConfig/production/Tracking/TrackingDigi.py

@@ -16,9 +16,7 @@
     ],
 }
 
-VXDPlanarDigiProcessor_CMOSVXD5 = MarlinProcessorWrapper(
-    "VXDPlanarDigiProcessor_CMOSVXD5"
-)
+VXDPlanarDigiProcessor_CMOSVXD5 = MarlinProcessorWrapper("VXDPlanarDigiProcessor_CMOSVXD5")
 VXDPlanarDigiProcessor_CMOSVXD5.ProcessorType = "DDPlanarDigiProcessor"
 VXDPlanarDigiProcessor_CMOSVXD5.Parameters = {
     "ForceHitsOntoSurface": ["true"],

StandardConfig/production/Tracking/TrackingDigi_FCCeeMDI.py

@@ -42,9 +42,7 @@
     "TrackerHitCollectionName": ["InnerTrackerBarrelHits"],
 }
 
-InnerEndcapPlanarDigiProcessor = MarlinProcessorWrapper(
-    "InnerEndcapPlanarDigiProcessor"
-)
+InnerEndcapPlanarDigiProcessor = MarlinProcessorWrapper("InnerEndcapPlanarDigiProcessor")
 InnerEndcapPlanarDigiProcessor.ProcessorType = "DDPlanarDigiProcessor"
 InnerEndcapPlanarDigiProcessor.Parameters = {
     "IsStrip": ["false"],

StandardConfig/production/Tracking/TrackingReco_FCCeeMDI.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 
 from Configurables import MarlinProcessorWrapper
-
 from py_utils import encode_CT_steps_dict_to_legacy_list
 
 CT_MAX_DIST = "0.03"  # RANDOM VALUE COPYIED FROM CLDRECO