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 seg fault for workspaces with RooDataHist objects #328

Merged
merged 3 commits into from
Jul 22, 2024
Merged

Fix seg fault for workspaces with RooDataHist objects #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0b01d8
replace python with python3
Jul 9, 2024
9cbcd67
Merge branch 'main' of github.com:cms-analysis/CombineHarvester into …
Jul 9, 2024
1c9bb97
define ws_store as global
Jul 9, 2024
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
2 changes: 1 addition & 1 deletion CombinePdfs/bin/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<use name="histfactory"/>
<use name="libxml2"/>
<use name="vdt"/>
<use name="python"/>
<use name="python3"/>
<use name="boost_program_options"/>
<use name="boost_filesystem"/>
<use name="boost_python"/>
Expand Down
2 changes: 1 addition & 1 deletion CombineTools/bin/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<use name="histfactory"/>
<use name="libxml2"/>
<use name="vdt"/>
<use name="python"/>
<use name="python3"/>
<use name="boost_program_options"/>
<use name="boost_filesystem"/>
<use name="boost_python"/>
Expand Down
1 change: 1 addition & 0 deletions CombineTools/interface/CombineHarvester.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,7 @@ class CombineHarvester {
std::vector<std::shared_ptr<Systematic>> systs_;
std::map<std::string, std::shared_ptr<Parameter>> params_;
std::map<std::string, std::shared_ptr<RooWorkspace>> wspaces_;
std::map<std::string, std::shared_ptr<RooWorkspace>> ws_store;

std::unordered_map<std::string, bool> flags_;

Expand Down
1 change: 0 additions & 1 deletion CombineTools/src/CombineHarvester_Datacards.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ int CombineHarvester::ParseDatacard(std::string const& filename,
std::vector<HistMapping> hist_mapping;
// std::map<std::string, RooAbsData*> data_map;
std::map<std::string, std::shared_ptr<TFile>> file_store;
std::map<std::string, std::shared_ptr<RooWorkspace>> ws_store;

bool start_nuisance_scan = false;
unsigned r = 0;
Expand Down