Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Gaudi
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Gaudi
Gaudi
Merge requests
!1439
Cleanup, fixes and new features around Sinks
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Cleanup, fixes and new features around Sinks
sponce_SinkFreefunctions
into
master
Overview
15
Commits
6
Pipelines
9
Changes
28
Merged
Sebastien Ponce
requested to merge
sponce_SinkFreefunctions
into
master
2 years ago
Overview
3
Commits
6
Pipelines
9
Changes
28
Expand
In details :
small fixes on the BaseSink interface
new regular flushing feature for BaseSink
a new flush method was added, called both at the end (finalize) and regularly if auto flush is activated (via non 0 AutoFlushPeriod property)
new unit testing for BaseSink, both for the regular flushing and previous existing (and not yet tested) features
replaced virtual methods toJSON, reset and mergeAndReset with free functions
adapted existing Sinks to new features
Edited
2 years ago
by
Sebastien Ponce
0
0
Merge request reports
Compare
master
version 8
12a50ef2
1 year ago
version 7
24c80e83
1 year ago
version 6
a4dca2c1
1 year ago
version 5
f75b7de9
2 years ago
version 4
899abc64
2 years ago
version 3
ed61ff78
2 years ago
version 2
8e79cace
2 years ago
version 1
8b5787c5
2 years ago
master (base)
and
latest version
latest version
d87e6d8c
6 commits,
1 year ago
version 8
12a50ef2
6 commits,
1 year ago
version 7
24c80e83
6 commits,
1 year ago
version 6
a4dca2c1
6 commits,
1 year ago
version 5
f75b7de9
5 commits,
2 years ago
version 4
899abc64
5 commits,
2 years ago
version 3
ed61ff78
4 commits,
2 years ago
version 2
8e79cace
4 commits,
2 years ago
version 1
8b5787c5
5 commits,
2 years ago
28 files
+
569
−
383
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
28
Search (e.g. *.vue) (Ctrl+P)
GaudiCommonSvc/include/GaudiCommonSvc/H1D.h
+
8
−
7
Options
@@ -8,11 +8,11 @@
* granted to it by virtue of its status as an Intergovernmental Organization *
* or submit itself to any jurisdiction. *
\***********************************************************************************/
#ifndef HISTOGRAMSVC_H1D_H
#define HISTOGRAMSVC_H1D_H 1
#pragma once
#include
"Generic1D.h"
#include
<AIDA/IHistogram1D.h>
#include
<Gaudi/Histograming/Sink/Utils.h>
#include
<GaudiKernel/DataObject.h>
#include
<TH1D.h>
@@ -47,10 +47,12 @@ namespace Gaudi {
void
adoptRepresentation
(
TObject
*
rep
)
override
;
/// set bin content (entries and centre are not used )
virtual
bool
setBinContents
(
int
i
,
int
entries
,
double
height
,
double
error
,
double
centre
);
//
/ need to
overwrite reset
to reset the sums
// overwrite reset
bool
reset
()
override
;
/// dumps Histogram to json data
nlohmann
::
json
toJSON
()
const
;
// free function reset
friend
void
reset
(
Histogram1D
&
h
)
{
h
.
reset
();
}
/// conversion to json via nlohmann library
friend
void
to_json
(
nlohmann
::
json
&
j
,
Gaudi
::
Histogram1D
const
&
h
)
{
j
=
*
h
.
m_rep
.
get
();
}
/// set histogram statistics
virtual
bool
setStatistics
(
int
allEntries
,
double
eqBinEntries
,
double
mean
,
double
rms
);
/// Fill the Profile1D with a value and the corresponding weight.
@@ -77,6 +79,5 @@ namespace Gaudi {
private
:
std
::
mutex
m_fillSerialization
;
};
// end class
I
Histogram1D
};
// end class Histogram1D
}
// end namespace Gaudi
#endif // HISTOGRAMSVC_H1D_H
Loading