Expand divisions only on request.

diff --git a/TGeant3/AliGeant3GeometryGUI.cxx b/TGeant3/AliGeant3GeometryGUI.cxx
index 5555e292eab6255fab11f296d7e05fb1c5d1e6ec..ba44508eac32e40ab7c9ec7f7cf67ef1820549b5 100644 (file)
--- a/TGeant3/AliGeant3GeometryGUI.cxx
+++ b/TGeant3/AliGeant3GeometryGUI.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.2  2001/07/09 11:45:15  morsch
+Reduced functionality: mediate between GUI and Geometry Conversion.
+
 Revision 1.1  2000/07/13 16:19:10  fca
 Mainly coding conventions + some small bug fixes
 
@@ -77,14 +80,18 @@ AliG3Medium    *gCurrentMedium   = new AliG3Medium();
 
 ClassImp(AliGeant3GeometryGUI)
 
-    AliGeant3GeometryGUI::AliGeant3GeometryGUI()
+    AliGeant3GeometryGUI::AliGeant3GeometryGUI(const char* opt)
 {
+    char tmp[20];
+    strcpy(tmp, opt);
+
 // Constructor
     fPanel     = new AliGuiGeomMain(gClient->GetRoot(), 500, 500);
 //  Store local copy of zebra bank entries
     AliG3toRoot* geometry = new AliG3toRoot();
-//    geometry->SetExpandDivisions();
+    if (strcmp(tmp, "expand") == 0) geometry->SetExpandDivisions();
     geometry->G3toRoot();
+    geometry->ConvertToRootShapes();
     
     AliG3Volume* top = (AliG3Volume*) 
        (geometry->GetTopFolder()->FindObject("ALIC"));

diff --git a/TGeant3/AliGeant3GeometryGUI.h b/TGeant3/AliGeant3GeometryGUI.h
index 870fa3897321dd2cb5eea09aa60778e087390c4a..d47ac6eac1e8e70da952e56293a6fdec1c560716 100644 (file)
--- a/TGeant3/AliGeant3GeometryGUI.h
+++ b/TGeant3/AliGeant3GeometryGUI.h
@@ -15,7 +15,7 @@ class TRotMatrix;
 
 class AliGeant3GeometryGUI : public TObject {
  public:
-    AliGeant3GeometryGUI();
+    AliGeant3GeometryGUI(const char* opt = "");
     virtual ~AliGeant3GeometryGUI(){}
    private:
     AliGuiGeomMain *fPanel;      // the main gui panel
@@ -26,9 +26,9 @@ class AliGeant3GeometryGUI : public TObject {
     TClonesArray   *fMedia;      // array of materials
     TObjArray      *fRotations;  // Rotation Matrices
  private:
-   AliGeant3GeometryGUI(const AliGeant3GeometryGUI&) {}
-  AliGeant3GeometryGUI & operator=(const AliGeant3GeometryGUI&) 
-  {return *this;}
+    AliGeant3GeometryGUI(const AliGeant3GeometryGUI&) {}
+    AliGeant3GeometryGUI & operator=(const AliGeant3GeometryGUI&) 
+    {return *this;}
     
     ClassDef(AliGeant3GeometryGUI,1)  // GUI for Geant3 geometry visualisation
 };