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

Update of DQM combo PR for L1T, including updates from 81x #14021

Merged

Conversation

mulhearn
Copy link
Contributor

This is intended to supercede #13763.

Now that PR #13767 it is only 60 files.

It also includes some updates from 81X after the corresponding tgs-v4 and DQM PRs which addressed problems with the IB. With these changes, L1Trigger, DataFormats/L1TMuon, and EventFilter/L1TRawToDigi are identical with CMSSW_8_1_0_pre2.

swang373 and others added 30 commits March 4, 2016 11:11
The configuration files were modified heavily to
test the ability to run locally on lxplus, then
the settings were reverted, keeping only those
changes which were relevant to enable running the
EMTF DQM module.
For integration into production DQM sequence
Checkout files in EventFilter/L1TRawToDigi from cms-l1t-offline branch
l1t-muon-CMSSW_8_0_0_pre6, committing only changes related to EMTF.
Checkout files in EventFilter/L1TRawToDigi from abrinke1 branch
EMTF_DQM_dev_800pre6, committing only changes related to EMTF.
Checkout files in DataFormats/L1TMuon from cms-l1t-offline branch
l1t-muon-CMSSW_8_0_0_pre6, committing only changes related to EMTF.
Checkout files in DataFormats/L1TMuon from abrinke1 branch
EMTF_DQM_dev_800pre6, committing only changes related to EMTF.
Conflicts:
	DataFormats/L1TMuon/interface/EMTFOutput.h
	EventFilter/L1TRawToDigi/python/emtfStage2Digis_cfi.py

Merge in the EMTF DQM module's 80X pull request.
TPs start at 1!
HF and HCAL digis will be combined in L1CaloLayer1 unpacker in this:
cms-sw#13723
This branch would then cause an error if we include HF digis as
currently implemented.
Organized the structure of l1tstage2_dqm_sourceclient-live_cfg.py for
clarity. the nLCTs plot checks the Quality of the SP.
Cherry picked from cms-sw#13725
Resolved Conflicts:
	DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py
	DQM/L1TMonitor/python/L1TStage2_cff.py
	DQM/L1TMonitor/src/SealModule.cc
Resolved Conflicts:
	DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py
	DQM/L1TMonitor/python/L1TStage2_cff.py
Resolved Conflicts:
	DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py
	Both added: DQM/L1TMonitor/interface/L1TStage2uGT.h
	DQM/L1TMonitor/python/L1TStage2_cff.py
	Both added: DQM/L1TMonitor/src/L1TStage2uGT.cc
	DQM/L1TMonitor/src/SealModule.cc
@cmsbuild
Copy link
Contributor

Pull request #14021 was updated. @cmsbuild, @rekovic, @deguio, @vanbesien, @mulhearn, @davidlange6 can you please check and sign again.

@mulhearn
Copy link
Contributor Author

please test

@mulhearn
Copy link
Contributor Author

+1

@cmsbuild
Copy link
Contributor

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

@deguio
Copy link
Contributor

deguio commented Apr 12, 2016

+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 after it passes the integration tests. This pull request requires discussion in the ORP meeting before it's merged. @slava77, @davidlange6, @Degano, @smuzaffar

@cmsbuild
Copy link
Contributor

@davidlange6
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit 60f96ea into cms-sw:CMSSW_8_0_X Apr 14, 2016
@nsmith- nsmith- mentioned this pull request Apr 19, 2016
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

10 participants