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

PPS geometry for Run3 #34499

Merged
merged 8 commits into from Jul 21, 2021
Merged

PPS geometry for Run3 #34499

merged 8 commits into from Jul 21, 2021

Conversation

fabferro
Copy link
Contributor

PR description:

This PR implements the description of Run3 PPS detectors (tracking and timing) at the status of art of current knowledge (2021/Run3 geometry for PPS was till now a replica of Run2 geometry).
Two geometries have been implemented: one to be used in Simulation workflows and one in Reconstruction's.
This is a peculiarity of PPS that we need to conserve and that arises from the specific features of how we deal with the connection with LHC machine in the two workflows.
Most of the files can be used for both geometries, when it was not possible, the involved files have been placed in Reco/Simu subdirs.
The geometry described in dict2021Geometry.py P5 contains the Simu version, the one described in geometryRPFromDD_2021_cfi.py contains the Reco version.
We have placed the new files in directories marked with 2021 flags trying to comply as much as possible to the Geometry naming conventions, provided that we also had to deal with two different detectors placed in four different pots, and a strict observations of the rules was not considered efficient nor clear enough.
Files needed in Run2 geometries have not been touched, to keep a full back-compatibility.
The tools to produce .db files for 2021 geometry has been update3d as well.

PR validation:

The geometries have been tested with a full (private) Simu+Reco chain which loads the two geometries, checking that we obtain compatible results.
Same results are obtained reading directly the xml's and reading the .db files produced with the official tools.
Tests with Run2 data has also been done: Run2 data processing is not affected by the PR.
The detectors are still being built thus no tests on real data could be performed.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-34499/23978

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @fabferro (Fabrizio Ferro) for master.

It involves the following packages:

  • CondTools/Geometry (db)
  • Configuration/Geometry (geometry, upgrade)
  • Geometry/CMSCommonData (geometry, upgrade)
  • Geometry/VeryForwardData (geometry)
  • Geometry/VeryForwardGeometry (geometry)

@civanch, @Dr15Jones, @makortel, @cvuosalo, @ianna, @kpedro88, @cmsbuild, @srimanob, @mdhildreth, @ggovi can you please review it and eventually sign? Thanks.
@vargasa, @cvuosalo, @jan-kaspar, @Martin-Grunewald, @bsunanda, @mmusich, @fabiocos, @slomeo this is something you requested to watch as well.
@silviodonato, @dpiparo, @qliphy, @perrotta you are the release manager for this.

cms-bot commands are listed here

@fabferro
Copy link
Contributor Author

FYI @wpcarvalho

@civanch
Copy link
Contributor

civanch commented Jul 15, 2021

please test

@cmsbuild
Copy link
Contributor

-1

Failed Tests: UnitTests
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-c2fead/16851/summary.html
COMMIT: c293caf
CMSSW: CMSSW_12_0_X_2021-07-15-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/34499/16851/install.sh to create a dev area with all the needed externals and cmssw changes.

Unit Tests

I found errors in the following unit tests:

---> test test2021Geometry had ERRORS

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 38
  • DQMHistoTests: Total histograms compared: 2786302
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2786279
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 37 files compared)
  • Checked 160 log files, 37 edm output root files, 38 DQM output files
  • TriggerResults: no differences found

@cvuosalo
Copy link
Contributor

@fabferro I don't understand the title of this PR. pre4 is done. It was made last week. This PR might be able to get into pre5, but pre4 is past.

@@ -0,0 +1,18 @@
import FWCore.ParameterSet.Config as cms
Copy link
Contributor

Choose a reason for hiding this comment

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

This file does not have a correct name.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It should be a dir actually. Something went wrong... I fixed it.

@cvuosalo
Copy link
Contributor

Configuration/Geometry/python/generate2021Geometry.py needs to be run, and the files it changes need to be included in this PR. Also Configuration/Geometry/README.md needs to be updated.

@fabferro fabferro changed the title Geo proposal120pre4 PPS geometry for Run3 Jul 15, 2021
@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. @silviodonato, @dpiparo, @qliphy, @perrotta (and backports should be raised in the release meeting by the corresponding L2)

@qliphy
Copy link
Contributor

qliphy commented Jul 21, 2021

+1

@qliphy
Copy link
Contributor

qliphy commented Jul 22, 2021

@fabferro
We are getting many IB errors after this PR getting merged. For example:
https://cmssdt.cern.ch/SDT/cgi-bin/logreader/slc7_amd64_gcc900/CMSSW_12_0_X_2021-07-21-2300/pyRelValMatrixLogs/run/11650.911_ZMM_14+2021_DD4hep+ZMM_14TeV_TuneCP5_GenSim+Digi+Reco+HARVEST+ALCA/step1_ZMM_14+2021_DD4hep+ZMM_14TeV_TuneCP5_GenSim+Digi+Reco+HARVEST+ALCA.log#/40-40
edm::FileInPath unable to find file Geometry/VeryForwardData/data/RP_Vertical_Device/2021/v1/RP_Vertical_Device.xml anywhere in the search path.

Please make a PR to upload those xml files to the repository the sooner the better:
https://github.com/cms-data/Geometry-VeryForwardData

e.g. the above xml should be put under a directory RP_Vertical_Device/2021/v1 in the repository

@fabferro
Copy link
Contributor Author

@fabferro
We are getting many IB errors after this PR getting merged. For example:
https://cmssdt.cern.ch/SDT/cgi-bin/logreader/slc7_amd64_gcc900/CMSSW_12_0_X_2021-07-21-2300/pyRelValMatrixLogs/run/11650.911_ZMM_14+2021_DD4hep+ZMM_14TeV_TuneCP5_GenSim+Digi+Reco+HARVEST+ALCA/step1_ZMM_14+2021_DD4hep+ZMM_14TeV_TuneCP5_GenSim+Digi+Reco+HARVEST+ALCA.log#/40-40
edm::FileInPath unable to find file Geometry/VeryForwardData/data/RP_Vertical_Device/2021/v1/RP_Vertical_Device.xml anywhere in the search path.

Please make a PR to upload those xml files to the repository the sooner the better:
https://github.com/cms-data/Geometry-VeryForwardData

e.g. the above xml should be put under a directory RP_Vertical_Device/2021/v1 in the repository

Working on it...

@smuzaffar
Copy link
Contributor

Currently all the xml files are in cmssw/Geometry/VeryForwardData . If there is not strong reason to keep these files in cmssw then pls move cmssw/Geometry/VeryForwardData/data to https://github.com/cms-data/Geometry-VeryForwardData

@qliphy
Copy link
Contributor

qliphy commented Jul 22, 2021

Moreover, @fabferro as you moved
[1] Geometry/VeryForwardData/data/RP_Vertical_Device/2021/v1/RP_Vertical_Device.xml
to
[2] Geometry/VeryForwardData/data/RP_Vertical_Device/2021/Simu/v1/RP_Vertical_Device.xml

this brings errors to complain:
edm::FileInPath unable to find file Geometry/VeryForwardData/data/RP_Vertical_Device/2021/v1/RP_Vertical_Device.xml anywhere in the search path.
in e.g.
https://cmssdt.cern.ch/SDT/cgi-bin/logreader/slc7_amd64_gcc900/CMSSW_12_0_X_2021-07-21-2300/unitTestLogs/DetectorDescription/DDCMS#/547-547
and
https://cmssdt.cern.ch/SDT/cgi-bin/logreader/slc7_amd64_gcc900/CMSSW_12_0_X_2021-07-21-2300/unitTestLogs/Geometry/TrackerGeometryBuilder#/73-73

Should we keep [1] instead?

@fabferro
Copy link
Contributor Author

fabferro commented Jul 22, 2021

@fabferro
We are getting many IB errors after this PR getting merged. For example:
https://cmssdt.cern.ch/SDT/cgi-bin/logreader/slc7_amd64_gcc900/CMSSW_12_0_X_2021-07-21-2300/pyRelValMatrixLogs/run/11650.911_ZMM_14+2021_DD4hep+ZMM_14TeV_TuneCP5_GenSim+Digi+Reco+HARVEST+ALCA/step1_ZMM_14+2021_DD4hep+ZMM_14TeV_TuneCP5_GenSim+Digi+Reco+HARVEST+ALCA.log#/40-40
edm::FileInPath unable to find file Geometry/VeryForwardData/data/RP_Vertical_Device/2021/v1/RP_Vertical_Device.xml anywhere in the search path.
Please make a PR to upload those xml files to the repository the sooner the better:
https://github.com/cms-data/Geometry-VeryForwardData
e.g. the above xml should be put under a directory RP_Vertical_Device/2021/v1 in the repository

Working on it...

@qliphy It seems I miss the permission to write to the repository.

@qliphy
Copy link
Contributor

qliphy commented Jul 22, 2021

@qliphy It seems I miss the permission to write to the repository.

@fabferro You can make a PR similar as to cms-sw

@fabferro
Copy link
Contributor Author

Moreover, @fabferro as you moved
[1] Geometry/VeryForwardData/data/RP_Vertical_Device/2021/v1/RP_Vertical_Device.xml
to
[2] Geometry/VeryForwardData/data/RP_Vertical_Device/2021/Simu/v1/RP_Vertical_Device.xml

this brings errors to complain:
edm::FileInPath unable to find file Geometry/VeryForwardData/data/RP_Vertical_Device/2021/v1/RP_Vertical_Device.xml anywhere in the search path.
in e.g.
https://cmssdt.cern.ch/SDT/cgi-bin/logreader/slc7_amd64_gcc900/CMSSW_12_0_X_2021-07-21-2300/unitTestLogs/DetectorDescription/DDCMS#/547-547
and
https://cmssdt.cern.ch/SDT/cgi-bin/logreader/slc7_amd64_gcc900/CMSSW_12_0_X_2021-07-21-2300/unitTestLogs/Geometry/TrackerGeometryBuilder#/73-73

Should we keep [1] instead?

No, we should have both. One is used for P4 and one for P5. The version used for P4 can't be deleted until P5 becomes the default and P4 deprecated.

@qliphy
Copy link
Contributor

qliphy commented Jul 22, 2021

No, we should have both. One is used for P4 and one for P5. The version used for P4 can't be deleted until P5 becomes the default and P4 deprecated.

Yes, I know. My question is that you have already moved
Geometry/VeryForwardData/data/RP_Vertical_Device/2021/v1/RP_Vertical_Device.xml
to
Geometry/VeryForwardData/data/RP_Vertical_Device/2021/Simu/v1/RP_Vertical_Device.xml

but there are other codes still requiring
Geometry/VeryForwardData/data/RP_Vertical_Device/2021/v1/RP_Vertical_Device.xml
so should we keep it? or should we touch those other codes?

@fabferro
Copy link
Contributor Author

No, we should have both. One is used for P4 and one for P5. The version used for P4 can't be deleted until P5 becomes the default and P4 deprecated.

Yes, I know. My question is that you have already moved
Geometry/VeryForwardData/data/RP_Vertical_Device/2021/v1/RP_Vertical_Device.xml
to
Geometry/VeryForwardData/data/RP_Vertical_Device/2021/Simu/v1/RP_Vertical_Device.xml

but there are other codes still requiring
Geometry/VeryForwardData/data/RP_Vertical_Device/2021/v1/RP_Vertical_Device.xml
so should we keep it? or should we touch those other codes?

We should keep both even if they are the same file. We moved it but we should have copied it. We are adding Run3 geometry, reordering Geometry/VeryForwardData/data and keeping a full back compatibility. This PR is an intermediate step.

@qliphy
Copy link
Contributor

qliphy commented Jul 22, 2021

Thanks @fabferro I saw you now add the missing file in cms-data/Geometry-VeryForwardData#1

However, as suggested by @smuzaffar #34499 (comment)
it would be better to move all xml files under cmssw/Geometry/VeryForwardData/data to https://github.com/cms-data/Geometry-VeryForwardData
Would you please do that?

@fabferro
Copy link
Contributor Author

Thanks @fabferro I saw you now add the missing file in cms-data/Geometry-VeryForwardData#1

However, as suggested by @smuzaffar #34499 (comment)
it would be better to move all xml files under cmssw/Geometry/VeryForwardData/data to https://github.com/cms-data/Geometry-VeryForwardData
Would you please do that?

I can copy them but this sounds new to me. Are you going to ask me to remove the files from CMSSW?
@cvuosalo can you comment on this request?

@qliphy
Copy link
Contributor

qliphy commented Jul 22, 2021

@fabferro

  1. You can first make a cms-data PR to copy all xml files under cmssw/Geometry/VeryForwardData/data to https://github.com/cms-data/Geometry-VeryForwardData
  2. then you can make a cms-sw PR to remove all those xml files
  3. We will take care of afterwards steps

On the other hand, if there is no objection, we can also first merge cms-data/Geometry-VeryForwardData#1 to add back the missing file, in order to cure the IB issues. Then you can take actions (above (1) and (2) ) later.

@fabferro
Copy link
Contributor Author

@fabferro

1. You can first make a cms-data PR to copy all xml files under cmssw/Geometry/VeryForwardData/data to https://github.com/cms-data/Geometry-VeryForwardData

2. then you can make a cms-sw PR to remove all those xml files

3. We will take care of afterwards steps

On the other hand, if there is no objection, we can also first merge cms-data/Geometry-VeryForwardData#1 to add back the missing file, in order to cure the IB issues. Then you can take actions (above (1) and (2) ) later.

Let's see if with the PR to cms-data we have cured the IB issues.
Before proceeding to move all PPS xml files to cms-data I would like to understand it better.
1- Are all detectors moving the files to cms-data? I still see tons of them in CMSSW.
2- Will I be able to link them directly in .py or in .xml files inside CMSSW?
As I said it's the first time I hear such a request.
Thanks.

@qliphy
Copy link
Contributor

qliphy commented Jul 22, 2021

Before proceeding to move all PPS xml files to cms-data I would like to understand it better.
1- Are all detectors moving the files to cms-data? I still see tons of them in CMSSW.

It is now recommended to move files to cms-data.

2- Will I be able to link them directly in .py or in .xml files inside CMSSW?

Yes, it works in many other cases.

@cvuosalo
Copy link
Contributor

I must have missed an important announcement. When has it been discussed to move Geometry XML files out of CMSSW?

@cvuosalo
Copy link
Contributor

@fabferro I think Geometry/VeryForwardData/data/RP_Vertical_Device/2021/v1/RP_Vertical_Device.xml should be restored in CMSSW.

@qliphy
Copy link
Contributor

qliphy commented Jul 22, 2021

I must have missed an important announcement. When has it been discussed to move Geometry XML files out of CMSSW?

@smuzaffar or @silviodonato may comment more on this. But I notice this is now more recommended at least for new data files.

As we receive complains about missing file holding Run3 test, @fabferro would you please make a PR to cms-sw to add the missing file? We can then discuss about the migration of geometry XML files to cms-data or not at e.g. next ORP.

@fabferro
Copy link
Contributor Author

I must have missed an important announcement. When has it been discussed to move Geometry XML files out of CMSSW?

@smuzaffar or @silviodonato may comment more on this. But I notice this is now more recommended at least for new data files.

As we receive complains about missing file holding Run3 test, @fabferro would you please make a PR to cms-sw to add the missing file? We can then discuss about the migration of geometry XML files to cms-data or not at e.g. next ORP.

Sure. Doing it.

@fabferro
Copy link
Contributor Author

Done in PR#34588. Code checks ongoing.

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

10 participants