Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Pawian
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Analyze
Contributor 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
PWA
Pawian
Commits
5f61ecc8
Commit
5f61ecc8
authored
12 years ago
by
Matthias Steinke
Browse files
Options
Downloads
Patches
Plain Diff
dirty hack in Jamroot to switch Minuit2 libs
parent
83bc46b8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Jamroot
+3
-1
3 additions, 1 deletion
Jamroot
Utils/ErrValue.hh
+2
-8
2 additions, 8 deletions
Utils/ErrValue.hh
Utils/MathUtils.hh
+5
-13
5 additions, 13 deletions
Utils/MathUtils.hh
Utils/PawianCollectionUtils.hh
+7
-13
7 additions, 13 deletions
Utils/PawianCollectionUtils.hh
with
17 additions
and
35 deletions
Jamroot
+
3
−
1
View file @
5f61ecc8
import os ;
local MinuitVariant = [ os.environ MinuitVariant ] ;
path-constant TOP : . ;
local rlibs = [ SHELL "$(ROOTSYS)/bin/root-config --libs" ] ;
ROOTLIBS = [ MATCH "(.*)[\n]" : $(rlibs) ] ;
...
...
@@ -13,7 +15,7 @@ project :
<cxxflags>-fopenmp
<linkflags>$(ROOTLIBS)
<linkflags>$(BOOSTLIBS)
<linkflags>-lMinuit
2
<linkflags>-l
$(
Minuit
Variant)
<linkflags>-lgomp
<linkflags>-pthread
<linkflags>-fopenmp
...
...
This diff is collapsed.
Click to expand it.
Utils/ErrValue.hh
+
2
−
8
View file @
5f61ecc8
#ifndef ERRVALUE_HH
#define ERRVALUE_HH
#pragma once
#include
<iostream>
class
ErrValue
{
class
ErrValue
{
public:
ErrValue
();
...
...
@@ -36,13 +34,9 @@ public:
bool
operator
>=
(
ErrValue
&
v
)
const
;
private:
double
meanValue
;
double
plus
;
double
minus
;
friend
std
::
ostream
&
operator
<<
(
std
::
ostream
&
o
,
const
ErrValue
&
v
);
};
#endif
This diff is collapsed.
Click to expand it.
Utils/MathUtils.hh
+
5
−
13
View file @
5f61ecc8
#ifndef MATHUTILS_HH
#define MATHUTILS_HH
#pragma once
#include
<cassert>
inline
double
pow
(
double
x
,
int
p
)
{
inline
double
pow
(
double
x
,
int
p
)
{
if
(
p
==
0
)
return
1.0
;
if
(
x
==
0.0
&&
p
>
0
)
return
0.0
;
if
(
p
<
0
)
{
p
=-
p
;
x
=
1
/
x
;}
...
...
@@ -17,8 +15,7 @@ inline double pow(double x, int p)
}
}
inline
double
pow
(
double
x
,
unsigned
int
p
)
{
inline
double
pow
(
double
x
,
unsigned
int
p
)
{
if
(
p
==
0
)
return
1.0
;
if
(
x
==
0.0
)
return
0.0
;
...
...
@@ -30,9 +27,7 @@ inline double pow(double x, unsigned int p)
}
}
inline
int
pow
(
int
x
,
int
p
)
{
inline
int
pow
(
int
x
,
int
p
)
{
if
(
p
==
0
)
return
1
;
if
(
x
==
0
&&
p
>
0
)
return
0
;
if
(
p
<
0
)
{
assert
(
x
==
1
||
x
==
-
1
);
return
(
-
p
%
2
)
?
x
:
1
;}
...
...
@@ -45,8 +40,7 @@ inline int pow(int x, int p)
}
}
inline
unsigned
int
pow
(
unsigned
int
x
,
unsigned
int
p
)
{
inline
unsigned
int
pow
(
unsigned
int
x
,
unsigned
int
p
)
{
if
(
p
==
0
)
return
1
;
if
(
x
==
0
)
return
0
;
...
...
@@ -57,5 +51,3 @@ inline unsigned int pow(unsigned int x, unsigned int p)
x
*=
x
;
}
}
#endif
This diff is collapsed.
Click to expand it.
Utils/PawianCollectionUtils.hh
+
7
−
13
View file @
5f61ecc8
#ifndef _PawianCollectionUtils_H
#define _PawianCollectionUtils_H
#pragma once
#include
<algorithm>
#include
<boost/shared_ptr.hpp>
namespace
pawian
{
namespace
Collection
{
struct
PtrLess
{
template
<
class
PtrType
>
template
<
class
PtrType
>
bool
operator
()(
PtrType
ptr1
,
PtrType
ptr2
)
const
{
return
(
*
ptr1
)
<
(
*
ptr2
);
}
};
struct
SharedPtrLess
{
template
<
class
PtrType
>
bool
operator
()(
boost
::
shared_ptr
<
PtrType
>
shptr1
,
boost
::
shared_ptr
<
PtrType
>
shptr2
)
const
{
template
<
class
PtrType
>
bool
operator
()(
boost
::
shared_ptr
<
PtrType
>
shptr1
,
boost
::
shared_ptr
<
PtrType
>
shptr2
)
const
{
PtrType
*
ptr1
=
shptr1
.
get
();
PtrType
*
ptr2
=
shptr2
.
get
();
return
(
*
ptr1
)
<
(
*
ptr2
);
}
};
}
}
#endif
}
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