diff --git a/Rich/RichFutureKernel/src/component/RichBaseTests.cpp b/Rich/RichFutureKernel/src/component/RichBaseTests.cpp
index 833e454731b97856e7049546941d56e360da5a3e..00c2463ffbb0851e7bce852ddd0ef817f70589b8 100644
--- a/Rich/RichFutureKernel/src/component/RichBaseTests.cpp
+++ b/Rich/RichFutureKernel/src/component/RichBaseTests.cpp
@@ -24,58 +24,111 @@ namespace Rich::Future::Tests {
template <typename HIST>
class HistoTestBase final
: public LHCb::Algorithm::Consumer<void(), Gaudi::Functional::Traits::BaseClass_t<HistoAlgBase>> {
+ private:
+ // variable type from hist
+ using T = param_t<HIST>;
+ // constants
+ static constexpr T minVar{0};
+ static constexpr T maxVar{100};
+ static constexpr std::uint16_t nBins{100};
+ /// test array of (optional) hists.
+ /// Note last entry is intentionally uninitialised to test handling this scenario.
+ mutable Hist::Array<HIST, 3> m_h;
+
public:
HistoTestBase( const std::string& name, ISvcLocator* pSvcLocator ) : Consumer( name, pSvcLocator ) {
setProperty( "HistoPrint", true ).ignore();
}
auto shoot() const {
- using T = param_t<HIST>;
- static T var = 0;
+ static T var = minVar;
+ T res{0};
if constexpr ( std::is_floating_point_v<T> ) {
- return std::remainder( var++, T{100} );
+ static constexpr T inc = ( maxVar - minVar ) / ( 10 * nBins );
+ res = var;
+ var += inc;
} else {
- return var++ % T{100};
+ res = var++;
}
+ if ( var > maxVar ) { var = minVar; }
+ debug() << "shoot " << res << endmsg;
+ return res;
}
void operator()() const override {
std::size_t iFill = 0;
auto h_b = m_h.buffer(); // test buffers
- while ( iFill++ < 50 ) {
- const auto i = ( iFill % 2 );
- if constexpr ( is_1d_v<HIST> ) {
- if constexpr ( is_weighted_v<HIST> ) {
- if constexpr ( is_profile_v<HIST> ) {
- m_h[i][shoot()] += {shoot(), shoot()};
- h_b[i][shoot()] += {shoot(), shoot()};
- } else if constexpr ( is_hist_v<HIST> ) {
- m_h[i][shoot()] += shoot();
- h_b[i][shoot()] += shoot();
+ while ( ++iFill <= 50 ) {
+ const auto a = shoot();
+ const auto b = shoot();
+ const auto c = shoot();
+ const auto d = shoot();
+ for ( const auto i : {0, 1} ) {
+ if constexpr ( is_1d_v<HIST> ) {
+ if constexpr ( is_weighted_v<HIST> ) {
+ if constexpr ( is_profile_v<HIST> ) {
+ debug() << "Filling W1DP " << a << " " << b << " " << c << endmsg;
+ if ( 0 == i ) {
+ m_h[i][a] += {b, c};
+ } else {
+ h_b[i][a] += {b, c};
+ }
+ } else if constexpr ( is_hist_v<HIST> ) {
+ debug() << "Filling W1DH " << a << " " << b << endmsg;
+ if ( 0 == i ) {
+ m_h[i][a] += b;
+ } else {
+ h_b[i][a] += b;
+ }
+ }
+ } else if constexpr ( is_not_weighted_v<HIST> ) {
+ if constexpr ( is_profile_v<HIST> ) {
+ debug() << "Filling 1DP " << a << " " << b << endmsg;
+ if ( 0 == i ) {
+ m_h[i][a] += b;
+ } else {
+ h_b[i][a] += b;
+ }
+ } else if constexpr ( is_hist_v<HIST> ) {
+ debug() << "Filling 1D " << a << endmsg;
+ if ( 0 == i ) {
+ ++m_h[i][a];
+ } else {
+ ++h_b[i][a];
+ }
+ }
}
- } else if constexpr ( is_not_weighted_v<HIST> ) {
- if constexpr ( is_profile_v<HIST> ) {
- m_h[i][shoot()] += shoot();
- h_b[i][shoot()] += shoot();
- } else if constexpr ( is_hist_v<HIST> ) {
- ++m_h[i][shoot()];
- ++h_b[i][shoot()];
- }
- }
- } else if constexpr ( is_2d_v<HIST> ) {
- if constexpr ( is_weighted_v<HIST> ) {
- if constexpr ( is_profile_v<HIST> ) {
- m_h[i][{shoot(), shoot()}] += {shoot(), shoot()};
- h_b[i][{shoot(), shoot()}] += {shoot(), shoot()};
- } else if constexpr ( is_hist_v<HIST> ) {
- m_h[i][{shoot(), shoot()}] += shoot();
- h_b[i][{shoot(), shoot()}] += shoot();
- }
- } else if constexpr ( is_not_weighted_v<HIST> ) {
- if constexpr ( is_profile_v<HIST> ) {
- m_h[i][{shoot(), shoot()}] += shoot();
- h_b[i][{shoot(), shoot()}] += shoot();
- } else if constexpr ( is_hist_v<HIST> ) {
- ++m_h[i][{shoot(), shoot()}];
- ++h_b[i][{shoot(), shoot()}];
+ } else if constexpr ( is_2d_v<HIST> ) {
+ if constexpr ( is_weighted_v<HIST> ) {
+ if constexpr ( is_profile_v<HIST> ) {
+ debug() << "Filling W2DP " << a << " " << b << " " << c << " " << d << endmsg;
+ if ( 0 == i ) {
+ m_h[i][{a, b}] += {c, d};
+ } else {
+ h_b[i][{a, b}] += {c, d};
+ }
+ } else if constexpr ( is_hist_v<HIST> ) {
+ debug() << "Filling W2DH " << a << " " << b << " " << c << endmsg;
+ if ( 0 == i ) {
+ m_h[i][{a, b}] += c;
+ } else {
+ h_b[i][{a, b}] += c;
+ }
+ }
+ } else if constexpr ( is_not_weighted_v<HIST> ) {
+ if constexpr ( is_profile_v<HIST> ) {
+ debug() << "Filling 2DP " << a << " " << b << " " << c << endmsg;
+ if ( 0 == i ) {
+ m_h[i][{a, b}] += c;
+ } else {
+ h_b[i][{a, b}] += c;
+ }
+ } else if constexpr ( is_hist_v<HIST> ) {
+ debug() << "Filling 2DH " << a << " " << b << endmsg;
+ if ( 0 == i ) {
+ ++m_h[i][{a, b}];
+ } else {
+ ++h_b[i][{a, b}];
+ }
+ }
}
}
}
@@ -89,22 +142,19 @@ namespace Rich::Future::Tests {
<< " W=" << is_weighted_v<HIST> << " NW=" << is_not_weighted_v<HIST> << endmsg;
bool ok = true;
if constexpr ( is_1d_v<HIST> ) {
- ok &= initHist( m_h[0], HID( "testH1D0" ), "Test 1D Histogram 0", 0, 100, 100, "Rand Number", "Entries" );
- ok &= initHist( m_h[1], HID( "testH1D1" ), "Test 1D Histogram 1", 0, 100, 100, "Rand Number", "Entries" );
+ ok &= initHist( m_h[0], HID( "testH1D0" ), "Test 1D Histogram 0", //
+ minVar, maxVar, nBins, "Rand Number", "Entries" );
+ ok &= initHist( m_h[1], HID( "testH1D1" ), "Test 1D Histogram 1", //
+ minVar, maxVar, nBins, "Rand Number", "Entries" );
}
if constexpr ( is_2d_v<HIST> ) {
ok &= initHist( m_h[0], HID( "testH2D0" ), "Test 2D Histogram 0", //
- 0, 100, 100, 0, 100, 100, "Rand Number", "Rand Number", "Entries" );
+ minVar, maxVar, nBins, minVar, maxVar, nBins, "Rand Number", "Rand Number", "Entries" );
ok &= initHist( m_h[1], HID( "testH2D1" ), "Test 2D Histogram 1", //
- 0, 100, 100, 0, 100, 100, "Rand Number", "Rand Number", "Entries" );
+ minVar, maxVar, nBins, minVar, maxVar, nBins, "Rand Number", "Rand Number", "Entries" );
}
return StatusCode{ok};
}
-
- private:
- /// test array of (optional) hists.
- /// Note last entry is intentionally uninitialised to test handling this scenario.
- mutable Hist::Array<HIST, 3> m_h;
};
DECLARE_COMPONENT_WITH_ID( HistoTestBase<H1D<>>, "RichTestH1DD" )
diff --git a/Rich/RichFutureKernel/tests/options/Histograms.py b/Rich/RichFutureKernel/tests/options/Histograms.py
index 7ba7401402d3291b9e85d231e1f9398cb44bd3ac..86fceaf8f0353c294e05997a7acc8f7ece637217 100644
--- a/Rich/RichFutureKernel/tests/options/Histograms.py
+++ b/Rich/RichFutureKernel/tests/options/Histograms.py
@@ -21,6 +21,7 @@ from Configurables import RichTestH1DI, RichTestP1DI, RichTestH2DI, RichTestP2DI
# Histo printout should be disabled if either of these is WARNING or above
outLevel = INFO
+#outLevel = DEBUG
MessageSvc().OutputLevel = INFO
algs = [
diff --git a/Rich/RichFutureKernel/tests/refs/histograms.ref b/Rich/RichFutureKernel/tests/refs/histograms.ref
index 58fc1d5abf6e1cca0b7e6d1ae4149b70c86e0553..b9a421c089cb7ebac1dcb19a65f9e5d82ca896bf 100644
--- a/Rich/RichFutureKernel/tests/refs/histograms.ref
+++ b/Rich/RichFutureKernel/tests/refs/histograms.ref
@@ -63,41 +63,41 @@ ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
RichTestH1DD INFO 1D histograms in directory "RichTestH1DD" : 2
| ID | Title | # | Mean | RMS | Skewness | Kurtosis |
- | /RICH/RichTestH1DD/testH1D0 | "Test 1D Histogram 0;Rand Number;Entries" | 50000 | 25.52 | 14.143 | 0.0091834 | -1.1995 |
- | /RICH/RichTestH1DD/testH1D1 | "Test 1D Histogram 1;Rand Number;Entries" | 50000 | 25 | 14.975 | 0 | -1.2116 |
+ | /RICH/RichTestH1DD/testH1D0 | "Test 1D Histogram 0;Rand Number;Entries" | 50000 | 49.971 | 28.870 | -0.0019763 | -1.1992 |
+ | /RICH/RichTestH1DD/testH1D1 | "Test 1D Histogram 1;Rand Number;Entries" | 50000 | 49.971 | 28.870 | -0.0019763 | -1.1992 |
RichTestH1DF INFO 1D histograms in directory "RichTestH1DF" : 2
| ID | Title | # | Mean | RMS | Skewness | Kurtosis |
- | /RICH/RichTestH1DF/testH1D0 | "Test 1D Histogram 0;Rand Number;Entries" | 50000 | 25.52 | 14.143 | 0.0091834 | -1.1995 |
- | /RICH/RichTestH1DF/testH1D1 | "Test 1D Histogram 1;Rand Number;Entries" | 50000 | 25 | 14.975 | 0 | -1.2116 |
+ | /RICH/RichTestH1DF/testH1D0 | "Test 1D Histogram 0;Rand Number;Entries" | 50000 | 49.941 | 28.851 | 0.001588 | -1.1972 |
+ | /RICH/RichTestH1DF/testH1D1 | "Test 1D Histogram 1;Rand Number;Entries" | 50000 | 49.941 | 28.851 | 0.001588 | -1.1972 |
RichTestH1DI INFO 1D histograms in directory "RichTestH1DI" : 2
| ID | Title | # | Mean | RMS | Skewness | Kurtosis |
- | /RICH/RichTestH1DI/testH1D0 | "Test 1D Histogram 0;Rand Number;Entries" | 50000 | 51 | 28.849 | 0 | -1.2031 |
- | /RICH/RichTestH1DI/testH1D1 | "Test 1D Histogram 1;Rand Number;Entries" | 50000 | 49 | 28.849 | 0 | -1.2031 |
+ | /RICH/RichTestH1DI/testH1D0 | "Test 1D Histogram 0;Rand Number;Entries" | 50000 | 49.996 | 28.868 | 0.00011879 | -1.2003 |
+ | /RICH/RichTestH1DI/testH1D1 | "Test 1D Histogram 1;Rand Number;Entries" | 50000 | 49.996 | 28.868 | 0.00011879 | -1.2003 |
RichTestWH1DD INFO 1D histograms in directory "RichTestWH1DD" : 2
| ID | Title | # | Mean | RMS | Skewness | Kurtosis |
- | /RICH/RichTestWH1DD/testH1D0 | "Test 1D Histogram 0;Rand Number;Entries" | 50000 | 34.167 | 11.528 | -0.56675 | -0.60602 |
- | /RICH/RichTestWH1DD/testH1D1 | "Test 1D Histogram 1;Rand Number;Entries" | 50000 | 34.167 | 11.528 | -0.56675 | -0.60602 |
+ | /RICH/RichTestWH1DD/testH1D0 | "Test 1D Histogram 0;Rand Number;Entries" | 50000 | 66.56 | 23.549 | -0.56731 | -0.59362 |
+ | /RICH/RichTestWH1DD/testH1D1 | "Test 1D Histogram 1;Rand Number;Entries" | 50000 | 66.56 | 23.549 | -0.56731 | -0.59362 |
RichTestWH1DF INFO 1D histograms in directory "RichTestWH1DF" : 2
| ID | Title | # | Mean | RMS | Skewness | Kurtosis |
- | /RICH/RichTestWH1DF/testH1D0 | "Test 1D Histogram 0;Rand Number;Entries" | 50000 | 34.167 | 11.528 | -0.56675 | -0.60602 |
- | /RICH/RichTestWH1DF/testH1D1 | "Test 1D Histogram 1;Rand Number;Entries" | 50000 | 34.167 | 11.528 | -0.56675 | -0.60602 |
+ | /RICH/RichTestWH1DF/testH1D0 | "Test 1D Histogram 0;Rand Number;Entries" | 50000 | 66.52 | 23.558 | -0.56176 | -0.60359 |
+ | /RICH/RichTestWH1DF/testH1D1 | "Test 1D Histogram 1;Rand Number;Entries" | 50000 | 66.52 | 23.558 | -0.56176 | -0.60359 |
RichTestP1DD INFO 1D profile histograms in directory "RichTestP1DD" : 2
| ID | Title | # | Mean | RMS | Skewness | Kurtosis |
- | /RICH/RichTestP1DD/testH1D0 | "Test 1D Histogram 0;Rand Number;Entries" | 25000 | 24.5 | 14.422 | 0 | -1.2038 |
- | /RICH/RichTestP1DD/testH1D1 | "Test 1D Histogram 1;Rand Number;Entries" | 25000 | 24.5 | 14.422 | 0 | -1.2038 |
+ | /RICH/RichTestP1DD/testH1D0 | "Test 1D Histogram 0;Rand Number;Entries" | 50000 | 48.971 | 28.870 | -0.0019763 | -1.1992 |
+ | /RICH/RichTestP1DD/testH1D1 | "Test 1D Histogram 1;Rand Number;Entries" | 50000 | 48.971 | 28.870 | -0.0019763 | -1.1992 |
RichTestP1DF INFO 1D profile histograms in directory "RichTestP1DF" : 2
| ID | Title | # | Mean | RMS | Skewness | Kurtosis |
- | /RICH/RichTestP1DF/testH1D0 | "Test 1D Histogram 0;Rand Number;Entries" | 25000 | 24.5 | 14.422 | 6.5108e-07 | -1.2039 |
- | /RICH/RichTestP1DF/testH1D1 | "Test 1D Histogram 1;Rand Number;Entries" | 25000 | 24.5 | 14.422 | 6.5108e-07 | -1.2039 |
+ | /RICH/RichTestP1DF/testH1D0 | "Test 1D Histogram 0;Rand Number;Entries" | 50000 | 48.941 | 28.851 | 0.0015863 | -1.1972 |
+ | /RICH/RichTestP1DF/testH1D1 | "Test 1D Histogram 1;Rand Number;Entries" | 50000 | 48.941 | 28.851 | 0.0015863 | -1.1972 |
RichTestP1DI INFO 1D profile histograms in directory "RichTestP1DI" : 2
| ID | Title | # | Mean | RMS | Skewness | Kurtosis |
- | /RICH/RichTestP1DI/testH1D0 | "Test 1D Histogram 0;Rand Number;Entries" | 50000 | 50.5 | 28.862 | 0 | -1.201 |
- | /RICH/RichTestP1DI/testH1D1 | "Test 1D Histogram 1;Rand Number;Entries" | 50000 | 50.5 | 28.862 | 0 | -1.201 |
+ | /RICH/RichTestP1DI/testH1D0 | "Test 1D Histogram 0;Rand Number;Entries" | 50000 | 49.996 | 28.868 | 0.00011879 | -1.2003 |
+ | /RICH/RichTestP1DI/testH1D1 | "Test 1D Histogram 1;Rand Number;Entries" | 50000 | 49.996 | 28.868 | 0.00011879 | -1.2003 |
RichTestWP1DD INFO 1D profile histograms in directory "RichTestWP1DD" : 2
| ID | Title | # | Mean | RMS | Skewness | Kurtosis |
- | /RICH/RichTestWP1DD/testH1D0 | "Test 1D Histogram 0;Rand Number;Entries" | 50000 | 0.50456 | 0.41173 | 96.152 | 9617.8 |
- | /RICH/RichTestWP1DD/testH1D1 | "Test 1D Histogram 1;Rand Number;Entries" | 50000 | 34.539 | 11.674 | -0.55601 | -0.61011 |
+ | /RICH/RichTestWP1DD/testH1D0 | "Test 1D Histogram 0;Rand Number;Entries" | 50000 | 66.461 | 23.550 | -0.56714 | -0.59369 |
+ | /RICH/RichTestWP1DD/testH1D1 | "Test 1D Histogram 1;Rand Number;Entries" | 50000 | 66.461 | 23.550 | -0.56715 | -0.59366 |
RichTestWP1DF INFO 1D profile histograms in directory "RichTestWP1DF" : 2
| ID | Title | # | Mean | RMS | Skewness | Kurtosis |
- | /RICH/RichTestWP1DF/testH1D0 | "Test 1D Histogram 0;Rand Number;Entries" | 50000 | 0.50456 | 0.41173 | 96.152 | 9617.8 |
- | /RICH/RichTestWP1DF/testH1D1 | "Test 1D Histogram 1;Rand Number;Entries" | 50000 | 34.539 | 11.674 | -0.55601 | -0.61011 |
+ | /RICH/RichTestWP1DF/testH1D0 | "Test 1D Histogram 0;Rand Number;Entries" | 50000 | 66.421 | 23.559 | -0.5616 | -0.60361 |
+ | /RICH/RichTestWP1DF/testH1D1 | "Test 1D Histogram 1;Rand Number;Entries" | 50000 | 66.421 | 23.559 | -0.5616 | -0.60361 |