Skip to content

Commit ccdf02c

Browse files
cmsbuildcmsbuild
authored
Merge pull request #47110 from mmusich/mm_dev_followup_to_47079_forConfDB
Partial revert of #47079: do not use `ifValue` switches in `fillDescriptions` affecting confDB parsing
2 parents fee38c5 + e214fa7 commit ccdf02c

File tree

6 files changed

+52
-78
lines changed

6 files changed

+52
-78
lines changed

‎Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBias_cff.py‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,6 @@
107107
),
108108
)
109109

110-
## remove uneeded paraemters sets because setNoiseFlags is False
111-
for param in ['PETstat', 'S8S1stat', 'S9S1stat']:
112-
if hasattr(_phase1_hfrecoNoise, param):
113-
delattr(_phase1_hfrecoNoise, param)
114-
if hasattr(_phase1_hfrecoMBNZS, param):
115-
delattr(_phase1_hfrecoMBNZS, param)
116-
117110
_phase1_seqALCARECOHcalCalMinBias = seqALCARECOHcalCalMinBias.copy()
118111
_phase1_seqALCARECOHcalCalMinBias.insert(0,hfprerecoMBNZS)
119112
_phase1_seqALCARECOHcalCalMinBias.insert(0,hfprerecoNoise)

‎HLTrigger/Configuration/python/HLT_75e33/modules/hltHfreco_cfi.py‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
import FWCore.ParameterSet.Config as cms
22

33
hltHfreco = cms.EDProducer("HFPhase1Reconstructor",
4+
HFStripFilter = cms.PSet(
5+
gap = cms.int32(2),
6+
lstrips = cms.int32(2),
7+
maxStripTime = cms.double(10.0),
8+
maxThreshold = cms.double(100.0),
9+
seedHitIetaMax = cms.int32(35),
10+
stripThreshold = cms.double(40.0),
11+
timeMax = cms.double(6.0),
12+
verboseLevel = cms.untracked.int32(10),
13+
wedgeCut = cms.double(0.05)
14+
),
415
PETstat = cms.PSet(
516
HcalAcceptSeverityLevel = cms.int32(9),
617
longETParams = cms.vdouble(

‎HLTrigger/Configuration/python/HLT_75e33/modules/hltHoreco_cfi.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
import FWCore.ParameterSet.Config as cms
22

33
hltHoreco = cms.EDProducer("HcalHitReconstructor",
4+
HFInWindowStat = cms.PSet(),
5+
PETstat = cms.PSet(),
6+
S8S1stat = cms.PSet(),
7+
S9S1stat = cms.PSet(),
48
Subdetector = cms.string('HO'),
59
correctForPhaseContainment = cms.bool(True),
610
correctForTimeslew = cms.bool(True),
@@ -9,13 +13,19 @@
913
dataOOTCorrectionCategory = cms.string('Data'),
1014
dataOOTCorrectionName = cms.string(''),
1115
digiLabel = cms.InputTag("hltHcalDigis"),
16+
digiTimeFromDB = cms.bool(True),
17+
digistat = cms.PSet(),
1218
dropZSmarkedPassed = cms.bool(True),
1319
firstAuxTS = cms.int32(4),
1420
firstSample = cms.int32(4),
21+
hfTimingTrustParameters = cms.PSet(),
1522
mcOOTCorrectionCategory = cms.string('MC'),
1623
mcOOTCorrectionName = cms.string(''),
1724
recoParamsFromDB = cms.bool(True),
1825
samplesToAdd = cms.int32(4),
26+
saturationParameters = cms.PSet(
27+
maxADCvalue = cms.int32(127)
28+
),
1929
setNegativeFlags = cms.bool(False),
2030
setNoiseFlags = cms.bool(False),
2131
setSaturationFlags = cms.bool(False),

‎HLTrigger/Configuration/python/customizeHLTforCMSSW.py‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -92,42 +92,15 @@ def customizeHLTfor47079(process):
9292
del filt.filterParams.pvSrc # Remove the pvSrc parameter
9393

9494
for prod in producers_by_type(process, 'HcalHitReconstructor'):
95-
# Remove "digiTimeFromDB" if "Subdetector" is not "HF"
96-
if hasattr(prod, 'Subdetector') and getattr(prod, 'Subdetector') != "HF":
97-
if hasattr(prod, 'digiTimeFromDB'):
98-
delattr(prod, 'digiTimeFromDB')
99-
100-
# Remove "saturationParameters" if "setSaturationFlags" is false
101-
if hasattr(prod, 'setSaturationFlags') and not getattr(prod, 'setSaturationFlags'):
102-
if hasattr(prod, 'saturationParameters'):
103-
delattr(prod, 'saturationParameters')
104-
105-
# Remove "hfTimingTrustParameters" if "setTimingTrustFlags" is false
106-
if hasattr(prod, 'setTimingTrustFlags') and not getattr(prod, 'setTimingTrustFlags'):
107-
if hasattr(prod, 'hfTimingTrustParameters'):
108-
delattr(prod, 'hfTimingTrustParameters')
109-
110-
# Remove 'PETstat', 'S8S1stat', 'S9S1stat', 'digistat' and 'HFInWindowStat' if "setNoiseFlags" is false
111-
if hasattr(prod, 'setNoiseFlags') and not getattr(prod, 'setNoiseFlags'):
112-
for param in ['PETstat', 'S8S1stat', 'S9S1stat', 'digistat', 'HFInWindowStat']:
113-
if hasattr(prod, param):
114-
delattr(prod, param)
115-
11695
# Remove useless parameters
11796
if hasattr(prod,'setHSCPFlags'):
11897
delattr(prod,'setHSCPFlags')
11998

12099
if hasattr(prod,'setPulseShapeFlags'):
121100
delattr(prod,'setPulseShapeFlags')
122-
123-
for prod in producers_by_type(process, 'HFPhase1Reconstructor'):
124-
# Remove 'HFStripFilter' if "runHFStripFilter" is false
125-
if hasattr(prod, 'runHFStripFilter') and not getattr(prod, 'runHFStripFilter'):
126-
delattr(prod,'HFStripFilter')
127101

128102
return process
129103

130-
131104
def customizeHLTfor47047(process):
132105
"""Migrates many ESProducers to MoveToDeviceCache"""
133106
import copy

‎RecoLocalCalo/HcalRecProducers/src/HFPhase1Reconstructor.cc‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -281,10 +281,9 @@ void HFPhase1Reconstructor::fillDescriptions(edm::ConfigurationDescriptions& des
281281
desc.add<edm::ParameterSetDescription>("algorithm", fillDescriptionForParseHFPhase1AlgoDescription())
282282
->setComment("configure the reconstruction algorithm");
283283

284-
desc.ifValue(
285-
edm::ParameterDescription<bool>("runHFStripFilter", true, true),
286-
false >> edm::EmptyGroupDescription() or true >> edm::ParameterDescription<edm::ParameterSetDescription>(
287-
"HFStripFilter", HFStripFilter::fillDescription(), true));
284+
desc.add<bool>("runHFStripFilter", true);
285+
desc.add<edm::ParameterSetDescription>("HFStripFilter", HFStripFilter::fillDescription());
286+
desc.add<bool>("setNoiseFlags", true);
288287

289288
{
290289
// Define common vectors
@@ -320,7 +319,10 @@ void HFPhase1Reconstructor::fillDescriptions(edm::ConfigurationDescriptions& des
320319
S9S1statDesc.add<std::vector<double>>("longETParams", std::vector<double>(13, 0));
321320
S9S1statDesc.add<int>("HcalAcceptSeverityLevel", 9);
322321
S9S1statDesc.add<bool>("isS8S1", false);
322+
desc.add<edm::ParameterSetDescription>("S9S1stat", S9S1statDesc);
323+
}
323324

325+
{
324326
// S8S1stat configuration
325327
edm::ParameterSetDescription S8S1statDesc;
326328
S8S1statDesc.add<std::vector<double>>(
@@ -335,7 +337,10 @@ void HFPhase1Reconstructor::fillDescriptions(edm::ConfigurationDescriptions& des
335337
S8S1statDesc.add<std::vector<double>>("longETParams", std::vector<double>(13, 0));
336338
S8S1statDesc.add<int>("HcalAcceptSeverityLevel", 9);
337339
S8S1statDesc.add<bool>("isS8S1", true);
340+
desc.add<edm::ParameterSetDescription>("S8S1stat", S8S1statDesc);
341+
}
338342

343+
{
339344
// PETstat configuration
340345
edm::ParameterSetDescription PETstatDesc;
341346
PETstatDesc.add<std::vector<double>>("short_R", {0.8});
@@ -350,14 +355,7 @@ void HFPhase1Reconstructor::fillDescriptions(edm::ConfigurationDescriptions& des
350355
PETstatDesc.add<std::vector<double>>("short_R_29", {0.8});
351356
PETstatDesc.add<std::vector<double>>("long_R_29", {0.8});
352357
PETstatDesc.add<int>("HcalAcceptSeverityLevel", 9);
353-
354-
// Conditionally add S9S1stat if setNoiseFlags is true
355-
desc.ifValue(
356-
edm::ParameterDescription<bool>("setNoiseFlags", true, true),
357-
false >> edm::EmptyGroupDescription() or
358-
true >> (edm::ParameterDescription<edm::ParameterSetDescription>("S9S1stat", S9S1statDesc, true) and
359-
edm::ParameterDescription<edm::ParameterSetDescription>("S8S1stat", S8S1statDesc, true) and
360-
edm::ParameterDescription<edm::ParameterSetDescription>("PETstat", PETstatDesc, true)));
358+
desc.add<edm::ParameterSetDescription>("PETstat", PETstatDesc);
361359
}
362360

363361
descriptions.addWithDefaultLabel(desc);

‎RecoLocalCalo/HcalRecProducers/src/HcalHitReconstructor.cc‎

Lines changed: 21 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -529,36 +529,29 @@ void HcalHitReconstructor::fillDescriptions(edm::ConfigurationDescriptions& desc
529529

530530
edm::ParameterSetDescription saturationParametersDesc;
531531
saturationParametersDesc.add<int>("maxADCvalue", 127);
532+
desc.add<edm::ParameterSetDescription>("saturationParameters", saturationParametersDesc);
532533

533-
// Conditionally add saturationParameters if setSaturationFlags is true
534-
desc.ifValue(
535-
edm::ParameterDescription<bool>("setSaturationFlags", true, true),
536-
false >> edm::EmptyGroupDescription() or true >> edm::ParameterDescription<edm::ParameterSetDescription>(
537-
"saturationParameters", saturationParametersDesc, true));
538-
539-
// Add digiTimeFromDB conditionally based on Subdetector being "HF"
540-
desc.ifValue(edm::ParameterDescription<std::string>("Subdetector", "HF", true),
541-
"HF" >> edm::ParameterDescription<bool>("digiTimeFromDB", false, true) or
542-
"HO" >> edm::EmptyGroupDescription() // Default case: do nothing
543-
);
534+
desc.add<bool>("setSaturationFlags", true);
535+
desc.add<std::string>("Subdetector", "HF");
536+
desc.add<bool>("digiTimeFromDB", false);
544537

545538
edm::ParameterSetDescription hfTimingTrustParametersDesc;
546539
hfTimingTrustParametersDesc.add<int>("hfTimingTrustLevel1", 1);
547540
hfTimingTrustParametersDesc.add<int>("hfTimingTrustLevel2", 4);
541+
desc.add<edm::ParameterSetDescription>("hfTimingTrustParameters", hfTimingTrustParametersDesc);
548542

549-
// Conditionally add hfTimingTrustParameters if setTimingTrustFlags is true
550-
desc.ifValue(edm::ParameterDescription<bool>("setTimingTrustFlags", true, true),
551-
false >> edm::EmptyGroupDescription() or
552-
true >> edm::ParameterDescription<edm::ParameterSetDescription>(
553-
"hfTimingTrustParameters", hfTimingTrustParametersDesc, true));
543+
desc.add<bool>("setTimingTrustFlags", true);
544+
desc.add<bool>("setNoiseFlags", true);
554545

555-
{
556-
edm::ParameterSetDescription digiStatDesc;
557-
HcalHFStatusBitFromDigis::fillHFDigiTimeParamsDesc(digiStatDesc);
546+
edm::ParameterSetDescription digiStatDesc;
547+
HcalHFStatusBitFromDigis::fillHFDigiTimeParamsDesc(digiStatDesc);
548+
desc.add<edm::ParameterSetDescription>("digistat", digiStatDesc);
558549

559-
edm::ParameterSetDescription hfInWindowStatDesc;
560-
HcalHFStatusBitFromDigis::fillHFTimeInWindowParamsDesc(hfInWindowStatDesc);
550+
edm::ParameterSetDescription hfInWindowStatDesc;
551+
HcalHFStatusBitFromDigis::fillHFTimeInWindowParamsDesc(hfInWindowStatDesc);
552+
desc.add<edm::ParameterSetDescription>("HFInWindowStat", hfInWindowStatDesc);
561553

554+
{
562555
edm::ParameterSetDescription s9s1StatDesc;
563556
s9s1StatDesc.add<std::vector<double>>("short_optimumSlope",
564557
{-99999,
@@ -597,7 +590,10 @@ void HcalHitReconstructor::fillDescriptions(edm::ConfigurationDescriptions& desc
597590
s9s1StatDesc.add<std::vector<double>>("longETParams", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0});
598591
s9s1StatDesc.add<int>("HcalAcceptSeverityLevel", 9);
599592
s9s1StatDesc.add<bool>("isS8S1", false);
593+
desc.add<edm::ParameterSetDescription>("S9S1stat", s9s1StatDesc);
594+
}
600595

596+
{
601597
edm::ParameterSetDescription s8s1StatDesc;
602598
s8s1StatDesc.add<std::vector<double>>(
603599
"short_optimumSlope", {0.30, 0.10, 0.10, 0.10, 0.10, 0.10, 0.10, 0.10, 0.10, 0.10, 0.10, 0.10, 0.10});
@@ -611,7 +607,10 @@ void HcalHitReconstructor::fillDescriptions(edm::ConfigurationDescriptions& desc
611607
s8s1StatDesc.add<std::vector<double>>("longETParams", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0});
612608
s8s1StatDesc.add<int>("HcalAcceptSeverityLevel", 9);
613609
s8s1StatDesc.add<bool>("isS8S1", true);
610+
desc.add<edm::ParameterSetDescription>("S8S1stat", s8s1StatDesc);
611+
}
614612

613+
{
615614
edm::ParameterSetDescription petStatDesc;
616615
petStatDesc.add<std::vector<double>>("short_R", {0.8});
617616
petStatDesc.add<std::vector<double>>(
@@ -625,17 +624,7 @@ void HcalHitReconstructor::fillDescriptions(edm::ConfigurationDescriptions& desc
625624
petStatDesc.add<std::vector<double>>("short_R_29", {0.8});
626625
petStatDesc.add<std::vector<double>>("long_R_29", {0.8});
627626
petStatDesc.add<int>("HcalAcceptSeverityLevel", 9);
628-
629-
// Conditionally add S9S1stat if setNoiseFlags is true
630-
desc.ifValue(
631-
edm::ParameterDescription<bool>("setNoiseFlags", true, true),
632-
false >> edm::EmptyGroupDescription() or
633-
true >>
634-
(edm::ParameterDescription<edm::ParameterSetDescription>("digistat", digiStatDesc, true) and
635-
edm::ParameterDescription<edm::ParameterSetDescription>("HFInWindowStat", hfInWindowStatDesc, true) and
636-
edm::ParameterDescription<edm::ParameterSetDescription>("S9S1stat", s9s1StatDesc, true) and
637-
edm::ParameterDescription<edm::ParameterSetDescription>("S8S1stat", s8s1StatDesc, true) and
638-
edm::ParameterDescription<edm::ParameterSetDescription>("PETstat", petStatDesc, true)));
627+
desc.add<edm::ParameterSetDescription>("PETstat", petStatDesc);
639628
}
640629

641630
desc.add<std::string>("dataOOTCorrectionName", std::string(""));

0 commit comments

Comments
 (0)