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] Integrate HFNose #28461

Merged
merged 2 commits into from
Dec 9, 2019

Conversation

jbsauvan
Copy link
Contributor

PR description:

Integrate the HFNose in the HGCAL trigger primitive generation.

@mariadalfonso FYI

PR validation:

Standard code checks and formatting.

scram b code-checks
scram b code-format

Test C9, C9, C10 workflows.

runTheMatrix.py -w upgrade -l 21634.0 --maxSteps=2
runTheMatrix.py -w upgrade -l 22034.0 --maxSteps=2
runTheMatrix.py -w upgrade -l 22434.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-28461/12895

  • This PR adds an extra 80KB to repository

@cmsbuild
Copy link
Contributor

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

It involves the following packages:

DataFormats/L1THGCal
Fireworks/Calo
L1Trigger/L1THGCal

@benkrikler, @Dr15Jones, @alja, @kpedro88, @cmsbuild, @rekovic can you please review it and eventually sign? Thanks.
@Martin-Grunewald, @alja, @amarini, @rovere, @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

@fabiocos
Copy link
Contributor

please test workflow 23234.0

@cmsbuild
Copy link
Contributor

cmsbuild commented Nov 24, 2019

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/3607/console Started: 2019/11/24 18:04

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

Comparison job queued.

@cmsbuild
Copy link
Contributor

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

@slava77 comparisons for the following workflows were not done due to missing matrix map:

  • /data/cmsbld/jenkins/workspace/compare-root-files-short-matrix/results/JR-comparison/PR-f9bcc8/23234.0_TTbar_14TeV+TTbar_14TeV_TuneCUETP8M1_2026D49_GenSimHLBeamSpotFull14+DigiFullTrigger_2026D49+RecoFullGlobal_2026D49+HARVESTFullGlobal_2026D49

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 3 differences found in the comparisons
  • DQMHistoTests: Total files compared: 34
  • DQMHistoTests: Total histograms compared: 2785613
  • DQMHistoTests: Total failures: 2
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2785270
  • DQMHistoTests: Total skipped: 341
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 33 files compared)
  • Checked 147 log files, 16 edm output root files, 34 DQM output files

@@ -223,7 +235,7 @@ void HGCalTriggerGeometryHexImp1::buildTriggerCellsAndModules()
unsigned triggerCell = cell_triggerCell.second;
auto itr_exist = trigger_cells_to_cells.emplace(triggerCell, list_cells());
itr_exist.first->second.emplace(cell);
//trigger_cells_to_cells.at(triggerCell).emplace(cell);
// trigger_cells_to_cells.at(triggerCell).emplace(cell);
Copy link
Contributor

Choose a reason for hiding this comment

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

delete commented-out code (everywhere in this file)

@@ -116,7 +128,7 @@ void HGCalTriggerGeometryImp1::buildMaps()
unsigned moduleId =
(tc2mItr != trigger_cells_to_modules_.end() ? tc2mItr->second
: 0); // 0 if the trigger cell doesn't belong to a module
//unsigned moduleId = trigger_cells_to_modules_.at(triggercellId);
// unsigned moduleId = trigger_cells_to_modules_.at(triggercellId);
Copy link
Contributor

Choose a reason for hiding this comment

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

delete commented-out code

)
)

## Note: this customization change both HGC and HFnose, to be revised
Copy link
Contributor

Choose a reason for hiding this comment

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

should this be addressed within this PR?

Copy link
Contributor

Choose a reason for hiding this comment

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

I have discussed with @jbsauvan
The plan is to duplicate the full L1 sequence instead of having one single object with both HGC and HFnose TP.

I intended to do in subsequent PR ; is it ok ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The duplication of the sequence for the HFNose might not be straightforward. In any case it will require checks and validation. So I would prefer to keep this for an other PR.

# NOSE parameters
fCPerMIPnose = recoparam.HGCalUncalibRecHit.HGCHFNoseConfig.fCPerMIP
layerWeightsNose = recocalibparam.dEdX.weightsNose
##thicknessCorrectionNose = recocalibparam.HGCalRecHit.thicknessNoseCorrection
Copy link
Contributor

Choose a reason for hiding this comment

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

delete commented-out code

Copy link
Contributor

Choose a reason for hiding this comment

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

Hardcoded lines 37
thicknessCorrectionNose = [0.759,0.760,0.773]
should be removed and line 36 uncommented

@@ -53,6 +58,8 @@ GlobalPoint HGCalTriggerTools::getTCPosition(const DetId& id) const {
// to distinguish a TC detId
}

// FIXME: to do HFNose
Copy link
Contributor

Choose a reason for hiding this comment

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

should this be fixed in this PR?

Copy link
Contributor

Choose a reason for hiding this comment

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

In principle it is ok, since it delegates the calculation to the geometry which correctly computes the nose TC positions.
comment can be removed

@@ -90,6 +100,7 @@ unsigned HGCalTriggerTools::layers(DetId::Detector type) const {
case DetId::HGCalHSc:
layers = bhLayers_;
break;
// FIXME: to do HFNose
Copy link
Contributor

Choose a reason for hiding this comment

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

should this be fixed in this PR?

Copy link
Contributor

Choose a reason for hiding this comment

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

@mariadalfonso @jbsauvan please check this

Copy link
Contributor

Choose a reason for hiding this comment

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

In HGCalTriggerTools::layers(DetId::Detector type) I do not have access to the subdet so cannot set up the switch to the HFNose.

Downstream the code the HGCalTriggerTools::layers(ForwardSubdetector type) is in use.
See for example the changes in https://github.com/cms-sw/cmssw/pull/28461/files#diff-ffd813bde161fec49fe1259f558ea728R91

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This function cannot handle HFNose.
At some point we should think if there is a better way to handle all cases, maybe merging the different layers functions. But it will require to check everywhere the functions are called. I propose to do this in an other PR. We can keep the FIXME in the code to remember that.

import FWCore.ParameterSet.Config as cms


from Configuration.Eras.Era_Phase2C6_timing_layer_bar_cff import Phase2C6_timing_layer_bar
Copy link
Contributor

Choose a reason for hiding this comment

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

this should be updated with respect to #28387

@alja
Copy link
Contributor

alja commented Nov 25, 2019

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 2, 2019

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 2, 2019

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 2, 2019

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

@slava77 comparisons for the following workflows were not done due to missing matrix map:

  • /data/cmsbld/jenkins/workspace/compare-root-files-short-matrix/results/JR-comparison/PR-f9bcc8/23234.0_TTbar_14TeV+TTbar_14TeV_TuneCUETP8M1_2026D49_GenSimHLBeamSpotFull14+DigiFullTrigger_2026D49+RecoFullGlobal_2026D49+HARVESTFullGlobal_2026D49

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 34
  • DQMHistoTests: Total histograms compared: 2793840
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2793498
  • DQMHistoTests: Total skipped: 341
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 33 files compared)
  • Checked 147 log files, 16 edm output root files, 34 DQM output files

@kpedro88
Copy link
Contributor

kpedro88 commented Dec 3, 2019

+upgrade
outstanding comments to be addressed in followup PR:
#28461 (comment)
#28461 (comment)

@fabiocos
Copy link
Contributor

fabiocos commented Dec 5, 2019

@alja the changes in the visualisation area look technical and minor, could you please have a look?

@rekovic this PR needs your attention

@alja
Copy link
Contributor

alja commented Dec 5, 2019

+1

@rekovic
Copy link
Contributor

rekovic commented Dec 9, 2019

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 9, 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 Dec 9, 2019

+1

@cmsbuild cmsbuild merged commit b6a7209 into cms-sw:master Dec 9, 2019
jbsauvan added a commit to PFCal-dev/cmssw that referenced this pull request Apr 7, 2020
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.

8 participants