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
01536fc6
Commit
01536fc6
authored
Oct 28, 2018
by
Simon Spannagel
Browse files
Automatically store all ROOT objects in finalise()
parent
67727394
Pipeline
#561325
failed with stages
in 4 minutes and 27 seconds
Changes
7
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/core/module/ModuleManager.cpp
View file @
01536fc6
...
...
@@ -657,6 +657,9 @@ void ModuleManager::finaliseAll() {
// Finalise the module
module
->
finalise
();
// Store all ROOT objects:
module
->
getROOTDirectory
()
->
Write
();
// Remove the pointer to the ROOT directory after finalizing
module
->
set_ROOT_directory
(
nullptr
);
...
...
src/modules/EventLoaderCLICpix2/EventLoaderCLICpix2.cpp
View file @
01536fc6
...
...
@@ -292,14 +292,3 @@ StatusCode EventLoaderCLICpix2::run(Clipboard* clipboard) {
// Return value telling analysis to keep running
return
Success
;
}
void
EventLoaderCLICpix2
::
finalise
()
{
hHitMap
->
Write
();
hMaskMap
->
Write
();
hHitMapDiscarded
->
Write
();
hPixelToTMap
->
Write
();
hPixelToT
->
Write
();
hPixelToA
->
Write
();
hPixelCnt
->
Write
();
hPixelsPerFrame
->
Write
();
}
src/modules/EventLoaderCLICpix2/EventLoaderCLICpix2.h
View file @
01536fc6
...
...
@@ -33,7 +33,6 @@ namespace corryvreckan {
// Functions
void
initialise
();
StatusCode
run
(
Clipboard
*
clipboard
);
void
finalise
();
private:
std
::
shared_ptr
<
Detector
>
m_detector
;
...
...
src/modules/TestAlgorithm/TestAlgorithm.cpp
View file @
01536fc6
...
...
@@ -125,16 +125,3 @@ StatusCode TestAlgorithm::run(Clipboard* clipboard) {
return
Success
;
}
void
TestAlgorithm
::
finalise
()
{
hitmap
->
Write
();
eventTimes
->
Write
();
correlationX
->
Write
();
correlationY
->
Write
();
correlationX2Dlocal
->
Write
();
correlationY2Dlocal
->
Write
();
correlationX2D
->
Write
();
correlationY2D
->
Write
();
correlationTime
->
Write
();
correlationTimeInt
->
Write
();
}
src/modules/TestAlgorithm/TestAlgorithm.h
View file @
01536fc6
...
...
@@ -22,7 +22,6 @@ namespace corryvreckan {
// Functions
void
initialise
();
StatusCode
run
(
Clipboard
*
clipboard
);
void
finalise
();
private:
std
::
shared_ptr
<
Detector
>
m_detector
;
...
...
src/modules/Timepix3Clustering/Timepix3Clustering.cpp
View file @
01536fc6
...
...
@@ -130,14 +130,6 @@ StatusCode Timepix3Clustering::run(Clipboard* clipboard) {
return
Success
;
}
void
Timepix3Clustering
::
finalise
()
{
clusterSize
->
Write
();
clusterWidthRow
->
Write
();
clusterWidthColumn
->
Write
();
clusterTot
->
Write
();
clusterPositionGlobal
->
Write
();
}
// Check if a pixel touches any of the pixels in a cluster
bool
Timepix3Clustering
::
touching
(
Pixel
*
neighbour
,
Cluster
*
cluster
)
{
...
...
src/modules/Timepix3Clustering/Timepix3Clustering.h
View file @
01536fc6
...
...
@@ -22,7 +22,6 @@ namespace corryvreckan {
// Functions
void
initialise
();
StatusCode
run
(
Clipboard
*
clipboard
);
void
finalise
();
private:
static
bool
sortByTime
(
Pixel
*
pixel1
,
Pixel
*
pixel2
);
...
...
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