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

70 x consumes migration i #1106

Merged
merged 7 commits into from Oct 27, 2013
Merged

Conversation

vadler
Copy link

@vadler vadler commented Oct 18, 2013

Migration of CommonTools/TriggerUtils to 'consumes'/'getByToken'-API.

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @vadler (Volker Adler) for CMSSW_7_0_X.

70 x consumes migration i

It involves the following packages:

DQM/SiStripMonitorCluster
Validation/RecoVertex
DQMOffline/JetMET
DQMOffline/Muon
DQM/SiStripMonitorTrack
DQM/TrackingMonitor
DQM/TrackerMonitorTrack
CommonTools/TriggerUtils
Validation/RecoTau

@smuzaffar, @thspeer, @danduggan, @rovere, @nclopezo, @deguio, @slava77, @vadler, @eliasron can you please review it and eventually sign? Thanks.
@cerati, @TaiSakuma, @GiacomoSguazzoni, @rovere this is something you requested to watch as well.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.
@ktf you are the release manager for this.

@nclopezo
Copy link
Contributor

@vadler
Copy link
Author

vadler commented Oct 18, 2013

@rovere , @deguio , @eliasron
Since CommonTools/TriggerUtils provides mostly helper classes used in DQM, I also needed to modify the instantiation of thos classes in the DQM modules. Some of the DQM modules do not inherit from EDM modules, so the functionality of EDConsumerBase has been added.

@nclopezo
Copy link
Contributor

Hi,

Now there are conflicts in the files:

DQMOffline/Muon/interface/MuonRecoOneHLT.h
DQMOffline/Muon/src/MuonRecoOneHLT.cc

with respect to the current HEAD of the branch.

@vadler
Copy link
Author

vadler commented Oct 18, 2013

Ah, lots of new stuff in the latest IB since pre6, which was the most recent one available for development last night :(
I'm gonna update this one accordingly...

@@ -48,12 +49,12 @@
#include "GlobalVariables.h"


class CaloMETAnalyzer : public CaloMETAnalyzerBase {
class CaloMETAnalyzer : public CaloMETAnalyzerBase, public edm::EDConsumerBase {
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm afraid inheriting from EDConsumerBase won't work since the framework only asks modules what they consume. Filling 'consumes' here will still cause the framework to abort any module which uses this code.

Copy link
Author

Choose a reason for hiding this comment

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

In fact, I was also not sure and hoped for a comment on this.
Does that mean, these modules MUST inherit from EDM modules to use 'getByToken'?
@rovere , @deguio , @eliasron , is there a reason why they do not?

Copy link
Contributor

Choose a reason for hiding this comment

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

'cause sometimes people think smarter.

I fear some restructuring of the code is needed here. I'll discuss with @deguio @danduggan and see how to proceed.

Copy link
Author

Choose a reason for hiding this comment

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

BTW: The change causing the conflict in MuonRecoOneHLT (#1106 (comment)) resolved that issue at least there. It was ported to be an EDAnalyzer.

Copy link
Author

Choose a reason for hiding this comment

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

It looks like I misunderstood the code structure of that package.
Fix is here: vadler@b3fc2a2

@cmsbuild
Copy link
Contributor

Pull request #1106 was updated. @smuzaffar, @thspeer, @danduggan, @rovere, @nclopezo, @deguio, @slava77, @vadler, @eliasron can you please check and sign again.

@cmsbuild
Copy link
Contributor

Pull request #1106 was updated. @smuzaffar, @thspeer, @danduggan, @rovere, @nclopezo, @deguio, @slava77, @vadler, @eliasron can you please check and sign again.

@cmsbuild
Copy link
Contributor

Pull request #1106 was updated. @smuzaffar, @thspeer, @danduggan, @rovere, @nclopezo, @deguio, @slava77, @vadler, @eliasron can you please check and sign again.

@vadler
Copy link
Author

vadler commented Oct 18, 2013

+1

@nclopezo
Copy link
Contributor

@deguio
Copy link
Contributor

deguio commented Oct 23, 2013

+1

@slava77
Copy link
Contributor

slava77 commented Oct 26, 2013

+1

tested
#1106 fa38838
as sign262
in CMSSW_7_0_X_2013-10-25-0200
No diffs, as expected.

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next IBs unless changes or unless it breaks tests. @ktf can you please take care of it?

ktf added a commit that referenced this pull request Oct 27, 2013
Consumes migration --  CommonTools/TriggerUtils
@ktf ktf merged commit 238a975 into cms-sw:CMSSW_7_0_X Oct 27, 2013
@vadler vadler deleted the 70X-consumesMigration-I branch November 6, 2013 15:02
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

8 participants