Skip to content
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

Fix some compiler warnings #1035

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix some compiler warnings #1035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 1 deletion src/Combine.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,9 @@ void Combine::run(TString hlfFile, const std::string &dataset, double &limit, do
TString tmpDir = "", tmpFile = "", pwd(gSystem->pwd());
if (makeTempDir_) {
tmpDir = "roostats-XXXXXX"; tmpFile = "model";
mkdtemp(const_cast<char *>(tmpDir.Data()));
if (mkdtemp(const_cast<char *>(tmpDir.Data())) == nullptr) {
throw std::runtime_error("Temporary file could not be created");
}
gSystem->cd(tmpDir.Data());
garbageCollect.path = tmpDir.Data(); // request that we delete this dir when done
} else if (!hlfFile.EndsWith(".hlf") && !hlfFile.EndsWith(".root")) {
Expand Down
17 changes: 5 additions & 12 deletions src/HZZ4L_RooCTauPdf_1D.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,17 +128,10 @@ Int_t HZZ4L_RooCTauPdf_1D::getAnalyticalIntegral(RooArgSet& allVars, RooArgSet&
}
Double_t HZZ4L_RooCTauPdf_1D::analyticalIntegral(Int_t code, const char* rangeName) const
{
switch (code)
{
case 1:
{
double integral = interpolateIntegral();
if( integral <= 0 ) integral = 1.0e-10;
return integral;
}
default:
cerr << "getAnalyticalIntegral failed, so analytical integration did not complete!" << endl;
assert(0);
}
R__ASSERT(code == 1);

double integral = interpolateIntegral();
if( integral <= 0 ) integral = 1.0e-10;
return integral;
}

17 changes: 5 additions & 12 deletions src/HZZ4L_RooCTauPdf_1D_Expanded.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,17 +304,10 @@ Int_t HZZ4L_RooCTauPdf_1D_Expanded::getAnalyticalIntegral(RooArgSet& allVars, Ro
}
Double_t HZZ4L_RooCTauPdf_1D_Expanded::analyticalIntegral(Int_t code, const char* rangeName) const
{
switch (code)
{
case 1:
{
double integral = interpolateIntegral();
if( integral <= 0 ) integral = 1.0e-10;
return integral;
}
default:
cerr << "getAnalyticalIntegral failed, so analytical integration did not complete!" << endl;
assert(0);
}
R__ASSERT(code == 1);

double integral = interpolateIntegral();
if( integral <= 0 ) integral = 1.0e-10;
return integral;
}

17 changes: 5 additions & 12 deletions src/HZZ4L_RooCTauPdf_2D.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,17 +129,10 @@ Int_t HZZ4L_RooCTauPdf_2D::getAnalyticalIntegral(RooArgSet& allVars, RooArgSet&
}
Double_t HZZ4L_RooCTauPdf_2D::analyticalIntegral(Int_t code, const char* rangeName) const
{
switch (code)
{
case 1:
{
double integral = interpolateIntegral();
if( integral <= 0 ) integral = 1.0e-10;
return integral;
}
default:
cerr << "getAnalyticalIntegral failed, so analytical integration did not complete!" << endl;
assert(0);
}
R__ASSERT(code == 1);

double integral = interpolateIntegral();
if( integral <= 0 ) integral = 1.0e-10;
return integral;
}

12 changes: 10 additions & 2 deletions src/HybridNew.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <TCanvas.h>
#include <TGraphErrors.h>
#include <TStopwatch.h>
#include <TSystem.h>
#include <TRandom3.h>
#include <TTree.h>
#include "RooRealVar.h"
Expand Down Expand Up @@ -296,6 +297,7 @@ bool HybridNew::run(RooWorkspace *w, RooStats::ModelConfig *mc_s, RooStats::Mode
return runTestStatistics(w, mc_s, mc_b, data, limit, limitErr, hint);
}
assert("Shouldn't get here" == 0);
return false;
}

bool HybridNew::runSignificance(RooWorkspace *w, RooStats::ModelConfig *mc_s, RooStats::ModelConfig *mc_b, RooAbsData &data, double &limit, double &limitErr, const double *hint) {
Expand Down Expand Up @@ -1382,8 +1384,14 @@ RooStats::HypoTestResult * HybridNew::evalWithFork(RooStats::HybridCalculator &h
}
} else {
RooRandom::randomGenerator()->SetSeed(newSeeds[ich]);
freopen(TString::Format("%s.%d.out.txt", tmpfile, ich).Data(), "w", stdout);
freopen(TString::Format("%s.%d.err.txt", tmpfile, ich).Data(), "w", stderr);
if(freopen(TString::Format("%s.%d.out.txt", tmpfile, ich).Data(), "w", stdout) == nullptr) {
SysError("RedirectOutput", "could not freopen stdout (errno: %d)", TSystem::GetErrno());
return result.release(); // nullptr at this point
}
if(freopen(TString::Format("%s.%d.err.txt", tmpfile, ich).Data(), "w", stderr) == nullptr) {
SysError("RedirectOutput", "could not freopen stderr (errno: %d)", TSystem::GetErrno());
return result.release(); // nullptr at this point
}
CombineLogger::instance().log("HybridNew.cc",__LINE__,std::string(Form(" I am child %d, seed %d",ich, newSeeds[ich])),__func__);
RooStats::HypoTestResult *hcResult = evalGeneric(hc, /*noFork=*/true);
TFile *f = TFile::Open(TString::Format("%s.%d.root", tmpfile, ich), "RECREATE");
Expand Down
1 change: 1 addition & 0 deletions src/VerticalInterpHistPdf.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1138,6 +1138,7 @@ Double_t FastVerticalInterpHistPdf2D2::maxVal(int code) const {
<< ") unsupported integration code " << code << "\n" << std::endl;
assert(0);

return 0.0;
}

FastVerticalInterpHistPdf2V::FastVerticalInterpHistPdf2V(const FastVerticalInterpHistPdf2 &hpdf, const RooAbsData &data, bool includeZeroWeights) :
Expand Down
Loading