[Pixel 3D Digitizer] Fix wrong channel assignation

[duartej]

PR description:

Fix bug in channel assignation, by using PixelDigi::pixelToChannel function instead of PixelTopology::channel.

• Brief description of the problem and the fix: https://indico.cern.ch/event/879045/contributions/3914362/attachments/2060899/3465619/20200622_digiChannelBug.pdf

@emiglior and @skinnari as conveners of the upgrade simulation group are aware and agree.
cc: @suchandradutta

PR validation:

This PR is affecting the Phase 2 upgrade 3D geometry only, checked with workflows 26234.0 and 24834.0 succesfully.

if this PR is a backport please specify the original PR and why you need to backport that PR:

Not a backport

[cmsbuild]

The code-checks are being triggered in jenkins.

[cmsbuild]

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-30446/16568

• This PR adds an extra 16KB to repository

• There are other open Pull requests which might conflict with changes you have proposed:

  • File SimTracker/SiPhase2Digitizer/plugins/Pixel3DDigitizerAlgorithm.cc modified in PR(s): [RFC] Test clang-tidy --checks modernize-use-emplace #29937

Code check has found code style and quality issues which could be resolved by applying following patch(s)

• code-format:
  https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-30446/16568/code-format.patch
  e.g. curl https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-30446/16568/code-format.patch | patch -p1
  You can also run scram build code-format to apply code format directly

[cmsbuild]

The code-checks are being triggered in jenkins.

[cmsbuild]

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-30446/16569

• This PR adds an extra 16KB to repository

• There are other open Pull requests which might conflict with changes you have proposed:

  • File SimTracker/SiPhase2Digitizer/plugins/Pixel3DDigitizerAlgorithm.cc modified in PR(s): [RFC] Test clang-tidy --checks modernize-use-emplace #29937

[cmsbuild]

A new Pull Request was created by @duartej (Jordi Duarte Campderros) for master.

It involves the following packages:

SimTracker/SiPhase2Digitizer

@cmsbuild, @civanch, @kpedro88, @mdhildreth can you please review it and eventually sign? Thanks.
@makortel, @mtosi, @GiacomoSguazzoni, @JanFSchulte, @rovere, @VinInn, @ebrondol, @threus, @dgulhan this is something you requested to watch as well.
@silviodonato, @dpiparo you are the release manager for this.

cms-bot commands are listed here

[mmusich]

@cmsbuild please test

[cmsbuild]

The tests are being triggered in jenkins.

• CMSSW_11_2_X_2020-06-28-0000/slc7_amd64_gcc820: https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/7476/console Started: 2020/06/29 10:28

[mmusich]

@duartej
I had a look to your attached presentation, the lines which you claim are giving inconsistent results for the phase1 digitizer are actually protected by a conditional inclusions

cmssw/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizerAlgorithm.cc

Lines 1515 to 1523 in 518b6ef

	#ifdef TP_DEBUG
	mp = MeasurementPoint(float(ix), float(iy));
	LocalPoint lp = topol->localPosition(mp);
	chan = topol->channel(lp);
	LogDebug("Pixel Digitizer") << " pixel " << ix << " " << iy << " - "
	<< " " << chan << " " << ChargeFraction << " " << mp.x() << " " << mp.y() << " "
	<< lp.x() << " " << lp.y() << " " // givex edge position
	<< chan; // edge belongs to previous ?
	#endif

in any case in the phase1 case the class PixelTopology is used, while here you are using Phase2TrackerTopology

[duartej]

@duartej
I had a look to your attached presentation, the lines which you claim are giving inconsistent results for the phase1 digitizer are actually protected by a conditional inclusions

cmssw/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizerAlgorithm.cc

Lines 1515 to 1523 in 518b6ef

	#ifdef TP_DEBUG
	mp = MeasurementPoint(float(ix), float(iy));
	LocalPoint lp = topol->localPosition(mp);
	chan = topol->channel(lp);
	LogDebug("Pixel Digitizer") << " pixel " << ix << " " << iy << " - "
	<< " " << chan << " " << ChargeFraction << " " << mp.x() << " " << mp.y() << " "
	<< lp.x() << " " << lp.y() << " " // givex edge position
	<< chan; // edge belongs to previous ?
	#endif

in any case in the phase1 case the class PixelTopology is used, while here you are using Phase2TrackerTopology

ahh, yes, you are right. I can see it is using the pixelToChannel function there as well.

However, regarding the Phase2TrackerTopology, it is actually PixelTopology (see https://github.com/cms-sw/cmssw/blob/master/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerFwd.h#L12, which is included in https://github.com/cms-sw/cmssw/blob/master/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.h#L17).

[cmsbuild]

+1
Tested at: 4df841c
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-d13e10/7480/summary.html
CMSSW: CMSSW_11_2_X_2020-06-28-0000
SCRAM_ARCH: slc7_amd64_gcc820

[cmsbuild]

Comparison job queued.

[cmsbuild]

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

Comparison Summary:

• No significant changes to the logs found
• Reco comparison results: 8 differences found in the comparisons
• DQMHistoTests: Total files compared: 36
• DQMHistoTests: Total histograms compared: 2778915
• DQMHistoTests: Total failures: 7
• DQMHistoTests: Total nulls: 0
• DQMHistoTests: Total successes: 2778858
• DQMHistoTests: Total skipped: 50
• DQMHistoTests: Total Missing objects: 0
• DQMHistoSizes: Histogram memory added: 0.0 KiB( 35 files compared)
• Checked 152 log files, 16 edm output root files, 36 DQM output files

[civanch]

+1

[kpedro88]

+upgrade

[cmsbuild]

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

[silviodonato]

+1