Merge branch 'master' into development

SiLab-Bonn · Jan 12, 2017 · 478c59c · 478c59c
2 parents 78a0a2d + f5a2530
commit 478c59c
Showing 1 changed file with 21 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -51,7 +51,24 @@ data_clusterizer.cpp
 .pydevproject
 # Examples output data
 examples/data/output*
-tmp
-*.pdf
-*tmp*.*
-.coverage*
+# Example data
+TestBeamData_FEI4_DUT0_cluster.h5
+TestBeamData_FEI4_DUT1_cluster.h5
+TestBeamData_FEI4_DUT4_cluster.h5
+TestBeamData_FEI4_DUT5_cluster.h5
+TestBeamData_Mimosa26_DUT0_hot_pixel.h5
+TestBeamData_Mimosa26_DUT0_hot_pixel_cluster.h5
+TestBeamData_Mimosa26_DUT1_hot_pixel.h5
+TestBeamData_Mimosa26_DUT1_hot_pixel_cluster.h5
+TestBeamData_Mimosa26_DUT2_hot_pixel.h5
+TestBeamData_Mimosa26_DUT2_hot_pixel_cluster.h5
+TestBeamData_Mimosa26_DUT0_hot_pixel.pdf
+TestBeamData_Mimosa26_DUT1_hot_pixel.pdf
+TestBeamData_Mimosa26_DUT2_hot_pixel.pdf
+hit_clusterizer.cpp
+Alignment.h5
+Correlation.h5
+TrackCandidates.h5
+Tracklets.h5
+Tracklets_corr.h5
+Tracks.h5