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

L1TRawToDigi Fixes #13607

Merged
merged 8 commits into from
Mar 8, 2016
Merged

Conversation

Martin-Grunewald
Copy link
Contributor

L1TRawToDigi Fixes
Includes a fixed version of @mulhearn 's #13549
and thus replaces that PR; and a fix by @blwiner on the number of algos being unpacked.

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 6, 2016

A new Pull Request was created by @Martin-Grunewald (Martin Grunewald) for CMSSW_8_0_X.

It involves the following packages:

EventFilter/L1TRawToDigi

@cmsbuild, @mulhearn, @davidlange6 can you please review it and eventually sign? Thanks.
@slava77, @Degano, @smuzaffar you are the release manager for this.

cms-bot commands are list here #13028

@Martin-Grunewald
Copy link
Contributor Author

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 6, 2016

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

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 6, 2016

-1
Tested at: bccbe82
I found a compilation error while trying to compile with clang:
I used this command:
scram b vclean && scram build -k -j 64 USER_CXXFLAGS='-fsyntax-only' COMPILER='llvm compile'

>> Compiling  /build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_8_0_X_2016-03-04-2300/src/EventFilter/L1TRawToDigi/src/implementations_stage2/GlobalExtBlkPacker.cc 
>> Compiling  /build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_8_0_X_2016-03-04-2300/src/EventFilter/L1TRawToDigi/src/implementations_stage2/GlobalExtBlkUnpacker.cc 
>> Compiling  /build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_8_0_X_2016-03-04-2300/src/EventFilter/L1TRawToDigi/src/implementations_stage2/JetPacker.cc 
>> Compiling  /build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_8_0_X_2016-03-04-2300/src/EventFilter/L1TRawToDigi/src/implementations_stage2/JetUnpacker.cc 
>> Compiling  /build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_8_0_X_2016-03-04-2300/src/EventFilter/L1TRawToDigi/src/implementations_stage2/L1TObjectCollections.cc 
/build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_8_0_X_2016-03-04-2300/src/DataFormats/L1TGlobal/src/GlobalAlgBlk.cc:27:27: error: unused variable 'maxPhysicsTriggers' [-Werror,-Wunused-const-variable]
const static unsigned int maxPhysicsTriggers = 512;  //TO DO Move this to a standard parameter area.
                          ^
1 error generated.
>> Compiling  /build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_8_0_X_2016-03-04-2300/src/EventFilter/L1TRawToDigi/src/implementations_stage2/L1TStage2Layer2Constants.cc 
Selected class -> edm::Wrapper > for ROOT: edm::Wrapper >


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

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:
4c8d048
You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-13607/11726/git-log-recent-commits
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-13607/11726/git-merge-result

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 6, 2016

Pull request #13607 was updated. @cmsbuild, @mulhearn, @davidlange6 can you please check and sign again.

@Martin-Grunewald
Copy link
Contributor Author

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 6, 2016

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

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 6, 2016

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 6, 2016

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 6, 2016

@mulhearn
Copy link
Contributor

mulhearn commented Mar 7, 2016

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 7, 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

int algBit = bt+wd*32+algOffset;
if(val==1 && algBit < 128) { //FIX ME...get dimension from object
unsigned int algBit = bt+wd*32+algOffset;
if(val==1 && algBit < alg.maxPhysicsTriggers) { //FIX ME...get dimension from object
Copy link
Contributor

Choose a reason for hiding this comment

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

will this affect the behaviour of the HLTL1TSeed modules when we run over data with CMSSW_8_0_1 ?

@mulhearn
Copy link
Contributor

mulhearn commented Mar 7, 2016

Yes, in 801 (until it is patched) the HLTL1TSeed filter will be rejecting events in paths that require triggers above bit 128...

-Mike

@davidlange6
Copy link
Contributor

+1

cmsbuild added a commit that referenced this pull request Mar 8, 2016
@cmsbuild cmsbuild merged commit 517e222 into cms-sw:CMSSW_8_0_X Mar 8, 2016
@davidlange6
Copy link
Contributor

@Martin-Grunewald @mulhearn - I just notice the data format changes - are they really required? makes a patch impossible

@Martin-Grunewald
Copy link
Contributor Author

What do you mean? Data member variables are unchanged!

@davidlange6
Copy link
Contributor

its changing headers in data formats

On Mar 8, 2016, at 1:50 PM, Martin Grunewald [email protected] wrote:

What do you mean? Data member variables are unchanged!


Reply to this email directly or view it on GitHub.

@fwyzard
Copy link
Contributor

fwyzard commented Mar 8, 2016

I'm afraid this one

const static unsigned int maxPhysicsTriggers = 512;

is needed.

@davidlt
Copy link
Contributor

davidlt commented Mar 8, 2016

You have to options:

  • Downgrade this to warning by setting CXXFLAGS in BuildFile.xml
  • Force compiler to emit it even if it's not used by adding the attribute

@davidlt
Copy link
Contributor

davidlt commented Mar 8, 2016

Ah, I see maxPhysicsTriggers was moved to a different header. Compilation issues are gone.

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