Merge remote-tracking branch 'upstream/dev' into UpdateTRKA3

Author: scannito

Detectors/Upgrades/ALICE3/Passive/src/Pipe.cxx

@@ -122,7 +122,8 @@ void Alice3Pipe::ConstructGeometry()
   // Add everything to the barrel
   barrel->AddNode(pipeVolume, 1, new TGeoTranslation(0, 30.f, 0));
 
-  pipeVolume->SetLineColor(kGreen + 3);
+  pipeVolume->SetLineColor(37);
+  pipeVolume->SetTransparency(0);
 }
 
 void Alice3Pipe::createMaterials()

Detectors/Upgrades/ALICE3/TRK/base/include/TRKBase/GeometryTGeo.h

@@ -43,6 +43,7 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache
   };
   static const char* getTRKVolPattern() { return sVolumeName.c_str(); }
   static const char* getTRKLayerPattern() { return sLayerName.c_str(); }
+  static const char* getTRKPetalAssemblyPattern() { return sPetalAssemblyName.c_str(); }
   static const char* getTRKPetalPattern() { return sPetalName.c_str(); }
   static const char* getTRKPetalDiskPattern() { return sPetalDiskName.c_str(); }
   static const char* getTRKPetalLayerPattern() { return sPetalLayerName.c_str(); }
@@ -160,6 +161,7 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache
 
   static std::string sVolumeName;
   static std::string sLayerName;
+  static std::string sPetalAssemblyName;
   static std::string sPetalName;
   static std::string sPetalDiskName;
   static std::string sPetalLayerName;