[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

src/B0Preshower_geo.cpp

@@ -155,7 +155,7 @@ static Ref_t create_B0Preshower(Detector& description, xml_h e, SensitiveDetecto
     }
     DetElement layer_element(sdet, layer_name, l_id);
     layer_element.setPlacement(layer_pv);
-    layer_element.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+    layer_element.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
 
     for (xml_coll_t ri(x_layer, _U(ring)); ri; ++ri) {
       xml_comp_t x_ring    = ri;
@@ -195,7 +195,7 @@ static Ref_t create_B0Preshower(Detector& description, xml_h e, SensitiveDetecto
           pv.addPhysVolID("barrel", 2).addPhysVolID("layer", l_id).addPhysVolID("module", mod_num);
           DetElement r_module(layer_element, m_base + "_neg", det_id);
           r_module.setPlacement(pv);
-          r_module.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+          r_module.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
           for (size_t ic = 0; ic < sensVols.size(); ++ic) {
             PlacedVolume sens_pv = sensVols[ic];
             DetElement comp_elt(r_module, sens_pv.volume().name(), mod_num);

src/B0Tracker_geo.cpp

@@ -182,7 +182,7 @@ static Ref_t create_B0Tracker(Detector& description, xml_h e, SensitiveDetector
     layer_name += "_P";
     DetElement layer_element(sdet, layer_name, l_id);
     layer_element.setPlacement(layer_pv);
-    layer_element.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+    layer_element.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
 
     auto& layerParams =
         DD4hepDetectorHelper::ensureExtension<dd4hep::rec::VariantParameters>(layer_element);
@@ -208,7 +208,7 @@ static Ref_t create_B0Tracker(Detector& description, xml_h e, SensitiveDetector
 
         // if (!reflect) {
         DetElement module(layer_element, m_base + "_pos", det_id);
-        module.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+        module.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
         pv = layer_vol.placeVolume(m_vol, Transform3D(RotationZYX(0, -M_PI / 2 - phi, -M_PI / 2),
                                                       Position(x, y, zstart + dz)));
         pv.addPhysVolID("layer", l_id).addPhysVolID("module", mod_num);
@@ -217,7 +217,7 @@ static Ref_t create_B0Tracker(Detector& description, xml_h e, SensitiveDetector
           PlacedVolume sens_pv = sensVols[ic];
           DetElement comp_elt(module, sens_pv.volume().name(), mod_num);
           comp_elt.setPlacement(sens_pv);
-          comp_elt.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+          comp_elt.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
           auto& comp_elt_params =
               DD4hepDetectorHelper::ensureExtension<dd4hep::rec::VariantParameters>(comp_elt);
           comp_elt_params.set<std::string>("axis_definitions", "XZY");

src/BackwardsTaggers_geo.cpp

@@ -47,7 +47,7 @@ static Ref_t create_detector(Detector& desc, xml_h e, SensitiveDetector sens) {
 
     // Create a DetElement for the module
     DetElement moddet(det, moduleName, moduleID);
-    moddet.setTypeFlag(det.typeFlag());  // make sure type flags are propagated
+    moddet.setTypeFlag(det.typeFlag()); // make sure type flags are propagated
 
     // Create an Assembly for the module contents
     Assembly moduleAssembly(moduleName + "_assembly");
@@ -108,7 +108,7 @@ static void Make_Tagger(Detector& desc, xml_coll_t& mod, Assembly& env, DetEleme
 
     DetElement laydet(modElement, "layerName" + std::to_string(layerID), layerID);
     laydet.setPlacement(pv_layer);
-    laydet.setTypeFlag(modElement.typeFlag());  // make sure type flags are propagated
+    laydet.setTypeFlag(modElement.typeFlag()); // make sure type flags are propagated
   }
 }
 

src/BarrelCalorimeterImaging_geo.cpp

@@ -78,7 +78,7 @@ static Ref_t create_detector(Detector& desc, xml_h e, SensitiveDetector sens) {
     envelope1_params.set<double>("envelope_z_max",
                                  getAttrOrDefault(x_envelope, _Unicode(envelope_z_max), 0.));
   }
-  envelope1_element.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+  envelope1_element.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
   // Add the volume boundary material if configured
   for (xml_coll_t boundary_material(x_detector, _Unicode(boundary_material)); boundary_material;
        ++boundary_material) {
@@ -97,7 +97,7 @@ static Ref_t create_detector(Detector& desc, xml_h e, SensitiveDetector sens) {
   // Build the envelope assembly for layers 2 to 6 (no Acts support)
   DetElement envelope26_element("envelope26", detector_id);
   Assembly envelope26_volume("envelope26");
-  envelope26_element.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+  envelope26_element.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
 
   // Build a sector for layer 1
   DetElement sector1_element("sector1", detector_id);
@@ -106,7 +106,7 @@ static Ref_t create_detector(Detector& desc, xml_h e, SensitiveDetector sens) {
     xml_comp_t x_sectors = x_detector.child(_Unicode(sectors));
     sector1_volume.setVisAttributes(desc.visAttributes(x_sectors.visStr()));
   }
-  sector1_element.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+  sector1_element.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
 
   // Build a sector for layers 2 to 6
   DetElement sector26_element("sector26", detector_id);
@@ -115,7 +115,7 @@ static Ref_t create_detector(Detector& desc, xml_h e, SensitiveDetector sens) {
     xml_comp_t x_sectors = x_detector.child(_Unicode(sectors));
     sector26_volume.setVisAttributes(desc.visAttributes(x_sectors.visStr()));
   }
-  sector26_element.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+  sector26_element.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
 
   // keep tracking of the total thickness
   double layer_pos_z = inner_r;
@@ -274,7 +274,7 @@ static Ref_t create_detector(Detector& desc, xml_h e, SensitiveDetector sens) {
       Trapezoid layer_shape(layer_trd_x1, layer_trd_x2, layer_trd_y1, layer_trd_y2, layer_trd_z);
       Volume layer_volume(layer_name, layer_shape, layer_mat);
       DetElement layer_element(layer_name, detector_id);
-      layer_element.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+      layer_element.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
       if (layer_num == 1) {
         sector1_element.add(layer_element);
       } else {
@@ -317,7 +317,7 @@ static Ref_t create_detector(Detector& desc, xml_h e, SensitiveDetector sens) {
                                    x_stave.visStr());
         // No parent, since it will be added on cloning and placement
         DetElement stave_element(stave_name, detector_id);
-        stave_element.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+        stave_element.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
 
         // Loop over the slices for this stave
         double slice_pos_z = -(stave_thick / 2.);
@@ -353,7 +353,7 @@ static Ref_t create_detector(Detector& desc, xml_h e, SensitiveDetector sens) {
               // Create module
               std::string module_name = _toString(i_module, "module%d");
               DetElement module_element(stave_element, module_name, i_module);
-              module_element.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+              module_element.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
 
               // Place module
               auto x = x0 + i_x * dx;
@@ -367,7 +367,8 @@ static Ref_t create_detector(Detector& desc, xml_h e, SensitiveDetector sens) {
               for (auto& sensitive_physvol : module_sensitives) {
                 DetElement sensitive_element(module_element, sensitive_physvol.volume().name(),
                                              i_module);
-                sensitive_element.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+                sensitive_element.setTypeFlag(
+                    sdet.typeFlag()); // make sure type flags are propagated
                 sensitive_element.setPlacement(sensitive_physvol);
 
                 auto& sensitive_element_params =
@@ -396,7 +397,7 @@ static Ref_t create_detector(Detector& desc, xml_h e, SensitiveDetector sens) {
           slice_volume.setAttributes(desc, x_slice.regionStr(), x_slice.limitsStr(),
                                      x_slice.visStr());
           DetElement slice_element(stave_element, slice_name, detector_id);
-          slice_element.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+          slice_element.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
 
           // Set sensitive
           if (x_slice.isSensitive()) {
@@ -427,7 +428,7 @@ static Ref_t create_detector(Detector& desc, xml_h e, SensitiveDetector sens) {
               (stave_j == 0) ? stave_element
                              : stave_element.clone(Form("stave%d", stave_num + stave_j));
           stave_j_element.setPlacement(stave_physvol);
-          stave_j_element.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+          stave_j_element.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
           layer_element.add(stave_j_element);
 
           // Increment X position of stave
@@ -503,7 +504,7 @@ static Ref_t create_detector(Detector& desc, xml_h e, SensitiveDetector sens) {
     DetElement sd1 =
         (sector_num == 0) ? sector1_element : sector1_element.clone(Form("sector1_%d", sector_num));
     sd1.setPlacement(sector1_physvol);
-    sd1.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+    sd1.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
     envelope1_element.add(sd1);
 
     // Place layers 2 through 6
@@ -512,7 +513,7 @@ static Ref_t create_detector(Detector& desc, xml_h e, SensitiveDetector sens) {
     DetElement sd26 = (sector_num == 0) ? sector26_element
                                         : sector26_element.clone(Form("sector26_%d", sector_num));
     sd26.setPlacement(sector26_physvol);
-    sd26.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+    sd26.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
     envelope26_element.add(sd26);
   }
 

src/BarrelCalorimeterScFi_geo.cpp

@@ -89,7 +89,7 @@ static Ref_t create_detector(Detector& desc, xml_h e, SensitiveDetector sens) {
   // build a single sector
   DetElement sector_det("sector0", det_id);
   Assembly mod_vol("sector");
-  sector_det.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+  sector_det.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
 
   // keep tracking of the total thickness
   double l_pos_z = inner_r;

src/BarrelHCalCalorimeter_geo.cpp

@@ -373,7 +373,7 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
   double increment_offset = -10.01 * increment_angle;
 
   DetElement tile_det("eta0 phi0", det_id);
-  tile_det.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+  tile_det.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
   sens.setType("calorimeter");
 
   for (int i_eta = 0; i_eta < 12; i_eta++) { // eta ring

src/BarrelPlanarMPGDTracker_geo.cpp

@@ -275,7 +275,7 @@ static Ref_t create_BarrelPlanarMPGDTracker_geo(Detector& description, xml_h e,
     pv = assembly.placeVolume(layer_assembly);
     pv.addPhysVolID("layer", lay_id);
     lay_elt.setPlacement(pv);
-    lay_elt.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+    lay_elt.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
 
     int module = 1;
     // loop over the modules in phi
@@ -288,7 +288,7 @@ static Ref_t create_BarrelPlanarMPGDTracker_geo(Detector& description, xml_h e,
       for (int j = 0; j < nz; j++) {
         string module_name = _toString(module, "module%d");
         DetElement mod_elt(lay_elt, module_name, module);
-        mod_elt.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+        mod_elt.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
         double mod_z       = 0.5 * dimensions.length();
         double z_placement = mod_z - 0.5 * pcb_feb_ext -
                              j * (nz * mod_z - pcb_feb_ext); // z location for module placement
@@ -311,7 +311,7 @@ static Ref_t create_BarrelPlanarMPGDTracker_geo(Detector& description, xml_h e,
           PlacedVolume sens_pv = sensVols[ic];
           DetElement comp_de(mod_elt, std::string("de_") + sens_pv.volume().name(), module);
           comp_de.setPlacement(sens_pv);
-          comp_de.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+          comp_de.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
         }
         // increas module counter
         module++;

src/BarrelTOFTracker_geo.cpp

@@ -491,10 +491,10 @@ static Ref_t create_TOFBarrel(Detector& description, xml_h e, SensitiveDetector
     double nz       = z_layout.nz();       // Number of modules to place in z.
     double z_dr     = z_layout.dr();       // Radial displacement parameter, of every other module.
 
-    Volume module_env = volumes[m_nam];
+    Volume module_env    = volumes[m_nam];
     Placements& sensVols = sensitives[m_nam];
     DetElement lay_elt(sdet, lay_nam, lay_id);
-    lay_elt.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+    lay_elt.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
 
     // the local coordinate systems of modules in dd4hep and acts differ
     // see http://acts.web.cern.ch/ACTS/latest/doc/group__DD4hepPlugins.html
@@ -526,7 +526,7 @@ static Ref_t create_TOFBarrel(Detector& description, xml_h e, SensitiveDetector
       for (int j = 0; j < nz; j++) {
         string module_name = _toString(module, "module%d");
         DetElement mod_elt(lay_elt, module_name, module);
-        mod_elt.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+        mod_elt.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
 
         Transform3D tr(RotationZYX(0, ((M_PI / 2) - phic - phi_tilt), -M_PI / 2),
                        Position(x, y, module_z));
@@ -538,7 +538,7 @@ static Ref_t create_TOFBarrel(Detector& description, xml_h e, SensitiveDetector
           PlacedVolume sens_pv = sensVols[ic];
           DetElement comp_de(mod_elt, std::string("de_") + sens_pv.volume().name(), module);
           comp_de.setPlacement(sens_pv);
-          comp_de.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+          comp_de.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
 
           auto& comp_de_params =
               DD4hepDetectorHelper::ensureExtension<dd4hep::rec::VariantParameters>(comp_de);

src/BarrelTrackerWithFrame_geo.cpp

@@ -265,10 +265,10 @@ static Ref_t create_BarrelTrackerWithFrame(Detector& description, xml_h e, Sensi
     double nz       = z_layout.nz();       // Number of modules to place in z.
     double z_dr     = z_layout.dr();       // Radial displacement parameter, of every other module.
 
-    Volume module_env = volumes[m_nam];
+    Volume module_env    = volumes[m_nam];
     Placements& sensVols = sensitives[m_nam];
     DetElement lay_elt(sdet, lay_nam, lay_id);
-    lay_elt.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+    lay_elt.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
 
     // the local coordinate systems of modules in dd4hep and acts differ
     // see http://acts.web.cern.ch/ACTS/latest/doc/group__DD4hepPlugins.html
@@ -300,7 +300,7 @@ static Ref_t create_BarrelTrackerWithFrame(Detector& description, xml_h e, Sensi
       for (int j = 0; j < nz; j++) {
         string module_name = _toString(module, "module%d");
         DetElement mod_elt(lay_elt, module_name, module);
-        mod_elt.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+        mod_elt.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
 
         Transform3D tr(RotationZYX(0, ((M_PI / 2) - phic - phi_tilt), -M_PI / 2),
                        Position(x, y, module_z));
@@ -312,7 +312,7 @@ static Ref_t create_BarrelTrackerWithFrame(Detector& description, xml_h e, Sensi
           PlacedVolume sens_pv = sensVols[ic];
           DetElement comp_de(mod_elt, std::string("de_") + sens_pv.volume().name(), module);
           comp_de.setPlacement(sens_pv);
-          comp_de.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+          comp_de.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
 
           auto& comp_de_params =
               DD4hepDetectorHelper::ensureExtension<dd4hep::rec::VariantParameters>(comp_de);

src/BeamPipeTracking_geo.cpp

@@ -42,7 +42,7 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
     int pipe_id            = getAttrOrDefault<int>(slice_coll, _Unicode(pipe_id), 0);
     string slice_name      = slice_coll.attr<string>(_Unicode(name));
     DetElement mother      = description.detector(grandmotherName).child(motherName);
-    mother.setTypeFlag(sdet.typeFlag);  // make sure type flags are propagated
+    mother.setTypeFlag(sdet.typeFlag); // make sure type flags are propagated
 
     // Get the mother volume
     Volume mother_vol = mother.volume();
@@ -123,7 +123,7 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
     DetElement slice_element(mother, slice_name, pipe_id);
 
     slice_element.setPlacement(disk_placement);
-    slice_element.setTypeFlag(sdet.typeFlag());  // make sure type flags are propagated
+    slice_element.setTypeFlag(sdet.typeFlag()); // make sure type flags are propagated
   }
 
   auto pv_assembly = description.worldVolume().placeVolume(assembly);