-
Notifications
You must be signed in to change notification settings - Fork 488
Fixed bug for nested AnalysisCompositeCuts; removed duplicated histogram classes from TableReader #5039
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
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit 5f95221e7172916cd67cd3d568440ca4bf09b3ec
Author: Ionut Arsene <iarsene@cern.ch>
Date: Wed Dec 9 16:11:44 2020 +0100
added the composite cut list in the constructor initializer list
commit 1fe24d5b8d140f42d83565df17c0a751ddb0dacd
Author: Ionut Arsene <iarsene@cern.ch>
Date: Wed Dec 9 12:42:33 2020 +0100
clang fixes
commit f70f65cc95c715b160687828cad94a7c9a5cd9b5
Author: Ionut Arsene <iarsene@cern.ch>
Date: Wed Dec 9 12:41:56 2020 +0100
clang fixes
commit 3d13ecee9a83598cc3dd37a5e7e65d4030c96039
Author: Ionut Arsene <iarsene@cern.ch>
Date: Wed Dec 9 12:38:07 2020 +0100
Bug fix to allow nested composite cuts (composite cuts of composite cuts); remove duplicate histogram classes from table-reader
commit 592862f9e21e156b62f4616f00b98523e04eb155
Merge: 453d9e2cd7 8fbf7d0
Author: Ionut Arsene <iarsene@cern.ch>
Date: Tue Dec 8 21:49:51 2020 +0100
Merge branch 'dev' of https://github.com/AliceO2Group/AliceO2 into dev
commit 453d9e2cd7871b1e9231dd7bf55378393723a15a
Merge: f74387c da6a51f
Author: Ionut Arsene <iarsene@cern.ch>
Date: Wed Dec 2 10:58:07 2020 +0100
Merge branch 'dev' of https://github.com/AliceO2Group/AliceO2 into dev
commit f74387c
Author: Ionut Arsene <iarsene@cern.ch>
Date: Wed Nov 25 10:40:04 2020 +0100
checkcode fix
commit e4e9c6e
Author: Ionut Arsene <iarsene@cern.ch>
Date: Tue Nov 24 11:05:20 2020 +0100
clang fixes
commit 6bbb54b
Author: Ionut Arsene <iarsene@cern.ch>
Date: Tue Nov 24 11:01:04 2020 +0100
o2checkcode fixes (namespace naming)
commit 513816f
Author: Ionut Arsene <iarsene@cern.ch>
Date: Mon Nov 23 17:46:31 2020 +0100
Squashed commit of the following:
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
Collaborator
Author
|
The O2/o2 test shows up as failed now (was green before), but the error is unrelated to this PR. So i am merging |
EmilGorm
pushed a commit
to EmilGorm/AliceO2
that referenced
this pull request
Nov 22, 2021
commit 5f95221e7172916cd67cd3d568440ca4bf09b3ec
Author: Ionut Arsene <iarsene@cern.ch>
Date: Wed Dec 9 16:11:44 2020 +0100
added the composite cut list in the constructor initializer list
commit 1fe24d5b8d140f42d83565df17c0a751ddb0dacd
Author: Ionut Arsene <iarsene@cern.ch>
Date: Wed Dec 9 12:42:33 2020 +0100
clang fixes
commit f70f65cc95c715b160687828cad94a7c9a5cd9b5
Author: Ionut Arsene <iarsene@cern.ch>
Date: Wed Dec 9 12:41:56 2020 +0100
clang fixes
commit 3d13ecee9a83598cc3dd37a5e7e65d4030c96039
Author: Ionut Arsene <iarsene@cern.ch>
Date: Wed Dec 9 12:38:07 2020 +0100
Bug fix to allow nested composite cuts (composite cuts of composite cuts); remove duplicate histogram classes from table-reader
commit 592862f9e21e156b62f4616f00b98523e04eb155
Merge: 453d9e2cd7 8fbf7d0
Author: Ionut Arsene <iarsene@cern.ch>
Date: Tue Dec 8 21:49:51 2020 +0100
Merge branch 'dev' of https://github.com/AliceO2Group/AliceO2 into dev
commit 453d9e2cd7871b1e9231dd7bf55378393723a15a
Merge: f74387c da6a51f
Author: Ionut Arsene <iarsene@cern.ch>
Date: Wed Dec 2 10:58:07 2020 +0100
Merge branch 'dev' of https://github.com/AliceO2Group/AliceO2 into dev
commit f74387c
Author: Ionut Arsene <iarsene@cern.ch>
Date: Wed Nov 25 10:40:04 2020 +0100
checkcode fix
commit e4e9c6e
Author: Ionut Arsene <iarsene@cern.ch>
Date: Tue Nov 24 11:05:20 2020 +0100
clang fixes
commit 6bbb54b
Author: Ionut Arsene <iarsene@cern.ch>
Date: Tue Nov 24 11:01:04 2020 +0100
o2checkcode fixes (namespace naming)
commit 513816f
Author: Ionut Arsene <iarsene@cern.ch>
Date: Mon Nov 23 17:46:31 2020 +0100
Squashed commit of the following:
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
Co-authored-by: Ionut Arsene <iarsene@cern.ch>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
commit 5f95221e7172916cd67cd3d568440ca4bf09b3ec
Author: Ionut Arsene iarsene@cern.ch
Date: Wed Dec 9 16:11:44 2020 +0100
commit 1fe24d5b8d140f42d83565df17c0a751ddb0dacd
Author: Ionut Arsene iarsene@cern.ch
Date: Wed Dec 9 12:42:33 2020 +0100
commit f70f65cc95c715b160687828cad94a7c9a5cd9b5
Author: Ionut Arsene iarsene@cern.ch
Date: Wed Dec 9 12:41:56 2020 +0100
commit 3d13ecee9a83598cc3dd37a5e7e65d4030c96039
Author: Ionut Arsene iarsene@cern.ch
Date: Wed Dec 9 12:38:07 2020 +0100
commit 592862f9e21e156b62f4616f00b98523e04eb155
Merge: 453d9e2cd7 8fbf7d0
Author: Ionut Arsene iarsene@cern.ch
Date: Tue Dec 8 21:49:51 2020 +0100
commit 453d9e2cd7871b1e9231dd7bf55378393723a15a
Merge: f74387c da6a51f
Author: Ionut Arsene iarsene@cern.ch
Date: Wed Dec 2 10:58:07 2020 +0100
commit f74387c
Author: Ionut Arsene iarsene@cern.ch
Date: Wed Nov 25 10:40:04 2020 +0100
commit e4e9c6e
Author: Ionut Arsene iarsene@cern.ch
Date: Tue Nov 24 11:05:20 2020 +0100
commit 6bbb54b
Author: Ionut Arsene iarsene@cern.ch
Date: Tue Nov 24 11:01:04 2020 +0100
commit 513816f
Author: Ionut Arsene iarsene@cern.ch
Date: Mon Nov 23 17:46:31 2020 +0100