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
691e873f
Commit
691e873f
authored
9 months ago
by
Alexander Heidelbach
Browse files
Options
Downloads
Patches
Plain Diff
Remove ext model handling from BaseFitter
parent
efa66531
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/zfitwrapper/BaseFitter.py
+0
-25
0 additions, 25 deletions
src/zfitwrapper/BaseFitter.py
with
0 additions
and
25 deletions
src/zfitwrapper/BaseFitter.py
+
0
−
25
View file @
691e873f
...
...
@@ -21,8 +21,6 @@ class BaseFitter(ABC):
self
.
model
=
model
self
.
retry
=
retry
self
.
_ext_loss
=
False
self
.
result_text
=
[]
# type: List[str]
@property
...
...
@@ -47,14 +45,6 @@ class BaseFitter(ABC):
def
gof
(
self
)
->
float
:
pass
@property
def
ext_loss
(
self
)
->
bool
:
return
self
.
_ext_loss
@ext_loss.setter
def
ext_loss
(
self
,
loss
:
bool
)
->
None
:
self
.
_ext_loss
=
loss
def
_calc_gof
(
self
,
counts
:
np
.
ndarray
,
centers
:
np
.
ndarray
)
->
float
:
limits
=
self
.
model
.
obs
.
limits
low
,
high
=
np
.
min
(
limits
),
np
.
max
(
limits
)
...
...
@@ -122,18 +112,6 @@ class BaseFitter(ABC):
)
)
def
_reset_yield
(
self
,
model
:
Model
)
->
None
:
ext_model
=
model
.
ext_model
assert
isinstance
(
ext_model
,
zfit
.
core
.
interfaces
.
ZfitPDF
)
yield_params
=
ext_model
.
get_yield
()
if
isinstance
(
yield_params
,
zfit
.
core
.
interfaces
.
ZfitParameter
):
for
param
in
yield_params
.
get_params
():
if
param
.
value
()
!=
param
.
value
():
assert
isinstance
(
param
,
zfit
.
Parameter
)
param
.
randomize
(
minval
=
None
,
maxval
=
None
,
sampler
=
np
.
random
.
uniform
)
def
_randomize_parameters
(
self
,
model
:
Model
)
->
None
:
for
param
in
model
.
parameters
.
values
():
modelparameter
=
model
.
get_modelparameter
(
param
.
name
)
...
...
@@ -182,9 +160,6 @@ class BaseFitter(ABC):
self
.
_randomize_parameters
(
model
=
model
)
if
self
.
ext_loss
:
self
.
_reset_yield
(
model
=
model
)
counter
+=
1
self
.
_fit
(
model
=
model
,
shuffle_params
=
shuffle_params
,
counter
=
counter
)
...
...
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