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

DataFormats dependency on Geometry Cleanup #28127

Merged
merged 3 commits into from Oct 12, 2019

Conversation

ianna
Copy link
Contributor

@ianna ianna commented Oct 8, 2019

PR description:

  • Restructure Geometry/TrackerGeometryBuilder package to remove unwanted dependency
  • Allow DataFormats dependency only on Geometry/CommonDetUnit, Geometry/CommonTopology and Geometry/CaloGeometry
  • Merge RPC analyser code into an RPC DetId unit test
  • Move CSC analyser dependent on CSCGeometry to CSC Geometry package
  • Move GEM analyser to GEM Geometry package

PR validation:

if this PR is a backport please specify the original PR:

Before submitting your pull requests, make sure you followed this checklist:

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 8, 2019

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 8, 2019

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-28127/12171

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 8, 2019

A new Pull Request was created by @ianna (Ianna Osborne) for master.

It involves the following packages:

Alignment/APEEstimation
Alignment/CommonAlignmentMonitor
Alignment/CommonAlignmentProducer
Alignment/OfflineValidation
CalibTracker/SiPixelConnectivity
CalibTracker/SiPixelESProducers
CalibTracker/SiPixelErrorEstimation
CalibTracker/SiPixelLorentzAngle
CalibTracker/SiPixelQuality
CalibTracker/SiPixelTools
CalibTracker/SiStripChannelGain
CalibTracker/SiStripCommon
CondFormats/SiPixelObjects
CondTools/SiPixel
DPGAnalysis/SiStripTools
DQM/Physics
DQM/PixelLumi
DQM/SiPixelMonitorClient
DQM/SiPixelMonitorCluster
DQM/SiPixelMonitorDigi
DQM/SiPixelMonitorRawData
DQM/SiPixelMonitorRecHit
DQM/SiPixelMonitorTrack
DQM/SiPixelPhase1Common
DQM/SiPixelPhase1Summary
DQM/SiPixelPhase1Track
DataFormats/MuonDetId
DataFormats/ParticleFlowReco
DataFormats/VertexReco
EventFilter/SiPixelRawToDigi
FastSimulation/SimplifiedGeometryPropagator
FastSimulation/TrackingRecHitProducer
Fireworks/Geometry
Geometry/CSCGeometry
Geometry/CommonDetUnit
Geometry/CommonTopologies
Geometry/GEMGeometry
Geometry/MTDNumberingBuilder
Geometry/TrackerGeometryBuilder
Geometry/TrackerNumberingBuilder
HLTrigger/special
L1Trigger/L1TMuon
L1Trigger/TrackTrigger
RecoBTag/PixelCluster
RecoHI/HiCentralityAlgos
RecoHI/HiTracking
RecoLocalTracker/Phase2TrackerRecHits
RecoLocalTracker/SiPhase2Clusterizer
RecoLocalTracker/SiPixelClusterizer
RecoLocalTracker/SiPixelRecHits
RecoLocalTracker/SubCollectionProducers
RecoLuminosity/LumiProducer
RecoMET/METProducers
RecoPixelVertexing/PixelLowPtUtilities
RecoTracker/DeDx
RecoTracker/MeasurementDet
RecoTracker/SpecialSeedGenerators
RecoTracker/TransientTrackingRecHit
SLHCUpgradeSimulations/Geometry
SUSYBSMAnalysis/HSCP
SimTracker/SiPhase2Digitizer
SimTracker/SiPixelDigitizer
SimTracker/TrackTriggerAssociation
SimTracker/TrackerHitAssociation
Validation/GlobalRecHits
Validation/RecoTrack
Validation/SiPixelPhase1TrackClustersV
Validation/TrackerDigis
Validation/TrackerRecHits

@andrius-k, @lveldere, @slava77, @schneiml, @ianna, @kpedro88, @Martin-Grunewald, @rekovic, @fioriNTU, @tlampen, @pohsun, @santocch, @perrotta, @civanch, @cmsbuild, @fwyzard, @Dr15Jones, @cvuosalo, @ssekmen, @mdhildreth, @jfernan2, @tocheng, @sbein, @ggovi, @benkrikler, @kmaeshima, @christopheralanwest, @alja, @franzoni can you please review it and eventually sign? Thanks.
@wmtford, @echabert, @rappoccio, @gouskos, @felicepantaleo, @jandrea, @emilbols, @sviret, @mandrenguyen, @jshlee, @alesaggio, @fioriNTU, @thomreis, @tlampen, @ahinzmann, @threus, @mmusich, @seemasharmafnal, @venturia, @pakhotin, @mmarionncern, @hdelanno, @JyothsnaKomaragiri, @makortel, @smoortga, @acaudron, @mverzett, @jhgoh, @lgray, @jdolen, @dkotlins, @dildick, @pieterdavid, @yetkinyilmaz, @alja, @abbiendi, @cbernet, @GiacomoSguazzoni, @rovere, @VinInn, @jdamgov, @ferencek, @nhanvtran, @yduhm, @tocheng, @echapon, @schoef, @mschrode, @idebruyn, @ebrondol, @ptcox, @mtosi, @dgulhan, @clelange, @HeinerTholen, @HuguesBrun, @adewit, @trocino, @battibass, @gbenelli, @jazzitup, @calderona, @hatakeyamak, @yenjie, @gkasieczka, @folguera, @Martin-Grunewald, @kurtejung, @gpetruc, @matt-komm, @mariadalfonso, @pvmulder, @andrzejnovak, @bachtis 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

@ianna
Copy link
Contributor Author

ianna commented Oct 8, 2019

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 8, 2019

The tests are being triggered in jenkins.

@pohsun
Copy link

pohsun commented Oct 10, 2019

+1

Copy link
Contributor

@perrotta perrotta left a comment

Choose a reason for hiding this comment

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

Is the configuration file to run CSCDetIdAnalyzer (previously in DataFormats/MuonDetId/test/cdan_cfg.py) moved somewhere else? The analyzer itself is now moved into CSCGeometry/test/stubs/CSCDetIdAnalyzer.cc, but I miss how it is run...

@@ -0,0 +1,9 @@
// #include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this file which only includes commented out lines really any useful?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

well spotted, thanks! There is definitely room for further cleanup. Would it be ok to do it as a subsequent PR or you'd prefer me to fix it in this one?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The configuration was not functional hence removed. I plan to add it in a later PR - including a script to run all tests.

@perrotta
Copy link
Contributor

+1

  • Rather technical restructuring of Geometry dependent includes
  • Jenkins tests pass and show no effect on reco outputs, as it should

@Martin-Grunewald
Copy link
Contributor

+1

@fabiocos
Copy link
Contributor

@ggovi @civanch @sbein @ssekmen @rekovic the changes in your domains look a simple change of include paths, I will move forward with the integration of this big PR tonight

@ianna I understand that you will have a follow-up cleaning some code (see the comment of @perrotta that I share)

@fabiocos
Copy link
Contributor

+1

@fabiocos
Copy link
Contributor

merge

@cmsbuild cmsbuild merged commit e7ec703 into cms-sw:master Oct 12, 2019
fwyzard added a commit to cms-patatrack/cmssw that referenced this pull request Nov 4, 2019
Update RecoLocalTracker/SiPixelRecHits files from Patatrack development
following "DataFormats dependency on Geometry Cleanup (cms-sw#28127)".
fwyzard added a commit to cms-patatrack/cmssw that referenced this pull request Oct 8, 2020
Update RecoLocalTracker/SiPixelRecHits files from Patatrack development
following "DataFormats dependency on Geometry Cleanup (cms-sw#28127)".
fwyzard added a commit to cms-patatrack/cmssw that referenced this pull request Oct 19, 2020
Update RecoLocalTracker/SiPixelRecHits files from Patatrack development
following "DataFormats dependency on Geometry Cleanup (cms-sw#28127)".
fwyzard added a commit to cms-patatrack/cmssw that referenced this pull request Oct 20, 2020
Update RecoLocalTracker/SiPixelRecHits files from Patatrack development
following "DataFormats dependency on Geometry Cleanup (cms-sw#28127)".
fwyzard added a commit to cms-patatrack/cmssw that referenced this pull request Oct 23, 2020
Update RecoLocalTracker/SiPixelRecHits files from Patatrack development
following "DataFormats dependency on Geometry Cleanup (cms-sw#28127)".
fwyzard added a commit to cms-patatrack/cmssw that referenced this pull request Nov 6, 2020
Update RecoLocalTracker/SiPixelRecHits files from Patatrack development
following "DataFormats dependency on Geometry Cleanup (cms-sw#28127)".
fwyzard added a commit to cms-patatrack/cmssw that referenced this pull request Nov 16, 2020
Update RecoLocalTracker/SiPixelRecHits files from Patatrack development
following "DataFormats dependency on Geometry Cleanup (cms-sw#28127)".
fwyzard added a commit to cms-patatrack/cmssw that referenced this pull request Nov 27, 2020
Update RecoLocalTracker/SiPixelRecHits files from Patatrack development
following "DataFormats dependency on Geometry Cleanup (cms-sw#28127)".
fwyzard pushed a commit to cms-patatrack/cmssw that referenced this pull request Dec 25, 2020
Update RecoLocalTracker/SiPixelRecHits files from Patatrack development
following "DataFormats dependency on Geometry Cleanup (cms-sw#28127)".
fwyzard added a commit to cms-patatrack/cmssw that referenced this pull request Dec 29, 2020
Update RecoLocalTracker/SiPixelRecHits files from Patatrack development
following "DataFormats dependency on Geometry Cleanup (cms-sw#28127)".
fwyzard added a commit to cms-patatrack/cmssw that referenced this pull request Dec 29, 2020
Update RecoLocalTracker/SiPixelRecHits files from Patatrack development
following "DataFormats dependency on Geometry Cleanup (cms-sw#28127)".
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment