DD4hep: SimTracker/TrackerMaterialAnalysis Migration MaterialAccounting #29577

vargasa · 2020-04-28T15:23:48Z

PR description:

Progress on dd4hep migration on SimTracker/TrackerMaterialAnalysis

PR validation:

DD

$ cmsRun SimTracker/TrackerMaterialAnalysis/test/listGroups.py

DD4hep

$ cmsRun SimTracker/TrackerMaterialAnalysis/test/listGroups_dd4hep.py

cmsbuild · 2020-04-28T15:24:17Z

The code-checks are being triggered in jenkins.

cmsbuild · 2020-04-28T15:29:23Z

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-29577/14889

This PR adds an extra 20KB to repository

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-29577/14889/code-format.patch
e.g. curl https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-29577/14889/code-format.patch | patch -p1
You can also run scram build code-format to apply code format directly

cmsbuild · 2020-04-28T15:56:57Z

The code-checks are being triggered in jenkins.

cmsbuild · 2020-04-28T16:03:40Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-29577/14890

This PR adds an extra 20KB to repository
There are other open Pull requests which might conflict with changes you have proposed:
- File SimTracker/TrackerMaterialAnalysis/plugins/dd4hep/DD4hep_Listgroups.cc modified in PR(s): [LLVM10] Fixing compilation warnings for Reco and SIM #29568

cmsbuild · 2020-04-28T16:04:06Z

A new Pull Request was created by @vargasa (Andrés Vargas) for master.

It involves the following packages:

SimTracker/TrackerMaterialAnalysis

@cmsbuild, @civanch, @mdhildreth can you please review it and eventually sign? Thanks.
@makortel, @GiacomoSguazzoni, @rovere, @VinInn, @apsallid, @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

cmsbuild · 2020-04-29T14:02:01Z

The code-checks are being triggered in jenkins.

cmsbuild · 2020-04-29T14:07:18Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-29577/14906

This PR adds an extra 24KB to repository
Found files with invalid states:
- SimTracker/TrackerMaterialAnalysis/plugins/dd4hep/MaterialAccountingGroup.cc:
  - Added: 43cbb3b
  - Modified: c7b7b3b, 8bc27cd
  - Deleted: c1c840b
- SimTracker/TrackerMaterialAnalysis/plugins/dd4hep/MaterialAccountingGroup.h:
  - Added: 43cbb3b
  - Modified: c7b7b3b, 8bc27cd
  - Deleted: c1c840b
There are other open Pull requests which might conflict with changes you have proposed:
- File SimTracker/TrackerMaterialAnalysis/plugins/dd4hep/DD4hep_Listgroups.cc modified in PR(s): [LLVM10] Fixing compilation warnings for Reco and SIM #29568

cmsbuild · 2020-04-29T14:07:45Z

Pull request #29577 was updated. @cmsbuild, @civanch, @mdhildreth can you please check and sign again.

vargasa · 2020-04-29T14:09:19Z

FYI: @cvuosalo @ianna

cvuosalo · 2020-04-29T18:57:57Z

@cmsbuild please test

cmsbuild · 2020-04-29T18:59:19Z

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/5912/console Started: 2020/04/29 21:05

cvuosalo · 2020-04-29T19:07:47Z

SimTracker/TrackerMaterialAnalysis/plugins/dd4hep/DD4hep_MaterialAccountingGroup.cc

+          cms::Translation trans = fv.translation(path);
+          GlobalPoint gp = GlobalPoint(trans.x(), trans.y(), trans.z());
+          m_elements.push_back(gp);
+          std::cout << "Adding element at (r,z) " << gp.perp() << "," << gp.z() << std::endl;


Shouldn't all these cout statements be changed to LogVerbatim? Is this program only for testing?

@cvuosalo This specific part has not changed from the existing code. Due to time constraints I'm focusing on having it working and we can address these details in future iterations

cmsbuild · 2020-04-29T20:20:04Z

+1
Tested at: c3dd904
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-e8beab/5912/summary.html
CMSSW: CMSSW_11_1_X_2020-04-29-1100
SCRAM_ARCH: slc7_amd64_gcc820

cmsbuild · 2020-04-29T20:20:07Z

Comparison job queued.

cmsbuild · 2020-04-29T21:53:48Z

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

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: 2696435
DQMHistoTests: Total failures: 25
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 2696091
DQMHistoTests: Total skipped: 319
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

civanch · 2020-04-30T06:27:19Z

+1
I would guess it is test code, so "cout" is allowed

cmsbuild · 2020-04-30T06:27:45Z

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 · 2020-04-30T16:24:57Z

SimTracker/TrackerMaterialAnalysis/plugins/dd4hep/DD4hep_MaterialAccountingGroup.cc

+
+  m_boundingbox.grow(s_tolerance);
+
+  std::cout << "Final BBox r_range: " << m_boundingbox.range_r().first << ", " << m_boundingbox.range_r().second


silviodonato · 2020-04-30T16:25:41Z

+1
@vargasa please prepare a very short PR removing the existing cout

boudoul · 2020-04-30T16:37:43Z

Hi @silviodonato and @vargasa , may I kindly suggest to one of you to create an issue opened until the cout is fixed, so that we are not forgetting ... thanks

vargasa · 2020-05-08T19:04:30Z

@boudoul @silviodonato thanks, I'll take care of it

vargasa added 3 commits April 27, 2020 14:18

Cleanup

d037ad2

Migrating MaterialAccountingGroup,BoundingBox

43cbb3b

Use shared_ptrs instead

c7b7b3b

cmsbuild added this to the CMSSW_11_1_X milestone Apr 28, 2020

cmsbuild added code-checks-pending comparison-pending orp-pending pending-signatures simulation-pending tests-pending labels Apr 28, 2020

cmsbuild added code-checks-rejected and removed code-checks-pending labels Apr 28, 2020

scram build code-format

8bc27cd

cmsbuild added code-checks-pending and removed code-checks-rejected labels Apr 28, 2020

cmsbuild added code-checks-approved and removed code-checks-pending labels Apr 28, 2020

cmsbuild added code-checks-pending and removed code-checks-approved labels Apr 29, 2020

vargasa added 2 commits April 29, 2020 09:06

Mostly intact

b498780

Add migrated class as friend

c3dd904

vargasa force-pushed the MaterialAccounting branch from a0a7d1c to c3dd904 Compare April 29, 2020 14:07

cmsbuild removed the code-checks-pending label Apr 29, 2020

cmsbuild added tests-started and removed tests-pending labels Apr 29, 2020

cvuosalo reviewed Apr 29, 2020

View reviewed changes

cmsbuild added tests-approved and removed tests-started labels Apr 29, 2020

cmsbuild added comparison-available and removed comparison-pending labels Apr 29, 2020

cmsbuild added fully-signed simulation-approved and removed pending-signatures simulation-pending labels Apr 30, 2020

cmsbuild mentioned this pull request Apr 30, 2020

[LLVM10] Fixing compilation warnings for SIM #29598

Merged

silviodonato reviewed Apr 30, 2020

View reviewed changes

cmsbuild added orp-approved and removed orp-pending labels Apr 30, 2020

cmsbuild merged commit a1c8b70 into cms-sw:master Apr 30, 2020

silviodonato mentioned this pull request May 1, 2020

Action items on #29577 #29610

Closed

vargasa deleted the MaterialAccounting branch October 9, 2020 13:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

DD4hep: SimTracker/TrackerMaterialAnalysis Migration MaterialAccounting #29577

DD4hep: SimTracker/TrackerMaterialAnalysis Migration MaterialAccounting #29577

vargasa commented Apr 28, 2020

cmsbuild commented Apr 28, 2020

cmsbuild commented Apr 28, 2020

cmsbuild commented Apr 28, 2020

cmsbuild commented Apr 28, 2020

cmsbuild commented Apr 28, 2020

cmsbuild commented Apr 29, 2020

cmsbuild commented Apr 29, 2020

cmsbuild commented Apr 29, 2020

vargasa commented Apr 29, 2020

cvuosalo commented Apr 29, 2020

cmsbuild commented Apr 29, 2020 •

edited

cvuosalo Apr 29, 2020

vargasa Apr 30, 2020

cmsbuild commented Apr 29, 2020

cmsbuild commented Apr 29, 2020

cmsbuild commented Apr 29, 2020

civanch commented Apr 30, 2020

cmsbuild commented Apr 30, 2020

silviodonato Apr 30, 2020

silviodonato commented Apr 30, 2020

boudoul commented Apr 30, 2020

vargasa commented May 8, 2020


		m_boundingbox.grow(s_tolerance);

		std::cout << "Final BBox r_range: " << m_boundingbox.range_r().first << ", " << m_boundingbox.range_r().second

DD4hep: SimTracker/TrackerMaterialAnalysis Migration MaterialAccounting #29577

DD4hep: SimTracker/TrackerMaterialAnalysis Migration MaterialAccounting #29577

Conversation

vargasa commented Apr 28, 2020

PR description:

PR validation:

cmsbuild commented Apr 28, 2020

cmsbuild commented Apr 28, 2020

cmsbuild commented Apr 28, 2020

cmsbuild commented Apr 28, 2020

cmsbuild commented Apr 28, 2020

cmsbuild commented Apr 29, 2020

cmsbuild commented Apr 29, 2020

cmsbuild commented Apr 29, 2020

vargasa commented Apr 29, 2020

cvuosalo commented Apr 29, 2020

cmsbuild commented Apr 29, 2020 • edited

cvuosalo Apr 29, 2020

Choose a reason for hiding this comment

vargasa Apr 30, 2020

Choose a reason for hiding this comment

cmsbuild commented Apr 29, 2020

cmsbuild commented Apr 29, 2020

cmsbuild commented Apr 29, 2020

civanch commented Apr 30, 2020

cmsbuild commented Apr 30, 2020

silviodonato Apr 30, 2020

Choose a reason for hiding this comment

silviodonato commented Apr 30, 2020

boudoul commented Apr 30, 2020

vargasa commented May 8, 2020

cmsbuild commented Apr 29, 2020 •

edited