Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Z
ZfitWrapper
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexander Heidelbach
ZfitWrapper
Commits
7c1822ee
Commit
7c1822ee
authored
8 months ago
by
Alexander Heidelbach
Browse files
Options
Downloads
Patches
Plain Diff
Add method to update fitparameters and some linting
parent
b5f9d77f
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/zfitwrapper/BaseModel.py
+24
-7
24 additions, 7 deletions
src/zfitwrapper/BaseModel.py
with
24 additions
and
7 deletions
src/zfitwrapper/BaseModel.py
+
24
−
7
View file @
7c1822ee
...
...
@@ -3,7 +3,12 @@ from typing import Dict, Optional, Union
import
zfit
import
zfit.core
from
.FitParameter
import
Fitparameter
,
FitCovarianceMatrix
,
CovarianceInputType
,
CovarianceType
from
.FitParameter
import
(
Fitparameter
,
FitCovarianceMatrix
,
CovarianceInputType
,
CovarianceType
,
)
class
BaseModel
(
ABC
):
...
...
@@ -18,9 +23,7 @@ class BaseModel(ABC):
self
.
_modelparameters
=
{}
# type: Dict[str, zfit.Parameter]
self
.
_covariance
=
{}
# type: CovarianceType
self
.
_model
=
None
# type: Optional[zfit.core.basepdf.BasePDF]
self
.
_ext_model
=
(
None
)
# type: Optional[Union[Union[zfit.core.basepdf.BasePDF,zfit.core.interfaces.ZfitPDF] , Fitparameter]]
self
.
_ext_model
=
None
# type: Optional[Union[Union[zfit.core.basepdf.BasePDF,zfit.core.interfaces.ZfitPDF] , Fitparameter]]
def
__add__
(
self
,
model
:
"
BaseModel
"
)
->
"
BaseModel
"
:
assert
self
.
obs
==
model
.
obs
,
Exception
(
...
...
@@ -55,7 +58,9 @@ class BaseModel(ABC):
def
modelparameters
(
self
)
->
Dict
[
str
,
zfit
.
Parameter
]:
if
self
.
parameters
and
not
self
.
_modelparameters
:
for
key
,
parameter
in
self
.
parameters
.
items
():
self
.
_modelparameters
[
key
]
=
zfit
.
Parameter
(
**
parameter
.
parameter_info_dict
)
self
.
_modelparameters
[
key
]
=
zfit
.
Parameter
(
**
parameter
.
parameter_info_dict
)
return
self
.
_modelparameters
...
...
@@ -76,7 +81,11 @@ class BaseModel(ABC):
@property
def
ext_model
(
self
,
)
->
Optional
[
Union
[
Union
[
zfit
.
core
.
basepdf
.
BasePDF
,
zfit
.
core
.
interfaces
.
ZfitPDF
],
Fitparameter
]]:
)
->
Optional
[
Union
[
Union
[
zfit
.
core
.
basepdf
.
BasePDF
,
zfit
.
core
.
interfaces
.
ZfitPDF
],
Fitparameter
]
]:
return
self
.
_ext_model
@ext_model.setter
...
...
@@ -98,7 +107,9 @@ class BaseModel(ABC):
return
OutputParameter
def
update_fitparameter
(
self
,
name
:
str
,
value
:
float
,
lower
:
float
,
upper
:
float
)
->
None
:
def
update_fitparameter
(
self
,
name
:
str
,
value
:
float
,
lower
:
float
,
upper
:
float
)
->
None
:
if
self
.
parameters
:
for
parameter
in
self
.
parameters
.
values
():
if
name
==
parameter
.
name
:
...
...
@@ -106,6 +117,12 @@ class BaseModel(ABC):
parameter
.
lower
=
lower
parameter
.
upper
=
upper
def
update_modelparameter
(
self
,
name
:
str
,
value
:
float
)
->
None
:
if
self
.
modelparameters
:
for
parameter
in
self
.
modelparameters
.
values
():
if
name
==
str
(
parameter
.
name
):
parameter
.
set_value
(
value
)
def
get_modelparameter
(
self
,
name
:
str
)
->
zfit
.
Parameter
:
OutputParameter
=
None
for
parameter
in
self
.
modelparameters
.
values
():
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment