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.

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

Migration to combinetf2 #575

Open
wants to merge 25 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
ab48337
Remove LnN uncertainty interface; remove lumi scaling histograms to c…
davidwalter2 Nov 14, 2024
c88b711
Fix definition of MCnoQCD to fix preOp in addSystematic
davidwalter2 Nov 14, 2024
acac317
Remove residual lumi histograms; implement option to float W normaliz…
davidwalter2 Nov 14, 2024
088b4ed
Merge branch 'main' of github.com:WMass/WRemnants into 241114_fixNormUnc
davidwalter2 Nov 24, 2024
c99d2db
Don't propagate normalization uncertainties into the fake estimation …
davidwalter2 Nov 24, 2024
029aa25
Adapt all but unfolding to combinetf2
davidwalter2 Dec 11, 2024
b96348e
linting
davidwalter2 Dec 11, 2024
1637424
Remove specific groups from combinetf1 that are no longer supported a…
davidwalter2 Dec 11, 2024
3c0d250
Fix impacts and CI
davidwalter2 Dec 11, 2024
2b988c2
Small fixes
davidwalter2 Dec 11, 2024
74348b9
Fix unfolding for CI
davidwalter2 Dec 12, 2024
ed4f0d4
Remove support for simultaneous ABCD and for setupCombine root output
davidwalter2 Dec 12, 2024
72e2653
dump nar
davidwalter2 Dec 12, 2024
96c6c06
Small fixes
davidwalter2 Dec 12, 2024
c49ce71
Merge branch 'main' of github.com:WMass/WRemnants into 241211_to_comb…
davidwalter2 Dec 12, 2024
8e4ba92
Merge branch '241114_fixNormUnc' of github.com:davidwalter2/WRemnants…
davidwalter2 Dec 12, 2024
86722dd
Fix CI and postfit plots
davidwalter2 Dec 12, 2024
71eda89
Adapt unfolding workflow to combinetf2
davidwalter2 Dec 12, 2024
79f8e24
Run everything in singularity
davidwalter2 Dec 12, 2024
8f1b36a
Revert "Run everything in singularity"
davidwalter2 Dec 12, 2024
e15e995
Adapt theory fit to combinetf2
davidwalter2 Dec 13, 2024
e9607ee
Merge branch 'main' of github.com:WMass/WRemnants into 241211_to_comb…
davidwalter2 Dec 13, 2024
1e97755
Remove unused import
davidwalter2 Dec 13, 2024
77b80c0
Dump narf; fixes on previous changes
davidwalter2 Dec 17, 2024
604828a
Latest updates on narf
davidwalter2 Dec 19, 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
171 changes: 85 additions & 86 deletions .github/workflows/main.yml

Large diffs are not rendered by default.

211 changes: 115 additions & 96 deletions .github/workflows/unfolding.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion narf
66 changes: 0 additions & 66 deletions scripts/ci/run_combine.sh

This file was deleted.

12 changes: 0 additions & 12 deletions scripts/ci/setup_and_run_combine.sh

This file was deleted.

22 changes: 15 additions & 7 deletions scripts/combine/printImpacts.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import argparse

from utilities.io_tools import combinetf_input
from utilities.io_tools import combinetf2_input


def parseArgs():
Expand All @@ -14,17 +14,25 @@ def parseArgs():
parser.add_argument(
"-s", "--sort", action="store_true", help="Sort nuisances by impact"
)
parser.add_argument(
"--globalImpacts", action="store_true", help="Print global impacts"
)
parser.add_argument(
"inputFile",
default="/Users/kenneth/cernbox/CombineStudies/WGen/etal_ptl_smear_unrolled_scetlib/fitresults_123456789.root",
help="fitresults output ROOT file from combinetf",
type=str,
help="fitresults output file from combinetf2",
)
return parser.parse_args()


def printImpacts(args, fitresult, poi="Wmass"):
impacts, labels, _ = combinetf_input.read_impacts_poi(
fitresult, not args.ungroup, sort=args.sort, poi=poi, normalize=False
impacts, labels = combinetf2_input.read_impacts_poi(
fitresult,
poi,
grouped=not args.ungroup,
global_impacts=args.globalImpacts,
sort=args.sort,
normalize=False,
)
unit = "MeV" if poi.startswith("mass") else "n.u. %"
if args.nuisance:
Expand All @@ -42,6 +50,6 @@ def printImpacts(args, fitresult, poi="Wmass"):

if __name__ == "__main__":
args = parseArgs()
fitresult = combinetf_input.get_fitresult(args.inputFile)
for poi in combinetf_input.get_poi_names(fitresult):
fitresult = combinetf2_input.get_fitresult(args.inputFile)
for poi in combinetf2_input.get_poi_names(fitresult):
printImpacts(args, fitresult, poi)
Loading