update to geant4 4.0 (not yet released)

diff --git a/TGeant4/TG4MaterialsFrames.cxx b/TGeant4/TG4MaterialsFrames.cxx
index 15e81471ace730ff18a7bdd1a3dfc5df0c690952..2e9209706c762e9465e7a0d1eb5049e231f9b8af 100644 (file)
--- a/TGeant4/TG4MaterialsFrames.cxx
+++ b/TGeant4/TG4MaterialsFrames.cxx
@@ -140,7 +140,7 @@ void TG4MaterialsFrames::SetMaterialsComboEntries()
 
    const G4MaterialTable* lComboEntries = G4Material::GetMaterialTable();
 
-    G4int ig = lComboEntries->entries();
+    G4int ig = lComboEntries->size();
     G4String name;
     
     for (int ii=0; ii < ig; ii++)
@@ -171,7 +171,7 @@ void TG4MaterialsFrames::DisplayMaterialCharacteristics( int qmat)
 //---> qmat gt 0 means clicking in the VolumesFrames ComboBox
 
    const G4MaterialTable* lComboEntries = G4Material::GetMaterialTable();
-   G4int ientr = lComboEntries->entries();
+   G4int ientr = lComboEntries->size();
    G4int index = qmat ;
    
    if ( !(qmat < 1) )

diff --git a/TGeant4/TG4VisManager.cxx b/TGeant4/TG4VisManager.cxx
index ff31b19e98fc4396f05cf71f81182ac51248669b..bec0f48948de6b687a48a13c7bdd339347c7aff3 100644 (file)
--- a/TGeant4/TG4VisManager.cxx
+++ b/TGeant4/TG4VisManager.cxx
@@ -100,9 +100,10 @@
 #endif
 
 //_____________________________________________________________________________
-TG4VisManager::TG4VisManager(G4int verboseLevel) {
+TG4VisManager::TG4VisManager(G4int verboseLevel)
+  : fVerboseLevel(0) {
 //  
-  fVerbose = verboseLevel; 
+  fVerboseLevel = verboseLevel; 
   fColourFlag = true;
 }
 
@@ -192,7 +193,7 @@ void TG4VisManager::RegisterGraphicsSystems()
   RegisterGraphicsSystem(new G4VRML2File);
 #endif
 
-  if (fVerbose > 0) {
+  if (fVerboseLevel > 0) {
     G4cout <<
       "\nYou have successfully chosen to use the following graphics systems."
         << G4endl;
@@ -467,7 +468,7 @@ void TG4VisManager::SetG4Attribute(G4LogicalVolume* const lv,
     case 3:
      lineStyle = G4VisAttributes::dotted; break;
     default:
-     if (fVerbose > 0)
+     if (fVerboseLevel > 0)
       G4cout << "TG4VisManager::Gsatt() Usage of LSTY :" << G4endl
             << "ATT = 1,2,3 means line unbroken, dashed or dotted" << G4endl
             << "any other value resets to the default : unbroken" << G4endl;
@@ -477,7 +478,7 @@ void TG4VisManager::SetG4Attribute(G4LogicalVolume* const lv,
   case kLWID:
    lineWidth = kAbsVal;
    if (lineWidth > 7) lineWidth = 7;
-   if (fVerbose > 0) 
+   if (fVerboseLevel > 0) 
        G4cout << "TG4VisManager::Gsatt() Usage for LWID :" << G4endl
               << "  The VAL you supply means the width of lines in pixels "
              << "for the screen and in 0.1*mm for paper." << G4endl
@@ -562,7 +563,7 @@ void TG4VisManager::SetG4Attribute(G4LogicalVolume* const lv,
      drawingStyle = G4VisAttributes::solid;
      break;
     default:
-     if (fVerbose > 0)
+     if (fVerboseLevel > 0)
          G4cout << "TG4VisManager::Gsatt() FILL usage :" << G4endl
                << "  The FILL values you can supply are only :" << G4endl
                << "+/- 1 : forces wireframe drawing (default)" << G4endl
@@ -878,16 +879,17 @@ void TG4VisManager::Gdraw(const char *name,Float_t theta, Float_t phi, Float_t p
 
   // set and register view parameters to the viewer
   
-  fVP.SetLightsMoveWithCamera(true);
-  fVP.SetViewGeom();
-  fVP.UnsetViewHits();
-  fVP.UnsetViewDigis();
-  fVP.SetNoOfSides(48);
-  fVP.SetCurrentTargetPoint(kTargetPoint);
-  fVP.SetViewpointDirection(viewpointDirection);
-  fVP.SetUpVector(upVector);
-  fVP.SetDensityCulling(true);
-  fpViewer->SetViewParameters(fVP);
+  G4ViewParameters vp;;
+  vp.SetLightsMoveWithCamera(true);
+  vp.SetViewGeom();
+  vp.UnsetViewHits();
+  vp.UnsetViewDigis();
+  vp.SetNoOfSides(48);
+  vp.SetCurrentTargetPoint(kTargetPoint);
+  vp.SetViewpointDirection(viewpointDirection);
+  vp.SetUpVector(upVector);
+  vp.SetDensityCulling(true);
+  fpViewer->SetViewParameters(vp);
 
   if (IsValidView())
   {

diff --git a/TGeant4/TG4VisManager.h b/TGeant4/TG4VisManager.h
index ea5c4776ec3ca7884934b84147b0508972ca5b08..7e88218d381723246b35075cbe453d2cd46b5995 100644 (file)
--- a/TGeant4/TG4VisManager.h
+++ b/TGeant4/TG4VisManager.h
@@ -92,7 +92,8 @@ class TG4VisManager: public G4VisManager
 
     //data members
     //------------
-    G4bool fColourFlag; //colour flag
+    G4bool fColourFlag;  //colour flag
+    G4int  fVerboseLevel;//verbose level
 };
 
 // inline methods