Remove pointless fivetheories and seventheories
#2186
Conversation
RoyStegeman
force-pushed
the
sum_th_covmats
branch
from
4d39ff2 to
3d92c97
Compare
RoyStegeman
changed the title
fivetheories and seventheories
RoyStegeman
force-pushed
the
sum_th_covmats
branch
from
3d92c97 to
91f0c1a
Compare
| return f(*args, **kwargs) | ||
|
|
||
| # Set this to get the same filename regardless of the action. | ||
| res.__name__ = "theory_covmat" |
There was a problem hiding this comment.
I guess this was done to uniform the name for the stored theory covmat. Do we plan to have different names then?
There was a problem hiding this comment.
I think it was, but the name of that function is not what decides the name of the stored .csv file and instead we have this
nnpdf/validphys2/src/validphys/config.py
Line 817 in 77c3343
Changing it now would break some old fits so probably not worth it
| s = covmat_5pt(name1, name2, deltas1, deltas2) | ||
| # 5bar-point ----------------------------------------------------------- | ||
| else: | ||
| s = covmat_5barpt(name1, name2, deltas1, deltas2) | ||
| # --------------------------------------------------------------------- | ||
| elif l == 7: | ||
| # Outdated 7pts implementation: left for posterity --------------------- | ||
| if seventheories == "original": | ||
| if point_prescription == "7original point": |
There was a problem hiding this comment.
Would it be better to use an elif == "7 point" instead of an else? I get that there are only two options at the moment, so the elif statement should be enough. But then any value in the runcard different from "7original point" would give "7 point".
There was a problem hiding this comment.
I agree, it's more readable this way
|
@achiefa are you happy with this? If so, can you approve the PR? Sorry for being in a rush, but I'd like to try to clean up the CRM and TCM implementations this week |
|
Thanks! :) |
This cleans up the theory covmat implementation by removing
fivetheoriesandseventheoriesfrom the namespace and instead directly checking for the value ofpointprescription.