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

Removed CalibTracker/SiStripCommon dependency from CalibFormats/SiStripObjects #33888

Merged
merged 9 commits into from Jun 9, 2021

Conversation

Dr15Jones
Copy link
Contributor

PR description:

CalibFormat objects should not be reading files to get intermediate data as this violates one of the guiding principles of CMSSW. This change moves the needed information into a separate class, SiStripDetInfo and requires code that constructs a SiStripQuality or a SiStripGain to pass in the appropriate SiStripDetInfo.

The class SiStripDetInfoFileReader now returns the SiStripDetInfo.

This now makes CalibFormats/SiStripObjects independent from algorithmic code.

PR validation:

Code compiles.

The information needed is now in SiStripDetInfo. It is up to the
code that constructs a SiStripQuality to get access to a
SiStripDetInfo.
This allows dropping dependency on CalibTracker/SiStripCommon.
@Dr15Jones
Copy link
Contributor Author

@davidlange6 this should help with the ROOT modules build.

@cmsbuild
Copy link
Contributor

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-33888/22931

Code check has found code style and quality issues which could be resolved by applying following patch(s)

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-33888/22936

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @Dr15Jones (Chris Jones) for master.

It involves the following packages:

CalibFormats/SiStripObjects
CalibTracker/SiStripCommon
CalibTracker/SiStripESProducers
CalibTracker/SiStripHitEfficiency
CalibTracker/SiStripQuality
CondCore/SiStripPlugins
DQM/SiStripMonitorSummary
DQMOffline/CalibTracker
OnlineDB/SiStripESSources
RecoLocalTracker/SiStripClusterizer

@perrotta, @malbouis, @andrius-k, @yuanchao, @kmaeshima, @tlampen, @ErnestaP, @ahmad3213, @cmsbuild, @jpata, @jfernan2, @slava77, @ggovi, @pohsun, @rvenditti, @francescobrivio can you please review it and eventually sign? Thanks.
@erikbutz, @echabert, @felicepantaleo, @pieterdavid, @robervalwalsh, @fioriNTU, @threus, @venturia, @hdelanno, @makortel, @JanFSchulte, @rociovilar, @yduhm, @sroychow, @GiacomoSguazzoni, @rovere, @VinInn, @tocheng, @jandrea, @alesaggio, @idebruyn, @mmusich, @mtosi, @arossi83, @gbenelli, @gpetruc this is something you requested to watch as well.
@silviodonato, @dpiparo, @qliphy you are the release manager for this.

cms-bot commands are listed here

@jfernan2
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

-1

Failed Tests: Build ClangBuild
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-59ed9d/15406/summary.html
COMMIT: fa8eceb
CMSSW: CMSSW_12_0_X_2021-05-28-2300/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/33888/15406/install.sh to create a dev area with all the needed externals and cmssw changes.

Build

I found compilation error when building:

>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_0_X_2021-05-28-2300/src/CalibTracker/SiStripESProducers/plugins/fake/Phase2TrackerCablingCfgESSource.cc
>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_0_X_2021-05-28-2300/src/CalibTracker/SiStripESProducers/plugins/fake/SiStripApvGainFakeESSource.cc
>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_0_X_2021-05-28-2300/src/CalibTracker/SiStripESProducers/plugins/fake/SiStripBackPlaneCorrectionFakeESSource.cc
In file included from /cvmfs/cms-ib.cern.ch/week0/slc7_amd64_gcc900/cms/cmssw/CMSSW_12_0_X_2021-05-28-2300/src/Geometry/TrackerNumberingBuilder/interface/utils.h:4,
                 from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_0_X_2021-05-28-2300/src/CalibTracker/SiStripESProducers/plugins/fake/SiStripBackPlaneCorrectionFakeESSource.cc:26:
/cvmfs/cms-ib.cern.ch/week0/slc7_amd64_gcc900/cms/cmssw/CMSSW_12_0_X_2021-05-28-2300/src/Geometry/TrackerNumberingBuilder/interface/GeometricDet.h:12:10: fatal error: DD4hep/Shapes.h: No such file or directory
   12 | #include 
      |          ^~~~~~~~~~~~~~~~~
compilation terminated.
>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_0_X_2021-05-28-2300/src/CalibTracker/SiStripESProducers/plugins/fake/SiStripBadModuleConfigurableFakeESSource.cc
gmake: *** [tmp/slc7_amd64_gcc900/src/CalibTracker/SiStripESProducers/plugins/CalibTrackerSiStripFakeESProducersPlugins/fake/SiStripBackPlaneCorrectionFakeESSource.cc.o] Error 1


Clang Build

I found compilation error while trying to compile with clang. Command used:

USER_CUDA_FLAGS='--expt-relaxed-constexpr' USER_CXXFLAGS='-Wno-register -fsyntax-only' scram build -k -j 32 COMPILER='llvm compile'

>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_0_X_2021-05-28-2300/src/CalibTracker/SiStripESProducers/plugins/fake/SiStripPedestalsFakeESSource.cc
>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_0_X_2021-05-28-2300/src/CalibTracker/SiStripESProducers/plugins/fake/SiStripQualityFakeESSource.cc
>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_0_X_2021-05-28-2300/src/CalibTracker/SiStripESProducers/plugins/fake/SiStripThresholdFakeESSource.cc
>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_0_X_2021-05-28-2300/src/CalibTracker/SiStripESProducers/plugins/fake/modules.cc
In file included from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_0_X_2021-05-28-2300/src/CalibTracker/SiStripESProducers/plugins/fake/SiStripHashedDetIdFakeESSource.cc:6:
/cvmfs/cms-ib.cern.ch/week0/slc7_amd64_gcc900/cms/cmssw/CMSSW_12_0_X_2021-05-28-2300/src/Geometry/TrackerNumberingBuilder/interface/GeometricDet.h:12:10: fatal error: 'DD4hep/Shapes.h' file not found
#include 
         ^~~~~~~~~~~~~~~~~
In file included from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_0_X_2021-05-28-2300/src/CalibTracker/SiStripESProducers/plugins/fake/SiStripLorentzAngleFakeESSource.cc:36:
/cvmfs/cms-ib.cern.ch/week0/slc7_amd64_gcc900/cms/cmssw/CMSSW_12_0_X_2021-05-28-2300/src/Geometry/TrackerNumberingBuilder/interface/GeometricDet.h:12:10: fatal error: 'DD4hep/Shapes.h' file not found
#include 


@Dr15Jones
Copy link
Contributor Author

Dr15Jones commented May 29, 2021

@smuzaffar why did the <use name="dd4hep"/> in Geometry/TrackerNumberingBuilder/BuildFile.xml not get applied to the plugins in CalibTracker/SiStripESProducers?

I figured it out. I removed a <use ../> directive higher up in the hierarchy.

@jfernan2
Copy link
Contributor

jfernan2 commented Jun 3, 2021

+1

@@ -8,6 +8,7 @@
<use name="CondFormats/SiStripObjects"/>
<use name="CalibFormats/SiStripObjects"/>
<use name="CalibTracker/Records"/>
<use name="Geometry/TrackerGeometryBuilder"/>
Copy link
Contributor

Choose a reason for hiding this comment

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

nevermind, I removed the comment; there's no problem here

@slava77
Copy link
Contributor

slava77 commented Jun 3, 2021

+reconstruction

for #33888 f589717

  • code changes in reco are rather trivial:
    • adapting to the new interface in RecoLocalTracker/SiStripClusterizer/test
    • update/fix of some missing package dependencies
  • jenkins tests pass and comparisons with the baseline show no (relevant) differences

@civanch
Copy link
Contributor

civanch commented Jun 3, 2021

+1

@yuanchao
Copy link
Contributor

yuanchao commented Jun 4, 2021

+1

  • remove CalibTracker/SiStripCommon dependency
  • matrix tests and unit tests passed

@qliphy
Copy link
Contributor

qliphy commented Jun 7, 2021

kindly ping @cms-sw/db-l2

@Dr15Jones
Copy link
Contributor Author

Ping @cms-sw/db-l2

@ggovi
Copy link
Contributor

ggovi commented Jun 8, 2021

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented Jun 8, 2021

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. @silviodonato, @dpiparo, @qliphy (and backports should be raised in the release meeting by the corresponding L2)

@qliphy
Copy link
Contributor

qliphy commented Jun 9, 2021

+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

9 participants