added inheritance from TG4VPhysicsConstructor;

all G4cout calls controlled by verbose level
(defined in TG4Verbose)

diff --git a/TGeant4/TG4PhysicsConstructorEM.cxx b/TGeant4/TG4PhysicsConstructorEM.cxx
index c15049f8dd4c2364e2cf37d2541e1b629c5882a9..1b2ec38ce542c327ba056c0ea59d7c00853ec483 100644 (file)
--- a/TGeant4/TG4PhysicsConstructorEM.cxx
+++ b/TGeant4/TG4PhysicsConstructorEM.cxx
@@ -23,10 +23,15 @@
 
 //_____________________________________________________________________________
 TG4PhysicsConstructorEM::TG4PhysicsConstructorEM(const G4String& name)
-  : G4VPhysicsConstructor(name)
-{
+  : TG4VPhysicsConstructor(name) {
+//
+}
+
+//_____________________________________________________________________________
+TG4PhysicsConstructorEM::TG4PhysicsConstructorEM(G4int verboseLevel,
+                                                 const G4String& name)
+  : TG4VPhysicsConstructor(name, verboseLevel) {
 //
-  SetVerboseLevel(1);
 }
 
 //_____________________________________________________________________________
@@ -152,6 +157,7 @@ void TG4PhysicsConstructorEM::ConstructProcess()
   ConstructProcessForElectron();
   ConstructProcessForPositron();
 
-  if (verboseLevel>0)
+  if (VerboseLevel() > 0) {
     G4cout << "### Electromagnetic physics constructed." << G4endl;
+  }  
 }

diff --git a/TGeant4/TG4PhysicsConstructorEM.h b/TGeant4/TG4PhysicsConstructorEM.h
index 6b7204cff6ec6e328bd17df0a801051bf69acbd9..1193632c697d9f0b4177feed4a823bb5d45678e0 100644 (file)
--- a/TGeant4/TG4PhysicsConstructorEM.h
+++ b/TGeant4/TG4PhysicsConstructorEM.h
@@ -12,7 +12,8 @@
 #ifndef TG4_PHYSICS_CONSTRUCTOR_EM_H
 #define TG4_PHYSICS_CONSTRUCTOR_EM_H
 
-#include <G4VPhysicsConstructor.hh>
+#include "TG4VPhysicsConstructor.h"
+
 #include <G4PhotoElectricEffect.hh>
 #include <G4ComptonScattering.hh>
 #include <G4GammaConversion.hh>
@@ -22,10 +23,12 @@
 #include <G4eplusAnnihilation.hh>
 #include <globals.hh>
 
-class TG4PhysicsConstructorEM: public G4VPhysicsConstructor
+class TG4PhysicsConstructorEM: public TG4VPhysicsConstructor
 {
   public:
-    TG4PhysicsConstructorEM(const G4String& name = "EM");
+    TG4PhysicsConstructorEM(const G4String& name = "EM"); 
+    TG4PhysicsConstructorEM(G4int verboseLevel, 
+                            const G4String& name = "EM");
     virtual ~TG4PhysicsConstructorEM();
 
   protected:

diff --git a/TGeant4/TG4PhysicsConstructorGeneral.cxx b/TGeant4/TG4PhysicsConstructorGeneral.cxx
index 8031ada91beeca309d0c7543bbd35ab11dbd805d..f2e9626e4a060cd6b44cf376e1f156c55432409d 100644 (file)
--- a/TGeant4/TG4PhysicsConstructorGeneral.cxx
+++ b/TGeant4/TG4PhysicsConstructorGeneral.cxx
@@ -24,10 +24,16 @@
 
 //_____________________________________________________________________________
 TG4PhysicsConstructorGeneral::TG4PhysicsConstructorGeneral(const G4String& name)
-  : G4VPhysicsConstructor(name)
-{
+  : TG4VPhysicsConstructor(name) {
+//
+}
+
+//_____________________________________________________________________________
+TG4PhysicsConstructorGeneral::TG4PhysicsConstructorGeneral(
+                                                  G4int verboseLevel,
+                                                   const G4String& name)
+  : TG4VPhysicsConstructor(name, verboseLevel) {
 //
-  SetVerboseLevel(1);
 }
 
 //_____________________________________________________________________________
@@ -59,10 +65,12 @@ void TG4PhysicsConstructorGeneral::ConstructProcess()
   if (aliDecayer) {
     TG4ExtDecayer* tg4Decayer = new TG4ExtDecayer(aliDecayer);
        // the tg4Decayer is deleted in G4Decay destructor
-    tg4Decayer->SetVerboseLevel(1);   
+    tg4Decayer->VerboseLevel(VerboseLevel());   
     fDecayProcess.SetExtDecayer(tg4Decayer);
     
-    if (verboseLevel>0) G4cout << "### External decayer is set" << G4endl;
+    if (VerboseLevel() > 0) { 
+      G4cout << "### External decayer is set" << G4endl;
+    }  
   } 
 
   theParticleIterator->reset();
@@ -81,6 +89,7 @@ void TG4PhysicsConstructorGeneral::ConstructProcess()
   TG4ProcessControlMap* processMap = TG4ProcessControlMap::Instance();
   processMap->Add(&fDecayProcess, kDCAY); 
 
-  if (verboseLevel>0)
+  if (VerboseLevel() > 0) {
     G4cout << "### General physics constructed." << G4endl;
+  }  
 }

diff --git a/TGeant4/TG4PhysicsConstructorGeneral.h b/TGeant4/TG4PhysicsConstructorGeneral.h
index 424ee3531061a9813fd5eba703642f6dda79a020..c6f767fcc81f9644b90ef2105b826b6fb138efa9 100644 (file)
--- a/TGeant4/TG4PhysicsConstructorGeneral.h
+++ b/TGeant4/TG4PhysicsConstructorGeneral.h
@@ -11,14 +11,17 @@
 #ifndef TG4_PHYSICS_CONSTRUCTOR_GENERAL_H
 #define TG4_PHYSICS_CONSTRUCTOR_GENERAL_H
 
-#include <G4VPhysicsConstructor.hh>
+#include "TG4VPhysicsConstructor.h"
+
 #include <G4Decay.hh>
 #include <globals.hh>
 
-class TG4PhysicsConstructorGeneral: public G4VPhysicsConstructor
+class TG4PhysicsConstructorGeneral: public TG4VPhysicsConstructor
 {
   public:
     TG4PhysicsConstructorGeneral(const G4String& name = "General");
+    TG4PhysicsConstructorGeneral(G4int verboseLevel,
+                                 const G4String& name = "General");
     virtual ~TG4PhysicsConstructorGeneral();
 
   protected:

diff --git a/TGeant4/TG4PhysicsConstructorMuon.cxx b/TGeant4/TG4PhysicsConstructorMuon.cxx
index 14236808a19074b6689196b44b2a2a6ea4b427f2..d7a784262b8b1d71db7666138b9006b9b2b7b20b 100644 (file)
--- a/TGeant4/TG4PhysicsConstructorMuon.cxx
+++ b/TGeant4/TG4PhysicsConstructorMuon.cxx
@@ -33,10 +33,15 @@
 
 //_____________________________________________________________________________
 TG4PhysicsConstructorMuon::TG4PhysicsConstructorMuon(const G4String& name)
-  : G4VPhysicsConstructor(name)
-{
+  : TG4VPhysicsConstructor(name) {
+//
+}
+
+//_____________________________________________________________________________
+TG4PhysicsConstructorMuon::TG4PhysicsConstructorMuon(G4int verboseLevel,
+                                                     const G4String& name)
+  : TG4VPhysicsConstructor(name, verboseLevel) {
 //
-  SetVerboseLevel(1);
 }
 
 //_____________________________________________________________________________
@@ -201,6 +206,7 @@ void TG4PhysicsConstructorMuon::ConstructProcess()
   ConstructProcessForTauPlus();
   ConstructProcessForTauMinus();
 
-  if (verboseLevel>0)
+  if (VerboseLevel() >0 ) {
     G4cout << "### Muon physics constructed." << G4endl;
+  }  
 }

diff --git a/TGeant4/TG4PhysicsConstructorMuon.h b/TGeant4/TG4PhysicsConstructorMuon.h
index 79a327789a7cb66624f4c90be6d18fad8554619a..88fc8f4e9748a2beb39c9e74e6143e7d6d823c6b 100644 (file)
--- a/TGeant4/TG4PhysicsConstructorMuon.h
+++ b/TGeant4/TG4PhysicsConstructorMuon.h
@@ -11,7 +11,8 @@
 #ifndef TG4_PHYSICS_CONSTRUCTOR_MUON_H
 #define TG4_PHYSICS_CONSTRUCTOR_MUON_H
 
-#include <G4VPhysicsConstructor.hh>
+#include "TG4VPhysicsConstructor.h"
+
 #include "G4MultipleScattering.hh"
 #include "G4MuBremsstrahlung.hh"
 #include "G4MuPairProduction.hh"
@@ -20,10 +21,12 @@
 #include "G4hIonisation.hh"
 #include <globals.hh>
 
-class TG4PhysicsConstructorMuon: public G4VPhysicsConstructor
+class TG4PhysicsConstructorMuon: public TG4VPhysicsConstructor
 {
   public:
-    TG4PhysicsConstructorMuon(const G4String& name = "EM");
+    TG4PhysicsConstructorMuon(const G4String& name = "Muon");
+    TG4PhysicsConstructorMuon(G4int verboseLevel,
+                              const G4String& name = "Muon");
     virtual ~TG4PhysicsConstructorMuon();
 
   protected:

diff --git a/TGeant4/TG4PhysicsConstructorOptical.cxx b/TGeant4/TG4PhysicsConstructorOptical.cxx
index 1c4481defd8e58d8e1c5df7fdd7c57c2102d7c52..9ab25653ce44abbb972de67c2e4088a332b88de2 100644 (file)
--- a/TGeant4/TG4PhysicsConstructorOptical.cxx
+++ b/TGeant4/TG4PhysicsConstructorOptical.cxx
@@ -21,10 +21,15 @@
 
 //_____________________________________________________________________________
 TG4PhysicsConstructorOptical::TG4PhysicsConstructorOptical(const G4String& name)
-  : G4VPhysicsConstructor(name)
-{
+  : TG4VPhysicsConstructor(name) {
+//
+}
+
+//_____________________________________________________________________________
+TG4PhysicsConstructorOptical::TG4PhysicsConstructorOptical(G4int verboseLevel,
+                                                          const G4String& name)
+  : TG4VPhysicsConstructor(name, verboseLevel) {
 //
-  SetVerboseLevel(1);
 }
 
 //_____________________________________________________________________________
@@ -107,7 +112,8 @@ void TG4PhysicsConstructorOptical::ConstructProcess()
   mcMap->Add(theRayleighScatteringProcess, kPRayleigh); 
   mcMap->Add(theBoundaryProcess, kPLightScattering); 
 
-  if (verboseLevel>0)
+  if (VerboseLevel() > 0) {
     G4cout << "### " << namePhysics << " physics constructed." << G4endl;
+  }  
 }
 

diff --git a/TGeant4/TG4PhysicsConstructorOptical.h b/TGeant4/TG4PhysicsConstructorOptical.h
index a12b2208f8191c2a122df842aa5c2057046b29ff..ac4d536100b07fac0b076bef45fc5f042683ae90 100644 (file)
--- a/TGeant4/TG4PhysicsConstructorOptical.h
+++ b/TGeant4/TG4PhysicsConstructorOptical.h
@@ -11,13 +11,16 @@
 #ifndef TG4_PHYSICS_CONSTRUCTOR_OPTICAL_H
 #define TG4_PHYSICS_CONSTRUCTOR_OPTICAL_H
 
-#include <G4VPhysicsConstructor.hh>
+#include "TG4VPhysicsConstructor.h"
+
 #include <globals.hh>
 
-class TG4PhysicsConstructorOptical: public G4VPhysicsConstructor
+class TG4PhysicsConstructorOptical: public TG4VPhysicsConstructor
 {
   public:
     TG4PhysicsConstructorOptical(const G4String& name = "Optical");
+    TG4PhysicsConstructorOptical(G4int verboseLevel,
+                                 const G4String& name = "Optical");
     virtual ~TG4PhysicsConstructorOptical();
 
   protected: