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

CTPPS: tracking for the diamond detector #17817

Merged
merged 23 commits into from Mar 30, 2017

Conversation

forthommel
Copy link
Contributor

Track fitting procedure for the CTPPS diamond detector.

runTheMatrix.py -l limited yielded: 16 16 15 13 7 1 1 1 tests passed, 1 0 0 0 0 0 0 0 failed with 4.22_RunCosmics2011A failing at step 0 (DAS_ERROR)

forthommel and others added 16 commits March 7, 2017 23:11
Conflicts:
	DataFormats/CTPPSReco/interface/CTPPSDiamondRecHit.h
	DataFormats/CTPPSReco/src/classes.h
	DataFormats/CTPPSReco/src/classes_def.xml
	RecoCTPPS/TotemRPLocal/plugins/CTPPSDiamondRecHitProducer.cc
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
Conflicts:
	DataFormats/CTPPSReco/interface/CTPPSDiamondRecHit.h
… it to the local tracks' EDProducer

Conflicts:
	RecoCTPPS/TotemRPLocal/python/ctppsDiamondLocalReconstruction_cff.py
	RecoCTPPS/TotemRPLocal/test/diamonds_reco_cfg.py
… 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
…ng a new one somewhere else)

Conflicts:
	RecoCTPPS/TotemRPLocal/test/diamonds_reco_cfg.py
Conflicts:
	RecoCTPPS/Configuration/python/RecoCTPPS_EventContent_cff.py
@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 8, 2017

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

It involves the following packages:

DataFormats/CTPPSReco
RecoCTPPS/Configuration
RecoCTPPS/TotemRPLocal

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

cms-bot commands are listed here #13028

@slava77
Copy link
Contributor

slava77 commented Mar 8, 2017

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 8, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/18234/console Started: 2017/03/08 01:45

@forthommel forthommel changed the title CTPPS: Diamonds tracking CTPPS: tracking for the diamond detector Mar 8, 2017
@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 8, 2017

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 8, 2017

Comparison job queued.

@cmsbuild
Copy link
Contributor

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

@@ -68,10 +68,7 @@ CTPPSDiamondLocalTrackFitter::produce( edm::Event& iEvent, const edm::EventSetup
// workaround to retrieve the detset for 4-5 without losing the reference
edm::DetSet<CTPPSDiamondLocalTrack>& tracks45 = pOut->operator[]( id_45 );

// first remove all hits from previous event
trk_algo_45_.clear();
trk_algo_56_.clear();
Copy link
Contributor

Choose a reason for hiding this comment

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

are the algorithms created "clear" so that it's safe to have the clear() call only at the end?

@forthommel
Copy link
Contributor Author

The CTPPSDiamondTrackRecognition::hitParametersVectorMap_ and CTPPSDiamondTrackRecognition::mhMap_ are supposingly constructed empty [1]. But if you feel it is safer to clear it at the CTPPSDiamondTrackRecognition constructor level, this can also be done...

@slava77
Copy link
Contributor

slava77 commented Mar 30, 2017

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 30, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/18802/console Started: 2017/03/30 11:31

@forthommel
Copy link
Contributor Author

@davidlange6 - Did we address your review properly?

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

Comparison job queued.

@cmsbuild
Copy link
Contributor

@slava77
Copy link
Contributor

slava77 commented Mar 30, 2017

+1

for #17817 1744996

  • technical update since the last signoff following review comments by @davidlange6 . Changes appear to have been implemented as requested
  • jenkins tests pass

@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 requires discussion in the ORP meeting before it's merged. @Muzaffar, @davidlange6, @smuzaffar

@davidlange6
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

7 participants