Simplify ODD Strip Module Handling, main branch (2024.08.20.)

core/include/traccc/clusterization/impl/measurement_creation.ipp

@@ -111,7 +111,6 @@ TRACCC_HOST_DEVICE inline void fill_measurement(
     if (mod.pixel.dimension == 1) {
         m.meas_dim = 1;
         m.local[1] = 0.f;
-        m.variance[1] = mod.pixel.variance_y;
     }
 }
 

core/include/traccc/geometry/pixel_data.hpp

@@ -24,7 +24,6 @@ struct pixel_data {
     scalar pitch_x = 1.f;
     scalar pitch_y = 1.f;
     char dimension = 2;
-    scalar variance_y = 0.f;
 
     TRACCC_HOST_DEVICE
     vector2 get_pitch() const { return {pitch_x, pitch_y}; };

device/common/include/traccc/clusterization/device/impl/aggregate_cluster.ipp

@@ -142,7 +142,6 @@ inline void aggregate_cluster(
     if (this_module.pixel.dimension == 1) {
         out.meas_dim = 1;
         out.local[1] = 0.f;
-        out.variance[1] = this_module.pixel.variance_y;
     } else {
         out.meas_dim = 2;
     }

io/include/traccc/io/digitization_config.hpp

@@ -17,7 +17,6 @@ namespace traccc {
 struct module_digitization_config {
     Acts::BinUtility segmentation;
     char dimensions = 2;
-    float variance_y = 0.f;
 };
 
 /// Type describing the digitization configuration for the whole detector

io/src/csv/read_cells.cpp

@@ -83,7 +83,6 @@ traccc::cell_module get_module(const std::uint64_t geometry_id,
             result.pixel.pitch_y = binning_data[1].step;
         }
         result.pixel.dimension = geo_it->dimensions;
-        result.pixel.variance_y = geo_it->variance_y;
     }
 
     return result;

io/src/read_digitization_config.cpp

@@ -32,30 +32,21 @@ void from_json(const nlohmann::json& json, module_digitization_config& cfg) {
     // Names/keywords used in the JSON file.
     static const char* geometric = "geometric";
     static const char* segmentation = "segmentation";
-    static const char* variances = "variances";
+    static const char* binningdata = "binningdata";
+    static const char* bins = "bins";
 
     // Read the binning information, if possible.
     if (json.find(geometric) != json.end()) {
         const auto& json_geom = json[geometric];
         if (json_geom.find(segmentation) != json_geom.end()) {
             Acts::from_json(json_geom[segmentation], cfg.segmentation);
-        }
-        if (json_geom.find(variances) != json_geom.end()) {
-            for (const auto& jdata : json_geom[variances]) {
-                const int index = jdata["index"];
-                if (index != 1) {
-                    continue;
-                }
-                for (const auto& rms : jdata["rms"]) {
-                    // A large RMS value associated to the second index happens
-                    // to mean that this is a strip detector...
-                    const float frms = rms.get<float>();
-                    if (frms > 1.0f) {
-                        cfg.dimensions = 1;
-                        cfg.variance_y = std::max(frms, cfg.variance_y);
-                    }
+            // If we only have 1 bins along any axis, then this is a 1D module.
+            const auto& json_segm = json_geom[segmentation];
+            for (const auto& bindata : json_segm[binningdata]) {
+                if (bindata[bins].get<int>() == 1) {
+                    cfg.dimensions = 1;
+                    break;
                 }
-                break;
             }
         }
     }