Skip to content
Snippets Groups Projects

Add km3net dataformat

Merged Zineb Aly requested to merge add-km3net-Dataformat into master

This closes issue #21 (closed)

Edited by Zineb Aly

Merge request reports

Pipeline #8234 passed with warnings

Pipeline passed with warnings for 20d89e6f on add-km3net-Dataformat

Test coverage 98.85% (0.07%) from 1 job
Approval is optional

Merged by Tamas GalTamas Gal 5 years ago (Feb 4, 2020 12:43pm UTC)

Merge details

  • Changes merged into master with b2f11999 (commits were squashed).
  • Deleted the source branch.

Pipeline #8243 passed with warnings

Pipeline passed with warnings for b2f11999 on master

Test coverage 98.85% (0.07%) from 1 job

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
45 45 # there are 18 fit keys
46 46 self.assertEqual(len(self.keys.fit_keys), 18)
47 47
48 def test_trigger(self):
49 # there are 4 trigger keys in v1.1.2 of km3net-Dataformat
50 trigger = self.keys.trigger
51 keys = ['JTRIGGER3DSHOWER', 'JTRIGGERMXSHOWER',
52 'JTRIGGER3DMUON', 'JTRIGGERNB']
53
54 self.assertListEqual(keys, [*trigger.keys()])
  • Tamas Gal
    Tamas Gal @tgal started a thread on the diff
  • 45 45 # there are 18 fit keys
    46 46 self.assertEqual(len(self.keys.fit_keys), 18)
    47 47
    48 def test_trigger(self):
    49 # there are 4 trigger keys in v1.1.2 of km3net-Dataformat
    50 trigger = self.keys.trigger
    51 keys = ['JTRIGGER3DSHOWER', 'JTRIGGERMXSHOWER',
    52 'JTRIGGER3DMUON', 'JTRIGGERNB']
    53
    54 self.assertListEqual(keys, [*trigger.keys()])
    55 self.assertListEqual([1, 2, 4, 5], [*trigger.values()])
    56
    57 def test_reconstruction(self):
    58 # there are 34 parameters in v1.1.2 of km3net-Dataformat
    59 reco = self.keys.reconstruction
    60 keys = ['JPP_RECONSTRUCTION_TYPE', 'JMUONFIT', 'JMUONBEGIN',
  • Tamas Gal marked as a Work In Progress

    marked as a Work In Progress

  • added api enhancement labels

  • Zineb Aly added 1 commit

    added 1 commit

    Compare with previous version

  • Zineb Aly added 2 commits

    added 2 commits

    Compare with previous version

  • Zineb Aly added 1 commit

    added 1 commit

    • 6fe49012 - adapt tracks to fitparameters

    Compare with previous version

  • Zineb Aly unmarked as a Work In Progress

    unmarked as a Work In Progress

  • Zineb Aly changed the description

    changed the description

  • Author Maintainer

    @tgal This is ready to merge into the master branch ;)

  • Alright :)

  • We still have merge conflicts :see_no_evil:

  • Tamas Gal added 3 commits

    added 3 commits

    Compare with previous version

  • I fixed them. Let's wait for the pipeline and merge. Thanks!

  • Tamas Gal enabled an automatic merge when the pipeline for 3321d2a9 succeeds

    enabled an automatic merge when the pipeline for 3321d2a9 succeeds

  • Zineb Aly aborted the automatic merge because source branch was updated

    aborted the automatic merge because source branch was updated

  • Zineb Aly added 1 commit

    added 1 commit

    Compare with previous version

  • Zineb Aly added 1 commit

    added 1 commit

    Compare with previous version

  • Author Maintainer

    I think we are good to merge now ;) (hopefully!)

  • merged

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading