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

bsunanda:Run2-hcx47 Add trigger primitive version in geometry #12301

Merged
merged 2 commits into from Nov 11, 2015

Conversation

bsunanda
Copy link
Contributor

@bsunanda bsunanda commented Nov 6, 2015

It may require new geometry records to test the DB version. XML versions work fine

@cmsbuild
Copy link
Contributor

cmsbuild commented Nov 6, 2015

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

bsunanda:Run2-hcx47 Add trigger primitive version in geometry

It involves the following packages:

CondFormats/GeometryObjects
Geometry/CaloTopology
Geometry/HcalCommonData

@civanch, @diguida, @ianna, @mdhildreth, @cmsbuild, @franzoni, @Dr15Jones, @cerminar, @ggovi, @mmusich can you please review it and eventually sign? Thanks.
@ghellwig, @apfeiffer1 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
Copy link
Contributor

ianna commented Nov 9, 2015

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Nov 9, 2015

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

@@ -64,6 +64,7 @@ class HcalParameters {
std::vector<int> phigroup;
std::vector<LayerItem> layerGroupEtaSim, layerGroupEtaRec;
int topologyMode;
int triggerMode;
Copy link
Contributor

Choose a reason for hiding this comment

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

@bsunanda - this will require schema change. I'd suggest to use the topologyMode integer with mask to store/retrieve triggerMode.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks - I shall do that. I shall give them 8 bits each right now.


From: Ianna Osborne [notifications@github.com]
Sent: 09 November 2015 16:35
To: cms-sw/cmssw
Cc: Sunanda Banerjee
Subject: Re: [cmssw] bsunanda:Run2-hcx47 Add trigger primitive version in geometry (#12301)

In CondFormats/GeometryObjects/interface/HcalParameters.hhttps://github.com//pull/12301#discussion_r44288078:

@@ -64,6 +64,7 @@ class HcalParameters {
std::vector phigroup;
std::vector layerGroupEtaSim, layerGroupEtaRec;
int topologyMode;

  • int triggerMode;

@bsunandahttps://github.com/bsunanda - this will require schema change. I'd suggest to use the topologyMode integer with mask to store/retrieve triggerMode.


Reply to this email directly or view it on GitHubhttps://github.com//pull/12301/files#r44288078.

@cmsbuild
Copy link
Contributor

cmsbuild commented Nov 9, 2015

-1

Tested at: ac60f58
I found errors in the following unit tests:

---> test runtestTqafTopEventProducers had ERRORS

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

@cmsbuild
Copy link
Contributor

cmsbuild commented Nov 9, 2015

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

@bsunanda
Copy link
Contributor Author

bsunanda commented Nov 9, 2015

@cmsbuild Please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Nov 9, 2015

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

@cmsbuild
Copy link
Contributor

cmsbuild commented Nov 9, 2015

@cmsbuild
Copy link
Contributor

cmsbuild commented Nov 9, 2015

@bsunanda
Copy link
Contributor Author

@ianna Please see if it can be approved

@ianna
Copy link
Contributor

ianna commented Nov 10, 2015

@bsunanda - this PR should go in with a new DB payloads. A new GT is required for that. I'll start the process.

@mmusich
Copy link
Contributor

mmusich commented Nov 10, 2015

@ianna, thanks, let's follow the usual procedure. First create the payload and then require them for 80X GTs. Currently we don't have yet 80X queues, let me open them.

@bsunanda
Copy link
Contributor Author

@ianna The old payload will work as well. The default trigger mode is 0 which makes the old payload compatible. There is no need to wait till new payloads are made.

@ianna
Copy link
Contributor

ianna commented Nov 10, 2015

+1

@cmsbuild
Copy link
Contributor

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

@@ -188,6 +199,28 @@ bool HcalTopology::validDetId(HcalSubdetector subdet, int ieta, int iphi,
return validHcal(id);
}

bool HcalTopology::validHT(const HcalTrigTowerDetId& id) const {

if (id.iphi()<1 || id.iphi()>72 || id.ieta()==0) return false;
Copy link
Contributor

Choose a reason for hiding this comment

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

@bsunanda - there is no alternative to these hardwired numbers?

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 AT the moment there is no way I can change the hardwired #'s. Please integrate it at the earliest because the HcalDetId changes are waiting for this PR to be integrated.


From: David Lange [notifications@github.com]
Sent: 10 November 2015 20:42
To: cms-sw/cmssw
Cc: Sunanda Banerjee
Subject: Re: [cmssw] bsunanda:Run2-hcx47 Add trigger primitive version in geometry (#12301)

In Geometry/CaloTopology/src/HcalTopology.cchttps://github.com//pull/12301#discussion_r44454520:

@@ -188,6 +199,28 @@ bool HcalTopology::validDetId(HcalSubdetector subdet, int ieta, int iphi,
return validHcal(id);
}

+bool HcalTopology::validHT(const HcalTrigTowerDetId& id) const {
+

  • if (id.iphi()<1 || id.iphi()>72 || id.ieta()==0) return false;

@bsunandahttps://github.com/bsunanda - there is no alternative to these hardwired numbers?


Reply to this email directly or view it on GitHubhttps://github.com//pull/12301/files#r44454520.

@davidlange6
Copy link
Contributor

+1
but :(

cmsbuild added a commit that referenced this pull request Nov 11, 2015
bsunanda:Run2-hcx47 Add trigger primitive version in geometry
@cmsbuild cmsbuild merged commit 15af33d into cms-sw:CMSSW_8_0_X Nov 11, 2015
@boudoul
Copy link
Contributor

boudoul commented Dec 2, 2015

Hi @bsunanda , could you please put by default the DebugLog to silent in HcalParametersFromDD.cc - The large number of 'cout' present in this file (maybe somewhere else too) is activated in production otherwise...

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

6 participants