Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Frida
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
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Coenen, Joachim
Frida
Commits
0ae0a821
Commit
0ae0a821
authored
9 years ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
kconv is not a fit parameter, but a generic curve parameter
parent
cdcbbc42
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
pub/lib/olf.cpp
+1
-1
1 addition, 1 deletion
pub/lib/olf.cpp
pub/lib/olf.hpp
+2
-2
2 additions, 2 deletions
pub/lib/olf.hpp
with
3 additions
and
3 deletions
pub/lib/olf.cpp
+
1
−
1
View file @
0ae0a821
...
...
@@ -127,10 +127,10 @@ void COlc::copy_meta_C_from_other( const COlc* other )
copy_meta_O_from_other
(
other
);
expr
=
other
->
expr
;
T
=
other
->
T
;
kconv
=
other
->
kconv
;
nP
=
other
->
nP
;
PCo
=
other
->
PCo
;
kd
=
other
->
kd
;
kconv
=
other
->
kconv
;
weighing
=
other
->
weighing
;
plot_to_grid
=
other
->
plot_to_grid
;
range_expr
=
other
->
range_expr
;
...
...
This diff is collapsed.
Click to expand it.
pub/lib/olf.hpp
+
2
−
2
View file @
0ae0a821
...
...
@@ -93,6 +93,7 @@ class COlc : public COlo {
enum
TScrInp
{
_STDIN
,
_CMDLIN
}
scrInpMode
;
///< Where pars are read from
string
expr
;
///< The curve's definition (input expression).
RNode
T
;
///< The curve's definition (parsed tree).
int
kconv
;
///< Index of resolution file to convolve with.
int
nP
;
///< Number of parameters.
// Refined description:
...
...
@@ -100,7 +101,6 @@ class COlc : public COlo {
// Fitting:
int
kd
;
///< Index of data file to be fitted.
int
kconv
;
///< Index of resolution file to convolve with.
enum
TWgt
{
_LIN
,
_LOG
,
_VAR
,
_VARC
,
_VARD
,
_LAST_TWGT
=
_VARD
}
weighing
;
///< Weight mode for fitting.
static
string
wgtNames
[];
...
...
@@ -111,7 +111,7 @@ class COlc : public COlo {
double
chi2
;
///< Global chi^2
COlc
()
:
COlo
(),
evaMode
(
_EXPR
),
scrInpMode
(
_STDIN
),
k
d
(
-
1
),
k
conv
(
-
1
),
weighing
(
_VAR
),
COlo
(),
evaMode
(
_EXPR
),
scrInpMode
(
_STDIN
),
k
conv
(
-
1
),
k
d
(
-
1
),
weighing
(
_VAR
),
plot_to_grid
(
false
),
range_expr
(
""
),
chi2
(
0
)
{}
// Functions that exist similarly for COld and COlc:
...
...
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