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

Using aux word to trace the origin of combined Plan 1 rechits #17516

Merged
merged 2 commits into from Feb 15, 2017

Conversation

igv4321
Copy link
Contributor

@igv4321 igv4321 commented Feb 15, 2017

Added methods needed for getting Plan 1 workflow to work (requested by Kevin and Sunanda).

This PR will not modify any existing results. Please merge asap.

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @igv4321 (Igor Volobouev) for CMSSW_9_0_X.

It involves the following packages:

DataFormats/HcalRecHit
RecoLocalCalo/HcalRecAlgos

@cmsbuild, @cvuosalo, @slava77, @davidlange6 can you please review it and eventually sign? Thanks.
@mariadalfonso, @argiro this is something you requested to watch as well.
@davidlange6, @smuzaffar you are the release manager for this.

cms-bot commands are listed here #13028

…acked elsewhere, so one can use a simpler packing scheme
@slava77
Copy link
Contributor

slava77 commented Feb 15, 2017

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 15, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/17795/console Started: 2017/02/15 13:54

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

Comparison job queued.

@cmsbuild
Copy link
Contributor

@slava77
Copy link
Contributor

slava77 commented Feb 15, 2017

some protection should be added in PFHBHERecHitCreatorMaxSample (method 1.5)
https://github.com/cms-sw/cmssw/blob/CMSSW_9_0_0_pre4/RecoParticleFlow/PFClusterProducer/interface/PFHBHERecHitCreatorMaxSample.h#L78
maybe just an assert that checks for OFF_COMBINED flag

@igv4321
Copy link
Contributor Author

igv4321 commented Feb 15, 2017

Since we are switching to Phase 1 reconstruction anyway, that particular code will have to be reworked in a much more radical manner. The Phase 1 ADC packing scheme is different since it has to accommodate 8-bit values. Anyway, this issue should be noted but it is not really related to this PR.

@slava77
Copy link
Contributor

slava77 commented Feb 15, 2017 via email

@igv4321
Copy link
Contributor Author

igv4321 commented Feb 15, 2017

Yes, they are different, and HPD channels will not remain in the same format. Naturally, we wanted to have the same packing/unpacking code for Phase 1 HB and HE. Here is the scheme which defines the Phase 1 ADC packing:
http://cmslxr.fnal.gov/source/RecoLocalCalo/HcalRecAlgos/src/HBHERecHitAuxSetter.cc
ADC values are packed into bytes (instead of 7-bit pieces), and there is a new aux word as well.

@slava77
Copy link
Contributor

slava77 commented Feb 15, 2017

Thanks for the reminder of the switch to 8 bits.

@slava77
Copy link
Contributor

slava77 commented Feb 15, 2017

+1

for #17516 32f8cb9

  • code changes are in line with the description; existing workflows are not affected; the plan-1 workflow will be affected in a somewhat technical way (there are no consumers of the aux fields at this point)
  • jenkins tests pass and comparisons with baseline show no differences

@cmsbuild
Copy link
Contributor

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

@davidlange6
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit 05ba7ff into cms-sw:CMSSW_9_0_X Feb 15, 2017
@@ -1,5 +1,7 @@
#include "DataFormats/HcalRecHit/interface/HBHERecHit.h"

#include "RecoLocalCalo/HcalRecAlgos/interface/HBHERecHitAuxSetter.h"
#include "RecoLocalCalo/HcalRecAlgos/interface/CaloRecHitAuxSetter.h"

Copy link
Contributor

Choose a reason for hiding this comment

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

@igv4321 , this breaks fwlite build. Can we avoid this dependency?

src/DataFormats/HcalRecHit/src/HBHERecHit.cc:3:70: fatal error: RecoLocalCalo/HcalRecAlgos/interface/HBHERecHitAuxSetter.h: No such file or directory

Copy link
Contributor

Choose a reason for hiding this comment

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

Can we get a check in jenkins tests for unwanted dependencies?

@davidlange6
Copy link
Contributor

davidlange6 commented Feb 16, 2017 via email

@igv4321
Copy link
Contributor Author

igv4321 commented Feb 16, 2017

Hm... This was a header dependency only, not a library dependency...
Anyway, fixed in PR #17534

@davidlange6
Copy link
Contributor

davidlange6 commented Feb 16, 2017 via email

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

5 participants