Addressing reviewer comments, plus fix in TGeoCompositeShape

Author: ihrivnac

geom/geom/inc/TGeoShape.h

@@ -61,6 +61,7 @@ class TGeoShape : public TNamed {
       kGeoParaboloid = BIT(28),
       kGeoHalfSpace = BIT(29),
       kGeoHype = BIT(30),
+      kGeoScaled = BIT(31),
       kGeoSavePrimitive = BIT(20)
    };
 

geom/geom/src/TGeoCompositeShape.cxx

@@ -257,6 +257,7 @@ TGeoCompositeShape::TGeoCompositeShape(const char *expression) : TGeoBBox(0, 0,
 
 TGeoCompositeShape::TGeoCompositeShape(const char *name, TGeoBoolNode *node) : TGeoBBox(0, 0, 0)
 {
+   SetShapeBit(TGeoShape::kGeoComb);
    SetName(name);
    fNode = node;
    if (!fNode) {

geom/geom/src/TGeoScaledShape.cxx

@@ -33,6 +33,7 @@ A shape scaled by a TGeoScale transformation
 
 TGeoScaledShape::TGeoScaledShape()
 {
+   SetShapeBit(TGeoShape::kGeoScaled);
    fShape = nullptr;
    fScale = nullptr;
 }
@@ -42,6 +43,7 @@ TGeoScaledShape::TGeoScaledShape()
 
 TGeoScaledShape::TGeoScaledShape(const char *name, TGeoShape *shape, TGeoScale *scale) : TGeoBBox(name, 0, 0, 0)
 {
+   SetShapeBit(TGeoShape::kGeoScaled);
    fShape = shape;
    fScale = scale;
    if (!fScale->IsRegistered())
@@ -54,6 +56,7 @@ TGeoScaledShape::TGeoScaledShape(const char *name, TGeoShape *shape, TGeoScale *
 
 TGeoScaledShape::TGeoScaledShape(TGeoShape *shape, TGeoScale *scale)
 {
+   SetShapeBit(TGeoShape::kGeoScaled);
    fShape = shape;
    fScale = scale;
    if (!fScale->IsRegistered())

geom/vecgeom/src/TGeoVGConverter.cxx

@@ -76,13 +76,15 @@ void TGeoVGConverter::ConvertGeometry()
       top->SetShape(vgshape);
    }
 
-   // Uncomment to print info about selected/excluded shapes
-   // if ( ! fSelectedShapeTypes.empty()) {
-   //   printf("# %zu selected shape type for conversion \n", fSelectedShapeTypes.size());
-   // }
-   // if ( ! fExcludedShapeTypes.empty()) {
-   //   printf("# %zu shape types excluded from conversion \n", fExcludedShapeTypes.size());
-   // }
+   // Print info about selected/excluded shapes
+   if (gGeoManager->GetVerboseLevel() > 1) {
+      if ( ! fSelectedShapeTypes.empty()) {
+        Info("ConvertGeometry","# %zu selected shape type for conversion \n", fSelectedShapeTypes.size());
+      }
+      if ( ! fExcludedShapeTypes.empty()) {
+        Info("ConvertGeometry","# %zu shape types excluded from conversion \n", fExcludedShapeTypes.size());
+      }
+   }
 
    // Now iterate the active geometry tree
    TGeoIterator next(fGeom->GetTopVolume());
@@ -96,29 +98,38 @@ void TGeoVGConverter::ConvertGeometry()
       // If fSelectedShapeTypes is not empty, convert only selected shapes
       if ((! fSelectedShapeTypes.empty()) &&
           (! isInSelection(vol->GetShape(), fSelectedShapeTypes))) {
-         printf("# Shape type %s is not selected for conversion\n", vol->GetShape()->IsA()->GetName());
+         if (gGeoManager->GetVerboseLevel() > 1) {
+            Info("ConvertGeometry","# Shape type %s is not selected for conversion\n",
+                 vol->GetShape()->IsA()->GetName());
+         }
          continue;
       }
 
       // Skip shapes excluded from conversion
       if (isInSelection(vol->GetShape(), fExcludedShapeTypes)) {
-         printf("# Shape type %s is excluded from conversion\n", vol->GetShape()->IsA()->GetName());
+         if (gGeoManager->GetVerboseLevel() > 1) {
+            Info("ConvertGeometry","# Shape type %s is excluded from conversion\n",
+                 vol->GetShape()->IsA()->GetName());
+         }
          continue;
       }
 
-      // printf("Converting %s\n", vol->GetName());
+      // Info("ConvertGeometry","Converting %s\n", vol->GetName());
       vgshape = TGeoVGShape::Create(vol->GetShape());
       if (vgshape) {
          nconverted++;
          vol->SetShape(vgshape);
       }
    }
-   printf("# Converted %d shapes to VecGeom ones\n", nconverted);
+   if (gGeoManager->GetVerboseLevel() > 0) {
+      Info("ConvertGeometry","# Converted %d shapes to VecGeom ones\n", nconverted);
+   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 /// Select shape(s) for conversion.
-/// Conversion is performed only on selected shapes (if set)
+/// Conversion is performed only on selected shapes. If unset, all solid types
+/// will be converted.
 
 void TGeoVGConverter::SelectShapeType(TGeoShape::EShapeType shapeType)
 {
@@ -127,6 +138,7 @@ void TGeoVGConverter::SelectShapeType(TGeoShape::EShapeType shapeType)
 
 ////////////////////////////////////////////////////////////////////////////////
 /// Exclude shape(s) from conversion.
+/// Excluded types have precedence in case a type is also selected.
 
 void TGeoVGConverter::ExcludeShapeType(TGeoShape::EShapeType shapeType)
 {

geom/vecgeom/src/TGeoVGShape.cxx

@@ -293,17 +293,14 @@ vecgeom::cxx::VUnplacedVolume *TGeoVGShape::Convert(TGeoShape const *const shape
 
    // THE SCALED SHAPE
    if (shape->IsA() == TGeoScaledShape::Class()) {
-      // TGeoScaledShape const *const p = static_cast<TGeoScaledShape const *>(shape);
-      // // First convert the referenced shape
-      // VUnplacedVolume *referenced_shape = Convert(p->GetShape());
-      // if (!referenced_shape)
-      //    return nullptr;
-      // const double *scale_root = p->GetScale()->GetScale();
-      // unplaced_volume =
-      //    GeoManager::MakeInstance<UnplacedScaledShape>(referenced_shape, scale_root[0], scale_root[1], scale_root[2]);
-
-      // temporarily skip scaled solids which cannot be excluded via EShapeType selection
-      printf("Unsupported scaled shape\n");
+      TGeoScaledShape const *const p = static_cast<TGeoScaledShape const *>(shape);
+      // First convert the referenced shape
+      VUnplacedVolume *referenced_shape = Convert(p->GetShape());
+      if (!referenced_shape)
+         return nullptr;
+      const double *scale_root = p->GetScale()->GetScale();
+      unplaced_volume =
+         GeoManager::MakeInstance<UnplacedScaledShape>(referenced_shape, scale_root[0], scale_root[1], scale_root[2]);
    }
 
    // THE CUT TUBE