Commit 6b1b587f authored by Jens Kroeger's avatar Jens Kroeger
Browse files

Merge branch 'v1.0-stable' into fix_copytrack

parents 543db667 ed0e9648
......@@ -33,7 +33,7 @@ RUN source scl_source enable devtoolset-7 && \
rm -rf ${ROOTSYS}/{src,build}
ENV PEARY_VERSION v0.9.11
ENV PEARY_VERSION v0.9.12
# Add layer for Caribou Peary
ENV PEARYPATH="/opt/peary"
......@@ -52,7 +52,7 @@ RUN source scl_source enable devtoolset-7 && \
rm -rf ${PEARYPATH}/{src,build}
ENV EUDAQ2_VERSION 2.4.1
ENV EUDAQ2_VERSION 2.4.2
# Add layer for EUDAQ2
ENV EUDAQ2PATH="/opt/eudaq2"
......@@ -73,4 +73,5 @@ RUN source scl_source enable devtoolset-7 && \
../src/eudaq-${EUDAQ2_VERSION} && \
make -j`grep -c processor /proc/cpuinfo` && \
make install && \
cp ${EUDAQ2PATH}/build/eudaqTarget* ${EUDAQ2PATH}/cmake/ && \
rm -rf ${EUDAQ2PATH}/{src,build}
......@@ -209,7 +209,8 @@ StatusCode DUTAssociation::run(std::shared_ptr<Clipboard> clipboard) {
void DUTAssociation::finalise() {
hCutHisto->Scale(1 / double(num_cluster));
LOG(INFO) << "In total, " << assoc_cluster_counter << " clusters are associated to tracks.";
LOG(STATUS) << "In total, " << assoc_cluster_counter << " clusters are associated to " << track_w_assoc_cls
<< " tracks.";
LOG(INFO) << "Number of tracks with at least one associated cluster: " << track_w_assoc_cls;
return;
}
......@@ -53,13 +53,18 @@ FUNCTION(ADD_CORRYVRECKAN_TEST TEST)
SET(CLIOPTIONS "${CLIOPTIONS} -g ${OPT}")
ENDFOREACH()
# Some tests might depend on others:
FILE(STRINGS ${TEST} DEPENDENCY REGEX "#DEPENDS ")
# Read the datasets from the configuration file:
FILE(STRINGS ${TEST} OPTS REGEX "#DATASET ")
LIST(LENGTH OPTS LISTCOUNT_DATA)
IF(LISTCOUNT_DATA LESS 1)
# Either we need a data set to operate on or another test output:
IF(LISTCOUNT_DATA LESS 1 AND NOT DEPENDENCY)
MESSAGE(FATAL_ERROR "No dataset defined for test \"${TEST}\"")
ENDIF()
FOREACH(SET ${OPTS})
FOREACH(OPT ${OPTS})
STRING(REPLACE "#DATASET " "" OPT "${OPT}")
SET(DATASETS "${DATASETS} ${OPT}")
ENDFOREACH()
......@@ -78,8 +83,6 @@ FUNCTION(ADD_CORRYVRECKAN_TEST TEST)
SET_TESTS_PROPERTIES(${TEST} PROPERTIES FAIL_REGULAR_EXPRESSION "${EXPRESSIONS_FAIL}")
ENDIF()
# Some tests might depend on others:
FILE(STRINGS ${TEST} DEPENDENCY REGEX "#DEPENDS ")
IF(DEPENDENCY)
STRING(REPLACE "#DEPENDS " "" DEPENDENCY "${DEPENDENCY}")
SET_TESTS_PROPERTIES(${TEST} PROPERTIES DEPENDS "${DEPENDENCY}")
......
[W0013_D04]
number_of_pixels = 256,256
orientation = 10.7471deg,186.437deg,-1.33797deg
orientation_mode = "xyz"
pixel_pitch = 55um,55um
position = 923.402um,296.86um,0
spatial_resolution = 4um,4um
time_resolution = 20ns
type = "Timepix3"
[W0013_E03]
number_of_pixels = 256,256
orientation = 11.0172deg,186.658deg,-1.06937deg
orientation_mode = "xyz"
pixel_pitch = 55um,55um
position = -249.154um,408.592um,21.5mm
spatial_resolution = 4um,4um
time_resolution = 20ns
type = "Timepix3"
[W0013_G02]
number_of_pixels = 256,256
orientation = 10.3075deg,187.093deg,-1.64124deg
orientation_mode = "xyz"
pixel_pitch = 55um,55um
position = 43.482um,378.305um,43.5mm
spatial_resolution = 4um,4um
time_resolution = 20ns
role = "dut"
type = "Timepix3"
[W0013_G03]
number_of_pixels = 256,256
orientation = 8.99544deg,8.99544deg,0
orientation_mode = "xyz"
pixel_pitch = 55um,55um
position = -0,-0,186.5mm
spatial_resolution = 4um,4um
time_resolution = 20ns
role = "reference"
type = "Timepix3"
[W0013_J05]
number_of_pixels = 256,256
orientation = 7.86184deg,9.84479deg,1.31121deg
orientation_mode = "xyz"
pixel_pitch = 55um,55um
position = 452.897um,-578.683um,208.5mm
spatial_resolution = 4um,4um
time_resolution = 20ns
type = "Timepix3"
[W0013_L09]
number_of_pixels = 256,256
orientation = 8.06547deg,10.0823deg,0.126337deg
orientation_mode = "xyz"
pixel_pitch = 55um,55um
position = -1.08498mm,-16.204um,231.5mm
spatial_resolution = 4um,4um
time_resolution = 20ns
type = "Timepix3"
......@@ -18,4 +18,4 @@ name = "MIMOSA26_2"
file_name = "data/mimosa26tel_desy_5400MeV/run000273_ni_190328144821_cut.raw"
#DATASET mimosa26tel_desy_5400MeV
#PASS [F:EventLoaderEUDAQ2:MIMOSA26_2] Found 7126 hits in the data.
#PASS [F:EventLoaderEUDAQ2:MIMOSA26_2] Found 8714 hits in the data.
[Corryvreckan]
log_level = "WARNING"
log_format = "DEFAULT"
detectors_file = "geometries/geometry_timepix3_telescope_dut.conf"
histogram_file = "histograms_read.root"
[FileReader]
file_name = "output/data.root"
[DUTAssociation]
spatial_cut = 200um,200um
time_cut = 100ns
[AnalysisEfficiency]
chi2ndof_cut = 8
time_cut_frameedge = 10ns
#DEPENDS test_write.conf
#PASS Total efficiency of detector W0013_G02: 99.9056%, measured with 178783/178952 matched/total tracks
[Corryvreckan]
detectors_file = "geometries/geometry_timepix3_telescope_dut.conf"
histogram_file = "test_writing.root"
log_level = "WARNING"
[Metronome]
event_length = 200us
[EventLoaderTimepix3]
input_directory = "data/timepix3tel_ebeam120"
[Clustering4D]
time_cut_abs = 100ns
[Tracking4D]
min_hits_on_track = 5
time_cut_abs = 200ns
spatial_cut_abs = 200um, 200um
[FileWriter]
#DATASET timepix3tel_ebeam120
#PASS Ev: 18.8k Px: 6.23M Tr: 178.5k (9.49/ev) t = 3.76s
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment