Skip to content
Snippets Groups Projects

Revert some interface changes of THistSvc

Merged Martin Errenst requested to merge merrenst/Gaudi:THistSvc-180131 into master
All threads resolved!
2 files
+ 9
9
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -405,7 +405,7 @@ StatusCode THistSvc::regTree( const std::string& id )
StatusCode THistSvc::regTree( const std::string& id, std::unique_ptr<TTree> tree )
{
StatusCode sc = regHist_i( std::move( tree ), id, false );
TTree* tr;
TTree* tr = nullptr;
if ( getTree( id, tr ).isSuccess() && sc.isSuccess() ) {
if ( m_autoSave != 0 ) {
tr->SetAutoSave( m_autoSave );
@@ -1169,7 +1169,7 @@ StatusCode THistSvc::io_reinit()
}
}
void* vf;
void* vf = nullptr;
Option_t* opts = f->GetOption();
int r = p_fileMgr->open( Io::ROOT, name(), fname, Io::WRITE, vf, "HIST" );
if ( r != 0 ) {
@@ -1606,7 +1606,7 @@ void THistSvc::MergeRootFile( TDirectory* target, TDirectory* source )
// loop over all keys in this directory
TList* lkeys = current_sourcedir->GetListOfKeys();
int nkeys = lkeys->GetEntries();
TKey* key;
TKey* key = nullptr;
for ( int jj = 0; jj < nkeys; jj++ ) {
key = (TKey*)lkeys->At( jj );
std::string pathnameinsource = current_sourcedir->GetPath() + std::string( "/" ) + key->GetName();
Loading