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

Cleanup pixel tracking code (master) #24288

Merged
merged 2 commits into from
Aug 21, 2018

Conversation

fwyzard
Copy link
Contributor

@fwyzard fwyzard commented Aug 14, 2018

Clean up some non-GPU-related pixel tracking code: clean up whitespaces and indenttion, plugin definitions, includes, and file names.

Add a customize function to provide a minimal pixel-tracking only configuration for profiling, removing validation, DQM, and output modules. Can be included in the configuration with

from RecoPixelVertexing.Configuration.customizePixelTracksForProfiling import customizePixelTracksForProfiling
process = customizePixelTracksForProfiling(process)

Backport from the Patatrack fork: cms-patatrack#49, cms-patatrack#122, cms-patatrack#134.

Can be included with the following snippet in the configuration:

    from RecoPixelVertexing.Configuration.customizePixelTracksForProfiling import customizePixelTracksForProfiling
    process = customizePixelTracksForProfiling(process)

Removes validation, DQM, and output modules.
As suggested in cms-patatrack#70 (comment), an `AsciiOutputModule` is used to require the `pixelTracks`.

Backport from the Patatrack fork (cms-patatrack#106).
@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@fwyzard
Copy link
Contributor Author

fwyzard commented Aug 14, 2018

@cmsbuild, please test

@cmsbuild
Copy link
Contributor

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-24288/6021

Code check has found code style and quality issues which could be resolved by applying a patch in https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-24288/6021/git-diff.patch
e.g. curl https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-24288/6021/git-diff.patch | patch -p1

You can run scram build code-checks to apply code checks directly

Cleanup whitespaces and indenttion, plugin definitions, includes, and file names.

Backport from the Patatrack fork: cms-patatrack#49, cms-patatrack#122, cms-patatrack#134.
@fwyzard fwyzard force-pushed the cleanup_pixel_tracking_code_103x branch from 417c50c to 5622c7a Compare August 15, 2018 07:13
@fwyzard
Copy link
Contributor Author

fwyzard commented Aug 15, 2018

@cmsbuild, please test

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 15, 2018

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/29831/console Started: 2018/08/15 09:17

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @fwyzard (Andrea Bocci) for master.

It involves the following packages:

EventFilter/SiPixelRawToDigi
RecoLocalTracker/SiPixelRecHits
RecoPixelVertexing/Configuration
RecoPixelVertexing/PixelLowPtUtilities
RecoPixelVertexing/PixelTrackFitting
RecoPixelVertexing/PixelTriplets

@perrotta, @cmsbuild, @slava77 can you please review it and eventually sign? Thanks.
@makortel, @felicepantaleo, @GiacomoSguazzoni, @rovere, @VinInn, @Martin-Grunewald, @dkotlins, @gpetruc, @ebrondol, @threus, @dgulhan this is something you requested to watch as well.
@davidlange6, @slava77, @fabiocos you are the release manager for this.

cms-bot commands are listed here

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

Comparison job queued.

@cmsbuild
Copy link
Contributor

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 31
  • DQMHistoTests: Total histograms compared: 2891469
  • DQMHistoTests: Total failures: 7
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2891272
  • DQMHistoTests: Total skipped: 190
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 30 files compared)
  • Checked 129 log files, 14 edm output root files, 31 DQM output files

}

void CellularAutomaton::evolve(const unsigned int minHitsPerNtuplet)
{
allStatus.resize(allCells.size());



unsigned int numberOfIterations = minHitsPerNtuplet - 2;
Copy link
Contributor

Choose a reason for hiding this comment

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

Ok, minHitsPerNtuplet is defined constant to "4" in the calling class in
http://cmslxr.fnal.gov/source/RecoPixelVertexing/PixelTriplets/src/CAHitQuadrupletGenerator.cc#0188

However, I find potentially dangerous to make differences of unsigned int's: is it fixed by the logic of the code that numberOfIterations cannot ever be passed as less or equal 2?

(Not strictly related to your PR, but I hit it while reviewing and I think it is worth to ask)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I wouldn't know...
@felicepantaleo can you comment ?

Copy link
Contributor

Choose a reason for hiding this comment

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

ciao Andrea,
The evolve method is and will never be called if the number of hits is smaller than 4 (you can check the triplet generator which does not call it).
If you really really want we can add an assert, but the assumption that the number of hits is equal to 4 is visible everywhere in: http://cmslxr.fnal.gov/source/RecoPixelVertexing/PixelTriplets/src/CAHitQuadrupletGenerator.cc

#include<cmath>


#include "RecoTracker/TkSeedingLayers/interface/SeedingHitSet.h"
Copy link
Contributor

Choose a reason for hiding this comment

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

This include wasn't alphabetically ordered as all the other ones.
Just pointing it out to you in case you didn't notice it: I really don't care too much about such an alphabetical order

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 escaped me !

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@fwyzard
Copy link
Contributor Author

fwyzard commented Aug 19, 2018

@perrotta @slava77 just to clarify - do you want us to make any changes, or are you OK with this as it is ?

@perrotta
Copy link
Contributor

perrotta commented Aug 19, 2018 via email

@perrotta
Copy link
Contributor

+1

  • Technical adjustments and clean up of pixel tracking code
  • Jenkins tests pass, with no effect on outputs

@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. @davidlange6, @slava77, @smuzaffar, @fabiocos (and backports should be raised in the release meeting by the corresponding L2)

@fabiocos
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit 33b5e42 into cms-sw:master Aug 21, 2018
@fwyzard fwyzard deleted the cleanup_pixel_tracking_code_103x branch October 31, 2018 06:44
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.

6 participants