Skip to content
Snippets Groups Projects

Mag field cache opt

Merged R D Schaffer requested to merge ATLAS-EGamma/athena:magFieldCache-opt into master
All threads resolved!

Testing a possible optimization of the zone/mesh field passing to BFieldCache which is done each time a new zone is required by AtlasFieldCache::getField. Must pass the b-field components of z,r,phi for the eight corners of a zone. Testing an explicit initialization of a matrix plot memory copy in BFieldCache - need to pick up corners, and the matrix in BFieldCache is [3][8] whereas locally it is stored as [xx][3].

@christos @amoussa

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Christos Anastopoulos resolved all threads

    resolved all threads

  • I'm getting merge conflicts (I think) and cannot merge. (Gitlab is being very odd tonight, hence my uncertainty)

    Yep, I now see

    Merge failed: Conflicts detected during merge. Please try again.
    Edited by Edward Moyse
  • R D Schaffer added 184 commits

    added 184 commits

    • 9bab60b1...3f4ed5fa - 183 commits from branch atlas:master
    • 148c8369 - Merge remote-tracking branch 'upstream/master' into magFieldCache-opt

    Compare with previous version

  • Author Developer

    ok, fetched upstream and merged it in...

  • This merge request affects 1 package:

    • MagneticField/MagFieldElements
  • :negative_squared_cross_mark: CI Result FAILURE (hash 148c8369)

    Athena AthSimulation AthGeneration AnalysisBase
    externals :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    make :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    required tests :o: :white_check_mark: :white_check_mark: :white_check_mark:
    optional tests :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:

    Full details available on this CI monitor view
    :white_check_mark: Athena: number of compilation errors 0, warnings 0
    :white_check_mark: AthSimulation: number of compilation errors 0, warnings 0
    :white_check_mark: AthGeneration: number of compilation errors 0, warnings 0
    :white_check_mark: AnalysisBase: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 18956]

  • Author Developer

    Hmm. Number of jets changed for two events in q431. This was only after the merge from upstream. The changes I had added were ok in the previous test, and I didn't change the code since. I am not sure what I should do now... My changes should NOT change any results. I can test again to see if I find anything that might have changed...

  • Hi @schaffer - no, this is unrelated. It's being discussed on mattermost and a fix should be imminent.

    https://mattermost.web.cern.ch/atlassoftware/channels/merge-request-shifter

  • added review-approved label and removed review-pending-level-1 label

  • merged

  • Edward Moyse mentioned in commit 83306da3

    mentioned in commit 83306da3

  • Author Developer

    Hi @emoyse,

    Thanks. I suspected as much. I cannot access the mattermost thread, but I suppose that this is for shifters...

  • It's not just for shifters - it's also for developers to chat to the shifters (i.e. to flag issues, find out what's going on or to request an urgent review).

    I noticed you weren't added to the atlassoftware mattermost group. Fixed!

  • Author Developer

    thanks @emoyse

  • Please register or sign in to reply
    Loading