Skip to content

Commit

Permalink
Remove all OutputLevel configurations from procesors (#152)
Browse files Browse the repository at this point in the history
This allows the global output setting of Gaudi to actually apply to
them. Otherwise it's not possible to set this globally.
  • Loading branch information
tmadlener authored Dec 10, 2024
1 parent fb10b66 commit 19c63b1
Show file tree
Hide file tree
Showing 17 changed files with 2 additions and 128 deletions.
6 changes: 0 additions & 6 deletions StandardConfig/production/BgOverlay/BgOverlay.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
#!/usr/bin/env python3

from Gaudi.Configuration import INFO
from Configurables import MarlinProcessorWrapper

BgOverlayWW = MarlinProcessorWrapper("BgOverlayWW")
BgOverlayWW.OutputLevel = INFO
BgOverlayWW.ProcessorType = "Overlay"
BgOverlayWW.Parameters = {
"InputFileNames": ["undefined.slcio"],
Expand All @@ -13,7 +11,6 @@
}

BgOverlayWB = MarlinProcessorWrapper("BgOverlayWB")
BgOverlayWB.OutputLevel = INFO
BgOverlayWB.ProcessorType = "Overlay"
BgOverlayWB.Parameters = {
"InputFileNames": ["undefined.slcio"],
Expand All @@ -22,7 +19,6 @@
}

BgOverlayBW = MarlinProcessorWrapper("BgOverlayBW")
BgOverlayBW.OutputLevel = INFO
BgOverlayBW.ProcessorType = "Overlay"
BgOverlayBW.Parameters = {
"InputFileNames": ["undefined.slcio"],
Expand All @@ -31,7 +27,6 @@
}

BgOverlayBB = MarlinProcessorWrapper("BgOverlayBB")
BgOverlayBB.OutputLevel = INFO
BgOverlayBB.ProcessorType = "Overlay"
BgOverlayBB.Parameters = {
"InputFileNames": ["undefined.slcio"],
Expand All @@ -40,7 +35,6 @@
}

PairBgOverlay = MarlinProcessorWrapper("PairBgOverlay")
PairBgOverlay.OutputLevel = INFO
PairBgOverlay.ProcessorType = "Overlay"
PairBgOverlay.Parameters = {
"ExcludeCollections": ["BeamCalCollection"],
Expand Down
7 changes: 0 additions & 7 deletions StandardConfig/production/CaloDigi/AHcalDigi.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
#!/usr/bin/env python3

from Gaudi.Configuration import INFO
from Configurables import MarlinProcessorWrapper

MyHcalBarrelDigi = MarlinProcessorWrapper("MyHcalBarrelDigi")
MyHcalBarrelDigi.OutputLevel = INFO
MyHcalBarrelDigi.ProcessorType = "RealisticCaloDigiScinPpd"
MyHcalBarrelDigi.Parameters = {
"CellIDLayerString": ["layer"],
Expand All @@ -22,7 +20,6 @@
}

MyHcalBarrelReco = MarlinProcessorWrapper("MyHcalBarrelReco")
MyHcalBarrelReco.OutputLevel = INFO
MyHcalBarrelReco.ProcessorType = "RealisticCaloRecoScinPpd"
MyHcalBarrelReco.Parameters = {
"CellIDLayerString": ["layer"],
Expand All @@ -37,7 +34,6 @@
}

MyHcalEndcapDigi = MarlinProcessorWrapper("MyHcalEndcapDigi")
MyHcalEndcapDigi.OutputLevel = INFO
MyHcalEndcapDigi.ProcessorType = "RealisticCaloDigiScinPpd"
MyHcalEndcapDigi.Parameters = {
"CellIDLayerString": ["layer"],
Expand All @@ -55,7 +51,6 @@
}

MyHcalEndcapReco = MarlinProcessorWrapper("MyHcalEndcapReco")
MyHcalEndcapReco.OutputLevel = INFO
MyHcalEndcapReco.ProcessorType = "RealisticCaloRecoScinPpd"
MyHcalEndcapReco.Parameters = {
"CellIDLayerString": ["layer"],
Expand All @@ -70,7 +65,6 @@
}

MyHcalRingDigi = MarlinProcessorWrapper("MyHcalRingDigi")
MyHcalRingDigi.OutputLevel = INFO
MyHcalRingDigi.ProcessorType = "RealisticCaloDigiScinPpd"
MyHcalRingDigi.Parameters = {
"CellIDLayerString": ["layer"],
Expand All @@ -88,7 +82,6 @@
}

MyHcalRingReco = MarlinProcessorWrapper("MyHcalRingReco")
MyHcalRingReco.OutputLevel = INFO
MyHcalRingReco.ProcessorType = "RealisticCaloRecoScinPpd"
MyHcalRingReco.Parameters = {
"CellIDLayerString": ["layer"],
Expand Down
4 changes: 0 additions & 4 deletions StandardConfig/production/CaloDigi/FcalDigi.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
#!/usr/bin/env python3

from Gaudi.Configuration import INFO
from Configurables import MarlinProcessorWrapper


MySimpleBCalDigi = MarlinProcessorWrapper("MySimpleBCalDigi")
MySimpleBCalDigi.OutputLevel = INFO
MySimpleBCalDigi.ProcessorType = "SimpleFCalDigi"
MySimpleBCalDigi.Parameters = {
"CalibrFCAL": [CONSTANTS["BeamCalCalibrationFactor"]],
Expand All @@ -18,7 +16,6 @@
}

MySimpleLCalDigi = MarlinProcessorWrapper("MySimpleLCalDigi")
MySimpleLCalDigi.OutputLevel = INFO
MySimpleLCalDigi.ProcessorType = "SimpleFCalDigi"
MySimpleLCalDigi.Parameters = {
"CalibrFCAL": ["89.0"],
Expand All @@ -31,7 +28,6 @@
}

MySimpleLHCalDigi = MarlinProcessorWrapper("MySimpleLHCalDigi")
MySimpleLHCalDigi.OutputLevel = INFO
MySimpleLHCalDigi.ProcessorType = "SimpleFCalDigi"
MySimpleLHCalDigi.Parameters = {
"CalibrFCAL": ["150"],
Expand Down
2 changes: 0 additions & 2 deletions StandardConfig/production/CaloDigi/MuonDigi.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
#!/usr/bin/env python3

from Gaudi.Configuration import INFO
from Configurables import MarlinProcessorWrapper

MyDDSimpleMuonDigi = MarlinProcessorWrapper("MyDDSimpleMuonDigi")
MyDDSimpleMuonDigi.OutputLevel = INFO
MyDDSimpleMuonDigi.ProcessorType = "DDSimpleMuonDigi"
MyDDSimpleMuonDigi.Parameters = {
"CalibrMUON": [CONSTANTS["MuonCalibration"]],
Expand Down
3 changes: 0 additions & 3 deletions StandardConfig/production/CaloDigi/SDHcalDigi.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
#!/usr/bin/env python3

from Gaudi.Configuration import INFO
from Configurables import MarlinProcessorWrapper

MySimDigital = MarlinProcessorWrapper("MySimDigital")
MySimDigital.OutputLevel = INFO
MySimDigital.ProcessorType = "SimDigital"
MySimDigital.Parameters = {
"AngleCorrectionPower": ["0.65"],
Expand Down Expand Up @@ -42,7 +40,6 @@
}

MySimDigitalToEnergy = MarlinProcessorWrapper("MySimDigitalToEnergy")
MySimDigitalToEnergy.OutputLevel = INFO
MySimDigitalToEnergy.ProcessorType = "SimDigitalToEnergy"
MySimDigitalToEnergy.Parameters = {
"EnergyCalibration": [CONSTANTS["SDHcalEnergyFactors"]],
Expand Down
21 changes: 0 additions & 21 deletions StandardConfig/production/CaloDigi/ScEcalDigi.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
#!/usr/bin/env python3

from Gaudi.Configuration import INFO
from Configurables import MarlinProcessorWrapper

MyEcalBarrelDigiEven = MarlinProcessorWrapper("MyEcalBarrelDigiEven")
MyEcalBarrelDigiEven.OutputLevel = INFO
MyEcalBarrelDigiEven.ProcessorType = "RealisticCaloDigiScinPpd"
MyEcalBarrelDigiEven.Parameters = {
"CellIDLayerString": ["layer"],
Expand All @@ -22,7 +20,6 @@
}

MyEcalBarrelDigiOdd = MarlinProcessorWrapper("MyEcalBarrelDigiOdd")
MyEcalBarrelDigiOdd.OutputLevel = INFO
MyEcalBarrelDigiOdd.ProcessorType = "RealisticCaloDigiScinPpd"
MyEcalBarrelDigiOdd.Parameters = {
"CellIDLayerString": ["layer"],
Expand All @@ -40,7 +37,6 @@
}

MyEcalBarrelRecoEven = MarlinProcessorWrapper("MyEcalBarrelRecoEven")
MyEcalBarrelRecoEven.OutputLevel = INFO
MyEcalBarrelRecoEven.ProcessorType = "RealisticCaloRecoScinPpd"
MyEcalBarrelRecoEven.Parameters = {
"CellIDLayerString": ["layer"],
Expand All @@ -55,7 +51,6 @@
}

MyEcalBarrelRecoOdd = MarlinProcessorWrapper("MyEcalBarrelRecoOdd")
MyEcalBarrelRecoOdd.OutputLevel = INFO
MyEcalBarrelRecoOdd.ProcessorType = "RealisticCaloRecoScinPpd"
MyEcalBarrelRecoOdd.Parameters = {
"CellIDLayerString": ["layer"],
Expand All @@ -70,7 +65,6 @@
}

MyEcalEndcapDigiEven = MarlinProcessorWrapper("MyEcalEndcapDigiEven")
MyEcalEndcapDigiEven.OutputLevel = INFO
MyEcalEndcapDigiEven.ProcessorType = "RealisticCaloDigiScinPpd"
MyEcalEndcapDigiEven.Parameters = {
"CellIDLayerString": ["layer"],
Expand All @@ -88,7 +82,6 @@
}

MyEcalEndcapDigiOdd = MarlinProcessorWrapper("MyEcalEndcapDigiOdd")
MyEcalEndcapDigiOdd.OutputLevel = INFO
MyEcalEndcapDigiOdd.ProcessorType = "RealisticCaloDigiScinPpd"
MyEcalEndcapDigiOdd.Parameters = {
"CellIDLayerString": ["layer"],
Expand All @@ -106,7 +99,6 @@
}

MyEcalEndcapRecoEven = MarlinProcessorWrapper("MyEcalEndcapRecoEven")
MyEcalEndcapRecoEven.OutputLevel = INFO
MyEcalEndcapRecoEven.ProcessorType = "RealisticCaloRecoScinPpd"
MyEcalEndcapRecoEven.Parameters = {
"CellIDLayerString": ["layer"],
Expand All @@ -121,7 +113,6 @@
}

MyEcalEndcapRecoOdd = MarlinProcessorWrapper("MyEcalEndcapRecoOdd")
MyEcalEndcapRecoOdd.OutputLevel = INFO
MyEcalEndcapRecoOdd.ProcessorType = "RealisticCaloRecoScinPpd"
MyEcalEndcapRecoOdd.Parameters = {
"CellIDLayerString": ["layer"],
Expand All @@ -136,7 +127,6 @@
}

MyEcalRingDigi = MarlinProcessorWrapper("MyEcalRingDigi")
MyEcalRingDigi.OutputLevel = INFO
MyEcalRingDigi.ProcessorType = "RealisticCaloDigiSilicon"
MyEcalRingDigi.Parameters = {
"CellIDLayerString": ["layer"],
Expand All @@ -149,7 +139,6 @@
}

MyEcalRingReco = MarlinProcessorWrapper("MyEcalRingReco")
MyEcalRingReco.OutputLevel = INFO
MyEcalRingReco.ProcessorType = "RealisticCaloRecoSilicon"
MyEcalRingReco.Parameters = {
"CellIDLayerString": ["layer"],
Expand All @@ -162,7 +151,6 @@
}

MyDDStripSplitterBarrel = MarlinProcessorWrapper("MyDDStripSplitterBarrel")
MyDDStripSplitterBarrel.OutputLevel = INFO
MyDDStripSplitterBarrel.ProcessorType = "DDStripSplitter"
MyDDStripSplitterBarrel.Parameters = {
"ECALcollection_evenLayers": ["ECalBarrelScHitsEvenRec"],
Expand All @@ -176,7 +164,6 @@
}

MyDDStripSplitterEndcap = MarlinProcessorWrapper("MyDDStripSplitterEndcap")
MyDDStripSplitterEndcap.OutputLevel = INFO
MyDDStripSplitterEndcap.ProcessorType = "DDStripSplitter"
MyDDStripSplitterEndcap.Parameters = {
"ECALcollection_evenLayers": ["ECalEndcapScHitsEvenRec"],
Expand All @@ -190,63 +177,55 @@
}

MergeEcalBarrelHits = MarlinProcessorWrapper("MergeEcalBarrelHits")
MergeEcalBarrelHits.OutputLevel = INFO
MergeEcalBarrelHits.ProcessorType = "MergeCollections"
MergeEcalBarrelHits.Parameters = {
"InputCollections": ["ECalBarrelScHitsEven", "ECalBarrelScHitsOdd"],
"OutputCollection": ["EcalBarrelCollection"],
}

MergeEcalEndcapHits = MarlinProcessorWrapper("MergeEcalEndcapHits")
MergeEcalEndcapHits.OutputLevel = INFO
MergeEcalEndcapHits.ProcessorType = "MergeCollections"
MergeEcalEndcapHits.Parameters = {
"InputCollections": ["ECalEndcapScHitsEven", "ECalEndcapScHitsOdd"],
"OutputCollection": ["EcalEndcapsCollection"],
}

MergeEcalBarrelDigiHits = MarlinProcessorWrapper("MergeEcalBarrelDigiHits")
MergeEcalBarrelDigiHits.OutputLevel = INFO
MergeEcalBarrelDigiHits.ProcessorType = "MergeCollections"
MergeEcalBarrelDigiHits.Parameters = {
"InputCollections": ["ECalBarrelScHitsEvenDigi", "ECalBarrelScHitsOddDigi"],
"OutputCollection": ["EcalBarrelCollectionDigi"],
}

MergeEcalEndcapDigiHits = MarlinProcessorWrapper("MergeEcalEndcapDigiHits")
MergeEcalEndcapDigiHits.OutputLevel = INFO
MergeEcalEndcapDigiHits.ProcessorType = "MergeCollections"
MergeEcalEndcapDigiHits.Parameters = {
"InputCollections": ["ECalEndcapScHitsEvenDigi", "ECalEndcapScHitsOddDigi"],
"OutputCollection": ["EcalEndcapsCollectionDigi"],
}

MergeEcalBarrelRecStripHits = MarlinProcessorWrapper("MergeEcalBarrelRecStripHits")
MergeEcalBarrelRecStripHits.OutputLevel = INFO
MergeEcalBarrelRecStripHits.ProcessorType = "MergeCollections"
MergeEcalBarrelRecStripHits.Parameters = {
"InputCollections": ["ECalBarrelScHitsEvenRec", "ECalBarrelScHitsOddRec"],
"OutputCollection": ["EcalBarrelStripCollectionRec"],
}

MergeEcalEndcapRecStripHits = MarlinProcessorWrapper("MergeEcalEndcapRecStripHits")
MergeEcalEndcapRecStripHits.OutputLevel = INFO
MergeEcalEndcapRecStripHits.ProcessorType = "MergeCollections"
MergeEcalEndcapRecStripHits.Parameters = {
"InputCollections": ["ECalEndcapScHitsEvenRec", "ECalEndcapScHitsOddRec"],
"OutputCollection": ["EcalEndcapStripCollectionRec"],
}

MergeEcalBarrelRecHits = MarlinProcessorWrapper("MergeEcalBarrelRecHits")
MergeEcalBarrelRecHits.OutputLevel = INFO
MergeEcalBarrelRecHits.ProcessorType = "MergeCollections"
MergeEcalBarrelRecHits.Parameters = {
"InputCollections": ["ECalBarrelScHitsSplit", "ECalBarrelScHitsUnSplit"],
"OutputCollection": ["EcalBarrelCollectionRec"],
}

MergeEcalEndcapRecHits = MarlinProcessorWrapper("MergeEcalEndcapRecHits")
MergeEcalEndcapRecHits.OutputLevel = INFO
MergeEcalEndcapRecHits.ProcessorType = "MergeCollections"
MergeEcalEndcapRecHits.Parameters = {
"InputCollections": ["ECalEndcapScHitsSplit", "ECalEndcapScHitsUnSplit"],
Expand Down
11 changes: 0 additions & 11 deletions StandardConfig/production/CaloDigi/SiWEcalDigi.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
#!/usr/bin/env python3

from Gaudi.Configuration import INFO
from Configurables import MarlinProcessorWrapper

MergeCollectionsEcalBarrelHits = MarlinProcessorWrapper(
"MergeCollectionsEcalBarrelHits"
)
MergeCollectionsEcalBarrelHits.OutputLevel = INFO
MergeCollectionsEcalBarrelHits.ProcessorType = "MergeCollections"
MergeCollectionsEcalBarrelHits.Parameters = {
"InputCollections": ["ECalBarrelSiHitsEven", "ECalBarrelSiHitsOdd"],
Expand All @@ -16,15 +14,13 @@
MergeCollectionsEcalEndcapHits = MarlinProcessorWrapper(
"MergeCollectionsEcalEndcapHits"
)
MergeCollectionsEcalEndcapHits.OutputLevel = INFO
MergeCollectionsEcalEndcapHits.ProcessorType = "MergeCollections"
MergeCollectionsEcalEndcapHits.Parameters = {
"InputCollections": ["ECalEndcapSiHitsEven", "ECalEndcapSiHitsOdd"],
"OutputCollection": ["EcalEndcapsCollection"],
}

MyEcalBarrelDigi = MarlinProcessorWrapper("MyEcalBarrelDigi")
MyEcalBarrelDigi.OutputLevel = INFO
MyEcalBarrelDigi.ProcessorType = "RealisticCaloDigiSilicon"
MyEcalBarrelDigi.Parameters = {
"CellIDLayerString": ["layer"],
Expand All @@ -37,7 +33,6 @@
}

MyEcalBarrelReco = MarlinProcessorWrapper("MyEcalBarrelReco")
MyEcalBarrelReco.OutputLevel = INFO
MyEcalBarrelReco.ProcessorType = "RealisticCaloRecoSilicon"
MyEcalBarrelReco.Parameters = {
"CellIDLayerString": ["layer"],
Expand All @@ -50,7 +45,6 @@
}

MyEcalBarrelGapFiller = MarlinProcessorWrapper("MyEcalBarrelGapFiller")
MyEcalBarrelGapFiller.OutputLevel = INFO
MyEcalBarrelGapFiller.ProcessorType = "BruteForceEcalGapFiller"
MyEcalBarrelGapFiller.Parameters = {
"CellIDLayerString": ["layer"],
Expand All @@ -63,7 +57,6 @@
}

MyEcalEndcapDigi = MarlinProcessorWrapper("MyEcalEndcapDigi")
MyEcalEndcapDigi.OutputLevel = INFO
MyEcalEndcapDigi.ProcessorType = "RealisticCaloDigiSilicon"
MyEcalEndcapDigi.Parameters = {
"CellIDLayerString": ["layer"],
Expand All @@ -76,7 +69,6 @@
}

MyEcalEndcapReco = MarlinProcessorWrapper("MyEcalEndcapReco")
MyEcalEndcapReco.OutputLevel = INFO
MyEcalEndcapReco.ProcessorType = "RealisticCaloRecoSilicon"
MyEcalEndcapReco.Parameters = {
"CellIDLayerString": ["layer"],
Expand All @@ -89,7 +81,6 @@
}

MyEcalEndcapGapFiller = MarlinProcessorWrapper("MyEcalEndcapGapFiller")
MyEcalEndcapGapFiller.OutputLevel = INFO
MyEcalEndcapGapFiller.ProcessorType = "BruteForceEcalGapFiller"
MyEcalEndcapGapFiller.Parameters = {
"CellIDLayerString": ["layer"],
Expand All @@ -102,7 +93,6 @@
}

MyEcalRingDigi = MarlinProcessorWrapper("MyEcalRingDigi")
MyEcalRingDigi.OutputLevel = INFO
MyEcalRingDigi.ProcessorType = "RealisticCaloDigiSilicon"
MyEcalRingDigi.Parameters = {
"CellIDLayerString": ["layer"],
Expand All @@ -115,7 +105,6 @@
}

MyEcalRingReco = MarlinProcessorWrapper("MyEcalRingReco")
MyEcalRingReco.OutputLevel = INFO
MyEcalRingReco.ProcessorType = "RealisticCaloRecoSilicon"
MyEcalRingReco.Parameters = {
"CellIDLayerString": ["layer"],
Expand Down
Loading

0 comments on commit 19c63b1

Please sign in to comment.