-
Notifications
You must be signed in to change notification settings - Fork 4.4k
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
Updated SiStrip unpacker (new FED readout modes) #12387
Conversation
A new Pull Request was created by @forthommel (Laurent Forthomme) for CMSSW_8_0_X. It involves the following packages: DataFormats/SiStripCommon @cmsbuild, @cvuosalo, @davidlange6, @slava77 can you please review it and eventually sign? Thanks. Following commands in first line of a comment are recognized
@Degano you are the release manager for this. |
@cmsbuild please test |
The tests are being triggered in jenkins. |
apparently, this one still merges OK in 80X after #12307 is merged. |
sistrip::FEDZSChannelUnpacker unpacker = sistrip::FEDZSChannelUnpacker::zeroSuppressedLiteModeUnpacker(buffer->channel(fedCh)); | ||
|
||
// unpack | ||
clusterizer.addFed(unpacker,ipair,record); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this line wil not compile anymore...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I cannot reproduce on my test bench. Could you please give me your compiler output?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you need to merge PR #12307
if you collapse Lite8 and lite10 there will be no problem..
@forthommel |
Pull request #12387 was updated. @cmsbuild, @cvuosalo, @davidlange6, @slava77 can you please check and sign again. |
63eeca4
to
d084963
Compare
@cmsbuild please test |
The tests are being triggered in jenkins. |
Pull request #12387 was updated. @cmsbuild, @cvuosalo, @davidlange6, @slava77 can you please check and sign again. |
+1
comparison of "76X version (#12161 fb69762) " .. "80X version (this PR)" (these could have been added back to 76X) --- a/RecoLocalTracker/SiStripClusterizer/plugins/ClustersFromRawProducer.cc
+++ b/RecoLocalTracker/SiStripClusterizer/plugins/ClustersFromRawProducer.cc
@@ -346,7 +346,7 @@ try { // edmNew::CapacityExaustedException
const sistrip::FEDReadoutMode mode = buffer->readoutMode();
- if likely(mode == sistrip::READOUT_MODE_ZERO_SUPPRESSED_LITE10 ) {
+ if likely(mode == sistrip::READOUT_MODE_ZERO_SUPPRESSED_LITE10 || mode == sistrip::READOUT_MODE_ZERO_SUPPRESSED_LITE8) {
try {
// create unpacker
@@ -370,28 +370,9 @@ try { // edmNew::CapacityExaustedException
}
continue;
}
- } else if likely(mode == sistrip::READOUT_MODE_ZERO_SUPPRESSED_LITE8 ) {
-
- try {
- // create unpacker
- sistrip::FEDZSChannelUnpacker unpacker = sistrip::FEDZSChannelUnpacker::zeroSuppressedLiteModeUnpacker(buffer->channel(fedCh));
-
- // unpack
- clusterizer.addFed(unpacker,ipair,record);
- } catch (edmNew::CapacityExaustedException) {
- throw;
- } catch (const cms::Exception& e) {
- if (edm::isDebugEnabled()) {
- std::ostringstream ss;
- ss << "Unordered clusters for channel " << fedCh << " on FED " << fedId << ": " << e.what();
- edm::LogWarning(sistrip::mlRawToCluster_) << ss.str();
- }
- continue;
- }
-
} else {
- if (mode == sistrip::READOUT_MODE_ZERO_SUPPRESSED or mode == sistrip::READOUT_MODE_ZERO_SUPPRESSED_FAKE ) {
+ if (mode == sistrip::READOUT_MODE_ZERO_SUPPRESSED || mode == sistrip::READOUT_MODE_ZERO_SUPPRESSED_FAKE ) {
try {
// create unpacker
sistrip::FEDZSChannelUnpacker unpacker = sistrip::FEDZSChannelUnpacker::zeroSuppressedModeUnpacker(buffer->channel(fedCh)); |
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 |
+1 |
Updated SiStrip unpacker (new FED readout modes)
Can you please clarify the value to be used for LegacyUnpacker: |
IIRC, LegacyUnpacker=true is introduced mostly for safety. The value "false" so far appeared to work OK for all. |
Introducing changes from #12157 and #12385 (from 7_5_X) to the 8_0_X release to be able to unpack new data formats introduced in the last FED FW upgrade (see these two PRs for more details)