Skip to content
Snippets Groups Projects

Update clang-format and switch to Ruff for Python linting and formatting

Merged Marco Clemencic requested to merge use-pre-commit into master
13 files
+ 9
176
Compare changes
  • Side-by-side
  • Inline
Files
13
@@ -599,10 +599,6 @@ class CaloFutureProcessor(CaloFutureRecoConf, LHCbConfigurableUser):
self.setCounterLevel()
# overwrite Reco & PID onDemand
dod = self.getProp("EnableOnDemand")
pdod = self.getProp("ProtoOnDemand")
if dod:
pdod = dod
self.setProp("EnableRecoOnDemand", dod)
## define the calo sequence
@@ -612,7 +608,6 @@ class CaloFutureProcessor(CaloFutureRecoConf, LHCbConfigurableUser):
doPIDs = self.getProp("CaloFuturePIDs")
skipNeutrals = self.getProp("SkipNeutrals")
skipCharged = self.getProp("SkipCharged")
context = self.getProp("Context")
# CaloFutureReco sequence
recoSeq = GaudiSequencer("CaloFutureRecoFor" + self.getName())
@@ -624,10 +619,6 @@ class CaloFutureProcessor(CaloFutureRecoConf, LHCbConfigurableUser):
if forceOnDemand:
self.setProp("EnableOnDemand", "True")
self.setProp("EnableRecoOnDemand", "True")
dig = self.digits()
clu = self.clusters()
phe = self.photonsAndElectrons()
mer = self.mergedPi0s()
# add only the requested components to the sequence
if "Digits" in recList:
@@ -645,10 +636,6 @@ class CaloFutureProcessor(CaloFutureRecoConf, LHCbConfigurableUser):
if "MergedPi0s" in recList or "SplitPhotons" in recList:
addAlgs(recoSeq, self.mergedPi0s())
# CaloFuturePIDs sequence
# pidSeq = getAlgo( GaudiSequencer , "CaloFuturePIDsSeq" , context )
# addAlgs ( pidSeq , self.caloPIDs () )
pidSeq = self.caloPIDs()
# update CaloFutureSequence
@@ -708,8 +695,8 @@ class CaloFutureProcessor(CaloFutureRecoConf, LHCbConfigurableUser):
ecal_converter2.OutputTable
) # HypoTrTable2D
brem = addInfo(ChargedProtoParticleAddBremInfo, "AddBrem")
comb = addInfo(ChargedProtoParticleAddCombineDLLs, "AddCombineDLLs")
addInfo(ChargedProtoParticleAddBremInfo, "AddBrem")
addInfo(ChargedProtoParticleAddCombineDLLs, "AddCombineDLLs")
# protoPMaker settings (from GlobalRecoConf)
from Configurables import DelegatingTrackSelector, GaudiSequencer
Loading