Skip to content

Commit

Permalink
Make sure that with damp:0 we use theta
Browse files Browse the repository at this point in the history
  • Loading branch information
andreab1997 committed Dec 1, 2023
1 parent 615500f commit 90c075d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/pineko/cli/fonll.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,14 @@ def subcommand(

# Get theory info
tcard = theory_card.load(theoryid)
if tcard["DAMP"] != 0:
if tcard["DAMP"] not in [-1,0]:
if not "DAMPPOWERc" in tcard or not "DAMPPOWERb" in tcard:
raise InconsistentInputsError(
"If DAMP is set, set also DAMPPOWERb and DAMPPOWERc"
)
else:
tcard["DAMPPOWERb"] = None
tcard["DAMPPOWERc"] = None
tcard["DAMPPOWERb"] = 0
tcard["DAMPPOWERc"] = 0
# Getting the paths to the grids
grids_name = grids_names(configs.configs["paths"]["ymldb"] / f"{dataset}.yaml")
for grid in grids_name:
Expand Down
2 changes: 1 addition & 1 deletion src/pineko/fonll.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ def produce_combined_fk(
fk_dict = fonll_info.fks
dampings = (
None
if damp[0] == 0
if damp[0] == -1
else produce_dampings(theorycard_constituent_fks, fonll_info, damp[1], damp[2])
)
combined_fk = combine(fk_dict, dampings=dampings)
Expand Down

0 comments on commit 90c075d

Please sign in to comment.