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

L1TObjectTypeInCond typedef instead of an overriding ObjectTypeInCond #18442

Merged

Conversation

slava77
Copy link
Contributor

@slava77 slava77 commented Apr 22, 2017

Globally-defined typedefs better be unique in DataFormats as they are globally known to ROOT (same typedef name should correspond to the same type; multiple definitions of the same typedef are apparently OK).
ObjectTypeInCond is defined in the legacy L1 already.

This should clear rather verbose errors in Tree::Draw with selections made from FWLite similar to

In file included from DataFormatsL1GlobalTrigger_xr dictionary payload:48:
In file included from L1GlobalTrigger/interface/L1GlobalTriggerObjectMapRecord.h:23:
DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerObjectMapFwd.h:34:33: error: typedef redefinition with different types ('vector<L1GtObject>' vs 'vector<l1t::GlobalObject>')
typedef std::vector<L1GtObject> ObjectTypeInCond;
                                ^
DataFormats/L1TGlobal/interface/GlobalObjectMapFwd.h:34:40: note: previous definition is here
typedef std::vector<l1t::GlobalObject> ObjectTypeInCond;

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @slava77 (Slava Krutelyov) for master.

It involves the following packages:

DataFormats/L1TGlobal
HLTrigger/HLTfilters
L1Trigger/L1TGlobal

@cmsbuild, @silviodonato, @Martin-Grunewald, @rekovic, @fwyzard, @mulhearn, @davidlange6 can you please review it and eventually sign? Thanks.
@Martin-Grunewald, @kreczko this is something you requested to watch as well.
@Muzaffar, @davidlange6, @smuzaffar you are the release manager for this.

cms-bot commands are listed here #13028

@slava77
Copy link
Contributor Author

slava77 commented Apr 22, 2017

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 22, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/19331/console Started: 2017/04/22 16:14

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

Comparison job queued.

@cmsbuild
Copy link
Contributor

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-18442/19331/summary.html

Comparison Summary:

  • You potentially added 3 lines to the logs
  • Reco comparison results: 3303 differences found in the comparisons
  • DQMHistoTests: Total files compared: 23
  • DQMHistoTests: Total histograms compared: 1826604
  • DQMHistoTests: Total failures: 30599
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 1795832
  • DQMHistoTests: Total skipped: 173
  • DQMHistoTests: Total Missing objects: 0
  • Checked 94 log files, 14 edm output root files, 23 DQM output files

@Martin-Grunewald
Copy link
Contributor

@slava77

Hmm, I'd prefer if instead of just a
using ObjectTypeInCond=L1TObjectTypeInCond
one is making a global search and replace of ObjectTypeInCond by L1TObjectTypeInCond
where it is required.

@slava77
Copy link
Contributor Author

slava77 commented Apr 23, 2017 via email

@cmsbuild
Copy link
Contributor

Pull request #18442 was updated. @cmsbuild, @silviodonato, @Martin-Grunewald, @rekovic, @fwyzard, @mulhearn, @davidlange6 can you please check and sign again.

@slava77
Copy link
Contributor Author

slava77 commented Apr 23, 2017

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 23, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/19335/console Started: 2017/04/23 15:46

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

Comparison job queued.

@cmsbuild
Copy link
Contributor

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-18442/19335/summary.html

Comparison Summary:

  • You potentially added 20 lines to the logs
  • Reco comparison results: 3302 differences found in the comparisons
  • DQMHistoTests: Total files compared: 23
  • DQMHistoTests: Total histograms compared: 1780144
  • DQMHistoTests: Total failures: 44898
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 1735073
  • DQMHistoTests: Total skipped: 173
  • DQMHistoTests: Total Missing objects: 0
  • Checked 94 log files, 14 edm output root files, 23 DQM output files

@Martin-Grunewald
Copy link
Contributor

+1

@rekovic
Copy link
Contributor

rekovic commented Apr 24, 2017

+1

@cmsbuild
Copy link
Contributor

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

@davidlange6
Copy link
Contributor

+1

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

6 participants