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

improved position measurement for 2D clusters in HGCAL silicon sensors #25411

Merged
merged 5 commits into from
Dec 20, 2018

Conversation

amartelli
Copy link
Contributor

Improved position for 2D clusters, with focus on electromagnetic showers thus concerning 2Dcl centered in the Silicon sensors.
Main changes:

Further position optimisation will follow a global restyle with optimised parameters of the Imaging algorithm. In the specific for the position:

  • same optimisation for Scintillator part
  • same optimisation for "sharing" option enabled

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 4, 2018

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 4, 2018

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 4, 2018

A new Pull Request was created by @amartelli for master.

It involves the following packages:

RecoLocalCalo/HGCalRecAlgos
RecoLocalCalo/HGCalRecProducers

@perrotta, @cmsbuild, @kpedro88, @slava77 can you please review it and eventually sign? Thanks.
@edjtscott, @vandreev11, @sethzenz, @felicepantaleo, @rovere, @argiro, @cseez, @pfs, @lgray, @kpedro88 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

@perrotta
Copy link
Contributor

perrotta commented Dec 4, 2018

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 4, 2018

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/31980/console Started: 2018/12/04 14:43

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 4, 2018

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 4, 2018

Comparison job queued.

VerbosityLevel the_verbosity = pERROR) : vecDeltas_(vecDeltas_in), kappa_(kappa_in),
VerbosityLevel the_verbosity = pERROR) :
W0threshold_(W0threshold_in),
positionDeltaRho_c_(positionDeltaRho_c_in),
Copy link
Contributor

Choose a reason for hiding this comment

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

inconsistent indentation

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 also fixed the indentation for other few lines in the same constructor

float rhEnergy = v[idx].data.weight;
if(total_weight == 0. || rhEnergy == 0.) continue;
float W0_ = W0threshold_[thick];
Wi = (W0_ + log(rhEnergy/total_weight)) > 0 ? (W0_ + log(rhEnergy/total_weight)) : 0.;
Copy link
Contributor

Choose a reason for hiding this comment

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

Wi = std::max(W0_ + log(rhEnergy/total_weight), 0.);

total_weight_log += Wi;
}
total_weight = total_weight_log;
x = x_log;
Copy link
Contributor

Choose a reason for hiding this comment

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

for silicon, why bother computing x and y values in the earlier loop that fills innerIndices if the values will get overwritten here?

@perrotta
Copy link
Contributor

perrotta commented Dec 6, 2018

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 6, 2018

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/32034/console Started: 2018/12/06 14:55

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 6, 2018

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 6, 2018

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 6, 2018

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 1211 differences found in the comparisons
  • DQMHistoTests: Total files compared: 33
  • DQMHistoTests: Total histograms compared: 3131939
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3131734
  • 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

@perrotta
Copy link
Contributor

+1

  • Code changes are in line with the PR description
  • Changes in phase2 output are in the HGCal layer clusters, and propagate down to the higher level quantities

@perrotta
Copy link
Contributor

@amartelli : since you did not want to integrate it here, I think that an adjustment that should be applied to all HGCal code in CMSSW (as soon as this PR gets merged) is to retrieve lastLayerEE and lastLayerFH from the geometry via RecHitTools.

As far as I can see, up to now only in RecoParticleFlow/PFClusterProducer/plugins/SimMappers/RealisticSimClusterMapper.cc those quantities are retrieved from RecHitTools, while everywhere else the same magic numbers are hardcoded instead. See for example:
https://cmssdt.cern.ch/lxr/search?%21v=CMSSW_10_4_X_2018-12-10-2300&_filestring=&_string=lastLayerEE
and
https://cmssdt.cern.ch/lxr/search?%21v=CMSSW_10_4_X_2018-12-10-2300&_filestring=&_string=lastLayerFH

@amartelli
Copy link
Contributor Author

@perrotta. Yes agreed that replacing "magic numbers" with quantities retrieved from the geometry via RecHitTools has to be done everywhere and indeed there were already threads about this.
As you comment, this is a more general problem than specific to this PR.
I mention @rovere for the DPG, we'll discuss about a restyle of this for all HGCal code in CMSSW.
thanks

@kpedro88
Copy link
Contributor

+upgrade

@cmsbuild
Copy link
Contributor

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)

@kpedro88
Copy link
Contributor

I opened #25472 to track the hardcoded layer number issue

@smuzaffar smuzaffar modified the milestones: CMSSW_10_4_X, CMSSW_10_5_X Dec 20, 2018
@fabiocos
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit bd57903 into cms-sw:master Dec 20, 2018
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

6 participants