HGCal Reco Geometry #12170

ianna · 2015-10-29T16:21:31Z

Allocate vectors at geometry constructor initialisation
Avoid resizing big vectors
Implement sorting of valid DetIds. Apply it if needed?

There was no point to have it static anyway.

Make them members in Vx3DHLTAnalyzer. Please test before accepting.

* HGCal geometry writer * Configuration files to write and read HGCal geometry * Test HGCal geometry from DB * HGCal DB geometry builder * Allow to drop Ecal subdetectors from Calo geometry DB builder

…Algos

…sizing big vectors.

cmsbuild · 2015-10-29T16:26:11Z

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

HGCal Reco Geometry

It involves the following packages:

Geometry/HGCalGeometry

@cmsbuild, @civanch, @Dr15Jones, @ianna, @mdhildreth can you please review it and eventually sign? Thanks.
@ghellwig this is something you requested to watch as well.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.
If you are a L2 or a release manager you can ask for tests by saying 'please test' or '@cmsbuild, please test' in the first line of a comment.
@Degano you are the release manager for this.
You can merge this pull request by typing 'merge' in the first line of your comment.

ianna · 2015-10-29T16:28:57Z

@lgray and @bsunanda - before I commit DB payloads code for HGCal, it seems some tiding up is needed. I'm not sure if you rely on sorted DetIds. I've provided a simple sort by rawId, more complex one can be implemented if needed.
Note, current implementation is very costly. You resize huge std::vectors ~thousand(s) times.

Also, FlatTrd breaks CaloCellGeometry polymorphism. The test asserts when Debug mode is enabled. I'm not going to fix it since @bsunanda is planning to move to another shape.

Please comment.

ianna · 2015-10-29T16:29:11Z

@cmsbuild please test

ianna · 2015-10-29T16:30:48Z

Geometry/HGCalGeometry/src/HGCalGeometryLoader.cc

@@ -114,6 +114,8 @@ HGCalGeometry* HGCalGeometryLoader::build (const HGCalTopology& topology) {
      }
    }
  }
+  // FIXME: Sort valid DetIds if neded
+  // geom->sortDetIds();


@lgray - here is a logical place to sort valid DetIds if needed.

@ianna better to just go ahead and sort them. It shouldn't have any adverse effect and can only help in the future.

@lgray - I'm a bit concerned about sorting 5 million element vector for "just in case" - as it's n*log2(n). What is current/future access pattern? Do you check every hit DetId on its validity? Mind the search is linear.

cmsbuild · 2015-10-29T16:31:09Z

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/9338/console

cmsbuild · 2015-10-29T18:40:21Z

+1
Tested at: ec57544
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-12170/9338/summary.html

cmsbuild · 2015-10-29T20:06:54Z

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

…h incorrect 16 samples flag reporting

…nHcalCalibAlgos Replace LinkDef file witl XML selection file in Calibration/HcalCalibAlgos

Static beam 80x

cmsbuild · 2015-11-02T12:31:41Z

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/9411/console

cmsbuild · 2015-11-02T12:31:42Z

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

cmsbuild · 2015-11-02T14:39:52Z

+1
Tested at: 54fd388
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-12170/9411/summary.html

ianna · 2015-11-02T14:40:58Z

+1

cmsbuild · 2015-11-02T14:41:37Z

This pull request is fully signed and it will be integrated in one of the next CMSSW_8_0_X IBs (tests are also fine). This pull request requires discussion in the ORP meeting before it's merged. @davidlange6, @Degano, @smuzaffar

Conflicts: Geometry/HGCalGeometry/interface/HGCalGeometry.h Geometry/HGCalGeometry/src/HGCalGeometry.cc

cmsbuild · 2015-11-02T16:10:04Z

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

cmsbuild · 2015-11-02T16:11:38Z

This pull request is fully signed and it will be integrated in one of the next CMSSW_8_0_X IBs (tests are also fine). This pull request requires discussion in the ORP meeting before it's merged. @davidlange6, @Degano, @smuzaffar

davidlange6 · 2015-11-03T12:23:20Z

Geometry/HGCalGeometry/src/HGCalGeometryLoader.cc

  if (counter != numberOfCells) {
    std::cerr << "inconsistent # of cells: expected " << numberOfCells << " , inited " << counter << std::endl;
    assert( counter == numberOfCells ) ;
  }
-  std::cout << "HGCalGeometryBuilder-> " << counter << " cells are produced" << std::endl;
+  std::cout << "HGCalGeometryBuilder-> " << counter << " cells are produced\n";


@ianna - could you remove this printout. Thanks

HGCal Reco Geometry

ianna · 2015-11-03T18:05:28Z

@davidlange6 - could you, please, revert this merge? I've merged this branch with another and wrongly pushed the result into this one. Sorry. (I wonder why the labels were not reset...)

Dmitrijus Bugelskis and others added 7 commits October 20, 2015 16:03

Fix formatFitTime() not to require a static variable in DQM/BeamMonitor.

5a2132e

There was no point to have it static anyway.

Fix statics in DQM/BeamMonitor.

00b6259

Make them members in Vx3DHLTAnalyzer. Please test before accepting.

* HGCal DB record

60a62b7

* HGCal geometry writer * Configuration files to write and read HGCal geometry * Test HGCal geometry from DB * HGCal DB geometry builder * Allow to drop Ecal subdetectors from Calo geometry DB builder

Replace LinkDef file witl XML selection file in Calibration/HcalCalib…

6fe1040

…Algos

move FourVectorHLT.h into the plugins/ directory

7c92d5b

TriggerBxMonitor: monitor the BX accept of L1 and HLT triggers

be5ff80

Allocate vectors during Geometry constructor initialization. Avoid re…

ec57544

…sizing big vectors.

cmsbuild added this to the Next CMSSW_8_0_X milestone Oct 29, 2015

cmsbuild added geometry-pending pending-signatures tests-pending orp-pending comparison-pending labels Oct 29, 2015

Fixing missing histograms in online for sistrip

50a767f

ianna reviewed Oct 29, 2015
View reviewed changes

cmsbuild added tests-started and removed tests-pending labels Oct 29, 2015

cmsbuild added tests-approved and removed tests-started labels Oct 29, 2015

cmsbuild added comparison-available and removed comparison-pending labels Oct 29, 2015

barvic and others added 3 commits October 29, 2015 21:54

80X - Fix for handling of rare cases of CSC CFEB data corruptions wit…

b31847e

…h incorrect 16 samples flag reporting

Merge pull request cms-sw#11883 from wmtan/ReplaceLinkDefInCalibratio…

d59ba8c

…nHcalCalibAlgos Replace LinkDef file witl XML selection file in Calibration/HcalCalibAlgos

Merge pull request cms-sw#12211 from dmitrijus/static_beam_try2_75x

fda41d6

Static beam 80x

cmsbuild added tests-pending comparison-pending and removed comparison-available tests-approved labels Nov 2, 2015

cmsbuild added tests-started and removed tests-pending labels Nov 2, 2015

cmsbuild added geometry-approved fully-signed tests-approved and removed geometry-pending pending-signatures tests-started labels Nov 2, 2015

ianna added 2 commits November 2, 2015 15:46

Merged hgcal-reco-geometry-cleanup from repository ianna

b2e7cb0

Merged hgcal-db-geometry from repository ianna

115aa4a

Conflicts: Geometry/HGCalGeometry/interface/HGCalGeometry.h Geometry/HGCalGeometry/src/HGCalGeometry.cc

cmsbuild added comparison-available and removed comparison-pending labels Nov 2, 2015

davidlange6 reviewed Nov 3, 2015
View reviewed changes

* Cleanup

9f94a6c

davidlange6 added a commit that referenced this pull request Nov 3, 2015

Merge pull request #12170 from ianna/hgcal-reco-geometry-cleanup

a3ba3f8

HGCal Reco Geometry

davidlange6 merged commit a3ba3f8 into cms-sw:CMSSW_8_0_X Nov 3, 2015

ianna mentioned this pull request Nov 3, 2015

Revert "HGCal Reco Geometry" #12251

Closed

ianna deleted the hgcal-reco-geometry-cleanup branch November 6, 2015 14:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

HGCal Reco Geometry #12170

HGCal Reco Geometry #12170

ianna commented Oct 29, 2015

cmsbuild commented Oct 29, 2015

ianna commented Oct 29, 2015

ianna commented Oct 29, 2015

ianna Oct 29, 2015

lgray Oct 29, 2015

ianna Oct 30, 2015

cmsbuild commented Oct 29, 2015

cmsbuild commented Oct 29, 2015

cmsbuild commented Oct 29, 2015

cmsbuild commented Nov 2, 2015

cmsbuild commented Nov 2, 2015

cmsbuild commented Nov 2, 2015

ianna commented Nov 2, 2015

cmsbuild commented Nov 2, 2015

cmsbuild commented Nov 2, 2015

cmsbuild commented Nov 2, 2015

davidlange6 Nov 3, 2015

ianna commented Nov 3, 2015

HGCal Reco Geometry #12170

HGCal Reco Geometry #12170

Conversation

ianna commented Oct 29, 2015

cmsbuild commented Oct 29, 2015

ianna commented Oct 29, 2015

ianna commented Oct 29, 2015

ianna Oct 29, 2015

Choose a reason for hiding this comment

lgray Oct 29, 2015

Choose a reason for hiding this comment

ianna Oct 30, 2015

Choose a reason for hiding this comment

cmsbuild commented Oct 29, 2015

cmsbuild commented Oct 29, 2015

cmsbuild commented Oct 29, 2015

cmsbuild commented Nov 2, 2015

cmsbuild commented Nov 2, 2015

cmsbuild commented Nov 2, 2015

ianna commented Nov 2, 2015

cmsbuild commented Nov 2, 2015

cmsbuild commented Nov 2, 2015

cmsbuild commented Nov 2, 2015

davidlange6 Nov 3, 2015

Choose a reason for hiding this comment

ianna commented Nov 3, 2015