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.

Sign up for GitHub

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

Jump to bottom

Add support for unpacking HCAL uHTRs (Backport to 73X from PR 7950) #8013

Merged
merged 23 commits into from Mar 12, 2015
Merged

Add support for unpacking HCAL uHTRs (Backport to 73X from PR 7950) #8013

merged 23 commits into from Mar 12, 2015

Conversation

agude
Copy link

@agude agude commented Mar 2, 2015

A backport of #7950 (see also #7972) as requested at the HCAL meeting today.

CC: @jmmans, @abdoulline, @ruckstuhl, @lihux25

Alexander Gude and others added 17 commits March 2, 2015 19:06
Remove flavor 3 checking as it no longer exists
7d53aaf 
We can now just check "m_flavor == 2" directly instead of checking part
of the bits to see if it is 2 or 3.
Rename rising/falling to leading/trailing edge
011cbf5
Add ok() method to HcalUHTRData::const_iterator
0eeddff 
This method works for flavor 2 and 4; all other flavors do not define an
OK bool and so it returns 'false'.
Fix ++ operator for HcalUHTRData::const_iterator
dada9c5 
After the header, ++ should only move 16 bits (1 row) as that is where
the data starts, but after that it should move 32 bits (2 rows) as that
is how each data entry is formatted.
@jmmans
Initial version of the container for Alex to play with
28d2fe2
@jmmans
Finish basic work on QIE10DataFrame and collection for the same. Shou…
c169e7a 
…ld be ready to use
Add QIE10 to Hcal Unpacker and DigiDump
ce82dc4
@jmmans
Fix masking error
64f4a98
@jmmans
Add QIE11 in to this branch as well to provide full support
2badbb1
@jmmans
Add version to the TrigTowerDetId
f98181b
Added HCAL TP version checking to L1RCT
29df622 
The L1RCTs only work with the old segmentation (version 0 for <= 2012),
so if the version is anything else, we continue.
Add HcalTrigTowerDetId constructor with version
42c04ab
Add HT versions to HcalText2DetIdConverter.cc
dd043fb 
We use the tens digit in the depth field from the text file to indicate
version. >= 10 is version 1, < 10 is version 0.
Fix "Firmware Flavor" handling in hcalRawToDigi
e9e83d8 
Previously it was hardcoded to be 0, which meant the unpacker treated
everything as HO. It is now set by HcalHTRData::packHeaderTrailer.

Also fix a Channel ID bug in HcalHTRData.cc
Fix minor bugs in HcalPacker.cc
8b7d8f8 
These bugs prevented HCAL Trigger Towers from properly being converted
to RAW.
processTrig now returns the size correctly
65dbeef 
Previously processTrig always returned 0 because the "size" variable was set to
0, then not actually used to hold the size of the vector, and finally
returned. Now size is properly set to the size of the vector.
Add braces to if and for statements in HcalPacker
f0aac9b
@cmsbuild cmsbuild added this to the Next CMSSW_7_3_X milestone Mar 2, 2015
@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 2, 2015

A new Pull Request was created by @agude (Alexander Gude) for CMSSW_7_3_X.

Backport to 73X from PR 7950

It involves the following packages:

CalibFormats/HcalObjects
DataFormats/HcalDetId
DataFormats/HcalDigi
EventFilter/HcalRawToDigi
L1Trigger/RegionalCaloTrigger

@civanch, @diguida, @cvuosalo, @mdhildreth, @cmsbuild, @nclopezo, @cerminar, @slava77, @mmusich, @mulhearn can you please review it and eventually sign? Thanks.
@Martin-Grunewald 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' in the first line of a comment.
@nclopezo you are the release manager for this.
You can merge this pull request by typing 'merge' in the first line of your comment.

@slava77
Copy link
Contributor

slava77 commented Mar 2, 2015

please describe effects on physics product outputs/results in data or MC
processing
that is expected from this change.
(a link to a somewhat detailed presentation would be nice)

Thank you.

On 3/2/15 10:33 AM, Alexander Gude wrote:

A backport of #7950 #7950 (see
also #7972 #7972) as requested at
the HCAL meeting today.

CC: @jmmans https://github.com/jmmans, @abdoulline
https://github.com/abdoulline, @ruckstuhl
https://github.com/ruckstuhl, @lihux25 https://github.com/lihux25

    You can view, comment on, or merge this pull request online at:

#8013

    Commit Summary

—
Reply to this email directly or view it on GitHub
#8013.

Vyacheslav (Slava) Krutelyov
TAMU: Physics Dept Texas A&M MS4242, College Station, TX 77843-4242
CERN: 42-R-027
AIM/Skype: siava16 googleTalk: slava77@gmail.com
(630) 291-5128 Cell (US) +41 76 275 7116 Cell (CERN)

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 3, 2015

+1
Tested at: f0aac9b
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-8013/2630/summary.html

@slava77
Copy link
Contributor

slava77 commented Mar 12, 2015

+1

for #8013 0833598
the changes in DF QIE10 and QIE11 are as expected.
jenkins compiled the changes without warnings (NB: the older CID compilation had no warnings either
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-8013/3281/unitTests.log)
the changed code is not executed in the tested workflows, so, no changes are expected.

davidlange6 added a commit that referenced this pull request Mar 12, 2015
@davidlange6
Merge pull request #8013 from UMN-CMS/backport_amc13_from_CMSSW_7_5_X
48255fd 
Add support for unpacking HCAL uHTRs (Backport to 73X from PR 7950)
@davidlange6 davidlange6 merged commit 48255fd into cms-sw:CMSSW_7_3_X Mar 12, 2015
@davidlange6
Copy link
Contributor

for this one, das is correct

https://cmsweb.cern.ch/das/request?view=list&limit=10&instance=prod%2Fglobal&input=file+dataset%3D%2FRelValSingleMuPt10%2FCMSSW_7_3_0_pre1-PRE_LS172_V15_FastSim-v1%2FGEN-SIM-DIGI-RECO+

the files are not at cern.

On Mar 12, 2015, at 5:00 AM, Alexander Gude notifications@github.com wrote:

Once again looks like a DAS error:

https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-8013/6916/runTheMatrix-results/50101.0_SingleMuPt10_UP15ID+SingleMuPt10_UP15FSIDINPUT+SingleMuPt10FS_UP15_ID+HARVESTUP15FS/step1_dasquery.log

None
Showing 1-10 out of 1 results, for more results use --idx/--limit options

—
Reply to this email directly or view it on GitHub.

@slava77
Copy link
Contributor

slava77 commented Mar 12, 2015

[it's easy to blame DAS ;) ]

Thanks for checking

Is it possible to get this file back?
I seem to remember a question from Giulio about missing files a few days
ago (it could be about this one, in fact)

On 3/12/15 11:27 AM, David Lange wrote:

for this one, das is correct

https://cmsweb.cern.ch/das/request?view=list&limit=10&instance=prod%2Fglobal&input=file+dataset%3D%2FRelValSingleMuPt10%2FCMSSW_7_3_0_pre1-PRE_LS172_V15_FastSim-v1%2FGEN-SIM-DIGI-RECO+

the files are not at cern.

On Mar 12, 2015, at 5:00 AM, Alexander Gude notifications@github.com wrote:

Once again looks like a DAS error:

https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-8013/6916/runTheMatrix-results/50101.0_SingleMuPt10_UP15ID+SingleMuPt10_UP15FSIDINPUT+SingleMuPt10FS_UP15_ID+HARVESTUP15FS/step1_dasquery.log

None
Showing 1-10 out of 1 results, for more results use --idx/--limit options

—
Reply to this email directly or view it on GitHub.

—
Reply to this email directly or view it on GitHub
#8013 (comment).

Vyacheslav (Slava) Krutelyov
TAMU: Physics Dept Texas A&M MS4242, College Station, TX 77843-4242
CERN: 42-R-027
AIM/Skype: siava16 googleTalk: slava77@gmail.com
(630) 291-5128 Cell (US) +41 76 275 7116 Cell (CERN)

@davidlange6
Copy link
Contributor

actually this failing check is essentially useless. I believe the intended check is 50202 instead of 50101. DavidM is in the process of changing it in jenkins.

On Mar 12, 2015, at 12:21 PM, Slava Krutelyov notifications@github.com wrote:

[it's easy to blame DAS ;) ]

Thanks for checking

Is it possible to get this file back?
I seem to remember a question from Giulio about missing files a few days
ago (it could be about this one, in fact)

On 3/12/15 11:27 AM, David Lange wrote:

for this one, das is correct

https://cmsweb.cern.ch/das/request?view=list&limit=10&instance=prod%2Fglobal&input=file+dataset%3D%2FRelValSingleMuPt10%2FCMSSW_7_3_0_pre1-PRE_LS172_V15_FastSim-v1%2FGEN-SIM-DIGI-RECO+

the files are not at cern.

On Mar 12, 2015, at 5:00 AM, Alexander Gude notifications@github.com wrote:

Once again looks like a DAS error:

https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-8013/6916/runTheMatrix-results/50101.0_SingleMuPt10_UP15ID+SingleMuPt10_UP15FSIDINPUT+SingleMuPt10FS_UP15_ID+HARVESTUP15FS/step1_dasquery.log

None
Showing 1-10 out of 1 results, for more results use --idx/--limit options

—
Reply to this email directly or view it on GitHub.

—
Reply to this email directly or view it on GitHub
#8013 (comment).

Vyacheslav (Slava) Krutelyov
TAMU: Physics Dept Texas A&M MS4242, College Station, TX 77843-4242
CERN: 42-R-027
AIM/Skype: siava16 googleTalk: slava77@gmail.com
(630) 291-5128 Cell (US) +41 76 275 7116 Cell (CERN)

—
Reply to this email directly or view it on GitHub.

@nclopezo
Copy link
Contributor

I changed the configuration of the tests in Jenkins to check 50202.

@agude agude deleted the backport_amc13_from_CMSSW_7_5_X branch March 18, 2015 12:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
alca-pending comparison-pending dqm-pending l1-pending orp-pending pending-signatures reconstruction-approved simulation-pending tests-started
Projects
None yet
Milestone
Next CMSSW_7_3_X
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@agude @cmsbuild @slava77 @nclopezo @civanch @deguio @diguida @davidlange6 @abdoulline @jmmans