Merge branch 'master' into 'master'

Updating default value of use_cluster_centre

See merge request !151

src/modules/DUTAssociation/DUTAssociation.cpp

@@ -8,7 +8,7 @@ DUTAssociation::DUTAssociation(Configuration config, std::shared_ptr<Detector> d
 
     timingCut = m_config.get<double>("timing_cut", Units::get<double>(200, "ns"));
     spatialCut = m_config.get<XYVector>("spatial_cut", 2 * m_detector->pitch());
-    useClusterCentre = m_config.get<bool>("use_cluster_centre", true);
+    useClusterCentre = m_config.get<bool>("use_cluster_centre", false);
 }
 
 void DUTAssociation::initialise() {

src/modules/DUTAssociation/README.md

@@ -8,14 +8,16 @@
 Module to establish an association between clusters on a DUT plane and a reference track.
 The association allows for cuts in position and time.
 For the spatial cut, two options are implemented which can be chosen using `use_cluster_centre`.
-By default, the distance of the cluster centre to the track intercept is compared to the `spatial_cut` in local coordinates. If larger than the cut, the cluster is not associated to the track.
-The other option is to compare the distance of the closest pixel of a cluster to the track intercept (also in local coordinates).
+
+By default, the distance of the closest pixel of a cluster to the track intercept is compared to the `spatial_cut` in local coordinates.
+If larger than the cut, the cluster is not associated to the track.
 This option can be chosen, e.g. for an efficiency analysis, when the cluster centre might be pulled away from the track intercept by a delta electron in the silicon.
+The other option is to compare the distance between the cluster centre and the track intercept to the `spatial_cut`(also in local coordinates).
 
 ### Parameters
 * `spatial_cut`: Maximum spatial distance in local coordinates in x- and y-direction allowed between cluster and track for association with the DUT. Expects two values for the two coordinates, defaults to twice the pixel pitch.
 * `timing_cut`: Maximum time difference allowed between cluster and track for association for the DUT. Default value is `200ns`.
-* `use_cluster_centre`: If set true, the cluster centre will be compared to the track position for the spatial cut. If false, the nearest pixel will be used. Defaults to `true`.
+* `use_cluster_centre`: If set true, the cluster centre will be compared to the track position for the spatial cut. If false, the nearest pixel in the cluster will be used. Defaults to `false`.
 
 ### Plots produced
 * distance in x of cluster centre to track minus closest pixel to track
@@ -34,6 +36,6 @@ This option can be chosen, e.g. for an efficiency analysis, when the cluster cen
 [DUTAssociation]
 spatial_cut = 100um, 50um
 timing_cut = 200ns
-use_cluster_centre = true
+use_cluster_centre = false
 
 ```