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

AK5 to AK4 for JEC's, Redux #5350

Closed

Conversation

rappoccio
Copy link
Contributor

Update of PR #5299, including suggestions from @Martin-Grunewald and
@mmarioncern.

Here is the last expected change for the AK5 -> AK4 transition. The
AK4 and AK8 global tags are now present at RECO and HLT level. I have
moved the defaults from AK5/AK7 to AK4/AK8 now. I also added services
for ALL available payloads (AK1,2,3,...10). The "default" is AK4.

I have coordinated with JME Trigger contacts to include the requisite
changes to CondDB for the HLT-related software changes. However, this
will still break the Run 1 matrix tests (5.1 and 25.0) with this
current PR.

Additional changes were made to fix unit tests by changing the global
tag from "startup" to "run2_mc", which fixed the broken unit tests.

Tested on the following workflows :

  • Working : 4.22, 4.53, 8.0, 1000.0, 1001.0, 1341.0, 25202.0
  • Broken : 5.1, 25.0

rappoccio and others added 30 commits September 16, 2014 19:38
…ng to fix various runtests by setting the GT to run2_mc
…ies runtest. Also fixing a couple of stray AK5s from python files more than one layer deep in the package
Helgrind identified a race condition in MultiTrackSelector. The problem
was StringCutObjectSelector is not const thread safe (i.e. it has a const
function which modifies its internal state) and therefore only one thread
at a time can call it. Therefore MultiTrackSelector can not simultaneously
talk to multiple events. However, converting the module to a stream module
is thread safe.
Errors reported by ubsan (undefined behavior) with GCC 4.9.1:

    PixelChannelIdentifier.h:40:22: runtime error: left shift of
negative value -1
    PixelChannelIdentifier.h:41:26: runtime error: left shift of negative
value -1
    PixelChannelIdentifier.h:42:23: runtime error: left shift of negative
value -1
    PixelChannelIdentifier.h:43:22: runtime error: left shift of negative
value -1
    PixelChannelIdentifier.h:44:25: runtime error: left shift of negative
value -1

(1) Change ctor arguments to be unsigned int. Left shifting by a
negative number is udefined behavior.

(2) ~0 == -1, left shifting such number is undefined behavior.

Signed-off-by: David Abdurachmanov <[email protected]>
RecoLocalTracker/SubCollectionProducers -- Fix bug on demand offline
The following adds support for Address Sanitizer (asan) IBs using
mainstream branch. Because a full stack of CMSSW is not compiled with
ASan we need some extra steps. ASan run-time must be linked into
main executables statically to force early ASan initialization.

Signed-off-by: David Abdurachmanov <[email protected]>
…treamModule

Converted MultiTrackSelector from global to stream
…metry

Provide only const access to ME0EtaPartitions
…nEventGenerator-4tau-CMSSW_7_2_X_2014-09-15-1400

restore assert ValidationEventGenerator 4tau decays
… variables rather than code copy and pastes as is currently
@slava77
Copy link
Contributor

slava77 commented Sep 26, 2014

@rappoccio
Sal, what are the actual changes that you intended to add here?
70K lines change sounds to be well beyond the scope of
AK5 to AK4 for JEC's

(considering that github occasionally shows more than there really is, I tried to merge locally and see diffs

CMSSW_7_2_X_2014-09-24-1400 
git cms-merge-topic cms-sw:CMSSW_7_2_X
#  260 files changed, 8811 insertions(+), 60591 deletions(-)
# most of the above is from #5421, anyways, your topic branch head is out of sync
git cms-merge-topic  5350
# 29 files changed, 571 insertions(+), 163 deletions(-)

I'm guessing the last one is actually the needed stuff, not the 60K lines

Could you please rebase

@rappoccio
Copy link
Contributor Author

@slava77 yes, sorry, I have a rebase. Should I close this PR and open a new one or use this one?

@slava77
Copy link
Contributor

slava77 commented Sep 26, 2014

you can try here, you will see if the history come out cleaner (I have my doubts ;) )
If it will, the irrelevant signatures should go away and the web-based diff should become much smaller

.. if not, make a new one

@rappoccio
Copy link
Contributor Author

OK merged here. It doesn't seem to have gotten cleaner hehehehe.

I will make a new PR then.

@rappoccio rappoccio closed this Sep 26, 2014
@rappoccio rappoccio mentioned this pull request Sep 26, 2014
@rappoccio
Copy link
Contributor Author

For the record : new PR is #5588.

@rappoccio rappoccio deleted the rappoccio_AK5toAK4_72x_noHLT branch November 3, 2014 21:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment