Fix crashes in HGCAL HLT/RECO with v19 geometry#48303
Fix crashes in HGCAL HLT/RECO with v19 geometry#48303cmsbuild merged 18 commits intocms-sw:masterfrom
Conversation
|
cms-bot internal usage |
|
-code-checks Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-48303/45166
Code check has found code style and quality issues which could be resolved by applying following patch(s)
|
|
allow @waredjeb test rights |
| tdcOnset_fC_ = ps.getParameter<double>("tdcOnset_fC"); | ||
| if (ps.exists("tdcForToAOnset_fC")) { | ||
| auto temp = ps.getParameter<std::vector<double> >("tdcForToAOnset_fC"); | ||
| std::cout << "temp " << temp.size() << " tdcForToaOnset " << tdcForToAOnset_fC_.size() << std::endl; |
There was a problem hiding this comment.
no cout in production code.
| HGCHEFConfig = _modifiedHGCHEFConfig_v19, | ||
| HGCHFNoseConfig = _modifiedHGCHFNoseConfig_v19 | ||
| ) | ||
|
|
| HGCHEFConfig = _modifiedHGCHEFConfig_v19, | ||
| HGCHFNoseConfig = _modifiedHGCHFNoseConfig_v19 | ||
| ) | ||
|
|
| maxNumberOfThickIndices = cms.uint32(8), | ||
| thresholdW0 = cms.vdouble(2.9, 2.9, 2.9, 2.9), | ||
| ) | ||
|
|
| # While here there are two different sets for CE-E and CE-H | ||
| # Additionally there are four values for each set, in order to follow the four detid silicon types [HD120um, LD200um, LD300um, HD200um] | ||
| # The thickness correction value for HD200um is copied from LD200um | ||
| >>>>>>> 3135ca68949 (initial fixes with procModifier v19) |
|
+code-checks Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-48303/45167
|
|
A new Pull Request was created by @waredjeb for master. It involves the following packages:
@BenjaminRS, @Martin-Grunewald, @Moanwar, @civanch, @cmsbuild, @jfernan2, @kpedro88, @mandrenguyen, @mdhildreth, @mmusich, @quinnanm, @srimanob, @subirsarkar can you please review it and eventually sign? Thanks. cms-bot commands are listed here |
|
test parameters:
|
|
@cmsbuild, please test |
|
-1 Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-c826bf/46689/summary.html This pull request cannot be automatically merged, could you please rebase it? |
|
Pull request #48303 was updated. @BenjaminRS, @Martin-Grunewald, @Moanwar, @civanch, @cmsbuild, @cseez, @felicepantaleo, @jfernan2, @kpedro88, @mandrenguyen, @mdhildreth, @mmusich, @pfs, @quinnanm, @rovere, @srimanob, @subirsarkar can you please check and sign again. |
|
@cmsbuild please test |
|
Bot stucked? |
|
+1 Size: This PR adds an extra 36KB to repository
Comparison SummaryThere are some workflows for which there are errors in the baseline: Summary:
|
mmusich
left a comment
There was a problem hiding this comment.
congratulations on the fix!
Please drop cms-specific python types whenever possible in clone() and toModify() calls to ensure type correctedness checks at runtime.
| phase2_hgcalV19.toModify(hltHGCalRecHitL1Seeded, | ||
| HGCEE_fCPerMIP = cms.vdouble(HGCAL_reco_constants.fcPerMip[0:4]), | ||
| HGCHEF_fCPerMIP = cms.vdouble(HGCAL_reco_constants.fcPerMip[4:8]), | ||
| HGCHFNose_fCPerMIP = cms.vdouble(1.25, 2.57, 3.88, 2.57), |
There was a problem hiding this comment.
| phase2_hgcalV19.toModify(hltHGCalRecHitL1Seeded, | |
| HGCEE_fCPerMIP = cms.vdouble(HGCAL_reco_constants.fcPerMip[0:4]), | |
| HGCHEF_fCPerMIP = cms.vdouble(HGCAL_reco_constants.fcPerMip[4:8]), | |
| HGCHFNose_fCPerMIP = cms.vdouble(1.25, 2.57, 3.88, 2.57), | |
| phase2_hgcalV19.toModify(hltHGCalRecHitL1Seeded, | |
| HGCEE_fCPerMIP = HGCAL_reco_constants.fcPerMip[0:4], | |
| HGCHEF_fCPerMIP = HGCAL_reco_constants.fcPerMip[4:8], | |
| HGCHFNose_fCPerMIP = [1.25, 2.57, 3.88, 2.57], |
| phase2_hgcalV19.toModify(hltHGCalRecHit, | ||
| HGCEE_fCPerMIP = cms.vdouble(HGCAL_reco_constants.fcPerMip[0:4]), | ||
| HGCHEF_fCPerMIP = cms.vdouble(HGCAL_reco_constants.fcPerMip[4:8]), | ||
| HGCHFNose_fCPerMIP = cms.vdouble(1.25, 2.57, 3.88, 2.57), |
There was a problem hiding this comment.
| phase2_hgcalV19.toModify(hltHGCalRecHit, | |
| HGCEE_fCPerMIP = cms.vdouble(HGCAL_reco_constants.fcPerMip[0:4]), | |
| HGCHEF_fCPerMIP = cms.vdouble(HGCAL_reco_constants.fcPerMip[4:8]), | |
| HGCHFNose_fCPerMIP = cms.vdouble(1.25, 2.57, 3.88, 2.57), | |
| phase2_hgcalV19.toModify(hltHGCalRecHit, | |
| HGCEE_fCPerMIP = HGCAL_reco_constants.fcPerMip[0:4], | |
| HGCHEF_fCPerMIP = HGCAL_reco_constants.fcPerMip[4:8], | |
| HGCHFNose_fCPerMIP = [1.25, 2.57, 3.88, 2.57], |
| _modifiedHGCEEConfig_v19 = hltHGCalUncalibRecHitL1Seeded.HGCEEConfig.clone( | ||
| fCPerMIP = cms.vdouble(HGCAL_reco_constants.fcPerMip[0:4]) | ||
| ) | ||
| _modifiedHGCHEFConfig_v19 = hltHGCalUncalibRecHitL1Seeded.HGCHEFConfig.clone( | ||
| fCPerMIP = cms.vdouble(HGCAL_reco_constants.fcPerMip[4:8]) | ||
| ) | ||
| _modifiedHGCHFNoseConfig_v19 = hltHGCalUncalibRecHitL1Seeded.HGCHFNoseConfig.clone( | ||
| fCPerMIP = cms.vdouble(1.25, 2.57, 3.88, 2.57) | ||
| ) |
There was a problem hiding this comment.
| _modifiedHGCEEConfig_v19 = hltHGCalUncalibRecHitL1Seeded.HGCEEConfig.clone( | |
| fCPerMIP = cms.vdouble(HGCAL_reco_constants.fcPerMip[0:4]) | |
| ) | |
| _modifiedHGCHEFConfig_v19 = hltHGCalUncalibRecHitL1Seeded.HGCHEFConfig.clone( | |
| fCPerMIP = cms.vdouble(HGCAL_reco_constants.fcPerMip[4:8]) | |
| ) | |
| _modifiedHGCHFNoseConfig_v19 = hltHGCalUncalibRecHitL1Seeded.HGCHFNoseConfig.clone( | |
| fCPerMIP = cms.vdouble(1.25, 2.57, 3.88, 2.57) | |
| ) | |
| _modifiedHGCEEConfig_v19 = hltHGCalUncalibRecHitL1Seeded.HGCEEConfig.clone( | |
| fCPerMIP = HGCAL_reco_constants.fcPerMip[0:4] | |
| ) | |
| _modifiedHGCHEFConfig_v19 = hltHGCalUncalibRecHitL1Seeded.HGCHEFConfig.clone( | |
| fCPerMIP = HGCAL_reco_constants.fcPerMip[4:8] | |
| ) | |
| _modifiedHGCHFNoseConfig_v19 = hltHGCalUncalibRecHitL1Seeded.HGCHFNoseConfig.clone( | |
| fCPerMIP = [1.25, 2.57, 3.88, 2.57] | |
| ) |
| _modifiedHGCEEConfig_v19 = hltHGCalUncalibRecHit.HGCEEConfig.clone( | ||
| fCPerMIP = cms.vdouble(HGCAL_reco_constants.fcPerMip[0:4]) | ||
| ) | ||
| _modifiedHGCHEFConfig_v19 = hltHGCalUncalibRecHit.HGCHEFConfig.clone( | ||
| fCPerMIP = cms.vdouble(HGCAL_reco_constants.fcPerMip[4:8]) | ||
| ) | ||
| _modifiedHGCHFNoseConfig_v19 = hltHGCalUncalibRecHit.HGCHFNoseConfig.clone( | ||
| fCPerMIP = cms.vdouble(1.25, 2.57, 3.88, 2.57) | ||
| ) |
There was a problem hiding this comment.
| _modifiedHGCEEConfig_v19 = hltHGCalUncalibRecHit.HGCEEConfig.clone( | |
| fCPerMIP = cms.vdouble(HGCAL_reco_constants.fcPerMip[0:4]) | |
| ) | |
| _modifiedHGCHEFConfig_v19 = hltHGCalUncalibRecHit.HGCHEFConfig.clone( | |
| fCPerMIP = cms.vdouble(HGCAL_reco_constants.fcPerMip[4:8]) | |
| ) | |
| _modifiedHGCHFNoseConfig_v19 = hltHGCalUncalibRecHit.HGCHFNoseConfig.clone( | |
| fCPerMIP = cms.vdouble(1.25, 2.57, 3.88, 2.57) | |
| ) | |
| _modifiedHGCEEConfig_v19 = hltHGCalUncalibRecHit.HGCEEConfig.clone( | |
| fCPerMIP = HGCAL_reco_constants.fcPerMip[0:4] | |
| ) | |
| _modifiedHGCHEFConfig_v19 = hltHGCalUncalibRecHit.HGCHEFConfig.clone( | |
| fCPerMIP = HGCAL_reco_constants.fcPerMip[4:8] | |
| ) | |
| _modifiedHGCHFNoseConfig_v19 = hltHGCalUncalibRecHit.HGCHFNoseConfig.clone( | |
| fCPerMIP = [1.25, 2.57, 3.88, 2.57] | |
| ) |
| ) No newline at end of file | ||
| ) | ||
|
|
||
| phase2_hgcalV19.toModify(HGCAL_chargeCollectionEfficiencies, values = cms.vdouble(1.0, 1.0,1.0,1.0)) |
There was a problem hiding this comment.
| phase2_hgcalV19.toModify(HGCAL_chargeCollectionEfficiencies, values = cms.vdouble(1.0, 1.0,1.0,1.0)) | |
| phase2_hgcalV19.toModify(HGCAL_chargeCollectionEfficiencies, values = [1.0, 1.0,1.0,1.0]) |
| ) No newline at end of file | ||
| ) | ||
|
|
||
| phase2_hgcalV19.toModify(HGCAL_noise_fC , values = cms.vdouble(0.32041011999999996, 0.384492144, 0.32041011999999996, 0.384492144)) |
There was a problem hiding this comment.
| phase2_hgcalV19.toModify(HGCAL_noise_fC , values = cms.vdouble(0.32041011999999996, 0.384492144, 0.32041011999999996, 0.384492144)) | |
| phase2_hgcalV19.toModify(HGCAL_noise_fC , values = [0.32041011999999996, 0.384492144, 0.32041011999999996, 0.384492144]) |
| phase2_hgcalV19.toModify(HGCAL_reco_constants, | ||
| thicknessCorrection = cms.vdouble(0.75, 0.76, 0.75, 0.76, 0.85, 0.85, 0.84, 0.85) , #CEE_12_HD, CEE_200_LD, CEE_300_LD, CEE_200_HD,CEH_12_HD, CEH_200_LD, CEH_300_LD, CEH_200_HD, | ||
| fcPerMip = cms.vdouble( | ||
| 2.06, 3.43, 5.15, 3.43, 2.06, 3.43, | ||
| 5.15, 3.43 | ||
| ), | ||
| noises = cms.vdouble( | ||
| 2000.0, 2400.0, 2000.0, 2400.0, 2000.0, 2400.0, | ||
| 2000.0, 2400. | ||
| ), | ||
| numberOfThicknesses = cms.uint32(4), | ||
| maxNumberOfThickIndices = cms.uint32(8), | ||
| thresholdW0 = cms.vdouble(2.9, 2.9, 2.9, 2.9), | ||
| ) |
There was a problem hiding this comment.
| phase2_hgcalV19.toModify(HGCAL_reco_constants, | |
| thicknessCorrection = cms.vdouble(0.75, 0.76, 0.75, 0.76, 0.85, 0.85, 0.84, 0.85) , #CEE_12_HD, CEE_200_LD, CEE_300_LD, CEE_200_HD,CEH_12_HD, CEH_200_LD, CEH_300_LD, CEH_200_HD, | |
| fcPerMip = cms.vdouble( | |
| 2.06, 3.43, 5.15, 3.43, 2.06, 3.43, | |
| 5.15, 3.43 | |
| ), | |
| noises = cms.vdouble( | |
| 2000.0, 2400.0, 2000.0, 2400.0, 2000.0, 2400.0, | |
| 2000.0, 2400. | |
| ), | |
| numberOfThicknesses = cms.uint32(4), | |
| maxNumberOfThickIndices = cms.uint32(8), | |
| thresholdW0 = cms.vdouble(2.9, 2.9, 2.9, 2.9), | |
| ) | |
| phase2_hgcalV19.toModify(HGCAL_reco_constants, | |
| thicknessCorrection = [0.75, 0.76, 0.75, 0.76, 0.85, 0.85, 0.84, 0.85] , #CEE_12_HD, CEE_200_LD, CEE_300_LD, CEE_200_HD,CEH_12_HD, CEH_200_LD, CEH_300_LD, CEH_200_HD, | |
| fcPerMip = [ | |
| 2.06, 3.43, 5.15, 3.43, 2.06, 3.43, | |
| 5.15, 3.43 | |
| ], | |
| noises = [ | |
| 2000.0, 2400.0, 2000.0, 2400.0, 2000.0, 2400.0, | |
| 2000.0, 2400. | |
| ], | |
| numberOfThicknesses = 4, | |
| maxNumberOfThickIndices = 8, | |
| thresholdW0 = [2.9, 2.9, 2.9, 2.9], | |
| ) |
| ) No newline at end of file | ||
| ) | ||
|
|
||
| phase2_hgcalV19.toModify(hgceeDigitizer.digiCfg.feCfg, tdcForToAOnset_fC= cms.vdouble(12.,12.,12.,12.)) |
There was a problem hiding this comment.
| phase2_hgcalV19.toModify(hgceeDigitizer.digiCfg.feCfg, tdcForToAOnset_fC= cms.vdouble(12.,12.,12.,12.)) | |
| phase2_hgcalV19.toModify(hgceeDigitizer.digiCfg.feCfg, tdcForToAOnset_fC= [12.,12.,12.,12.]) |
| ) No newline at end of file | ||
| ) | ||
|
|
||
| phase2_hgcalV19.toModify(hgchebackDigitizer.digiCfg.feCfg, tdcForToAOnset_fC = cms.vdouble(12.,12.,12.,12.)) |
There was a problem hiding this comment.
| phase2_hgcalV19.toModify(hgchebackDigitizer.digiCfg.feCfg, tdcForToAOnset_fC = cms.vdouble(12.,12.,12.,12.)) | |
| phase2_hgcalV19.toModify(hgchebackDigitizer.digiCfg.feCfg, tdcForToAOnset_fC = [12.,12.,12.,12.]) |
| ) No newline at end of file | ||
| ) | ||
|
|
||
| phase2_hgcalV19.toModify(hgchefrontDigitizer.digiCfg.feCfg, tdcForToAOnset_fC = cms.vdouble(12.,12.,12.,12.)) |
There was a problem hiding this comment.
| phase2_hgcalV19.toModify(hgchefrontDigitizer.digiCfg.feCfg, tdcForToAOnset_fC = cms.vdouble(12.,12.,12.,12.)) | |
| phase2_hgcalV19.toModify(hgchefrontDigitizer.digiCfg.feCfg, tdcForToAOnset_fC = [12.,12.,12.,12.]) |
|
type hgcal |
|
type bug-fix |
|
+code-checks Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-48303/45665
|
|
Pull request #48303 was updated. @BenjaminRS, @Martin-Grunewald, @Moanwar, @civanch, @cmsbuild, @cseez, @felicepantaleo, @jfernan2, @kpedro88, @mandrenguyen, @mdhildreth, @mmusich, @pfs, @quinnanm, @rovere, @srimanob, @subirsarkar can you please check and sign again. |
|
please test |
|
|
||
|
|
||
| phase2_hgcalV19.toModify(HGCAL_reco_constants, | ||
| thicknessCorrection = 0.75, 0.76, 0.75, 0.76, 0.85, 0.85, 0.84, 0.85 , #CEE_12_HD, CEE_200_LD, CEE_300_LD, CEE_200_HD,CEH_12_HD, CEH_200_LD, CEH_300_LD, CEH_200_HD, |
There was a problem hiding this comment.
| thicknessCorrection = 0.75, 0.76, 0.75, 0.76, 0.85, 0.85, 0.84, 0.85 , #CEE_12_HD, CEE_200_LD, CEE_300_LD, CEE_200_HD,CEH_12_HD, CEH_200_LD, CEH_300_LD, CEH_200_HD, | |
| thicknessCorrection = [0.75, 0.76, 0.75, 0.76, 0.85, 0.85, 0.84, 0.85] , #CEE_12_HD, CEE_200_LD, CEE_300_LD, CEE_200_HD,CEH_12_HD, CEH_200_LD, CEH_300_LD, CEH_200_HD, |
| phase2_hgcalV19.toModify(hltHGCalRecHitL1Seeded, | ||
| HGCEE_fCPerMIP = HGCAL_reco_constants.fcPerMip[0:4], | ||
| HGCHEF_fCPerMIP = HGCAL_reco_constants.fcPerMip[4:8], | ||
| HGCHFNose_fCPerMIP = 1.25, 2.57, 3.88, 2.57, |
There was a problem hiding this comment.
mmmh, here and elsewhere now the square bracket is missing!
|
@cmsbuild please abort |
|
+code-checks Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-48303/45666
|
|
Pull request #48303 was updated. @BenjaminRS, @Martin-Grunewald, @Moanwar, @civanch, @cmsbuild, @cseez, @felicepantaleo, @jfernan2, @kpedro88, @mandrenguyen, @mdhildreth, @mmusich, @pfs, @quinnanm, @rovere, @srimanob, @subirsarkar can you please check and sign again. |
|
@cmsbuild, please test |
|
+1 Size: This PR adds an extra 52KB to repository
Comparison SummaryThere are some workflows for which there are errors in the baseline: Summary:
|
|
+hlt
|
|
+1 |
|
@civanch, @subirsarkar, @Moanwar Please approve this PR |
|
+Upgrade |
|
+1 |
|
@BenjaminRS, @quinnanm Please approve this PR |
|
+l1 |
|
@antoniovilela, @mandrenguyen, Please merge this PR |
|
+1 |
|
This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request will now be reviewed by the release team before it's merged. @rappoccio, @mandrenguyen, @sextonkennedy, @antoniovilela (and backports should be raised in the release meeting by the corresponding L2) |
|
+1 |
PR description:
This PR should go on top of #48287 fixing the HLT and RECO part for V19 geometry.
Also in this case the PR is not ready but it would benefit from the CI/CD tests to spot additional errors in moving to the new geometry.
####: For testing this PR:
FYI: @felicepantaleo @pfs @jbsauvan @EmyrClement @indra-ehep @bsunanda