Remove dependency from DDCMS/interface/DDShapes.h #31649

namapane · 2020-10-02T11:25:15Z

PR description:

Addressing #31569, replacing #31578 as discussed therein.

Should also replace the former in #31603, cf: #31603 (comment) .

PR validation:

Ran MF regression over all MF geometries for all nominal currents and eras, for builders from DDD and DD4hep, from xml and from DB

cmsbuild · 2020-10-02T11:25:41Z

The code-checks are being triggered in jenkins.

cmsbuild · 2020-10-02T11:31:55Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-31649/18745

This PR adds an extra 24KB to repository
There are other open Pull requests which might conflict with changes you have proposed:
- File MagneticField/GeomBuilder/src/DD4hep_volumeHandle.cc modified in PR(s): [DD4hep] Filtered View is not a Shape #31603

cmsbuild · 2020-10-02T11:32:20Z

A new Pull Request was created by @namapane (Nicola Amapane) for master.

It involves the following packages:

MagneticField/GeomBuilder

@perrotta, @jpata, @cmsbuild, @slava77 can you please review it and eventually sign? Thanks.
@silviodonato, @dpiparo, @qliphy you are the release manager for this.

cms-bot commands are listed here

ianna · 2020-10-02T12:59:46Z

please test

cmsbuild · 2020-10-02T13:00:10Z

The tests are being triggered in jenkins.

CMSSW_11_2_X_2020-10-02-1100/slc7_amd64_gcc820: https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/9707/console Started: 2020/10/02 15:01

cmsbuild · 2020-10-02T13:02:42Z

The tests are being triggered in jenkins.
Tested with other pull request(s) #31581

CMSSW_11_2_X_2020-10-02-1100/slc7_amd64_gcc820: https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/9708/console Started: 2020/10/02 15:03

cmsbuild · 2020-10-02T13:08:01Z

-1

Tested at: b8e7ce9

CMSSW: CMSSW_11_2_X_2020-10-02-1100
SCRAM_ARCH: slc7_amd64_gcc820
You can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-05f749/9708/summary.html

I found follow errors while testing this PR

Failed tests: Build

Build:

I found compilation error when building:

--- Registered EDM Plugin: GeometryVeryForwardGeometryBuilderPlugins
Entering library rule at Geometry/VeryForwardGeometryBuilder
>> Compiling  /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-02-1100/src/Geometry/VeryForwardGeometryBuilder/src/CTPPSGeometry.cc
>> Compiling  /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-02-1100/src/Geometry/VeryForwardGeometryBuilder/src/DetGeomDesc.cc
In file included from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-02-1100/src/Geometry/VeryForwardGeometryBuilder/src/DetGeomDesc.cc:17:
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-02-1100/poison/DetectorDescription/DDCMS/interface/DDShapes.h:1:2: error: #error THIS FILE HAS BEEN REMOVED FROM THE PACKAGE.
 #error THIS FILE HAS BEEN REMOVED FROM THE PACKAGE.
  ^~~~~
>> Compiling  /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-02-1100/src/Geometry/VeryForwardGeometryBuilder/src/DetGeomDescBuilder.cc
>> Compiling  /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-02-1100/src/Geometry/VeryForwardGeometryBuilder/src/module.cc
In file included from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_2_X_2020-10-02-1100/src/Geometry/VeryForwardGeometryBuilder/src/DetGeomDesc.cc:17:

cmsbuild · 2020-10-02T13:08:04Z

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

cmsbuild · 2020-10-05T16:29:26Z

The code-checks are being triggered in jenkins.

cmsbuild · 2020-10-05T16:34:44Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-31649/18796

This PR adds an extra 24KB to repository
There are other open Pull requests which might conflict with changes you have proposed:
- File MagneticField/GeomBuilder/src/DD4hep_volumeHandle.cc modified in PR(s): [DD4hep] Filtered View is not a Shape #31603

cmsbuild · 2020-10-05T16:35:06Z

Pull request #31649 was updated. @perrotta, @jpata, @cmsbuild, @slava77 can you please check and sign again.

namapane

The changes seem to be about geometry, therefore I would ask @cms-sw/geometry-l2 to take a look please.

While a look from @cms-sw/geometry-l2 (or anybody) is welcome, I'd like to point out that this is not about geometry, it is just about the internal implemention of MF with, no side effect on geometry whatsoever.
(Or maybe MF falls under the responsibility of geometry-l2; but I don't think that was ever formally defined.)

namapane · 2020-10-05T15:02:29Z

MagneticField/GeomBuilder/src/DD4hep_volumeHandle.cc

 #include <string>
 #include <iterator>

 using namespace SurfaceOrientation;
 using namespace std;
 using namespace magneticfield;
 using namespace edm;
+//using namespace angle_units::operators;


namapane · 2020-10-05T15:19:25Z

MagneticField/GeomBuilder/src/DD4hep_volumeHandle.cc

+      double rInPlusZ = cons.rMin2();
+      double rOutPlusZ = cons.rMax2();
+      double startPhi = cons.startPhi();
+      double deltaPhi = cons.endPhi() - startPhi;


Not really since these values are passed to functions that handle phi modularity internally (using the old Geom::Phi implementation). That is confirmed by the fact that regression tests passed.
I can in any case add a reco::deltaPhi() for the sake of clarity, it would not harm.

ianna · 2020-10-06T11:44:27Z

please test

cmsbuild · 2020-10-06T11:44:50Z

The tests are being triggered in jenkins.

CMSSW_11_2_X_2020-10-05-2300/slc7_amd64_gcc820: https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/9756/console Started: 2020/10/06 13:47

ianna · 2020-10-06T11:46:53Z

From the reco point of view I had just some rather minor code remarks. The changes seem to be about geometry, therefore I would ask @cms-sw/geometry-l2 to take a look please. Thanks!

@jpata - the changes were requested by geometry and are perfectly fine :-)

cmsbuild · 2020-10-06T12:57:25Z

+1
Tested at: 0851263
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-f5cb39/9756/summary.html
CMSSW: CMSSW_11_2_X_2020-10-05-2300
SCRAM_ARCH: slc7_amd64_gcc820

cmsbuild · 2020-10-06T12:57:27Z

Comparison job queued.

cmsbuild · 2020-10-06T14:22:48Z

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

Comparison Summary:

No significant changes to the logs found
Reco comparison results: 4 differences found in the comparisons
DQMHistoTests: Total files compared: 35
DQMHistoTests: Total histograms compared: 2542225
DQMHistoTests: Total failures: 7
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 2542196
DQMHistoTests: Total skipped: 22
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: 0.0 KiB( 34 files compared)
Checked 149 log files, 22 edm output root files, 35 DQM output files

jpata · 2020-10-06T16:26:17Z

+reconstruction

technical, removes legacy DDShapes dependency from MagneticField/GeomBuilder
no reco changes are observed
additional tests have also been run for dd4hep by the author with no regressions

cmsbuild · 2020-10-06T16:26:41Z

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

silviodonato · 2020-10-06T20:12:33Z

+1

Remove dependency from DDCMS/interface/DDShapes.h

b8e7ce9

cmsbuild added this to the CMSSW_11_2_X milestone Oct 2, 2020

cmsbuild added code-checks-pending comparison-pending orp-pending pending-signatures reconstruction-pending tests-pending labels Oct 2, 2020

namapane mentioned this pull request Oct 2, 2020

[DD4hep] MagneticField Builder Shapes Use Cleanup - Use dd4hep::Solid Directly #31578

Closed

cmsbuild added code-checks-approved and removed code-checks-pending labels Oct 2, 2020

This was referenced Oct 2, 2020

[DD4hep] Filtered View is not a Shape #31603

Closed

[DD4hep] MagnetidField Geometry Builder to Use dd4hep::Solid #31569

Closed

cmsbuild added tests-started and removed tests-pending labels Oct 2, 2020

ianna mentioned this pull request Oct 2, 2020

[DD4hep] Remove Shape Wrapper Classes #31581

Merged

cmsbuild added the requires-external label Oct 2, 2020

cmsbuild added comparison-notrun tests-rejected and removed comparison-pending tests-started labels Oct 2, 2020

cmsbuild mentioned this pull request Oct 2, 2020

[DD4hep] Remove Spurious Include #31652

Merged

cmsbuild added the tests-pending label Oct 5, 2020

cmsbuild added code-checks-approved and removed code-checks-pending labels Oct 5, 2020

namapane commented Oct 5, 2020

View reviewed changes

cmsbuild added tests-started and removed tests-pending labels Oct 6, 2020

cmsbuild added tests-approved and removed tests-started labels Oct 6, 2020

cmsbuild added comparison-available and removed comparison-pending labels Oct 6, 2020

cmsbuild added fully-signed reconstruction-approved and removed pending-signatures reconstruction-pending labels Oct 6, 2020

cmsbuild added orp-approved and removed orp-pending labels Oct 6, 2020

cmsbuild merged commit d2bf361 into cms-sw:master Oct 6, 2020

cmsbuild mentioned this pull request Oct 6, 2020

Add a customisation to run the "GRun" HLT menu on Run 2 data/MC #31655

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove dependency from DDCMS/interface/DDShapes.h #31649

Remove dependency from DDCMS/interface/DDShapes.h #31649

namapane commented Oct 2, 2020 •

edited

Loading

cmsbuild commented Oct 2, 2020

cmsbuild commented Oct 2, 2020

cmsbuild commented Oct 2, 2020

ianna commented Oct 2, 2020

cmsbuild commented Oct 2, 2020 •

edited

Loading

cmsbuild commented Oct 2, 2020 •

edited

Loading

cmsbuild commented Oct 2, 2020

cmsbuild commented Oct 2, 2020

cmsbuild commented Oct 5, 2020

cmsbuild commented Oct 5, 2020

cmsbuild commented Oct 5, 2020

namapane left a comment

namapane Oct 5, 2020

namapane Oct 5, 2020

ianna commented Oct 6, 2020

cmsbuild commented Oct 6, 2020 •

edited

Loading

ianna commented Oct 6, 2020

cmsbuild commented Oct 6, 2020

cmsbuild commented Oct 6, 2020

cmsbuild commented Oct 6, 2020

jpata commented Oct 6, 2020

cmsbuild commented Oct 6, 2020

silviodonato commented Oct 6, 2020

Remove dependency from DDCMS/interface/DDShapes.h #31649

Remove dependency from DDCMS/interface/DDShapes.h #31649

Conversation

namapane commented Oct 2, 2020 • edited Loading

PR description:

PR validation:

cmsbuild commented Oct 2, 2020

cmsbuild commented Oct 2, 2020

cmsbuild commented Oct 2, 2020

ianna commented Oct 2, 2020

cmsbuild commented Oct 2, 2020 • edited Loading

cmsbuild commented Oct 2, 2020 • edited Loading

cmsbuild commented Oct 2, 2020

cmsbuild commented Oct 2, 2020

cmsbuild commented Oct 5, 2020

cmsbuild commented Oct 5, 2020

cmsbuild commented Oct 5, 2020

namapane left a comment

Choose a reason for hiding this comment

namapane Oct 5, 2020

Choose a reason for hiding this comment

namapane Oct 5, 2020

Choose a reason for hiding this comment

ianna commented Oct 6, 2020

cmsbuild commented Oct 6, 2020 • edited Loading

ianna commented Oct 6, 2020

cmsbuild commented Oct 6, 2020

cmsbuild commented Oct 6, 2020

cmsbuild commented Oct 6, 2020

jpata commented Oct 6, 2020

cmsbuild commented Oct 6, 2020

silviodonato commented Oct 6, 2020

namapane commented Oct 2, 2020 •

edited

Loading

cmsbuild commented Oct 2, 2020 •

edited

Loading

cmsbuild commented Oct 2, 2020 •

edited

Loading

cmsbuild commented Oct 6, 2020 •

edited

Loading