Skip to content
Snippets Groups Projects

Revert some interface changes of THistSvc

Merged Martin Errenst requested to merge merrenst/Gaudi:THistSvc-180131 into master
1 file
+ 4
7
Compare changes
  • Side-by-side
  • Inline
@@ -2,9 +2,9 @@
#include "THistWrite.h"
#include "GaudiKernel/ITHistSvc.h"
#include "GaudiKernel/LockedHandle.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/RndmGenerators.h"
#include "GaudiKernel/LockedHandle.h"
#include <math.h>
#include "TDirectory.h"
@@ -74,7 +74,7 @@ StatusCode THistWrite::initialize()
if ( m_ths->regHist( "TempHist5", std::unique_ptr<TH1F>( h5 ) ).isFailure() ) {
error() << "Couldn't register TempHist5" << endmsg;
}
if( strcmp( h5->GetName(), "TempHist5" ) ){
if ( strcmp( h5->GetName(), "TempHist5" ) ) {
error() << "Couldn't use TempHist5 afterwards. getName = " << h5->GetName() << endmsg;
}
@@ -82,11 +82,10 @@ StatusCode THistWrite::initialize()
if ( m_ths->regHist( "TempHist6", std::unique_ptr<TH1D>( h6 ), h6 ).isFailure() ) {
error() << "Couldn't register TempHist6" << endmsg;
}
if( strcmp( h6->GetName(), "TempHist6" ) ){
if ( strcmp( h6->GetName(), "TempHist6" ) ) {
error() << "Couldn't use TempHist6 afterwards. getName = " << h6->GetName() << endmsg;
}
// Profile in "/"
std::unique_ptr<TH1> tp = std::make_unique<TProfile>( "profile", "profile", 100, -50., -50. );
if ( m_ths->regHist( "/rec/prof", std::move( tp ) ).isFailure() ) {
@@ -99,11 +98,10 @@ StatusCode THistWrite::initialize()
error() << "Couldn't register tr" << endmsg;
}
// Update to stream "upd", dir "/xxx"
std::unique_ptr<TH1F> h3s = std::make_unique<TH1F>( "1Dgauss_shared", "1D Gaussian", 100, -50., 50. );
LockedHandle<TH1> lh1;
if ( m_ths->regShared( "/upd/xxx/gauss1d_shared", std::move ( h3s ), lh1 ).isFailure() ) {
if ( m_ths->regShared( "/upd/xxx/gauss1d_shared", std::move( h3s ), lh1 ).isFailure() ) {
error() << "Couldn't register gauss1d_shared" << endmsg;
}
@@ -219,7 +217,6 @@ StatusCode THistWrite::execute()
error() << "Couldn't retrieve 3Dgauss_shared" << endmsg;
}
TTree* tr;
if ( m_ths->getTree( "/rec/trees/stuff/tree1", tr ).isFailure() ) {
error() << "Couldn't retrieve tree tree1" << endmsg;
Loading