Maintainability cleanup for EventSelector #11143

wmtan · 2015-09-04T18:24:31Z

This PR is a cleanup of the EventSelector class for maintainability and clarity. The changes include:

Removing one unused and one unnecessary data member.
Renaming some data members, function members, and function parameters to be more mnemonic
The three data members that are never changed are made const (more for clarity than for const correctness) and initialized in the initializer lists of the class. They are no longer modified in init() (renamed to initPathNames()), because they were just being reset to the same values.
The three const data members are the first three data members.
Iterator loops are changed to range for loops.

cmsbuild · 2015-09-04T18:26:11Z

A new Pull Request was created by @wmtan for CMSSW_7_6_X.

Maintainability cleanup for EventSelector

It involves the following packages:

FWCore/Framework

@cmsbuild, @smuzaffar, @Dr15Jones can you please review it and eventually sign? Thanks.
@Martin-Grunewald, @wddgit 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.
If you are a L2 or a release manager you can ask for tests by saying 'please test' in the first line of a comment.
@Degano you are the release manager for this.
You can merge this pull request by typing 'merge' in the first line of your comment.

Dr15Jones · 2015-09-04T20:34:59Z

please test

cmsbuild · 2015-09-04T20:36:17Z

The tests are being triggered in jenkins.

Dr15Jones · 2015-09-04T20:44:46Z

FWCore/Framework/src/EventSelector.cc

-    		       	       HLTGlobalStatus const& tr, 
+  bool
+  EventSelector::acceptOneBit(Bits const& b,
+    		       	       HLTGlobalStatus const& tr,
    		               hlt::HLTState const& s) const
  {
    bool lookForException = (s == hlt::Exception);
    Bits::const_iterator i(b.begin());
    Bits::const_iterator e(b.end());


why were these variables kept?

Chris,
Just an oversight. I will remove them when you let me know that you have no other suggested changes, or in a half hour or so if I don't hear from you.

Signed-off-by: wmtan <wmtan@fnal.gov>

cmsbuild · 2015-09-04T21:16:24Z

Pull request #11143 was updated. @cmsbuild, @smuzaffar, @Dr15Jones can you please check and sign again.

Dr15Jones · 2015-09-04T22:06:31Z

please test

Dr15Jones · 2015-09-04T22:06:56Z

+1

cmsbuild · 2015-09-04T22:11:22Z

The tests are being triggered in jenkins.

cmsbuild · 2015-09-04T22:11:23Z

This pull request is fully signed and it will be integrated in one of the next CMSSW_7_6_X IBs or unless it breaks tests. This pull request requires discussion in the ORP meeting before it's merged. @davidlange6, @Degano, @smuzaffar

cmsbuild · 2015-09-04T22:16:21Z

This pull request is fully signed and it will be integrated in one of the next CMSSW_7_6_X IBs or unless it breaks tests. This pull request requires discussion in the ORP meeting before it's merged. @davidlange6, @Degano, @smuzaffar

cmsbuild · 2015-09-05T03:51:32Z

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

1 warning generated.
>> Compiling  /tmp/cmsbuild/workspace/ib-any-integration/CMSSW_7_6_X_2015-09-04-1700/src/FWCore/Framework/src/EventSetupRecord.cc 
>> Compiling  /tmp/cmsbuild/workspace/ib-any-integration/CMSSW_7_6_X_2015-09-04-1700/src/FWCore/Framework/src/EventSetupRecordIntervalFinder.cc 
>> Compiling  /tmp/cmsbuild/workspace/ib-any-integration/CMSSW_7_6_X_2015-09-04-1700/src/FWCore/Framework/src/EventSetupRecordKey.cc 
>> Compiling  /tmp/cmsbuild/workspace/ib-any-integration/CMSSW_7_6_X_2015-09-04-1700/src/FWCore/Framework/src/EventSetupRecordProvider.cc 
/tmp/cmsbuild/workspace/ib-any-integration/CMSSW_7_6_X_2015-09-04-1700/src/FWCore/Framework/src/EventSelector.cc:398:26: error: unused variable 'i' [-Werror,-Wunused-variable]
    Bits::const_iterator i(b.begin());
                         ^
/tmp/cmsbuild/workspace/ib-any-integration/CMSSW_7_6_X_2015-09-04-1700/src/FWCore/Framework/src/EventSelector.cc:399:26: error: unused variable 'e' [-Werror,-Wunused-variable]
    Bits::const_iterator e(b.end());
                         ^

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

cmsbuild · 2015-09-05T03:56:13Z

This pull request is fully signed and it will be integrated in one of the next CMSSW_7_6_X IBs (but tests are reportedly failing). This pull request requires discussion in the ORP meeting before it's merged. @davidlange6, @Degano, @smuzaffar

cmsbuild · 2015-09-05T04:39:37Z

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

cmsbuild · 2015-09-05T04:41:16Z

This pull request is fully signed and it will be integrated in one of the next CMSSW_7_6_X IBs (but tests are reportedly failing). This pull request requires discussion in the ORP meeting before it's merged. @davidlange6, @Degano, @smuzaffar

cmsbuild · 2015-09-05T05:23:52Z

+1
Tested at: 9ea4f8f
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-11143/7910/summary.html

cmsbuild · 2015-09-05T05:26:09Z

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

cmsbuild · 2015-09-05T06:06:48Z

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

davidlange6 · 2015-09-05T06:47:23Z

+1

Maintainability cleanup for EventSelector

cmsbuild added this to the Next CMSSW_7_6_X milestone Sep 4, 2015

cmsbuild added core-pending pending-signatures tests-pending orp-pending comparison-pending labels Sep 4, 2015

cmsbuild added tests-started and removed tests-pending labels Sep 4, 2015

Dr15Jones reviewed Sep 4, 2015
View reviewed changes

Maintainability cleanup for EventSelector

9ea4f8f

Signed-off-by: wmtan <wmtan@fnal.gov>

wmtan force-pushed the EventSelectorCleanup branch from f2a0a67 to 9ea4f8f Compare September 4, 2015 21:11

cmsbuild added tests-pending and removed tests-started labels Sep 4, 2015

cmsbuild added core-approved fully-signed and removed core-pending pending-signatures labels Sep 4, 2015

cmsbuild added tests-started and removed tests-pending labels Sep 4, 2015

cmsbuild added tests-rejected and removed tests-started labels Sep 5, 2015

cmsbuild added comparison-available and removed comparison-pending labels Sep 5, 2015

cmsbuild added tests-approved and removed tests-rejected labels Sep 5, 2015

cmsbuild added orp-approved and removed orp-pending labels Sep 5, 2015

cmsbuild added a commit that referenced this pull request Sep 5, 2015

Merge pull request #11143 from wmtan/EventSelectorCleanup

6e9f7f0

Maintainability cleanup for EventSelector

cmsbuild merged commit 6e9f7f0 into cms-sw:CMSSW_7_6_X Sep 5, 2015

wmtan deleted the EventSelectorCleanup branch September 14, 2015 16:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Maintainability cleanup for EventSelector #11143

Maintainability cleanup for EventSelector #11143

wmtan commented Sep 4, 2015

cmsbuild commented Sep 4, 2015

Dr15Jones commented Sep 4, 2015

cmsbuild commented Sep 4, 2015

Dr15Jones Sep 4, 2015

wmtan Sep 4, 2015

cmsbuild commented Sep 4, 2015

Dr15Jones commented Sep 4, 2015

Dr15Jones commented Sep 4, 2015

cmsbuild commented Sep 4, 2015

cmsbuild commented Sep 4, 2015

cmsbuild commented Sep 4, 2015

cmsbuild commented Sep 5, 2015

cmsbuild commented Sep 5, 2015

cmsbuild commented Sep 5, 2015

cmsbuild commented Sep 5, 2015

cmsbuild commented Sep 5, 2015

cmsbuild commented Sep 5, 2015

cmsbuild commented Sep 5, 2015

davidlange6 commented Sep 5, 2015

Maintainability cleanup for EventSelector #11143

Maintainability cleanup for EventSelector #11143

Conversation

wmtan commented Sep 4, 2015

cmsbuild commented Sep 4, 2015

Dr15Jones commented Sep 4, 2015

cmsbuild commented Sep 4, 2015

Dr15Jones Sep 4, 2015

Choose a reason for hiding this comment

wmtan Sep 4, 2015

Choose a reason for hiding this comment

cmsbuild commented Sep 4, 2015

Dr15Jones commented Sep 4, 2015

Dr15Jones commented Sep 4, 2015

cmsbuild commented Sep 4, 2015

cmsbuild commented Sep 4, 2015

cmsbuild commented Sep 4, 2015

cmsbuild commented Sep 5, 2015

cmsbuild commented Sep 5, 2015

cmsbuild commented Sep 5, 2015

cmsbuild commented Sep 5, 2015

cmsbuild commented Sep 5, 2015

cmsbuild commented Sep 5, 2015

cmsbuild commented Sep 5, 2015

davidlange6 commented Sep 5, 2015