Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PF] Add fillDescription to RecoParticleFlow producers #45212

Merged
merged 7 commits into from
Jun 21, 2024
Merged

[PF] Add fillDescription to RecoParticleFlow producers #45212

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
41f08d0
Add fillDescription to RecoParticleFlow producers
Jun 13, 2024
7b34707
Fixed issue and implemented comments
Jun 13, 2024
50d3e58
Remove exists and fix fill descriptions
Jun 15, 2024
2da72f0
Remove the unknown PF parameter settings
Jun 16, 2024
a848a6c
Implemented comments
Jun 16, 2024
c85415b
Remove optional condition on parameters
Jun 18, 2024
9fee0bb
Undo the renaming of gathering, seeding and reHitEnergyNorm double ve…
Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions ...nfiguration/python/HLT_75e33/modules/hltParticleFlowClusterECALUncorrectedL1Seeded_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
allCellsPositionCalc = cms.PSet(
algoName = cms.string('Basic2DGenericPFlowPositionCalc'),
logWeightDenominator = cms.double(0.08),
logWeightDenominatorByDetector = cms.VPSet(),
minAllowedNormalization = cms.double(1e-09),
minFractionInCalc = cms.double(1e-09),
posCalcNCrystals = cms.int32(-1),
Expand Down Expand Up @@ -54,6 +55,7 @@
positionCalc = cms.PSet(
algoName = cms.string('Basic2DGenericPFlowPositionCalc'),
logWeightDenominator = cms.double(0.08),
logWeightDenominatorByDetector = cms.VPSet(),
minAllowedNormalization = cms.double(1e-09),
minFractionInCalc = cms.double(1e-09),
posCalcNCrystals = cms.int32(9),
Expand Down Expand Up @@ -84,7 +86,8 @@
X0 = cms.double(0.89),
algoName = cms.string('ECAL2DPositionCalcWithDepthCorr'),
minAllowedNormalization = cms.double(0.0),
minFractionInCalc = cms.double(0.0)
minFractionInCalc = cms.double(0.0),
timeResolutionCalc = cms.PSet()
),
recHitEnergyNorms = cms.VPSet(
cms.PSet(
Expand All @@ -107,7 +110,8 @@
X0 = cms.double(0.89),
algoName = cms.string('ECAL2DPositionCalcWithDepthCorr'),
minAllowedNormalization = cms.double(0.0),
minFractionInCalc = cms.double(0.0)
minFractionInCalc = cms.double(0.0),
timeResolutionCalc = cms.PSet()
),
recHitCleaners = cms.VPSet(),
recHitsSource = cms.InputTag("hltParticleFlowRecHitECALL1Seeded"),
Expand Down
8 changes: 6 additions & 2 deletions ...nfiguration/python/HLT_75e33/modules/hltParticleFlowClusterECALUncorrectedUnseeded_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
allCellsPositionCalc = cms.PSet(
algoName = cms.string('Basic2DGenericPFlowPositionCalc'),
logWeightDenominator = cms.double(0.08),
logWeightDenominatorByDetector = cms.VPSet(),
minAllowedNormalization = cms.double(1e-09),
minFractionInCalc = cms.double(1e-09),
posCalcNCrystals = cms.int32(-1),
Expand Down Expand Up @@ -54,6 +55,7 @@
positionCalc = cms.PSet(
algoName = cms.string('Basic2DGenericPFlowPositionCalc'),
logWeightDenominator = cms.double(0.08),
logWeightDenominatorByDetector = cms.VPSet(),
minAllowedNormalization = cms.double(1e-09),
minFractionInCalc = cms.double(1e-09),
posCalcNCrystals = cms.int32(9),
Expand Down Expand Up @@ -84,7 +86,8 @@
X0 = cms.double(0.89),
algoName = cms.string('ECAL2DPositionCalcWithDepthCorr'),
minAllowedNormalization = cms.double(0.0),
minFractionInCalc = cms.double(0.0)
minFractionInCalc = cms.double(0.0),
timeResolutionCalc = cms.PSet()
),
recHitEnergyNorms = cms.VPSet(
cms.PSet(
Expand All @@ -107,7 +110,8 @@
X0 = cms.double(0.89),
algoName = cms.string('ECAL2DPositionCalcWithDepthCorr'),
minAllowedNormalization = cms.double(0.0),
minFractionInCalc = cms.double(0.0)
minFractionInCalc = cms.double(0.0),
timeResolutionCalc = cms.PSet()
),
recHitCleaners = cms.VPSet(),
recHitsSource = cms.InputTag("hltParticleFlowRecHitECALUnseeded"),
Expand Down
29 changes: 17 additions & 12 deletions HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterHBHE_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@
cms.PSet(
depths = cms.vint32(1, 2, 3, 4),
detector = cms.string('HCAL_BARREL1'),
gatheringThreshold = cms.vdouble(0.1, 0.2, 0.3, 0.3),
gatheringThresholdPt = cms.vdouble(0.0, 0.0, 0.0, 0.0)
gatheringThresholds = cms.vdouble(0.1, 0.2, 0.3, 0.3),
gatheringThresholdsPt = cms.vdouble(0.0, 0.0, 0.0, 0.0)
),
cms.PSet(
depths = cms.vint32(
1, 2, 3, 4, 5,
6, 7
),
detector = cms.string('HCAL_ENDCAP'),
gatheringThreshold = cms.vdouble(
gatheringThresholds = cms.vdouble(
0.1, 0.2, 0.2, 0.2, 0.2,
0.2, 0.2
),
gatheringThresholdPt = cms.vdouble(
gatheringThresholdsPt = cms.vdouble(
0.0, 0.0, 0.0, 0.0, 0.0,
0.0, 0.0
)
Expand Down Expand Up @@ -55,7 +55,9 @@
),
minAllowedNormalization = cms.double(1e-09),
minFractionInCalc = cms.double(1e-09),
posCalcNCrystals = cms.int32(-1)
posCalcNCrystals = cms.int32(-1),
timeResolutionCalcBarrel = cms.PSet(),
timeResolutionCalcEndcap = cms.PSet()
),
clusterTimeResFromSeed = cms.bool(False),
excludeOtherSeeds = cms.bool(True),
Expand Down Expand Up @@ -86,21 +88,24 @@
),
minAllowedNormalization = cms.double(1e-09),
minFractionInCalc = cms.double(1e-09),
posCalcNCrystals = cms.int32(5)
posCalcNCrystals = cms.int32(5),
timeResolutionCalcBarrel = cms.PSet(),
timeResolutionCalcEndcap = cms.PSet()
),
positionCalcForConvergence = cms.PSet(),
recHitEnergyNorms = cms.VPSet(
cms.PSet(
depths = cms.vint32(1, 2, 3, 4),
detector = cms.string('HCAL_BARREL1'),
recHitEnergyNorm = cms.vdouble(0.1, 0.2, 0.3, 0.3)
recHitEnergyNorms = cms.vdouble(0.1, 0.2, 0.3, 0.3)
),
cms.PSet(
depths = cms.vint32(
1, 2, 3, 4, 5,
6, 7
),
detector = cms.string('HCAL_ENDCAP'),
recHitEnergyNorm = cms.vdouble(
recHitEnergyNorms = cms.vdouble(
0.1, 0.2, 0.2, 0.2, 0.2,
0.2, 0.2
)
Expand Down Expand Up @@ -142,20 +147,20 @@
cms.PSet(
depths = cms.vint32(1, 2, 3, 4),
detector = cms.string('HCAL_BARREL1'),
seedingThreshold = cms.vdouble(0.125, 0.25, 0.35, 0.35),
seedingThresholdPt = cms.vdouble(0.0, 0.0, 0.0, 0.0)
seedingThresholds = cms.vdouble(0.125, 0.25, 0.35, 0.35),
seedingThresholdsPt = cms.vdouble(0.0, 0.0, 0.0, 0.0)
),
cms.PSet(
depths = cms.vint32(
1, 2, 3, 4, 5,
6, 7
),
detector = cms.string('HCAL_ENDCAP'),
seedingThreshold = cms.vdouble(
seedingThresholds = cms.vdouble(
0.1375, 0.275, 0.275, 0.275, 0.275,
0.275, 0.275
),
seedingThresholdPt = cms.vdouble(
seedingThresholdsPt = cms.vdouble(
0.0, 0.0, 0.0, 0.0, 0.0,
0.0, 0.0
)
Expand Down
5 changes: 4 additions & 1 deletion HLTrigger/Configuration/python/HLT_75e33/modules/hltParticleFlowClusterHCAL_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,11 @@
),
minAllowedNormalization = cms.double(1e-09),
minFractionInCalc = cms.double(1e-09),
posCalcNCrystals = cms.int32(-1)
posCalcNCrystals = cms.int32(-1),
timeResolutionCalcBarrel = cms.PSet(),
timeResolutionCalcEndcap = cms.PSet()
),
positionCalc = cms.PSet(),
minFractionToKeep = cms.double(1e-07),
nSigmaEta = cms.double(2.0),
nSigmaPhi = cms.double(2.0)
Expand Down
8 changes: 6 additions & 2 deletions HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterECALUncorrected_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
allCellsPositionCalc = cms.PSet(
algoName = cms.string('Basic2DGenericPFlowPositionCalc'),
logWeightDenominator = cms.double(0.08),
logWeightDenominatorByDetector = cms.VPSet(),
minAllowedNormalization = cms.double(1e-09),
minFractionInCalc = cms.double(1e-09),
posCalcNCrystals = cms.int32(-1),
Expand Down Expand Up @@ -54,6 +55,7 @@
positionCalc = cms.PSet(
algoName = cms.string('Basic2DGenericPFlowPositionCalc'),
logWeightDenominator = cms.double(0.08),
logWeightDenominatorByDetector = cms.VPSet(),
minAllowedNormalization = cms.double(1e-09),
minFractionInCalc = cms.double(1e-09),
posCalcNCrystals = cms.int32(9),
Expand Down Expand Up @@ -84,7 +86,8 @@
X0 = cms.double(0.89),
algoName = cms.string('ECAL2DPositionCalcWithDepthCorr'),
minAllowedNormalization = cms.double(0.0),
minFractionInCalc = cms.double(0.0)
minFractionInCalc = cms.double(0.0),
timeResolutionCalc = cms.PSet()
),
recHitEnergyNorms = cms.VPSet(
cms.PSet(
Expand All @@ -107,7 +110,8 @@
X0 = cms.double(0.89),
algoName = cms.string('ECAL2DPositionCalcWithDepthCorr'),
minAllowedNormalization = cms.double(0.0),
minFractionInCalc = cms.double(0.0)
minFractionInCalc = cms.double(0.0),
timeResolutionCalc = cms.PSet()
),
recHitCleaners = cms.VPSet(),
recHitsSource = cms.InputTag("particleFlowRecHitECAL"),
Expand Down
11 changes: 9 additions & 2 deletions HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterHF_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,12 @@
allCellsPositionCalc = cms.PSet(
algoName = cms.string('Basic2DGenericPFlowPositionCalc'),
logWeightDenominator = cms.double(0.8),
logWeightDenominatorByDetector = cms.VPSet(),
minAllowedNormalization = cms.double(1e-09),
minFractionInCalc = cms.double(1e-09),
posCalcNCrystals = cms.int32(-1)
posCalcNCrystals = cms.int32(-1),
timeResolutionCalcBarrel = cms.PSet(),
timeResolutionCalcEndcap = cms.PSet()
),
excludeOtherSeeds = cms.bool(True),
maxIterations = cms.uint32(50),
Expand All @@ -36,10 +39,14 @@
positionCalc = cms.PSet(
algoName = cms.string('Basic2DGenericPFlowPositionCalc'),
logWeightDenominator = cms.double(0.8),
logWeightDenominatorByDetector = cms.VPSet(),
minAllowedNormalization = cms.double(1e-09),
minFractionInCalc = cms.double(1e-09),
posCalcNCrystals = cms.int32(5)
posCalcNCrystals = cms.int32(5),
timeResolutionCalcBarrel = cms.PSet(),
timeResolutionCalcEndcap = cms.PSet()
),
positionCalcForConvergence = cms.PSet(),
recHitEnergyNorms = cms.VPSet(
cms.PSet(
detector = cms.string('HF_EM'),
Expand Down
11 changes: 9 additions & 2 deletions HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowClusterHO_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,12 @@
allCellsPositionCalc = cms.PSet(
algoName = cms.string('Basic2DGenericPFlowPositionCalc'),
logWeightDenominator = cms.double(0.05),
logWeightDenominatorByDetector = cms.VPSet(),
minAllowedNormalization = cms.double(1e-09),
minFractionInCalc = cms.double(1e-09),
posCalcNCrystals = cms.int32(-1)
posCalcNCrystals = cms.int32(-1),
timeResolutionCalcBarrel = cms.PSet(),
timeResolutionCalcEndcap = cms.PSet()
),
excludeOtherSeeds = cms.bool(True),
maxIterations = cms.uint32(50),
Expand All @@ -36,10 +39,14 @@
positionCalc = cms.PSet(
algoName = cms.string('Basic2DGenericPFlowPositionCalc'),
logWeightDenominator = cms.double(0.05),
logWeightDenominatorByDetector = cms.VPSet(),
minAllowedNormalization = cms.double(1e-09),
minFractionInCalc = cms.double(1e-09),
posCalcNCrystals = cms.int32(5)
posCalcNCrystals = cms.int32(5),
timeResolutionCalcBarrel = cms.PSet(),
timeResolutionCalcEndcap = cms.PSet()
),
positionCalcForConvergence = cms.PSet(),
recHitEnergyNorms = cms.VPSet(
cms.PSet(
detector = cms.string('HCAL_BARREL2_RING0'),
Expand Down
81 changes: 79 additions & 2 deletions HLTrigger/Configuration/python/customizeHLTforCMSSW.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ def customiseHCALFor2018Input(process):

for producer in producers_by_type(process, "PFClusterProducer"):
if producer.seedFinder.thresholdsByDetector[0].detector.value() == 'HCAL_BARREL1':
producer.seedFinder.thresholdsByDetector[0].seedingThreshold = _seedingThresholdsHB
producer.initialClusteringStep.thresholdsByDetector[0].gatheringThreshold = _thresholdsHB
producer.seedFinder.thresholdsByDetector[0].seedingThresholds = _seedingThresholdsHB
producer.initialClusteringStep.thresholdsByDetector[0].gatheringThresholds = _thresholdsHB
producer.pfClusterBuilder.recHitEnergyNorms[0].recHitEnergyNorm = _thresholdsHB
producer.pfClusterBuilder.positionCalc.logWeightDenominatorByDetector = logWeightDenominatorHCAL2018
producer.pfClusterBuilder.allCellsPositionCalc.logWeightDenominatorByDetector = logWeightDenominatorHCAL2018
Expand Down Expand Up @@ -314,6 +314,82 @@ def customizeHLTfor45063(process):
delattr(prod,"mvaScaleStdEL2")

return process

def customizeHLTfor45212(process):
# Add missing parameters for Basic2DGenericPFlowPositionCalc
for p in ["PFClusterProducer", "LegacyPFClusterProducer", "PFMultiDepthClusterProducer"]:
for prod in producers_by_type(process, p):
for n in ["positionCalc", "allCellsPositionCalc"]:
if hasattr(prod, "pfClusterBuilder") and hasattr(prod.pfClusterBuilder, n) and hasattr(getattr(prod.pfClusterBuilder, n), "algoName") and (getattr(prod.pfClusterBuilder, n).algoName == "Basic2DGenericPFlowPositionCalc"):
if not hasattr(getattr(prod.pfClusterBuilder, n), "logWeightDenominatorByDetector"):
getattr(prod.pfClusterBuilder, n).logWeightDenominatorByDetector = cms.VPSet()
if not hasattr(getattr(prod.pfClusterBuilder, n), "timeResolutionCalcBarrel"):
getattr(prod.pfClusterBuilder, n).timeResolutionCalcBarrel = cms.PSet()
if not hasattr(getattr(prod.pfClusterBuilder, n), "timeResolutionCalcEndcap"):
getattr(prod.pfClusterBuilder, n).timeResolutionCalcEndcap = cms.PSet()

# Add missing parameters for ECAL2DPositionCalcWithDepthCorr
for prod in producers_by_type(process, 'PFClusterProducer'):
if hasattr(prod, "pfClusterBuilder") and hasattr(prod.pfClusterBuilder, "positionCalcForConvergence") and hasattr(prod.pfClusterBuilder.positionCalcForConvergence, "algoName") and (prod.pfClusterBuilder.positionCalcForConvergence.algoName == "ECAL2DPositionCalcWithDepthCorr"):
if not hasattr(prod.pfClusterBuilder.positionCalcForConvergence, "timeResolutionCalc"):
prod.pfClusterBuilder.positionCalcForConvergence.timeResolutionCalc = cms.PSet()
if hasattr(prod, "positionReCalc") and hasattr(prod.positionReCalc, "algoName") and (prod.positionReCalc.algoName == "ECAL2DPositionCalcWithDepthCorr"):
if not hasattr(prod.positionReCalc, "timeResolutionCalc"):
prod.positionReCalc.timeResolutionCalc = cms.PSet()

# Add missing parameters for Basic2DGenericPFlowClusterizer
for p in ["PFClusterProducer", "LegacyPFClusterProducer"]:
for prod in producers_by_type(process, p):
if hasattr(prod, "pfClusterBuilder") and hasattr(prod.pfClusterBuilder, "algoName") and (prod.pfClusterBuilder.algoName == "Basic2DGenericPFlowClusterizer"):
if not hasattr(prod.pfClusterBuilder, "positionCalc"):
prod.pfClusterBuilder.positionCalc = cms.PSet()
if not hasattr(prod.pfClusterBuilder, "allCellsPositionCalc"):
prod.pfClusterBuilder.allCellsPositionCalc = cms.PSet()
if not hasattr(prod.pfClusterBuilder, "positionCalcForConvergence"):
prod.pfClusterBuilder.positionCalcForConvergence = cms.PSet()

# Add missing parameters for PFMultiDepthClusterizer
for prod in producers_by_type(process, 'PFMultiDepthClusterProducer'):
if hasattr(prod, "pfClusterBuilder") and hasattr(prod.pfClusterBuilder, "algoName") and (prod.pfClusterBuilder.algoName == "PFMultiDepthClusterizer"):
if not hasattr(prod.pfClusterBuilder, "positionCalc"):
prod.pfClusterBuilder.positionCalc = cms.PSet()
if not hasattr(prod.pfClusterBuilder, "allCellsPositionCalc"):
prod.pfClusterBuilder.allCellsPositionCalc = cms.PSet()

# Add missing parameters for PFCandConnector
for prod in producers_by_type(process, 'PFProducer'):
if hasattr(prod, "iCfgCandConnector"):
if not hasattr(prod.iCfgCandConnector, "dptRel_PrimaryTrack"):
prod.iCfgCandConnector.dptRel_PrimaryTrack = cms.double(0)
if not hasattr(prod.iCfgCandConnector, "dptRel_MergedTrack"):
prod.iCfgCandConnector.dptRel_MergedTrack = cms.double(0)
if not hasattr(prod.iCfgCandConnector, "ptErrorSecondary"):
prod.iCfgCandConnector.ptErrorSecondary = cms.double(0)
if not hasattr(prod.iCfgCandConnector, "nuclCalibFactors"):
prod.iCfgCandConnector.nuclCalibFactors = cms.vdouble()

# Fix types for gathering and seeding thresholds, and recHitEnergyNorm
for prod in producers_by_type(process, 'PFClusterProducer'):
if hasattr(prod, "initialClusteringStep") and hasattr(prod.initialClusteringStep, "thresholdsByDetector"):
if hasattr(prod.initialClusteringStep.thresholdsByDetector, "gatheringThreshold") and isinstance(prod.initialClusteringStep.thresholdsByDetector.gatheringThreshold, cms.vdouble):
prod.initialClusteringStep.thresholdsByDetector.gatheringThresholds = prod.initialClusteringStep.thresholdsByDetector.gatheringThreshold
delattr(prod.initialClusteringStep.thresholdsByDetector, "gatheringThreshold")
if hasattr(prod.initialClusteringStep.thresholdsByDetector, "gatheringThresholdPt") and isinstance(prod.initialClusteringStep.thresholdsByDetector.gatheringThresholdPt, cms.vdouble):
prod.initialClusteringStep.thresholdsByDetector.gatheringThresholdsPt = prod.initialClusteringStep.thresholdsByDetector.gatheringThresholdPt
delattr(prod.initialClusteringStep.thresholdsByDetector, "gatheringThresholdPt")
if hasattr(prod, "seedFinder") and hasattr(prod.seedFinder, "thresholdsByDetector"):
if hasattr(prod.seedFinder.thresholdsByDetector, "seedingThreshold") and isinstance(prod.seedFinder.thresholdsByDetector.seedingThreshold, cms.vdouble):
prod.seedFinder.thresholdsByDetector.seedingThresholds = prod.seedFinder.thresholdsByDetector.seedingThreshold
delattr(prod.seedFinder.thresholdsByDetector, "seedingThreshold")
if hasattr(prod.seedFinder.thresholdsByDetector, "seedingThresholdPt") and isinstance(prod.seedFinder.thresholdsByDetector.seedingThresholdPt, cms.vdouble):
prod.seedFinder.thresholdsByDetector.seedingThresholdsPt = prod.seedFinder.thresholdsByDetector.seedingThresholdPt
delattr(prod.seedFinder.thresholdsByDetector, "seedingThresholdPt")
for n in ["positionCalc", "allCellsPositionCalc"]:
if hasattr(prod, "pfClusterBuilder") and hasattr(prod.pfClusterBuilder, n) and hasattr(getattr(prod.pfClusterBuilder, n), "recHitEnergyNorms") and hasattr(getattr(prod.pfClusterBuilder, n).recHitEnergyNorms, "recHitEnergyNorm") and isinstance(getattr(prod.pfClusterBuilder, n).recHitEnergyNorms.recHitEnergyNorm, cms.vdouble):
getattr(prod.pfClusterBuilder, n).recHitEnergyNorms.recHitEnergyNorms = getattr(prod.pfClusterBuilder, n).recHitEnergyNorms.recHitEnergyNorm
delattr(getattr(prod.pfClusterBuilder, n).recHitEnergyNorms, "recHitEnergyNorm")

return process
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, why adding all these new parameters here - when there is the fillDescriptions methods which take care of providing them if they are not in the py config?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are the values to be used different?

Copy link
Contributor Author

@stahlleiton stahlleiton Jun 18, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because when I tested them, if there were not present in the menu but were expected in the fillDescription, it returned an error of missing parameter. So this checks if the parameter is present, and if it is not, then adds it with a default value to the HLT module

Copy link
Contributor Author

@stahlleiton stahlleiton Jun 18, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or are you referring to the recHitEnergyNorms , seedingThresholds and gatheringThresholds parameters?
If yes, it is because there were conflicts of two different types (double and std::vector<"double">) used with exactly the same parameter name (not allowed in fillDescription (got an error of duplicate name)), so I created two sets of parameters:

  • seedingThresholds , gatheringThresholds and recHitEnergyNorms of type std::vector<"double">
  • seedingThreshold , gatheringThreshold and recHitEnergyNorm of type double (keeping the original names)

So the python macro also checks for the parameters which are type std::vector<"double"> with names (seedingThreshold , gatheringThreshold and recHitEnergyNorm) and effectively renames them to the new names (seedingThresholds , gatheringThresholds and recHitEnergyNorms)

Copy link
Contributor

@mmusich mmusich Jun 18, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because when I tested them, if there were not present in the menu but were expected in the fillDescription, it returned an error of missing parameter. So this checks if the parameter is present, and if it is not, then adds it with a default value to the HLT module

Then please add an appropriate default for the HLT in the fillDescription itself.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, I think the issue is probably related to them been declared optional. I will try to change them from optional to normal parameters

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see also #45212 (comment)

Copy link
Contributor Author

@stahlleiton stahlleiton Jun 18, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So when I replaced the exists (checking that a given label of a pset was present) with checking the emptiness of the given parameter sets, it prompted the situation where a parameter set would then be by default empty but could also have parameters, so I made the parameters of those psets optional. However the moment those psets are not empty anymore, then some of the parameters are read and it triggers the missing parameter error when they are not present (since they were declared as optional).
I will check how to deal with these cases (probably avoid checking that the pset is empty and instead use another criteria to replace the previous exists conditions)

Copy link
Contributor Author

@stahlleiton stahlleiton Jun 18, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed it in c85415b , such that now all the parameters I added in the fillDescription are no longer optional. Also fixed the customizeForCMSSW.py file such that now it only deals with the renaming of the double vector parameters

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I managed to undo the renaming of the double vector parameters in 9fee0bb , so now I don't customize the menu anymore, and this change helped reduce the number of changed files by 10


# CMSSW version specific customizations
def customizeHLTforCMSSW(process, menuType="GRun"):
Expand All @@ -326,5 +402,6 @@ def customizeHLTforCMSSW(process, menuType="GRun"):
process = checkHLTfor43774(process)
process = customizeHLTfor44576(process)
process = customizeHLTfor45063(process)
process = customizeHLTfor45212(process)

return process
Loading