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

Shift to orbit frame #35679

Merged
merged 5 commits into from
Oct 20, 2021
Merged

Shift to orbit frame #35679

merged 5 commits into from
Oct 20, 2021

Conversation

mundim
Copy link
Contributor

@mundim mundim commented Oct 14, 2021

PR description:

This PR implements a shift of the starting position of the scattered proton to the so called "orbit" reference frame, the one that defines the beam spot at the IP and in which the optical function for the proton propagation is defined.
No change in the output is expected unless a better matching between the generated and reconstructed proton kinematics.

PR validation:

All tests ran without any issues. In particular, runTheMatrix was run with the standard wf and also the ones specific for pps:

runTheMatrix.py -l limited,11725.0,11925.0 --ibeos -j8

with output:
42 41 40 31 20 4 1 1 1 tests passed, 0 0 0 0 0 0 0 0 0 failed

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-35679/25969

  • This PR adds an extra 28KB to repository

@cmsbuild
Copy link
Contributor

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

It involves the following packages:

  • SimTransport/PPSProtonTransport (simulation)

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

cms-bot commands are listed here

@mundim
Copy link
Contributor Author

mundim commented Oct 14, 2021

Just to let you now: @clemencia, @fabferro

@@ -144,26 +143,30 @@
empiricalAperture56_xi0_int = cms.double(0.074),
empiricalAperture56_xi0_slp = cms.double(6.604E-04),
empiricalAperture56_a_int = cms.double(-22.7),
empiricalAperture56_a_slp = cms.double(1.600)
empiricalAperture56_a_slp = cms.double(1.600),
Copy link
Contributor

Choose a reason for hiding this comment

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

@mundim , why this comma?

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 was left behind after a change in the config. I can remove it for sure if this is a problem. Shouldn't it be detected by code-checks and/or code-format option?

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-35679/25996

  • This PR adds an extra 16KB to repository

@cmsbuild
Copy link
Contributor

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

@civanch
Copy link
Contributor

civanch commented Oct 18, 2021

please test

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-4242cb/19703/summary.html
COMMIT: be1a27e
CMSSW: CMSSW_12_1_X_2021-10-17-2300/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/35679/19703/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

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

@civanch
Copy link
Contributor

civanch commented Oct 18, 2021

+1

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-35679/26058

  • This PR adds an extra 28KB to repository

@cmsbuild
Copy link
Contributor

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

@civanch
Copy link
Contributor

civanch commented Oct 19, 2021

please test

@perrotta
Copy link
Contributor

Thank you @mundim
However I think

#include "Utilities/PPS/interface/PPSUtilities.h"

is still missing from SimTransport/PPSProtonTransport/src/OpticalFunctionsTransport.cc

@mundim
Copy link
Contributor Author

mundim commented Oct 19, 2021

Thank you @mundim However I think

#include "Utilities/PPS/interface/PPSUtilities.h"

is still missing from SimTransport/PPSProtonTransport/src/OpticalFunctionsTransport.cc

That's weird, the compilation went fine in my working area. Let me check...Sorry about it.

@mundim
Copy link
Contributor Author

mundim commented Oct 19, 2021

Thank you @mundim However I think

#include "Utilities/PPS/interface/PPSUtilities.h"

is still missing from SimTransport/PPSProtonTransport/src/OpticalFunctionsTransport.cc

That's weird, the compilation went fine in my working area. Let me check...Sorry about it.

It is included in
SimTransport/PPSProtonTransport/interface/BaseProtonTransport.h

which is a base class from which OpticalFunctionsTransport is derived.

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-4242cb/19738/summary.html
COMMIT: 6861d57
CMSSW: CMSSW_12_1_X_2021-10-19-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/35679/19738/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 8 differences found in the comparisons
  • DQMHistoTests: Total files compared: 40
  • DQMHistoTests: Total histograms compared: 2751113
  • DQMHistoTests: Total failures: 6
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2751085
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 39 files compared)
  • Checked 170 log files, 37 edm output root files, 40 DQM output files
  • TriggerResults: no differences found

@perrotta
Copy link
Contributor

@cms-sw/simulation-l2 I imagine that you have nothing against the last (rather trivial) updates applied after your previous signature. I'm going to merge this for the next IB, please comment in case you see any issue with it

@civanch
Copy link
Contributor

civanch commented Oct 20, 2021

+1

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

@perrotta
Copy link
Contributor

+1

m_beamline45(nullptr),
m_beamline56(nullptr),
beamParametersToken_(iC.esConsumes()),
beamspotToken_(iC.esConsumes()) {
Copy link
Contributor

Choose a reason for hiding this comment

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

thanks to this, now the SIM step depends on the reconstruction level beamspot... which implies the whole chain of MC conditions production now folds because you need the reconstruction beamspot to even produce the PU library. Nice!
@francescobrivio

Copy link
Contributor

Choose a reason for hiding this comment

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

this should use the generator level smearing in my opinion @civanch

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.

5 participants