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

MTD Geometry: avoid dependence on namespace in volume name string #26344

Merged
merged 1 commit into from Apr 4, 2019

Conversation

fabiocos
Copy link
Contributor

@fabiocos fabiocos commented Apr 3, 2019

PR description:

Follow-up of #26307 : the DetId for ETL negative size is correctly reconstructed in the geometry test, but within Geant4 the namespace of the volume is not present in the string list used to build the basename. This is now fixed.

PR validation:

The residual issue was detected with the MTD validation package under preparation (PR to arrive independently). Enabling detailed verbosity within step1 of test workflows shows now that ETDetIds are correctly generated:

%MSG-d TimingSim:  OscarMTProducer:g4SimHits 03-Apr-2019 16:51:49 CEST  Run: 1 Event: 3 TimingSD.cc:139
TimingSD:
 Global entry point: (-742.526,-533.83,-3031)
 Global exit  point: (-742.603,-533.88,-3031.3)
 Global step length: 0.313607
 Local  entry point: (20.7802,17.6108,0.15)
 Local  exit  point: (20.7776,17.5195,-0.15)
 Local  step length: 0.313607
%MSG
%MSG-i MtdSim:  OscarMTProducer:g4SimHits 03-Apr-2019 16:51:49 CEST  Run: 1 Event: 3
MtdSD::getBaseNumber(): Adding level 0: EModule8Disc1Timingactive[1]
%MSG
%MSG-i MtdSim:  OscarMTProducer:g4SimHits 03-Apr-2019 16:51:49 CEST  Run: 1 Event: 3
MtdSD::getBaseNumber(): Adding level 1: EModule8Disc1Timingwafer[1]
%MSG
%MSG-i MtdSim:  OscarMTProducer:g4SimHits 03-Apr-2019 16:51:49 CEST  Run: 1 Event: 3
MtdSD::getBaseNumber(): Adding level 2: EModule8Disc1[124]
%MSG
%MSG-i MtdSim:  OscarMTProducer:g4SimHits 03-Apr-2019 16:51:49 CEST  Run: 1 Event: 3
MtdSD::getBaseNumber(): Adding level 3: Ring8Disc1[1]
%MSG
%MSG-i MtdSim:  OscarMTProducer:g4SimHits 03-Apr-2019 16:51:49 CEST  Run: 1 Event: 3
MtdSD::getBaseNumber(): Adding level 4: Disc1[1]
%MSG
%MSG-i MtdSim:  OscarMTProducer:g4SimHits 03-Apr-2019 16:51:49 CEST  Run: 1 Event: 3
MtdSD::getBaseNumber(): Adding level 5: EndcapTimingLayer[1]
%MSG
%MSG-i MtdSim:  OscarMTProducer:g4SimHits 03-Apr-2019 16:51:49 CEST  Run: 1 Event: 3
MtdSD::getBaseNumber(): Adding level 6: CALOECFront[1]
%MSG
%MSG-i MtdSim:  OscarMTProducer:g4SimHits 03-Apr-2019 16:51:49 CEST  Run: 1 Event: 3
MtdSD::getBaseNumber(): Adding level 7: CALOECTSFront[1]
%MSG
%MSG-i MtdSim:  OscarMTProducer:g4SimHits 03-Apr-2019 16:51:49 CEST  Run: 1 Event: 3
MtdSD::getBaseNumber(): Adding level 8: CALOEC[2]
%MSG
%MSG-i MtdSim:  OscarMTProducer:g4SimHits 03-Apr-2019 16:51:49 CEST  Run: 1 Event: 3
MtdSD::getBaseNumber(): Adding level 9: CALO[1]
%MSG
%MSG-i MtdSim:  OscarMTProducer:g4SimHits 03-Apr-2019 16:51:49 CEST  Run: 1 Event: 3
MtdSD::getBaseNumber(): Adding level 10: CMSE[1]
%MSG
%MSG-i MtdSim:  OscarMTProducer:g4SimHits 03-Apr-2019 16:51:49 CEST  Run: 1 Event: 3
MtdSD::getBaseNumber(): Adding level 11: DDDWorld[0]
%MSG
%MSG-i MTDGeom:  OscarMTProducer:g4SimHits 03-Apr-2019 16:51:49 CEST  Run: 1 Event: 3
ETLNumberingScheme geometry levels = 12
%MSG
%MSG-i MTDGeom:  OscarMTProducer:g4SimHits 03-Apr-2019 16:51:49 CEST  Run: 1 Event: 3
EModule8Disc1Timingactive, EModule8Disc1Timingwafer, EModule8Disc1, Ring8Disc1, Disc1, EndcapTimingLayer, CALOECFront, CALOECTSFront, CALOEC, CALO, CMSE, DDDWorld
%MSG
%MSG-i MTDGeom:  OscarMTProducer:g4SimHits 03-Apr-2019 16:51:49 CEST  Run: 1 Event: 3
ETL Numbering scheme:  ring = 8 zside = 0 module = 124 modtyp = 0 Raw Id = 1661484544[MTDDetId::print]  0110 0011 0000 1000 0011 1110 0000 0000
 rawId       : 0x63083e00
 bits[0:24]  : 01083e00
 Detector        : 6
 SubDetector     : 1
 MTD subdetector : 2
 ETL 
 Side        : 0
 Ring        : 8
 Module      : 124
 Module type : 0

%MSG
TimingSD CreateNewHit for FastTimerHitsEndcap PV EModule8Disc1Timingactive PVid = 1 Unit 1661484544
 primary 1 Tof(ns)= 10.2171 time slice 1021 E(GeV)= 34070.9 trackID 1 mu+ parentID 0
 is primary particle
updateHit: FastTimerHitsEndcap add eloss(GeV) 8.66007e-05CurrentHit=0x7f7433b36140, PostStepPoint= (-742.603,-533.88,-3031.3)
%MSG-d TimingSim:  OscarMTProducer:g4SimHits 03-Apr-2019 16:51:49 CEST  Run: 1 Event: 3 TimingSD.cc:139
TimingSD:
 Global entry point: (-743.986,-534.771,-3036.7)
 Global exit  point: (-744.063,-534.82,-3037)
 Global step length: 0.313626
 Local  entry point: (21.5955,15.8952,-0.15)
 Local  exit  point: (21.6023,15.804,0.15)
 Local  step length: 0.313626
%MSG
%MSG-i MTDGeom:  OscarMTProducer:g4SimHits 03-Apr-2019 16:51:49 CEST  Run: 1 Event: 3
ETLNumberingScheme geometry levels = 12
%MSG
%MSG-i MTDGeom:  OscarMTProducer:g4SimHits 03-Apr-2019 16:51:49 CEST  Run: 1 Event: 3
EModule8Disc1Timingactive, EModule8Disc1Timingwafer, EModule8Disc1, Ring8Disc1, Disc1, EndcapTimingLayer, CALOECFront, CALOECTSFront, CALOEC, CALO, CMSE, DDDWorld
%MSG
%MSG-i MTDGeom:  OscarMTProducer:g4SimHits 03-Apr-2019 16:51:49 CEST  Run: 1 Event: 3
ETL Numbering scheme:  ring = 8 zside = 0 module = 123 modtyp = 0 Raw Id = 1661484416[MTDDetId::print]  0110 0011 0000 1000 0011 1101 1000 0000
 rawId       : 0x63083d80
 bits[0:24]  : 01083d80
 Detector        : 6
 SubDetector     : 1
 MTD subdetector : 2
 ETL 
 Side        : 0
 Ring        : 8
 Module      : 123
 Module type : 0

%MSG
TimingSD CreateNewHit for FastTimerHitsEndcap PV EModule8Disc1Timingactive PVid = 1 Unit 1661484416
 primary 1 Tof(ns)= 10.237 time slice 1023 E(GeV)= 34069.1 trackID 1 mu+ parentID 0
 is primary particle

SimHits are now visible in the test https://github.com/casarsa/cmssw/blob/mc-valMTD-devel-new/Validation/MtdValidation/plugins/EtlSimHitsValidation.cc as can be seen by the produced plots:

SimHitNeg.pdf
SimHitPos.pdf

@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 3, 2019

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 3, 2019

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-26344/9059

  • This PR adds an extra 12KB to repository

@fabiocos
Copy link
Contributor Author

fabiocos commented Apr 3, 2019

please test workflow 29034.0

@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 3, 2019

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/33941/console Started: 2019/04/03 18:11

@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 3, 2019

A new Pull Request was created by @fabiocos (Fabio Cossutti) for master.

It involves the following packages:

Geometry/MTDCommonData

@civanch, @Dr15Jones, @cvuosalo, @ianna, @kpedro88, @cmsbuild, @mdhildreth can you please review it and eventually sign? Thanks.
@davidlange6, @slava77, @fabiocos you are the release manager for this.

cms-bot commands are listed here

@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 3, 2019

@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 3, 2019

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 3, 2019

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

@slava77 comparisons for the following workflows were not done due to missing matrix map:

  • /build/cmsbld/jenkins/workspace/compare-root-files-short-matrix/results/JR-comparison/PR-26344/29034.0_TTbar_14TeV+TTbar_14TeV_TuneCUETP8M1_2023D41_GenSimHLBeamSpotFull14+DigiFullTrigger_2023D41+RecoFullGlobal_2023D41+HARVESTFullGlobal_2023D41

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 32
  • DQMHistoTests: Total histograms compared: 3139747
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3139549
  • DQMHistoTests: Total skipped: 197
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 31 files compared)
  • Checked 133 log files, 14 edm output root files, 32 DQM output files

@cvuosalo
Copy link
Contributor

cvuosalo commented Apr 4, 2019

+1

@kpedro88
Copy link
Contributor

kpedro88 commented Apr 4, 2019

+upgrade

@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 4, 2019

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 Author

fabiocos commented Apr 4, 2019

type bugfix

@fabiocos
Copy link
Contributor Author

fabiocos commented Apr 4, 2019

+1

@cmsbuild cmsbuild merged commit d341f7b into cms-sw:master Apr 4, 2019
@fabiocos fabiocos deleted the fc-fixD41-again branch April 5, 2019 12:52
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

4 participants