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

Run3-sim47 Remove reference to trackermaterial in materials.xml #28313

Merged
merged 6 commits into from Apr 7, 2020

Conversation

bsunanda
Copy link
Contributor

PR description:

Several cfi files use only materials.xml and not trackermaterial.xml. A couple of materials refer to trackermaterial.xml for elements which are identically defined in materials.xml. Removing the references will allow the cfi's which only used materials.xml to work without any warnings.

PR validation:

Tested with runTheMatrix.py for standard workflows

if this PR is a backport please specify the original PR:

Nothing special

@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-28313/12552

  • This PR adds an extra 28KB to repository

@cmsbuild
Copy link
Contributor

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

It involves the following packages:

Geometry/CMSCommonData

@civanch, @Dr15Jones, @cvuosalo, @ianna, @mdhildreth, @cmsbuild, @kpedro88 can you please review it and eventually sign? Thanks.
@davidlange6, @slava77, @fabiocos you are the release manager for this.

cms-bot commands are listed here

@bsunanda
Copy link
Contributor Author

@cmsbuild Please test

@ianna
Copy link
Contributor

ianna commented Oct 30, 2019

-1

@bsunanda - we cannot change legacy scenarios. In addition, the materials used in Tracker should be moved out of materials.xml so that they can still use and modify T_Copper and T_Aluminum for zero material studies. Please see the issue #28285

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 30, 2019

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/3269/console Started: 2019/10/30 17:52

@bsunanda
Copy link
Contributor Author

@ianna I am happy as long as materials.xml does not refer to trackermaterial

@ianna
Copy link
Contributor

ianna commented Oct 30, 2019

@ianna I am happy as long as materials.xml does not refer to trackermaterial

One should move these materials from materials.xml to trackermaterial.xml and update all Tracker xml files that use them. Then update the payloads.

Alternatively, you can use the new materials.xml version since it's not used in the payloads and can be modified:

Geometry/CMSCommonData/data/materials/2021/v1/materials.xml

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

Comparison job queued.

@bsunanda
Copy link
Contributor Author

@ianna I shall modify the xml files to do that but can someone update the payloads. But I don't see why payloads to be created. Moving the definition from one file to another will not change the physical quantities

@cmsbuild
Copy link
Contributor

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-64d438/3269/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: 2961036
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2960694
  • 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

@fabiocos
Copy link
Contributor

fabiocos commented Apr 3, 2020

@cvuosalo I see, so this has nothing to do with the material reorganization. In any case a factor of 10 in preshower volumes does not sound healthy, but it depends on the real use of these volumes. And I do not see them in Run2/Run3 xml geometry.

In any case, if we update xmls we have unrelated changes already, and if we want to keep the capability to produce Run1 geometries when DDD has gone I think we need to make the update, right? Although I am not sure this update is specifically needed by DD4hep (@bsunanda could you please confirm?)

@civanch
Copy link
Contributor

civanch commented Apr 3, 2020

Hi all,

because we do not want change DB geometry for Run-1,2 can we sign this PR, which for today will change XML geometry for Run-3 and Phase-2 any. Any result for Run-1,2 will not be changed.

We agreed to restore functionality of XML for Run1,2, when Run3 will be completed and DD4Hep migration will be done. The condition: XML for Run1,2 should be identical to DB Run1,2. Only after that we can drop old DD.

@ianna , @cvuosalo , would you agree?

@cvuosalo
Copy link
Contributor

cvuosalo commented Apr 4, 2020

@civanch What I understand you saying is that, since we are not planning to make new DB payloads for Runs 1-2 in the near future, we are then free to change the Runs 1-2 XML files. The problem of the Runs 1-2 XML files will be pushed back until after the DD4hep migration is completed.

But the plan you mentioned concerns me. The stated condition "XML for Runs 1-2 should be identical to the DB payloads for Runs 1-2" is true for the legacy releases of CMSSW (5_3 and 10_6) but will pose significant problems for new versions of CMSSW. We will need to discuss it at the next Sim meeting.

@cvuosalo
Copy link
Contributor

cvuosalo commented Apr 6, 2020

unhold

@cmsbuild cmsbuild removed the hold label Apr 6, 2020
@cvuosalo
Copy link
Contributor

cvuosalo commented Apr 6, 2020

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 6, 2020

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
Copy link
Contributor

hold

We will need to discuss it at the next Sim meeting.

@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 7, 2020

Pull request has been put on hold by @silviodonato
They need to issue an unhold command to remove the hold state or L1 can unhold it for all

@silviodonato
Copy link
Contributor

If I understand correctly,

  • the current XML geometry does not match the DB geometry
  • this PR does not change the XML geometry
  • hence, even after this PR, we will continue to have a XML geometry that does not match the DB geometry

If this is correct, I think we can safety merge this PR.
The mismatch between XML geometry and DB geometry is a different issue and will be fixed with another PR.

@ianna
Copy link
Contributor

ianna commented Apr 7, 2020

@silviodonato - you are correct.

I'd suggest to merge this PR and upload the new DB payloads for all Runs (and update the Run3 GTs). The GT change will result in a baseline comparison differences. However, we know that it would be superficial at this point. Then we'd need to update the baseline. This would make sure we'd catch any further geometry changes resulting in a baseline comparison differences.

@civanch
Copy link
Contributor

civanch commented Apr 7, 2020

I agree with Ianna. Probably, optimal would be to complete fixing of Run-3 geometry and after make GTs for Run-3? We may agree, at what pre-release we stop updating Run-3 geometry. In a mean time this PR may be merged.

@silviodonato
Copy link
Contributor

unhold
ok, I will integrate this PR in the next IB

@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 7, 2020

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
Copy link
Contributor

+1

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

9 participants