Skip to content

[RF] Remove some dead code #20699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
guitargeek wants to merge 2 commits into
base: master
Choose a base branch
from
+1 −22
Open

[RF] Remove some dead code #20699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d07250d
[RF] Removed unused TStopwatch
guitargeek Dec 10, 2025
7a48645
[RF] Remove dead code in `RooWorkspace::import()`
guitargeek Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions roofit/histfactory/src/HistoToWorkspaceFactoryFast.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
#include "HFMsgService.h"

#include "TH1.h"
#include "TStopwatch.h"

// specific to this package
#include <RooStats/HistFactory/Detail/HistFactoryImpl.h>
Expand Down Expand Up @@ -754,9 +753,6 @@ RooArgList HistoToWorkspaceFactoryFast::createObservables(const TH1 *hist, RooWo
vector<string> systToFix = measurement.GetConstantParams();
bool doRatio=false;

// to time the macro
TStopwatch t;
t.Start();
//ES// string channel_name=summary[0].channel;
string channel_name = channel.GetName();

Expand Down
1 change: 0 additions & 1 deletion roofit/roofitcore/src/RooAbsTestStatistic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include "RooAbsReal.h"
#include "RooSetProxy.h"
#include "RooRealProxy.h"
#include "TStopwatch.h"
#include "Math/Util.h"

#include <string>
Expand Down
2 changes: 1 addition & 1 deletion roofit/roofitcore/src/RooRealMPFE.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "RooRealProxy.h"
#include "RooListProxy.h"
#include "RooArgList.h"
#include "TStopwatch.h"

#include <vector>

class RooArgSet ;
Expand Down
16 changes: 0 additions & 16 deletions roofit/roofitcore/src/RooWorkspace.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,22 +623,6 @@ bool RooWorkspace::import(const RooAbsArg& inArg,
RooArgSet(*cloneTop).snapshot(cloneSet2, !noRecursion);
RooAbsArg* cloneTop2 = cloneSet2.find(topName2.c_str()) ;

// Make final check list of conflicting nodes
RooArgSet conflictNodes2 ;
RooArgSet branchSet2 ;
for (const auto branch2 : branchSet2) {
if (_allOwnedNodes.find(branch2->GetName())) {
conflictNodes2.add(*branch2) ;
}
}

// Terminate here if there are conflicts and no resolution protocol
if (!conflictNodes2.empty()) {
coutE(ObjectHandling) << "RooWorkSpace::import(" << GetName() << ") ERROR object named " << inArg.GetName() << ": component(s) "
<< conflictNodes2 << " cause naming conflict after conflict resolution protocol was executed" << std::endl ;
return true ;
}

// Perform any auxiliary imports at this point
for (const auto node : cloneSet2) {
if (node->importWorkspaceHook(*this)) {
Expand Down
Loading