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.

Sign up for GitHub

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

[Geometry] Move public headers to interface directory #34755

Merged
merged 2 commits into from Aug 4, 2021
Merged

[Geometry] Move public headers to interface directory #34755

merged 2 commits into from Aug 4, 2021

Conversation

smuzaffar
Copy link
Contributor

As reported in #34718 , this PR moves headers in interface directory for Geometry

      6 src/Geometry/CSCGeometry/src/CSCWireGroupPackage.h
      1 src/Geometry/CSCGeometryBuilder/src/CSCGeometryParsFromDD.h
      1 src/Geometry/DTGeometryBuilder/src/DTGeometryParsFromDD.h
      3 src/Geometry/ForwardGeometry/src/ZdcHardcodeGeometryData.h
      1 src/Geometry/GEMGeometryBuilder/src/GEMGeometryParsFromDD.h
      1 src/Geometry/GEMGeometryBuilder/src/ME0GeometryParsFromDD.h
      1 src/Geometry/RPCGeometryBuilder/src/RPCGeometryParsFromDD.h

@cmsbuild cmsbuild added this to the CMSSW_12_1_X milestone Aug 4, 2021
@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 4, 2021

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-34755/24421

  • This PR adds an extra 52KB to repository

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 4, 2021

A new Pull Request was created by @smuzaffar (Malik Shahzad Muzaffar) for master.

It involves the following packages:

  • CondTools/Geometry (db)
  • Geometry/CSCGeometry (geometry)
  • Geometry/CSCGeometryBuilder (geometry)
  • Geometry/DTGeometry (geometry)
  • Geometry/DTGeometryBuilder (geometry)
  • Geometry/ForwardGeometry (geometry)
  • Geometry/GEMGeometryBuilder (geometry, upgrade)
  • Geometry/RPCGeometryBuilder (geometry)
  • SimG4CMS/Forward (simulation)

@civanch, @Dr15Jones, @makortel, @cvuosalo, @ianna, @kpedro88, @cmsbuild, @AdrianoDee, @srimanob, @mdhildreth, @ggovi can you please review it and eventually sign? Thanks.
@battibass, @cvuosalo, @rovere, @jshlee, @bsunanda, @watson-ij, @dildick, @mmusich, @ptcox, @fabiocos, @slomeo this is something you requested to watch as well.
@silviodonato, @dpiparo, @qliphy, @perrotta you are the release manager for this.

cms-bot commands are listed here

ianna
ianna suggested changes Aug 4, 2021
View reviewed changes
Copy link
Contributor

@ianna ianna left a comment

Choose a reason for hiding this comment

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

@smuzaffar - IMHO, it would be better to avoid "../" in the header include.

Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.cc Outdated
@@ -13,7 +13,7 @@
//
#include "CSCGeometryBuilderFromDDD.h"
#include "CSCGeometryBuilder.h"
#include "CSCGeometryParsFromDD.h"
#include "../interface/CSCGeometryParsFromDD.h"
Copy link
Contributor

Choose a reason for hiding this comment

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

@smuzaffar - is it intended?

Geometry/CSCGeometryBuilder/src/CSCGeometryParsFromDD.cc Outdated
@@ -10,15 +10,15 @@
// Modified: Wed, 23 December 2020
// Original author: Tim Cox
*/
#include "CSCGeometryParsFromDD.h"
#include "../interface/CSCGeometryParsFromDD.h"
Copy link
Contributor

Choose a reason for hiding this comment

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

@smuzaffar - and here?

Geometry/ForwardGeometry/src/ZdcGeometry.cc Outdated
@@ -2,7 +2,7 @@
#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
#include "Geometry/ForwardGeometry/interface/ZdcGeometry.h"
#include "Geometry/ForwardGeometry/interface/IdealZDCTrapezoid.h"
#include "ZdcHardcodeGeometryData.h"
#include "../interface/ZdcHardcodeGeometryData.h"
Copy link
Contributor

Choose a reason for hiding this comment

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

@smuzaffar - and here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

as codeing rules ( http://cms-sw.github.io/cms_coding_rules.html#6--packaging-rules-1 ) permit this so that is why I used it but I can fix this and replace it with package/interface/file.h

Copy link
Contributor

Choose a reason for hiding this comment

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

4.8 Do not use absolute directory names or relative file paths in #include directives.

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 4, 2021

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-34755/24425

  • This PR adds an extra 52KB to repository

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 4, 2021

Pull request #34755 was updated. @civanch, @Dr15Jones, @makortel, @cvuosalo, @ianna, @kpedro88, @cmsbuild, @AdrianoDee, @srimanob, @mdhildreth, @ggovi can you please check and sign again.

@smuzaffar
Copy link
Contributor Author

please test

@smuzaffar smuzaffar changed the title [Geometry] Move public headers on to interface directory [Geometry] Move public headers to interface directory Aug 4, 2021
@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 4, 2021

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-c999c2/17506/summary.html
COMMIT: 367d8b2
CMSSW: CMSSW_12_1_X_2021-08-03-2300/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/34755/17506/install.sh to create a dev area with all the needed externals and cmssw changes.

CMS StaticAnalyzer warnings: There are 20 EventSetupRecord::get warnings. See https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-c999c2/17506/llvm-analysis/esrget-sa.txt for details.

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 39
  • DQMHistoTests: Total histograms compared: 2998564
  • DQMHistoTests: Total failures: 6
  • DQMHistoTests: Total nulls: 1
  • DQMHistoTests: Total successes: 2998535
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: -0.004 KiB( 38 files compared)
  • DQMHistoSizes: changed ( 312.0 ): -0.004 KiB MessageLogger/Warnings
  • Checked 165 log files, 37 edm output root files, 39 DQM output files
  • TriggerResults: no differences found

@ianna
Copy link
Contributor

ianna commented Aug 4, 2021

+1

@civanch
Copy link
Contributor

civanch commented Aug 4, 2021

+1

@srimanob
Copy link
Contributor

srimanob commented Aug 4, 2021

+Upgrade

@perrotta
Copy link
Contributor

perrotta commented Aug 4, 2021

+1

  • @cms-sw/db-l2 , I assume you are fine with this technical update

@perrotta
Copy link
Contributor

perrotta commented Aug 4, 2021

merge

@cmsbuild cmsbuild merged commit 124e58f into cms-sw:master Aug 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slava77 slava77 slava77 left review comments

@ianna ianna ianna requested changes

Assignees
No one assigned
Labels
code-checks-approved db-pending geometry-approved orp-approved pending-signatures simulation-approved tests-approved upgrade-approved
Projects
None yet
Milestone
CMSSW_12_1_X
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@smuzaffar @cmsbuild @ianna @civanch @srimanob @perrotta @slava77