Phase2-hgx124 Split the SD for HGCal for silicon and scintillators #23772

bsunanda · 2018-07-10T14:04:20Z

Allow fiducial volume cuts in silicon and scintillator detectors of HGCal

cmsbuild · 2018-07-10T14:06:03Z

The code-checks are being triggered in jenkins.

cmsbuild · 2018-07-10T14:13:25Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-23772/5451

cmsbuild · 2018-07-10T14:13:44Z

A new Pull Request was created by @bsunanda for master.

It involves the following packages:

Geometry/HGCalCommonData
Geometry/HGCalSimData
SimG4CMS/Calo
SimG4Core/Application

@civanch, @Dr15Jones, @ianna, @mdhildreth, @cmsbuild, @kpedro88 can you please review it and eventually sign? Thanks.
@makortel 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

bsunanda · 2018-07-10T14:13:58Z

@cmsbuild Please test

cmsbuild · 2018-07-10T14:14:00Z

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/29063/console Started: 2018/07/10 16:14

kpedro88 · 2018-07-10T14:15:53Z

Geometry/HGCalCommonData/src/HGCalDDDConstants.cc

+    double dx = std::abs(xx-hgpar_->waferPosX_[k]);
+    double dy = std::abs(yy-hgpar_->waferPosY_[k]);
+    if (dx <= rmax_ && dy <= hexside_) {
+      if ((dy <= 0.5*hexside_) || (dx*tan30deg_ <= (hexside_-dy))) {


these two if statements could be combined

kpedro88 · 2018-07-10T14:18:22Z

Geometry/HGCalCommonData/src/HGCalDDDConstants.cc

+				<< rr-zz/std::sinh(hgpar_->etaMinBH_+ieta*cell)
+				<< ":" << zz/std::sinh(hgpar_->etaMinBH_+(ieta-1)*cell)-rr;
+#endif
+  return ((dist > rr*dphi) ? rr*dphi : dist);


return std::min(rr*dphi,dist);

kpedro88 · 2018-07-10T14:19:08Z

Geometry/HGCalCommonData/src/HGCalDDDConstants.cc

@@ -1067,6 +1148,30 @@ bool HGCalDDDConstants::waferInLayerTest(int wafer, int lay, bool full) const {
  return in;
 }

+bool HGCalDDDConstants::waferGlobal2Local(double& xx, double& yy, int& wafer, 
+					  int& celltyp) const {
+  std::cout << xx <<":" << yy << ":" << wafer << ":" << celltyp << ":" << hgpar_ << "\n";


remove cout

kpedro88 · 2018-07-10T14:20:22Z

Geometry/HGCalCommonData/src/HGCalDDDConstants.cc

+  std::cout << xx <<":" << yy << ":" << wafer << ":" << celltyp << ":" << hgpar_ << "\n";
+  int sizew = (int)(hgpar_->waferPosX_.size());
+  wafer     = sizew;
+  for (int k=0; k<sizew; ++k) {


this looks similar to the loop in distFromEdgeHex(); can it be put in a common function?

kpedro88 · 2018-07-10T14:27:59Z

SimG4CMS/Calo/src/HGCScintSD.cc

+			       << " top Level " << levelT1_ << ":" << levelT2_;
+#endif
+
+    numberingScheme_ = new HGCalNumberingScheme(*hgcons_,mydet_,nameX_);


this looks like a potential memory leak, use a smart pointer (also fix it in other HGCal SD classes)

kpedro88 · 2018-07-10T15:14:19Z

SimG4CMS/Calo/src/HGCalSD.cc

-    numberingScheme_ = new HGCalNumberingScheme(*hgcons,mydet_,nameX_);
-    if (rejectMB_ && (!isScint_)) 
-      mouseBite_ = new HGCMouseBite(*hgcons,angles_,mouseBiteCut_,waferRot_);
+    numberingScheme_ = new HGCalNumberingScheme(*hgcons_,mydet_,nameX_);


smart pointers here as well

cmsbuild · 2018-07-10T20:42:34Z

-1

Tested at: ec638ad

You can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-23772/29063/summary.html

I found follow errors while testing this PR

Failed tests: RelVals

RelVals:

The relvals timed out after 2 hours.

cmsbuild · 2018-07-10T20:42:42Z

Comparison not run due to runTheMatrix errors (RelVals and Igprof tests were also skipped)

cmsbuild · 2018-07-10T22:03:58Z

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/29068/console Started: 2018/07/11 00:04

cmsbuild · 2018-07-10T22:03:59Z

Pull request #23772 was updated. @civanch, @Dr15Jones, @ianna, @mdhildreth, @cmsbuild, @kpedro88 can you please check and sign again.

cmsbuild · 2018-07-11T01:59:15Z

+1
Tested at: 512425c
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-23772/29068/summary.html

cmsbuild · 2018-07-11T01:59:18Z

Comparison job queued.

cmsbuild · 2018-07-11T03:49:09Z

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

Comparison Summary:

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

ianna · 2018-07-11T14:44:15Z

Geometry/HGCalCommonData/src/HGCalDDDConstants.cc

@@ -242,10 +243,88 @@ double HGCalDDDConstants::cellSizeHex(int type) const {
  return cell;
 }

+double HGCalDDDConstants::distFromEdgeHex(double x, double y, double z) const {


@bsunanda - please, add a comment what is calculated here. Is the point(x,y) inside of the polygon?

@bsunanda it takes longer for me to check the code without comment on what it suppose to do.

bsunanda · 2018-07-11T15:21:18Z

Hi Ianna This is for a point inside the volume. I shall add a comment for the next version which is under preparation right now. Could this PR be merged as it is now. That will help in the progress of the next PR. Best regards Sunanda

________________________________ From: Ianna Osborne [notifications@github.com] Sent: 11 July 2018 16:46 To: cms-sw/cmssw Cc: Sunanda Banerjee; Mention Subject: Re: [cms-sw/cmssw] Phase2-hgx124 Split the SD for HGCal for silicon and scintillators (#23772) @ianna requested changes on this pull request.

________________________________ In Geometry/HGCalCommonData/src/HGCalDDDConstants.cc<#23772 (comment)>:

@@ -242,10 +243,88 @@ double HGCalDDDConstants::cellSizeHex(int type) const {

return cell; } +double HGCalDDDConstants::distFromEdgeHex(double x, double y, double z) const { @bsunanda<https://github.com/bsunanda> - please, add a comment what is calculated here. Is the point(x,y) inside of the polygon? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub<#23772 (review)>, or mute the thread<https://github.com/notifications/unsubscribe-auth/AEzMuowUP_8z70RJqJkm7iWLpbrjqjIDks5uFg_GgaJpZM4VJeLT>.

kpedro88 · 2018-07-11T19:26:11Z

+upgrade

bsunanda · 2018-07-11T21:48:48Z

@ianna @civanch Can you approve this PR so that I can make the subsequent PR's

civanch · 2018-07-11T22:19:40Z

+1

cmsbuild · 2018-07-11T22:21:03Z

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 · 2018-07-12T20:57:24Z

+1

it affects only Phase2, g4SimHits is changed only for SD of HGCal.

Split the SD for HGCal for silicon and scintillators

ec638ad

cmsbuild added this to the CMSSW_10_2_X milestone Jul 10, 2018

cmsbuild added code-checks-pending comparison-pending geometry-pending orp-pending pending-signatures simulation-pending tests-pending upgrade-pending labels Jul 10, 2018

cmsbuild added code-checks-approved and removed code-checks-pending labels Jul 10, 2018

cmsbuild added tests-started and removed tests-pending labels Jul 10, 2018

kpedro88 reviewed Jul 10, 2018

View reviewed changes

cmsbuild added comparison-notrun tests-rejected and removed comparison-pending tests-started labels Jul 10, 2018

Take care of Kevin's suggestions

512425c

cmsbuild removed code-checks-approved comparison-notrun tests-rejected labels Jul 10, 2018

cmsbuild added the code-checks-approved label Jul 10, 2018

cmsbuild added tests-started and removed tests-pending labels Jul 10, 2018

cmsbuild added tests-approved and removed tests-started labels Jul 11, 2018

cmsbuild added comparison-available and removed comparison-pending labels Jul 11, 2018

ianna suggested changes Jul 11, 2018

View reviewed changes

cmsbuild added upgrade-approved and removed upgrade-pending labels Jul 11, 2018

cmsbuild added fully-signed geometry-approved simulation-approved and removed geometry-pending pending-signatures simulation-pending labels Jul 11, 2018

cmsbuild added orp-approved and removed orp-pending labels Jul 12, 2018

cmsbuild merged commit 464e822 into cms-sw:master Jul 12, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Phase2-hgx124 Split the SD for HGCal for silicon and scintillators #23772

Phase2-hgx124 Split the SD for HGCal for silicon and scintillators #23772

bsunanda commented Jul 10, 2018

cmsbuild commented Jul 10, 2018

cmsbuild commented Jul 10, 2018

cmsbuild commented Jul 10, 2018

bsunanda commented Jul 10, 2018

cmsbuild commented Jul 10, 2018 •

edited

kpedro88 Jul 10, 2018

kpedro88 Jul 10, 2018

kpedro88 Jul 10, 2018

kpedro88 Jul 10, 2018

kpedro88 Jul 10, 2018

kpedro88 Jul 10, 2018

cmsbuild commented Jul 10, 2018

cmsbuild commented Jul 10, 2018

cmsbuild commented Jul 10, 2018 •

edited

cmsbuild commented Jul 10, 2018

cmsbuild commented Jul 11, 2018

cmsbuild commented Jul 11, 2018

cmsbuild commented Jul 11, 2018

ianna Jul 11, 2018

ianna Jul 12, 2018

bsunanda commented Jul 11, 2018 via email

kpedro88 commented Jul 11, 2018

bsunanda commented Jul 11, 2018

civanch commented Jul 11, 2018

cmsbuild commented Jul 11, 2018

fabiocos commented Jul 12, 2018

Phase2-hgx124 Split the SD for HGCal for silicon and scintillators #23772

Phase2-hgx124 Split the SD for HGCal for silicon and scintillators #23772

Conversation

bsunanda commented Jul 10, 2018

cmsbuild commented Jul 10, 2018

cmsbuild commented Jul 10, 2018

cmsbuild commented Jul 10, 2018

bsunanda commented Jul 10, 2018

cmsbuild commented Jul 10, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cmsbuild commented Jul 10, 2018

cmsbuild commented Jul 10, 2018

cmsbuild commented Jul 10, 2018 • edited

cmsbuild commented Jul 10, 2018

cmsbuild commented Jul 11, 2018

cmsbuild commented Jul 11, 2018

cmsbuild commented Jul 11, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bsunanda commented Jul 11, 2018 via email

kpedro88 commented Jul 11, 2018

bsunanda commented Jul 11, 2018

civanch commented Jul 11, 2018

cmsbuild commented Jul 11, 2018

fabiocos commented Jul 12, 2018

cmsbuild commented Jul 10, 2018 •

edited

cmsbuild commented Jul 10, 2018 •

edited