Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Corryvreckan
Corryvreckan
Commits
2674731a
Commit
2674731a
authored
Feb 10, 2020
by
Simon Spannagel
Browse files
Apply clang-format-8 formatting changes
parent
d53c7104
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/core/utils/file.h
View file @
2674731a
...
...
@@ -158,10 +158,11 @@ namespace corryvreckan {
* All the required directories are deleted recursively from the top-directory (use this with caution).
*/
inline
void
remove_path
(
const
std
::
string
&
path
)
{
int
status
=
nftw
(
path
.
c_str
(),
[](
const
char
*
remove_path
,
const
struct
stat
*
,
int
,
struct
FTW
*
)
{
return
remove
(
remove_path
);
},
64
,
FTW_DEPTH
);
int
status
=
nftw
(
path
.
c_str
(),
[](
const
char
*
remove_path
,
const
struct
stat
*
,
int
,
struct
FTW
*
)
{
return
remove
(
remove_path
);
},
64
,
FTW_DEPTH
);
if
(
status
!=
0
)
{
throw
std
::
invalid_argument
(
"path cannot be completely deleted"
);
...
...
src/objects/GblTrack.cpp
View file @
2674731a
...
...
@@ -59,7 +59,6 @@ void GblTrack::fit() {
scatterWidth
(
0
)
=
1
/
(
scatteringTheta
(
material
,
total_material
)
*
scatteringTheta
(
material
,
total_material
));
scatterWidth
(
1
)
=
scatterWidth
(
0
);
point
.
addScatterer
(
Eigen
::
Vector2d
::
Zero
(),
scatterWidth
);
};
auto
JacToNext
=
[](
double
val
)
{
Matrix5d
Jac
;
...
...
@@ -81,7 +80,7 @@ void GblTrack::fit() {
};
// lambda to add plane (not the first one) and air scatterers //FIXME: Where to put them?
auto
addPlane
=
[
&
JacToNext
,
&
prevPos
,
&
addMeasurementtoGblPoint
,
&
addScattertoGblPoint
,
&
points
,
this
](
std
::
vector
<
Plane
>::
iterator
&
plane
)
{
std
::
vector
<
Plane
>::
iterator
&
plane
)
{
double
dist
=
plane
->
postion
()
-
prevPos
;
double
frac1
=
0.21
,
frac2
=
0.58
;
// Current layout
...
...
src/objects/Linkdef.h
View file @
2674731a
...
...
@@ -8,9 +8,10 @@
#pragma link off all functions;
// Missing ROOT objects
#pragma link C++ class ROOT::Math::Cartesian2D < unsigned int > +;
#pragma link C++ class ROOT::Math::DisplacementVector2D < ROOT::Math::Cartesian2D < unsigned int >, \
ROOT::Math::DefaultCoordinateSystemTag > +;
#pragma link C++ class ROOT::Math::Cartesian2D < unsigned int> + ;
#pragma link C++ class ROOT::Math::DisplacementVector2D < ROOT::Math::Cartesian2D < unsigned int>, \
ROOT::Math::DefaultCoordinateSystemTag> + \
;
// Corryvreckan objects
#pragma link C++ class corryvreckan::Object + ;
...
...
@@ -26,4 +27,4 @@
#pragma link C++ class corryvreckan::Event + ;
// Vector of Object for internal storage
#pragma link C++ class std::vector < corryvreckan::Object*
> +;
#pragma link C++ class std::vector < corryvreckan::Object*> +
;
Simon Spannagel
@simonspa
mentioned in commit
4b03462d
·
Jun 18, 2020
mentioned in commit
4b03462d
mentioned in commit 4b03462d48b3988c8c6007a62973f907fe4b65e8
Toggle commit list
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