Skip to content
Snippets Groups Projects
Commit d06db17c authored by Stephan Hageboeck's avatar Stephan Hageboeck Committed by Danilo Piparo
Browse files

[RF] Fix compiler warnings.

RooAbsSelfCached* were using a local variable that has the same name as a function.
parent 408c44cb
Branches
Tags
No related merge requests found
...@@ -105,19 +105,14 @@ void RooAbsSelfCachedPdf::fillCacheObject(RooAbsCachedPdf::PdfCacheElem& cache) ...@@ -105,19 +105,14 @@ void RooAbsSelfCachedPdf::fillCacheObject(RooAbsCachedPdf::PdfCacheElem& cache)
RooArgSet* RooAbsSelfCachedPdf::actualObservables(const RooArgSet& /*nset*/) const RooArgSet* RooAbsSelfCachedPdf::actualObservables(const RooArgSet& /*nset*/) const
{ {
// Make list of servers // Make list of servers
RooArgSet servers ; RooArgSet *serverSet = new RooArgSet;
TIterator* siter = serverIterator() ; for (auto server : _serverList) {
siter->Reset() ; serverSet->add(*server) ;
RooAbsArg* server ;
while((server=(RooAbsArg*)siter->Next())) {
servers.add(*server) ;
} }
// Return servers that are in common with given normalization set // Return servers that are in common with given normalization set
return new RooArgSet(servers) ; return serverSet;
//return (RooArgSet*) servers.selectCommon(nset) ;
} }
...@@ -129,19 +124,16 @@ RooArgSet* RooAbsSelfCachedPdf::actualObservables(const RooArgSet& /*nset*/) con ...@@ -129,19 +124,16 @@ RooArgSet* RooAbsSelfCachedPdf::actualObservables(const RooArgSet& /*nset*/) con
RooArgSet* RooAbsSelfCachedPdf::actualParameters(const RooArgSet& nset) const RooArgSet* RooAbsSelfCachedPdf::actualParameters(const RooArgSet& nset) const
{ {
RooArgSet *servers = new RooArgSet ; RooArgSet *serverSet = new RooArgSet;
TIterator* siter = serverIterator() ; for (auto server : _serverList) {
siter->Reset() ; serverSet->add(*server) ;
RooAbsArg* server ;
while((server=(RooAbsArg*)siter->Next())) {
servers->add(*server) ;
} }
// Remove all given observables from server list // Remove all given observables from server list
servers->remove(nset,kTRUE,kTRUE) ; serverSet->remove(nset,kTRUE,kTRUE);
return servers ; return serverSet;
} }
......
...@@ -103,17 +103,14 @@ void RooAbsSelfCachedReal::fillCacheObject(RooAbsCachedReal::FuncCacheElem& cach ...@@ -103,17 +103,14 @@ void RooAbsSelfCachedReal::fillCacheObject(RooAbsCachedReal::FuncCacheElem& cach
RooArgSet* RooAbsSelfCachedReal::actualObservables(const RooArgSet& nset) const RooArgSet* RooAbsSelfCachedReal::actualObservables(const RooArgSet& nset) const
{ {
// Make list of servers // Make list of servers
RooArgSet servers ; RooArgSet serverSet;
TIterator* siter = serverIterator() ; for (auto server : _serverList) {
siter->Reset() ; serverSet.add(*server);
RooAbsArg* server ;
while((server=(RooAbsArg*)siter->Next())) {
servers.add(*server) ;
} }
// Return servers that are in common with given normalization set // Return servers that are in common with given normalization set
return (RooArgSet*) servers.selectCommon(nset) ; return (RooArgSet*) serverSet.selectCommon(nset);
} }
...@@ -126,19 +123,16 @@ RooArgSet* RooAbsSelfCachedReal::actualObservables(const RooArgSet& nset) const ...@@ -126,19 +123,16 @@ RooArgSet* RooAbsSelfCachedReal::actualObservables(const RooArgSet& nset) const
RooArgSet* RooAbsSelfCachedReal::actualParameters(const RooArgSet& nset) const RooArgSet* RooAbsSelfCachedReal::actualParameters(const RooArgSet& nset) const
{ {
// Make list of servers // Make list of servers
RooArgSet *servers = new RooArgSet ; RooArgSet *serverSet = new RooArgSet;
TIterator* siter = serverIterator() ; for (auto server : _serverList) {
siter->Reset() ; serverSet->add(*server);
RooAbsArg* server ;
while((server=(RooAbsArg*)siter->Next())) {
servers->add(*server) ;
} }
// Remove all given observables from server list // Remove all given observables from server list
servers->remove(nset,kTRUE,kTRUE) ; serverSet->remove(nset,kTRUE,kTRUE);
return servers ; return serverSet;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment