Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
cosmotools
CAMEL
Commits
b51375cf
Commit
b51375cf
authored
Sep 19, 2019
by
Plaszczynski Stephane
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
correct case when Engine==0
parent
9ce363df
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
14 deletions
+16
-14
cmt/requirements-lite.generic
cmt/requirements-lite.generic
+1
-1
src/camel/Chi2Combiner.cc
src/camel/Chi2Combiner.cc
+15
-13
No files found.
cmt/requirements-lite.generic
View file @
b51375cf
...
...
@@ -4,7 +4,7 @@ use class *
#
compiler
options
#
default
is
gcc
here
are
the
C
++
compiler
options
macro
cppflags
" -O2 -pipe -fPIC -Wall -Wno-reorder -Wno-sign-compare -Wno-unknown-pragmas"
macro
cppflags
" -O2 -pipe -fPIC -Wall -Wno-reorder -Wno-sign-compare -Wno-unknown-pragmas
-g
"
#
do
we
need
optimzations
here
?
#
macro_append
cppflags
"-ffast-math -m64 "
...
...
src/camel/Chi2Combiner.cc
View file @
b51375cf
...
...
@@ -41,7 +41,7 @@ Chi2Combiner::~Chi2Combiner()
for
(
size_t
i
=
0
;
i
<
obs
.
size
();
i
++
)
delete
obs
[
i
];
double
tot
=
timer
->
total
();
//cout << __FILE__ << " :deleting Engine " << endl;
delete
engine
;
if
(
engine
)
delete
engine
;
cout
<<
"TIMER TOTAL TIME="
<<
tot
<<
" s
\t
="
<<
tot
/
60.
<<
" min
\t
="
<<
tot
/
3600
<<
"h"
<<
endl
;
delete
timer
;
...
...
@@ -88,18 +88,20 @@ Chi2Combiner::chi2_eff(const std::vector<double>& par) const {
#pragma omp critical
{
self
->
OK
=
engine
->
updateParValues
(
par
);
}
if
(
!
OK
)
{
//A TUNER!!!!!!!!!!!!!1
chi2
=
chi2_prev
*
10.
;
self
->
iter
++
;
if
(
verbose
)
{
os
<<
"0
\t
"
<<
chi2
<<
"
\t
"
<<
timer
->
partial
();
cout
<<
os
.
str
()
<<
endl
;
}
return
chi2
;
if
(
engine
){
self
->
OK
=
engine
->
updateParValues
(
par
);
if
(
!
OK
)
{
//A TUNER!!!!!!!!!!!!!1
chi2
=
chi2_prev
*
10.
;
self
->
iter
++
;
}
if
(
verbose
)
{
os
<<
"0
\t
"
<<
chi2
<<
"
\t
"
<<
timer
->
partial
();
cout
<<
os
.
str
()
<<
endl
;
}
return
chi2
;
}
}
//loop update chi2 observables
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment