Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Corryvreckan
Corryvreckan
Commits
82a89d0b
Commit
82a89d0b
authored
Oct 30, 2017
by
Simon Spannagel
Browse files
Fix formatting (
@dhynds
, install the pre-commit hook, please!)
parent
aaa34a54
Pipeline
#225637
passed with stage
in 1 minute and 48 seconds
Changes
8
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/algorithms/Alignment.cpp
View file @
82a89d0b
...
...
@@ -234,8 +234,7 @@ void Alignment::finalise() {
string
detectorID
=
detector
->
name
();
// Do not align the reference plane
if
(
detectorID
==
m_config
.
get
<
std
::
string
>
(
"reference"
)
||
detectorID
==
m_config
.
get
<
std
::
string
>
(
"DUT"
))
{
if
(
detectorID
==
m_config
.
get
<
std
::
string
>
(
"reference"
)
||
detectorID
==
m_config
.
get
<
std
::
string
>
(
"DUT"
))
{
continue
;
}
...
...
src/core/Detector.cpp
View file @
82a89d0b
...
...
@@ -107,8 +107,7 @@ void Detector::initialise() {
// Make the local to global transform, built from a displacement and
// rotation
m_translations
=
new
Translation3D
(
m_displacementX
,
m_displacementY
,
m_displacementZ
);
m_rotations
=
new
Rotation3D
(
ROOT
::
Math
::
RotationZ
(
m_rotationZ
)
*
ROOT
::
Math
::
RotationY
(
m_rotationY
)
*
m_rotations
=
new
Rotation3D
(
ROOT
::
Math
::
RotationZ
(
m_rotationZ
)
*
ROOT
::
Math
::
RotationY
(
m_rotationY
)
*
ROOT
::
Math
::
RotationX
(
m_rotationX
));
m_localToGlobal
=
new
Transform3D
(
*
m_rotations
,
*
m_translations
);
...
...
src/core/Detector.h
View file @
82a89d0b
...
...
@@ -11,10 +11,10 @@
#include
<Math/Vector3D.h>
#include
"Math/Point3D.h"
#include
"Math/Rotation3D.h"
#include
"Math/RotationZYX.h"
#include
"Math/RotationX.h"
#include
"Math/RotationY.h"
#include
"Math/RotationZ.h"
#include
"Math/RotationZYX.h"
#include
"Math/Transform3D.h"
#include
"Math/Translation3D.h"
#include
"Math/Vector3D.h"
...
...
src/objects/Pixel.h
View file @
82a89d0b
...
...
@@ -3,42 +3,41 @@
#include
"TestBeamObject.h"
namespace
corryvreckan
{
class
Pixel
:
public
TestBeamObject
{
public:
// Constructors and destructors
Pixel
()
=
default
;
virtual
~
Pixel
()
{}
Pixel
(
std
::
string
detectorID
,
int
row
,
int
col
,
int
tot
)
{
m_detectorID
=
detectorID
;
m_row
=
row
;
m_column
=
col
;
m_adc
=
tot
;
m_timestamp
=
0
;
}
Pixel
(
std
::
string
detectorID
,
int
row
,
int
col
,
int
tot
,
long
long
int
timestamp
)
{
m_detectorID
=
detectorID
;
m_row
=
row
;
m_column
=
col
;
m_adc
=
tot
;
m_timestamp
=
timestamp
;
}
// Member variables
int
m_row
;
int
m_column
;
int
m_adc
;
// ROOT I/O class definition - update version number when you change this
// class!
ClassDef
(
Pixel
,
1
)
};
// Vector type declaration
typedef
std
::
vector
<
Pixel
*>
Pixels
;
namespace
corryvreckan
{
class
Pixel
:
public
TestBeamObject
{
public:
// Constructors and destructors
Pixel
()
=
default
;
virtual
~
Pixel
()
{}
Pixel
(
std
::
string
detectorID
,
int
row
,
int
col
,
int
tot
)
{
m_detectorID
=
detectorID
;
m_row
=
row
;
m_column
=
col
;
m_adc
=
tot
;
m_timestamp
=
0
;
}
Pixel
(
std
::
string
detectorID
,
int
row
,
int
col
,
int
tot
,
long
long
int
timestamp
)
{
m_detectorID
=
detectorID
;
m_row
=
row
;
m_column
=
col
;
m_adc
=
tot
;
m_timestamp
=
timestamp
;
}
// Member variables
int
m_row
;
int
m_column
;
int
m_adc
;
// ROOT I/O class definition - update version number when you change this
// class!
ClassDef
(
Pixel
,
1
)
};
// Vector type declaration
typedef
std
::
vector
<
Pixel
*>
Pixels
;
}
#endif // PIXEL_H
src/objects/SpidrSignal.h
View file @
82a89d0b
...
...
@@ -12,7 +12,7 @@ public:
m_type
=
type
;
m_timestamp
=
timestamp
;
}
// virtual ~SpidrSignal() {}
// virtual ~SpidrSignal() {}
// Functions
...
...
src/objects/TestBeamObject.cpp
View file @
82a89d0b
// local
#include
"TestBeamObject.h"
#include
"Pixel.h"
#include
"Cluster.h"
#include
"Pixel.h"
#include
"Track.h"
#include
"core/utils/exceptions.h"
...
...
src/objects/TestBeamObject.h
View file @
82a89d0b
...
...
@@ -14,37 +14,36 @@
namespace
corryvreckan
{
class
TestBeamObject
:
public
TObject
{
class
TestBeamObject
:
public
TObject
{
public:
// Constructors and destructors
TestBeamObject
()
{}
virtual
~
TestBeamObject
()
{
m_timestamp
=
0
;
}
public:
// Constructors and destructors
TestBeamObject
()
{}
virtual
~
TestBeamObject
()
{
m_timestamp
=
0
;
}
// Methods to get member variables
std
::
string
getDetectorID
()
{
return
m_detectorID
;
}
long
long
int
timestamp
()
{
return
m_timestamp
;
}
void
timestamp
(
long
long
int
time
)
{
m_timestamp
=
time
;
}
// Methods to get member variables
std
::
string
getDetectorID
()
{
return
m_detectorID
;
}
long
long
int
timestamp
()
{
return
m_timestamp
;
}
void
timestamp
(
long
long
int
time
)
{
m_timestamp
=
time
;
}
// Methods to set member variables
void
setDetectorID
(
std
::
string
detectorID
)
{
m_detectorID
=
detectorID
;
}
// Methods to set member variables
void
setDetectorID
(
std
::
string
detectorID
)
{
m_detectorID
=
detectorID
;
}
// Function to get instantiation of inherited class (given a string, give back
// an object of type 'daughter')
static
TestBeamObject
*
Factory
(
std
::
string
,
TestBeamObject
*
object
=
NULL
);
static
TestBeamObject
*
Factory
(
std
::
string
,
std
::
string
,
TestBeamObject
*
object
=
NULL
);
// Function to get instantiation of inherited class (given a string, give back
// an object of type 'daughter')
static
TestBeamObject
*
Factory
(
std
::
string
,
TestBeamObject
*
object
=
NULL
);
static
TestBeamObject
*
Factory
(
std
::
string
,
std
::
string
,
TestBeamObject
*
object
=
NULL
);
// Member variables
std
::
string
m_detectorID
;
long
long
int
m_timestamp
;
// Member variables
std
::
string
m_detectorID
;
long
long
int
m_timestamp
;
// ROOT I/O class definition - update version number when you change this
// class!
ClassDef
(
TestBeamObject
,
1
)
};
// Vector type declaration
typedef
std
::
vector
<
TestBeamObject
*>
TestBeamObjects
;
// ROOT I/O class definition - update version number when you change this
// class!
ClassDef
(
TestBeamObject
,
1
)
};
// Vector type declaration
typedef
std
::
vector
<
TestBeamObject
*>
TestBeamObjects
;
}
#endif // TESTBEAMOBJECT_H
src/objects/Track.h
View file @
82a89d0b
...
...
@@ -23,7 +23,7 @@ public:
m_direction
.
SetZ
(
1.
);
m_state
.
SetZ
(
0.
);
}
// virtual ~Track() {}
// virtual ~Track() {}
// Copy constructor (also copies clusters from the original track)
Track
(
Track
*
track
)
{
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment