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

Jump to bottom

CTPPS: backport of diamond track fitting to 8_0_X #18238

Merged
merged 23 commits into from Apr 11, 2017
Merged

CTPPS: backport of diamond track fitting to 8_0_X #18238

merged 23 commits into from Apr 11, 2017

Conversation

forthommel
Copy link
Contributor

Backport of #17817 to the 8_0_X branch for the foreseen re-reconstruction of 2016 data.

forthommel and others added 23 commits April 6, 2017 11:09
@forthommel
Added the CTPPSDiamondLocalTrack object
8cf0647 
Conflicts:
	DataFormats/CTPPSReco/interface/CTPPSDiamondRecHit.h
	DataFormats/CTPPSReco/src/classes.h
	DataFormats/CTPPSReco/src/classes_def.xml
	RecoCTPPS/TotemRPLocal/plugins/CTPPSDiamondRecHitProducer.cc
@forthommel
New cfi file for the local tracks fitter
c878423 
Conflicts:
	DataFormats/CTPPSReco/interface/CTPPSDiamondRecHit.h
	RecoCTPPS/TotemRPLocal/interface/CTPPSDiamondRecHitProducerAlgorithm.h
	RecoCTPPS/TotemRPLocal/plugins/CTPPSDiamondRecHitProducer.cc
	RecoCTPPS/TotemRPLocal/python/ctppsDiamondRecHitProducer_cfi.py
	RecoCTPPS/TotemRPLocal/src/CTPPSDiamondRecHitProducerAlgorithm.cc
@nminafra @forthommel
first attempt of reco
56aec0e
@nminafra @forthommel
Added setters to CTPPS*LocalTrack and RecHit
502c2f0 
Conflicts:
	DataFormats/CTPPSReco/interface/CTPPSDiamondRecHit.h
@forthommel
New constructor for the track recognition algorithm object ; plugging…
8b50851 
… it to the local tracks' EDProducer

Conflicts:
	RecoCTPPS/TotemRPLocal/python/ctppsDiamondLocalReconstruction_cff.py
	RecoCTPPS/TotemRPLocal/test/diamonds_reco_cfg.py
@forthommel
Added the fitting parameters to the configuration file
535fe3f
@forthommel
Combined both the totemRP and ctppsDiamond local reconstructions into…
8d816fa 
… a single ctppsLocalReconstruction object ; moved floating point quantities in diamonds rechits from double to single precision ; bumped CTPPSDiamondRecHit class version from 2 to 3

Conflicts:
	RecoCTPPS/TotemRPLocal/python/ctppsDiamondLocalReconstruction_cff.py

Conflicts:
	Configuration/StandardSequences/python/Reconstruction_cff.py
	RecoCTPPS/TotemRPLocal/python/ctppsDiamondLocalReconstruction_cff.py
	RecoCTPPS/TotemRPLocal/test/diamonds_reco_cfg.py

Conflicts:
	Configuration/StandardSequences/python/Reconstruction_cff.py
@forthommel
Making use of the already present recoCTPPS object (instead of defini…
b0ed82b 
…ng a new one somewhere else)

Conflicts:
	RecoCTPPS/TotemRPLocal/test/diamonds_reco_cfg.py

Conflicts:
	Configuration/StandardSequences/python/Reconstruction_cff.py
@forthommel
Added the local tracks to the output definition
bd90b9d 
Conflicts:
	RecoCTPPS/Configuration/python/RecoCTPPS_EventContent_cff.py
@nminafra @forthommel
Reco good to go
f298934
@nminafra @forthommel
Changed variable names
19ba726
@forthommel
Storing local tracks information as floats instead of doubles ; match…
6925b87 
…ed the module name to its products
@forthommel
Code documentation and cleanup
fabd6f4
@forthommel
Setting the default value to 0 for timing information in the local tr…
5e9c8a3 
…acks
@nminafra @forthommel
Reco out of time bug fixed
50977f6
@nminafra @forthommel
RecHit and LocalTrack MH included
4e9d63e
@forthommel
Amended the diamonds local track recognition ; New local tracks const…
ad03d34 
…ructor with attributes ; other secondary fixes
@forthommel
Improved memory footprint of the local tracks recognition
bdde148
@forthommel
Use the precise pixel efficiency function instead of the fast one
8329831 
* Reverted the pixel efficiency function to the erf-precise one
* Tracking spatial resolution/step moved from 50 to 10 um
@forthommel
Passing by references ; range for loops
42fd863
@forthommel
Tracks sorting by temporal, then by spatial position
c88a166
@forthommel
Track recognition algorithms not defined as pointers
af0ee6f
@forthommel
Unordered maps for the parameters and hitmp in local tracks fitter ; …
e5717ca 
…clearing the fitters' hits collection after the event is filled
@cmsbuild cmsbuild added this to the Next CMSSW_8_0_X milestone Apr 6, 2017
@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 6, 2017

A new Pull Request was created by @forthommel (Laurent Forthomme) for CMSSW_8_0_X.

It involves the following packages:

DataFormats/CTPPSReco
RecoCTPPS/Configuration
RecoCTPPS/TotemRPLocal

@perrotta, @cmsbuild, @slava77, @davidlange6 can you please review it and eventually sign? Thanks.
@davidlange6, @smuzaffar you are the release manager for this.

cms-bot commands are listed here #13028

@slava77
Copy link
Contributor

slava77 commented Apr 6, 2017

@cmsbuild please test

@forthommel this wasn't on the required feature list for the legacy. So, it may make it in the shadow of other needed features.

@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 6, 2017 •
edited

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/18972/console Started: 2017/04/06 11:32

@forthommel
Copy link
Contributor Author

@slava77 thanks for the build. Indeed, as discussed outside this scope we wanted the RecHits and geometry (along with all other changes backported through #17815) to be present in 8_0_X, but we were also interested in having the tracks (once tested and merged in 9_1_X with #17817).

@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 6, 2017

+1
Tested at: e5717ca
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-18238/18972/summary.html

@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 6, 2017

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 6, 2017

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

Comparison Summary:

  • No significant changes to the logs found
  • ROOTFileChecks: Some differences in event products or their sizes found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 16
  • DQMHistoTests: Total histograms compared: 1164175
  • DQMHistoTests: Total failures: 1109
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 1162948
  • DQMHistoTests: Total skipped: 118
  • DQMHistoTests: Total Missing objects: 0
  • Checked 63 log files, 14 edm output root files, 16 DQM output files

@forthommel
Copy link
Contributor Author

Hi @slava77, @davidlange6! Can we expect this backport to be part of the next 8_0_X release?

@slava77
Copy link
Contributor

slava77 commented Apr 10, 2017

backport of #17817
to get the bot add a backport label

@slava77
Copy link
Contributor

slava77 commented Apr 10, 2017

+1

for #18238 e5717ca

  • changes are the same as in 91X version CTPPS: tracking for the diamond detector #17817 1744996 which went to 910pre2 and there were apparently no issues at run time in relvals (although 2016H where diamonds are present is not a part of relvals)
  • jenkins tests pass and comparisons show no differences while the size check reports changes (expected as seen in 91X PR tests)

This was requested earlier for legacy rereco if it makes it in time before release build.

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next CMSSW_8_0_X IBs (tests are also fine). This pull request requires discussion in the ORP meeting before it's merged. @davidlange6, @smuzaffar

@slava77 slava77 mentioned this pull request Apr 10, 2017
Closed
@davidlange6
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit 8a3f14e into cms-sw:CMSSW_8_0_X Apr 11, 2017
@forthommel forthommel deleted the ctpps-diamond-localtracks_80X branch July 17, 2017 13:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
backport comparison-available fully-signed orp-approved reconstruction-approved tests-approved
Projects
None yet
Milestone
CMSSW_8_0_X
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@forthommel @cmsbuild @slava77 @davidlange6 @nminafra