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

HGcal Hexgonal Geometry #12862

Merged
merged 8 commits into from
Jan 8, 2016
Merged

Conversation

ianna
Copy link
Contributor

@ianna ianna commented Jan 4, 2016

  • Merge Sunanda's bsunanda:Run2-hcx60 branch
  • Fix conflicts
  • Move HGCalParameters class to common HGCal directory
  • Add a schema for HGCalParameters as PHGCalParameters
  • Add serialization test for a new schema PHGCalParameters

Replaces #12845

Sunanda and others added 8 commits December 23, 2015 19:33
Conflicts:
	CondFormats/GeometryObjects/src/classes.h
	CondFormats/GeometryObjects/src/classes_def.xml
* Add a schema for HGCalParameters as PHGCalParameters
* Add serialization test for a new schema PHGCalParameters
* Fix conflicts
@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 4, 2016

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

It involves the following packages:

CondFormats/GeometryObjects
Configuration/Geometry
DataFormats/ForwardDetId
Geometry/CaloGeometry
Geometry/CaloTopology
Geometry/HGCalCommonData
Geometry/HGCalGeometry
RecoLocalCalo/HGCalRecProducers
SimCalorimetry/HGCalSimProducers
SimDataFormats/CaloTest
SimG4CMS/Calo

@civanch, @diguida, @cvuosalo, @ianna, @mdhildreth, @cmsbuild, @franzoni, @Dr15Jones, @cerminar, @slava77, @ggovi, @mmusich, @davidlange6 can you please review it and eventually sign? Thanks.
@ghellwig, @Martin-Grunewald, @vandreev11, @sethzenz, @makortel, @apfeiffer1, @kpedro88, @lgray, @cseez, @pfs, @tocheng this is something you requested to watch as well.
@slava77, @Degano, @smuzaffar you are the release manager for this.

Following commands in first line of a comment are recognized

  • +1|approve[d]|sign[ed]: L1/L2's to approve it
  • -1|reject[ed]: L1/L2's to reject it
  • assign <category>[,<category>[,...]]: L1/L2's to request signatures from other categories
  • unassign <category>[,<category>[,...]]: L1/L2's to remove signatures from other categories
  • hold: L1/all L2's/release manager to mark it as on hold
  • unhold: L1/user who put this PR on hold
  • merge: L1/release managers to merge this request
  • [@cmsbuild,] please test: L1/L2 and selected users to start jenkins tests
  • [@cmsbuild,] please test with cms-sw/cmsdist#<PR>: L1/L2 and selected users to start jenkins tests using externals from cmsdist

@ianna
Copy link
Contributor Author

ianna commented Jan 4, 2016

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 4, 2016

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

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 4, 2016

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 4, 2016

@ianna
Copy link
Contributor Author

ianna commented Jan 4, 2016

+1

@slava77
Copy link
Contributor

slava77 commented Jan 4, 2016

+1

for #12862 95fcf83

@ianna
Copy link
Contributor Author

ianna commented Jan 5, 2016

@slava77 - this PR is the same as you've already signed (just moving files around).
@ggovi and @diguida - this is a first iteration of a new schema for HGCal parameters. Please, let me know if you have time to look at it. I'd like to integrate the PR ASAP as it involves changes in DataFormats. Alternatively, I can remove the schema from this PR to speed up its integration. Thanks.

@mmusich
Copy link
Contributor

mmusich commented Jan 7, 2016

+1
adding PHGCalParameters CondFormat

@mmusich
Copy link
Contributor

mmusich commented Jan 7, 2016

@ggovi please have a look too

@ggovi
Copy link
Contributor

ggovi commented Jan 7, 2016

+1

@ianna
Copy link
Contributor Author

ianna commented Jan 8, 2016

@civanch - could you, please, have a look? Thanks.

@@ -110,6 +110,7 @@
<SpecPar name="HGCalEE">
<PartSelector path="//HGCalEESensitive.*"/>
<Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
<Parameter name="GeometryMode" value="HGCalGeometryMode::Square" eval="false"/>
Copy link
Contributor

Choose a reason for hiding this comment

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

@ianna - do I understand this code correctly to say that in each xml we have a line to which "GeometryMode" we do NOT use? Could we not make this more descriptive by giving the GeometryMode we DO use instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@davidlange6 - your assumption is not correct. HGCal "GeometryMode" is used starting from this PR. It is either a square or a hexagon reflecting its sensors shape.

Copy link
Contributor

Choose a reason for hiding this comment

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

ok Thanks!

On Jan 8, 2016, at 4:48 PM, Ianna Osborne [email protected] wrote:

In Geometry/HGCalCommonData/data/v1/hgcalEE.xml:

@@ -110,6 +110,7 @@


@davidlange6 - your assumption is not correct. HGCal "GeometryMode" is used starting from this PR. It is either a square or a hexagon reflecting its sensors shape.


Reply to this email directly or view it on GitHub.

@civanch
Copy link
Contributor

civanch commented Jan 8, 2016

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 8, 2016

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. @slava77, @davidlange6, @Degano, @smuzaffar

@davidlange6
Copy link
Contributor

+1

On Jan 8, 2016, at 4:59 PM, cmsbuild [email protected] wrote:

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. @slava77, @davidlange6, @Degano, @smuzaffar


Reply to this email directly or view it on GitHub.

cmsbuild added a commit that referenced this pull request Jan 8, 2016
@cmsbuild cmsbuild merged commit f3046c6 into cms-sw:CMSSW_8_0_X Jan 8, 2016
@ianna ianna deleted the hgcal-hexgonal-geometry branch January 13, 2016 10:14
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.

7 participants