Skip to content

First commit of the DQ FilterPP, CutsLibrary and HistogramsLibrary - #4902

Merged
jgrosseo merged 5 commits into
AliceO2Group:devfrom
iarsene:dev
Dec 2, 2020
Merged

First commit of the DQ FilterPP, CutsLibrary and HistogramsLibrary#4902
jgrosseo merged 5 commits into
AliceO2Group:devfrom
iarsene:dev

Conversation

@iarsene

@iarsene iarsene commented Nov 23, 2020

Copy link
Copy Markdown
Collaborator
  1. FilterPP
    Produces a bit field column with DQ related decisions, to be used for the DQ high level triggering studies in high lumi pp collisions. Event, track and pair selections are configurables, picked up from the CutsLibrary
  2. CutsLibrary
    Collection of several widely used cuts, to be loaded in analysis tasks. Cuts are identified by a string, at init() time, and can be provided via configurables, or hardcoded in the task body.
  3. HistogramsLibrary
    Adds predefined collections of histograms to the histogram manager and a given histogram class.
  4. Various other updates to support these changes.

Ionut Arsene
Squashed commit of the following:
513816f 
commit b604a6b951b977e575da71961b2a443a97e0c11a
Author: Ionut Arsene <iarsene@cern.ch>
Date:   Mon Nov 23 17:43:30 2020 +0100

    clang fixes

commit 781746f8a8086e8ed5b77b925b873f690fe4de04
Author: Ionut Arsene <iarsene@cern.ch>
Date:   Mon Nov 23 17:25:42 2020 +0100

    Squashed commit of the following:

    commit 9dd23cef2ad9581f4ceec596df5dcb8f08a61e1d
    Author: Ionut Arsene <iarsene@cern.ch>
    Date:   Mon Nov 23 17:18:12 2020 +0100

        First commit of the HistogramsLibrary; updates in various places to use the histogram library

    commit 937e1c5a973c2c25bbd62696cdd8d5c3c2922772
    Merge: db3ae836ee 807d607
    Author: Ionut Arsene <iarsene@cern.ch>
    Date:   Mon Nov 23 09:46:58 2020 +0100

        Updated the call for FillPair() in dileptonMuMu task; solved conflicts
        Merge branch 'dev' of https://github.com/AliceO2Group/AliceO2 into dqEventFilter2

    commit db3ae836eef72145b84c9d8d66a90b567e66bbfb
    Author: Ionut Arsene <iarsene@cern.ch>
    Date:   Mon Nov 23 09:37:49 2020 +0100

        Added a workflow for pp events filtering; Added cuts library

commit 338151a2d184891479974aeded726e754cf03517
Merge: 27a75b9 aec3bf5
Author: Ionut Arsene <iarsene@cern.ch>
Date:   Mon Nov 23 17:23:04 2020 +0100

    Merge branch 'dev' of https://github.com/AliceO2Group/AliceO2 into dev

commit 27a75b9
Author: Ionut Arsene <iarsene@cern.ch>
Date:   Fri Nov 6 12:14:07 2020 +0100

    clang fix

commit ef8206a
Author: Ionut Arsene <iarsene@cern.ch>
Date:   Fri Nov 6 11:55:56 2020 +0100

    Optimizations and small fixes

    Squashed commit of the following:

    commit e0ac92b303c6c9dbf4ecadd04a0299d9db566a79
    Author: Ionut Arsene <iarsene@cern.ch>
    Date:   Fri Nov 6 11:11:31 2020 +0100

        small fix for thr kIsSPDany variable

    commit 773b845c684d76717f61f5392c3be2567010e4ac
    Author: Ionut Arsene <iarsene@cern.ch>
    Date:   Thu Nov 5 16:16:59 2020 +0100

        Call .reserve() for the muon tables

    commit 8c7981e7eb092a2f63848d5214f72a99840c1387
    Merge: 8a0d37e09a d570677
    Author: Ionut Arsene <iarsene@cern.ch>
    Date:   Thu Nov 5 09:04:48 2020 +0100

        Merge branch 'dev' of https://github.com/AliceO2Group/AliceO2 into dev

    commit 8a0d37e09ac8f615a5000a87667e600a36135bd5
    Author: Ionut Arsene <iarsene@cern.ch>
    Date:   Thu Nov 5 09:03:45 2020 +0100

        clang fixes

    commit 8eaaf21e08815080c91c428a51353e42b4c073d3
    Author: Ionut Arsene <iarsene@cern.ch>
    Date:   Thu Nov 5 08:59:41 2020 +0100

        track-selection decisions added to the skimmed track filtering tag

    commit eab1326d6ed4a5d9ac4dadeabaabf24c0c53cbab
    Merge: bf202e00f4 a8a9dab
    Author: Ionut Arsene <iarsene@cern.ch>
    Date:   Fri Oct 30 22:28:34 2020 +0100

        Merge branch 'dev' of https://github.com/AliceO2Group/AliceO2 into dev

    commit bf202e00f4da6c419de5b263e04b3ff3a756e304
    Author: Ionut Arsene <iarsene@cern.ch>
    Date:   Fri Oct 30 22:13:22 2020 +0100

        Partitions added in tableMaker and other optimizations

    commit 0644b00176c1be2c1a4729c9ca64ed9b8426c917
    Merge: 233691d4e5 9b7f1f7
    Author: Ionut Arsene <iarsene@cern.ch>
    Date:   Tue Oct 20 12:21:23 2020 +0200

        Merge branch 'dev' of https://github.com/AliceO2Group/AliceO2 into dev

    commit 233691d4e51d0a454a3f9b2a11e690c997f2da3d
    Merge: 967c061a93 341158b
    Author: Ionut Arsene <iarsene@cern.ch>
    Date:   Wed Oct 14 10:22:15 2020 +0200

        Merge branch 'dev' of https://github.com/AliceO2Group/AliceO2 into dev

    commit 967c061a937d7d9e4c3611f9b8dc03166cde17ff
    Merge: df2aa4e2c9 b60b2ca
    Author: Ionut Arsene <iarsene@cern.ch>
    Date:   Mon Oct 12 09:30:23 2020 +0200

        Merge branch 'dev' of https://github.com/AliceO2Group/AliceO2 into dev

    commit df2aa4e2c92e93713d081bf324c87679d931af95
    Merge: b0cd406 baab712
    Author: Ionut Arsene <iarsene@cern.ch>
    Date:   Fri Oct 9 15:41:33 2020 +0200

        Merge branch 'dev' of https://github.com/AliceO2Group/AliceO2 into dev

    commit b0cd406
    Author: Ionut Arsene <iarsene@cern.ch>
    Date:   Thu Oct 8 16:46:36 2020 +0200

        removed temporarilly the dilepton-hadron analysis task from workflow

    commit 32985c2
    Author: Ionut Arsene <iarsene@cern.ch>
    Date:   Thu Oct 8 15:39:43 2020 +0200

        fixup! Several changes. More variables added in VarManager; TableMaker applies tighter selection track cuts; Output object for histograms changed to take the HistogramManager master histogram list instead of the manager itself.

    commit 182829a
    Author: Ionut Arsene <iarsene@cern.ch>
    Date:   Thu Oct 8 15:32:08 2020 +0200

        Several changes. More variables added in VarManager; TableMaker applies tighter selection track cuts; Output object for histograms
        changed to take the HistogramManager master histogram list instead of the manager itself.

    commit 4195887
    Merge: ddcf87d 2a6805b
    Author: Ionut Arsene <iarsene@cern.ch>
    Date:   Thu Oct 8 13:18:19 2020 +0200

        Merge branch 'dev' of https://github.com/AliceO2Group/AliceO2 into dev

    commit ddcf87d
    Merge: 6a637d5 d39deb0
    Author: Ionut Arsene <iarsene@cern.ch>
    Date:   Wed Oct 7 12:26:45 2020 +0200

        Merge branch 'dev' of https://github.com/AliceO2Group/AliceO2 into dev

    commit 6a637d5
    Author: Ionut Arsene <iarsene@cern.ch>
    Date:   Thu Sep 17 18:14:41 2020 +0200

        clang

    commit e0a7d96
    Author: Ionut Arsene <iarsene@cern.ch>
    Date:   Thu Sep 17 18:13:27 2020 +0200

        removed tof and tpc pid response from table maker
@iarsene
iarsene requested a review from jgrosseo as a code owner November 23, 2020 16:57
@jgrosseo

jgrosseo commented Nov 24, 2020

Copy link
Copy Markdown
Collaborator

Changes are fine, but there are checkcode errors

@iarsene

iarsene commented Nov 24, 2020

Copy link
Copy Markdown
Collaborator Author

Hi Jan,
The checkcode complains about the namespace naming convention (for underscores) and i am not sure to what is referring. I use no underscores in namespace naming. Anyway, i changed all the namespace names to lower cases, since its the only pattern i see i might break wrt to what i see defined in other places.
Cheers, Ionut

jgrosseo
jgrosseo previously approved these changes Nov 24, 2020
View reviewed changes
@iarsene

iarsene commented Nov 24, 2020

Copy link
Copy Markdown
Collaborator Author

The dataflow error seems unrelated

@jgrosseo

jgrosseo commented Nov 24, 2020

Copy link
Copy Markdown
Collaborator

1 more checkcode...

@iarsene

iarsene commented Nov 29, 2020

Copy link
Copy Markdown
Collaborator Author

Hi @jgrosseo, this PR and others seem to be in the same situation. Should we merge them or we still wait for the tests to succeed ?

@jgrosseo
jgrosseo merged commit 176183c into AliceO2Group:dev Dec 2, 2020
@jgrosseo

jgrosseo commented Dec 2, 2020

Copy link
Copy Markdown
Collaborator

MacOS CI hasn't been rerun since 3 days, seems to be unrelated

EmilGorm pushed a commit to EmilGorm/AliceO2 that referenced this pull request Nov 22, 2021
@iarsene @jgrosseo
First commit of the DQ FilterPP, CutsLibrary and HistogramsLibrary (A…
12f67e6 
…liceO2Group#4902)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jgrosseo jgrosseo jgrosseo left review comments

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@iarsene @jgrosseo @ktf