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.

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

[HGCAL trigger] Configuration updates. New eg ID. Gen macthing selector. Noise threshold. #26545

Merged
merged 9 commits into from May 8, 2019

Conversation

jbsauvan
Copy link
Contributor

PR description:

  • Add egamma cluster id for the "histomax" clustering
  • Add gen-matched cluster selector
  • Refactor configurations and customisations to better handle multiple algorithms and era modifications
  • Add sensor cell threshold at 3sigma of the noise before summing sensor cells into trigger cells

Needs external cms-data/L1Trigger-L1THGCal#13

PR validation:

scram b code-checks
scram b code-format
runTheMatrix.py -w upgrade -l 21234.0 --maxSteps=2
runTheMatrix.py -w upgrade -l 27434.0 --maxSteps=2
runTheMatrix.py -w upgrade -l 29034.0 --maxSteps=2

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-26545/9442

  • This PR adds an extra 40KB to repository

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @jbsauvan (Jean-Baptiste Sauvan) for master.

It involves the following packages:

L1Trigger/L1THGCal
L1Trigger/L1THGCalUtilities

@cmsbuild, @rekovic, @kpedro88 can you please review it and eventually sign? Thanks.
@Martin-Grunewald, @amarini, @lgray this is something you requested to watch as well.
@davidlange6, @slava77, @fabiocos you are the release manager for this.

cms-bot commands are listed here

Copy link
Contributor

@kpedro88 kpedro88 left a comment

Choose a reason for hiding this comment

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

Some simple review comments while waiting for the external data update


private:
std::vector<double> thickness_corrections_;
double LSB_silicon_fC_;
Copy link
Contributor

Choose a reason for hiding this comment

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

member variable names should start with lower case

):
parameters_c2d = distance_C2d_params.clone()
set_threshold_params(parameters_c2d, seed_threshold, cluster_threshold)
parameters_c2d.dR_cluster = distance
Copy link
Contributor

Choose a reason for hiding this comment

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

parameters can be reset inside the clone() statement (everywhere in this file)

raise KeyError('HGC TPG ID: Cannot find a cut corresponding to the working point {}'.format(wp))
parameters_c3d = process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters
identification = egamma_identification_histomax.clone()
identification.WorkingPoints = cms.vdouble(
Copy link
Contributor

Choose a reason for hiding this comment

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

can be done inside clone()

threshold_scintillator=threshold_conc_proc.triggercell_threshold_scintillator # in mipT
):
parameters = threshold_conc_proc.clone()
parameters.triggercell_threshold_silicon = threshold_silicon
Copy link
Contributor

Choose a reason for hiding this comment

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

can be done inside clone() (everywhere in this file)

# (see https://indico.cern.ch/event/806845/contributions/3359859/attachments/1815187/2966402/19-03-20_EGPerf_HGCBE.pdf
# for more details)
phase2_hgcalV9.toModify(c2d_thresholds_pset,
seeding_threshold_silicon=cms.double(3.75),
Copy link
Contributor

Choose a reason for hiding this comment

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

better to avoid using cms.double() in toModify(), e.g. seeding_threshold_silicon = 3.75 (to check automatically if the assigned value has the right type vs. the original value)

# (see https://indico.cern.ch/event/806845/contributions/3359859/attachments/1815187/2966402/19-03-20_EGPerf_HGCBE.pdf
# for more details)
phase2_hgcalV9.toModify(histoMax_C3d_params,
threshold_histo_multicluster=cms.double(7.5), # MipT
Copy link
Contributor

Choose a reason for hiding this comment

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

better to avoid using cms.double() in toModify()



histoMaxVariableDR_C3d_params = histoMax_C3d_params.clone()
histoMaxVariableDR_C3d_params.dR_multicluster = cms.double(0.)
Copy link
Contributor

Choose a reason for hiding this comment

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

can be done inside clone() (everywhere in this file)

# (see https://indico.cern.ch/event/806845/contributions/3359859/attachments/1815187/2966402/19-03-20_EGPerf_HGCBE.pdf
# for more details)
phase2_hgcalV9.toModify(threshold_conc_proc,
triggercell_threshold_silicon=cms.double(1.5), # MipT
Copy link
Contributor

Choose a reason for hiding this comment

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

better to avoid using cms.double() in toModify()

LSB_scintillator_MIP_(conf.getParameter<double>("scintillatorCellLSB_MIP")),
thresholds_silicon_(conf.getParameter<std::vector<double>>("thresholdsSilicon")),
threshold_scintillator_(conf.getParameter<double>("thresholdScintillator")) {
if (thickness_corrections_.size() != 3) {
Copy link
Contributor

Choose a reason for hiding this comment

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

magic number 3 should be named constant

}

void l1t::HGC3DClusterGenMatchSelector::produce(edm::Event &iEvent, const edm::EventSetup &) {
std::unique_ptr<l1t::HGCalMulticlusterBxCollection> out(new l1t::HGCalMulticlusterBxCollection());
Copy link
Contributor

Choose a reason for hiding this comment

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

use std::make_unique

jbsauvan added a commit to PFCal-dev/cmssw that referenced this pull request Apr 27, 2019
@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-26545/9460

  • This PR adds an extra 72KB to repository

@cmsbuild
Copy link
Contributor

Pull request #26545 was updated. @cmsbuild, @rekovic, @kpedro88 can you please check and sign again.

@jbsauvan
Copy link
Contributor Author

Thanks @kpedro88 , comments have been addressed.

@rekovic
Copy link
Contributor

rekovic commented May 2, 2019

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented May 2, 2019

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/34454/console Started: 2019/05/02 09:09

@cmsbuild
Copy link
Contributor

cmsbuild commented May 2, 2019

-1

Tested at: a40da35

You can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-26545/34454/summary.html

I found follow errors while testing this PR

Failed tests: RelVals

  • RelVals:

When I ran the RelVals I found an error in the following workflows:
20034.0 step2

runTheMatrix-results/20034.0_TTbar_14TeV+TTbar_14TeV_TuneCUETP8M1_2023D17_GenSimHLBeamSpotFull14+DigiFullTrigger_2023D17+RecoFullGlobal_2023D17+HARVESTFullGlobal_2023D17/step2_TTbar_14TeV+TTbar_14TeV_TuneCUETP8M1_2023D17_GenSimHLBeamSpotFull14+DigiFullTrigger_2023D17+RecoFullGlobal_2023D17+HARVESTFullGlobal_2023D17.log

21234.0 step2
runTheMatrix-results/21234.0_TTbar_14TeV+TTbar_14TeV_TuneCUETP8M1_2023D21_GenSimHLBeamSpotFull14+DigiFullTrigger_2023D21+RecoFullGlobal_2023D21+HARVESTFullGlobal_2023D21/step2_TTbar_14TeV+TTbar_14TeV_TuneCUETP8M1_2023D21_GenSimHLBeamSpotFull14+DigiFullTrigger_2023D21+RecoFullGlobal_2023D21+HARVESTFullGlobal_2023D21.log

27434.0 step2
runTheMatrix-results/27434.0_TTbar_14TeV+TTbar_14TeV_TuneCUETP8M1_2023D35_GenSimHLBeamSpotFull14+DigiFullTrigger_2023D35+RecoFullGlobal_2023D35+HARVESTFullGlobal_2023D35/step2_TTbar_14TeV+TTbar_14TeV_TuneCUETP8M1_2023D35_GenSimHLBeamSpotFull14+DigiFullTrigger_2023D35+RecoFullGlobal_2023D35+HARVESTFullGlobal_2023D35.log

29034.0 step2
runTheMatrix-results/29034.0_TTbar_14TeV+TTbar_14TeV_TuneCUETP8M1_2023D41_GenSimHLBeamSpotFull14+DigiFullTrigger_2023D41+RecoFullGlobal_2023D41+HARVESTFullGlobal_2023D41/step2_TTbar_14TeV+TTbar_14TeV_TuneCUETP8M1_2023D41_GenSimHLBeamSpotFull14+DigiFullTrigger_2023D41+RecoFullGlobal_2023D41+HARVESTFullGlobal_2023D41.log

@cmsbuild
Copy link
Contributor

cmsbuild commented May 2, 2019

Comparison not run due to runTheMatrix errors (RelVals and Igprof tests were also skipped)

@cmsbuild
Copy link
Contributor

cmsbuild commented May 3, 2019

@cmsbuild
Copy link
Contributor

cmsbuild commented May 3, 2019

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented May 3, 2019

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-26545/34478/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 33
  • DQMHistoTests: Total histograms compared: 3211964
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3211759
  • DQMHistoTests: Total skipped: 204
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 32 files compared)
  • Checked 137 log files, 14 edm output root files, 33 DQM output files

@kpedro88
Copy link
Contributor

kpedro88 commented May 6, 2019

+upgrade

@rekovic
Copy link
Contributor

rekovic commented May 7, 2019

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented May 7, 2019

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. @davidlange6, @slava77, @smuzaffar, @fabiocos (and backports should be raised in the release meeting by the corresponding L2)

@fabiocos
Copy link
Contributor

fabiocos commented May 8, 2019

+1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants