Index: trunk/geant4/N03/.DAWN_1.history
===================================================================
--- trunk/geant4/N03/.DAWN_1.history	(revision 608)
+++ trunk/geant4/N03/.DAWN_1.history	(revision 609)
@@ -1,10 +1,10 @@
-885739
-35
-35
+103078
 0
-10.6007
--11.7529
-11.7529
-1.1
+0
+0
+0
+0
+0
+1
 1
 0.001
Index: trunk/geant4/N03/G4History.macro
===================================================================
--- trunk/geant4/N03/G4History.macro	(revision 608)
+++ trunk/geant4/N03/G4History.macro	(revision 609)
@@ -1,8 +1,4 @@
 /run/verbose 2
 /vis/scene/create
-/vis/open DAWNFILE
-/vis/sceneHandler/create DAWNFILE
-/vis/sceneHandler/attach
-/vis/viewer/create ! ! 600
 /vis/open OGLSQT
 /vis/sceneHandler/create OGLSQT
@@ -12,6 +8,6 @@
 /vis/scene/notifyHandlers
 /vis/viewer/flush
-/vis/viewer/refresh viewer-1
-/vis/viewer/update viewer-1
+/vis/viewer/refresh viewer-0
+/vis/viewer/update viewer-0
 /vis/scene/add/trajectories
 /tracking/storeTrajectory 1
@@ -22,39 +18,2 @@
 /vis/scene/endOfEventAction accumulate
 /vis/scene/notifyHandlers
-/control/execute visTutor/gui.mac
-/gui/addMenu file File
-/gui/addButton file Continue continue
-/gui/addButton file Exit "exit"
-/gui/addMenu run Run
-/gui/addButton run "beamOn 1" "/run/beamOn 1"
-/gui/addButton run run1 "/control/execute run1.mac"
-/gui/addButton run run2 "/control/execute run2.mac"
-/gui/addMenu gun Gun
-/gui/addButton gun "50 MeV"  "/gun/energy 50 MeV"
-/gui/addButton gun "1 GeV"   "/gun/energy 1 GeV"
-/gui/addButton gun "10 GeV"  "/gun/energy 10 GeV"
-/gui/addButton gun "e-"      "/gun/particle e-"
-/gui/addButton gun "pi0"     "/gun/particle pi0"
-/gui/addButton gun "pi+"     "/gun/particle pi+"
-/gui/addButton gun "neutron" "/gun/particle neutron"
-/gui/addButton gun "proton"  "/gun/particle proton"
-/gui/addMenu vis Vis
-/gui/addButton vis Vis0(OGLIX) "/control/execute visTutor/exN03Vis0.mac"
-/gui/addButton vis Vis1(OGLSX) "/control/execute visTutor/exN03Vis1.mac"
-/gui/addButton vis Vis2(OGLSX) "/control/execute visTutor/exN03Vis2.mac"
-/gui/addButton vis Vis3(OGLSX) "/control/execute visTutor/exN03Vis3.mac"
-/gui/addButton vis Vis4(OGLIX) "/control/execute visTutor/exN03Vis4.mac"
-/gui/addButton vis Vis12(OGLIQT) "/control/execute visTutor/exN03Vis12.mac"
-/gui/addButton vis Vis14(OGLSQT) "/control/execute visTutor/exN03Vis14.mac"
-/gui/addButton vis Vis5(OIX)   "/control/execute visTutor/exN03Vis5.mac"
-/gui/addButton vis Vis6(VRML2FILE) "/control/execute visTutor/exN03Vis6.mac"
-/gui/addButton vis Vis7(DAWNFILE) "/control/execute visTutor/exN03Vis7.mac"
-/gui/addButton vis Vis8(DAWNFILE) "/control/execute visTutor/exN03Vis8.mac"
-/gui/addButton vis Vis9(OGLIWIN) "/control/execute visTutor/exN03Vis9.mac"
-/gui/addButton vis Vis10(OIWin32) "/control/execute visTutor/exN03Vis10.mac"
-/gui/addButton vis Vis11(OGLSXm) "/control/execute visTutor/exN03Vis11.mac"
-/gui/addMenu viewer Viewer
-/gui/addButton viewer "Set style solid" "/vis/viewer/set/style solid"
-/gui/addButton viewer "Set style wireframe" "/vis/viewer/set/style wire"
-/gui/addButton viewer "Update scene" "/vis/scene/notifyHandlers"
-/N03/event/printModulo 100
Index: trunk/geant4/N03/History
===================================================================
--- trunk/geant4/N03/History	(revision 608)
+++ trunk/geant4/N03/History	(revision 609)
@@ -1,3 +1,3 @@
-$Id: History,v 1.111 2006/10/26 14:58:59 allison Exp $
+$Id: History,v 1.116 2007/11/16 10:52:37 lgarnier Exp $
 --------------------------------------------------
 
@@ -16,4 +16,22 @@
      ----------------------------------------------------------
      
+16-11-07 Laurent Garnier
+- exampleN03 : Adding Qt render possibility
+- visTutor/gui.mac : Adding menu for Qt render
+- visTutor/exN03Vis14.mac,visTutor/exN03Vis15.mac : Adding file menu for
+  Qt render
+
+02-07-07 V.Ivant (exampleN03-V09-00-00)
+- make destructors virtual, cleanup
+
+25-06-07 mma (exampleN03-V08-03-02)
+- simplifications in exampleN03.cc
+     
+13-06-07 mma (exampleN03-V08-03-01)
+- more verbose in rndmSeed.mac
+     
+21-05-07 John Allison (exampleN03-V08-03-00)
+- Changed visTutor/exN03Vis12.loop and 13: follows change to /vis/ogl/printEPS.
+
 26-10-06 John Allison (exampleN03-V08-01-04)
 - Migrate to new trajectory modeling commands:
Index: trunk/geant4/N03/exampleN03.cc
===================================================================
--- trunk/geant4/N03/exampleN03.cc	(revision 608)
+++ trunk/geant4/N03/exampleN03.cc	(revision 609)
@@ -25,29 +25,10 @@
 //
 //
-// $Id: exampleN03.cc,v 1.28 2006/06/29 17:48:30 gunter Exp $
-// GEANT4 tag $Name: geant4-08-01 $
+// $Id: exampleN03.cc,v 1.33 2007/11/16 10:50:41 lgarnier Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-
-/** Environnement definition for app launch for mac
-*/
-//#define MOSX_APP
-#ifdef MOSX_APP
-#define G4UI_BUILD_QT_SESSION
-#define G4UI_USE_QT
-#define G4VIS_BUILD_OPENGLQT_DRIVER
-#define G4VIS_USE_OPENGLQT
-#endif
-/** End of Environnement definition for app launch for mac
-*/
-
-
-
-
-
-
 
 #include "G4RunManager.hh"
@@ -56,22 +37,5 @@
 #include "G4UItcsh.hh"
 
-#ifdef G4UI_USE_XM
-#include "G4UIXm.hh"
-#endif
-
-#ifdef G4UI_USE_QT
-#include "G4UIQt.hh"
-#include "G4Qt.hh"
-#endif
-
-#ifdef G4UI_USE_WIN32
-#include "G4UIWin32.hh"
-#endif
-
 #include "Randomize.hh"
-
-#ifdef G4VIS_USE
-#include "G4VisExecutive.hh"
-#endif
 
 #include "ExN03DetectorConstruction.hh"
@@ -83,4 +47,23 @@
 #include "ExN03SteppingVerbose.hh"
 
+#ifdef G4VIS_USE
+#include "G4VisExecutive.hh"
+#endif
+
+#ifdef G4UI_USE_XM
+#include "G4UIXm.hh"
+#endif
+
+#ifdef G4UI_USE_WIN32
+#include "G4UIWin32.hh"
+#endif
+
+#ifdef G4UI_USE_QT
+#include "G4UIQt.hh"
+#include "G4Qt.hh"
+#include <qapplication.h>
+#endif
+
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
@@ -90,9 +73,8 @@
   //
   CLHEP::HepRandom::setTheEngine(new CLHEP::RanecuEngine);
-    
+  
   // User Verbose output class
   //
-  G4VSteppingVerbose* verbosity = new ExN03SteppingVerbose;
-  G4VSteppingVerbose::SetInstance(verbosity);
+  G4VSteppingVerbose::SetInstance(new ExN03SteppingVerbose);
      
   // Construct the default run manager
@@ -107,38 +89,9 @@
   G4VUserPhysicsList* physics = new ExN03PhysicsList;
   runManager->SetUserInitialization(physics);
-
-  G4UIsession* session=0;
-  
-#ifndef MOSX_APP
-  if (argc==1)   // Define UI session for interactive mode.
-    {
-#endif
-      // G4UIterminal is a (dumb) terminal
-      //
-#if defined(G4UI_USE_XM)
-      session = new G4UIXm(argc,argv);
-#elif defined(G4UI_USE_WIN32)
-      session = new G4UIWin32();
-#elif defined(G4UI_USE_QT)
-      session = new G4UIQt(argc,argv);
-#elif defined(G4UI_USE_TCSH)
-      session = new G4UIterminal(new G4UItcsh);      
-#else
-      session = new G4UIterminal();
-#endif
-#ifndef MOSX_APP
-    }
-#endif
-  
-#ifdef G4VIS_USE
-  // Visualization manager
-  //
-  G4VisManager* visManager = new G4VisExecutive;
-  visManager->Initialize();
-#endif
-     
+    
   // Set user action classes
   //
-  G4VUserPrimaryGeneratorAction* gen_action = new ExN03PrimaryGeneratorAction(detector);
+  G4VUserPrimaryGeneratorAction* gen_action = 
+                          new ExN03PrimaryGeneratorAction(detector);
   runManager->SetUserAction(gen_action);
   //
@@ -150,5 +103,5 @@
   //
   G4UserSteppingAction* stepping_action =
-    new ExN03SteppingAction(detector, event_action);
+                    new ExN03SteppingAction(detector, event_action);
   runManager->SetUserAction(stepping_action);
   
@@ -156,41 +109,45 @@
   //
   runManager->Initialize();
-    
+  
   // Get the pointer to the User Interface manager
   //
-  G4UImanager* UI = G4UImanager::GetUIpointer();  
+  G4UImanager* UI = G4UImanager::GetUIpointer();      
+  
+  if (argc!=1)   // batch mode
+    {
+      G4String command = "/control/execute ";
+      G4String fileName = argv[1];
+      UI->ApplyCommand(command+fileName);    
+    }
+  else           // interactive mode : define visualization UI terminal
+    {
+#ifdef G4VIS_USE
+      G4VisManager* visManager = new G4VisExecutive;
+      visManager->Initialize();
+#endif
 
-  if (session)   // Define UI session for interactive mode
-    {
-      // G4UIterminal is a (dumb) terminal
-      //
-#ifdef MOSX_APP
-      G4Qt* interactorManager = G4Qt::getInstance (); 
-      G4String vis = QString("/control/execute "+((QApplication*)interactorManager->GetMainInteractor())->applicationDirPath ()+"/../Resources/vis.mac").toStdString().c_str();
+      G4UIsession* session = 0;
+#if defined(G4UI_USE_TCSH)
+      session = new G4UIterminal(new G4UItcsh);      
+#elif defined(G4UI_USE_XM)
+      session = new G4UIXm(argc,argv);
+      UI->ApplyCommand("/control/execute visTutor/gui.mac");      
+#elif defined(G4UI_USE_WIN32)
+      session = new G4UIWin32();
+      UI->ApplyCommand("/control/execute visTutor/gui.mac");      
+#elif defined(G4UI_USE_QT)
+      session = new G4UIQt(argc,argv);
+      UI->ApplyCommand("/control/execute visTutor/gui.mac");      
 #else
-      G4String vis = "/control/execute vis.mac";    
+      session = new G4UIterminal();
 #endif
-      UI->ApplyCommand(vis);    
-#if defined(G4UI_USE_XM) || defined(G4UI_USE_WIN32) || defined(G4UI_USE_QT)
-      // Customize the G4UIXm,Win32 menubar with a macro file
-      //
-#ifdef MOSX_APP
-      G4String visTutor = QString("/control/execute "+((QApplication*)interactorManager->GetMainInteractor())->applicationDirPath ()+"/../Resources/visTutor/gui.mac").toStdString().c_str();
-#else
-      G4String visTutor = "/control/execute visTutor/gui.mac";    
-#endif
-      UI->ApplyCommand(visTutor);
-#endif
+
+      UI->ApplyCommand("/control/execute vis.mac");
       session->SessionStart();
       delete session;
-    }
-  else           // Batch mode
-    { 
+      
 #ifdef G4VIS_USE
-      visManager->SetVerboseLevel("quiet");
-#endif
-      G4String command = "/control/execute ";
-      G4String fileName = argv[1];
-      UI->ApplyCommand(command+fileName);
+      delete visManager;
+#endif                
     }
 
@@ -199,10 +156,5 @@
   //                 owned and deleted by the run manager, so they should not
   //                 be deleted in the main() program !
-
-#ifdef G4VIS_USE
-  delete visManager;
-#endif
   delete runManager;
-  delete verbosity;
 
   return 0;
Index: trunk/geant4/N03/exampleN03.out
===================================================================
--- trunk/geant4/N03/exampleN03.out	(revision 608)
+++ trunk/geant4/N03/exampleN03.out	(revision 609)
@@ -1,5 +1,5 @@
 
 *************************************************************
- Geant4 version Name: geant4-08-02-patch-01-ref    (23-February-2007)
+ Geant4 version Name: global-V09-00-00    (28-August-2007)
                       Copyright : Geant4 Collaboration
                       Reference : NIM A 506 (2003), 250-303
@@ -10,35 +10,35 @@
 ***** Table : Nb of materials = 13 *****
 
- Material: Aluminium     density:  2.700 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   8.893 cm 
+ Material: Aluminium     density:  2.700 g/cm3   RadL:   8.893 cm   Imean: 166.400 eV 
    --->  Element: Aluminium ( )   Z = 13.0   N =  27.0   A =  26.98 g/mole  ElmMassFraction: 100.00 %  ElmAbundance 100.00 %
 
- Material: liquidArgon     density:  1.390 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:  14.065 cm 
+ Material: liquidArgon     density:  1.390 g/cm3   RadL:  14.065 cm   Imean: 187.200 eV 
    --->  Element: liquidArgon ( )   Z = 18.0   N =  40.0   A =  39.95 g/mole  ElmMassFraction: 100.00 %  ElmAbundance 100.00 %
 
- Material:     Lead     density: 11.350 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   5.612 mm 
+ Material:     Lead     density: 11.350 g/cm3   RadL:   5.612 mm   Imean: 820.000 eV 
    --->  Element: Lead ( )   Z = 82.0   N = 207.2   A = 207.19 g/mole  ElmMassFraction: 100.00 %  ElmAbundance 100.00 %
 
- Material:    Water     density:  1.000 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:  36.092 cm 
+ Material:    Water     density:  1.000 g/cm3   RadL:  36.092 cm   Imean:  75.000 eV 
    --->  Element: Hydrogen (H)   Z =  1.0   N =   1.0   A =   1.01 g/mole  ElmMassFraction:  11.21 %  ElmAbundance  66.67 %
    --->  Element: Oxygen (O)   Z =  8.0   N =  16.0   A =  16.00 g/mole  ElmMassFraction:  88.79 %  ElmAbundance  33.33 %
 
- Material: Scintillator     density:  1.032 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:  42.549 cm 
+ Material: Scintillator     density:  1.032 g/cm3   RadL:  42.549 cm   Imean:  63.913 eV 
    --->  Element: Carbon (C)   Z =  6.0   N =  12.0   A =  12.01 g/mole  ElmMassFraction:  91.45 %  ElmAbundance  47.37 %
    --->  Element: Hydrogen (H)   Z =  1.0   N =   1.0   A =   1.01 g/mole  ElmMassFraction:   8.55 %  ElmAbundance  52.63 %
 
- Material:    Mylar     density:  1.397 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:  28.599 cm 
+ Material:    Mylar     density:  1.397 g/cm3   RadL:  28.599 cm   Imean:  75.075 eV 
    --->  Element: Carbon (C)   Z =  6.0   N =  12.0   A =  12.01 g/mole  ElmMassFraction:  62.49 %  ElmAbundance  45.45 %
    --->  Element: Hydrogen (H)   Z =  1.0   N =   1.0   A =   1.01 g/mole  ElmMassFraction:   4.20 %  ElmAbundance  36.36 %
    --->  Element: Oxygen (O)   Z =  8.0   N =  16.0   A =  16.00 g/mole  ElmMassFraction:  33.30 %  ElmAbundance  18.18 %
 
- Material:   quartz     density:  2.200 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:  12.295 cm 
+ Material:   quartz     density:  2.200 g/cm3   RadL:  12.295 cm   Imean: 126.007 eV 
    --->  Element: Silicon (Si)   Z = 14.0   N =  28.1   A =  28.09 g/mole  ElmMassFraction:  46.75 %  ElmAbundance  33.33 %
    --->  Element: Oxygen (O)   Z =  8.0   N =  16.0   A =  16.00 g/mole  ElmMassFraction:  53.25 %  ElmAbundance  66.67 %
 
- Material:      Air     density:  1.290 mg/cm3  temperature: 273.15 K  pressure:   1.00 atm  RadLength: 285.161 m  
+ Material:      Air     density:  1.290 mg/cm3  RadL: 285.161 m    Imean:  85.684 eV   temperature: 273.15 K  pressure:   1.00 atm
    --->  Element: Nitrogen (N)   Z =  7.0   N =  14.0   A =  14.01 g/mole  ElmMassFraction:  70.00 %  ElmAbundance  72.71 %
    --->  Element: Oxygen (O)   Z =  8.0   N =  16.0   A =  16.00 g/mole  ElmMassFraction:  30.00 %  ElmAbundance  27.29 %
 
- Material:  Aerogel     density: 200.000 mg/cm3  temperature: 273.15 K  pressure:   1.00 atm  RadLength:   1.493 m  
+ Material:  Aerogel     density: 200.000 mg/cm3  RadL:   1.493 m    Imean: 100.118 eV 
    --->  Element: Silicon (Si)   Z = 14.0   N =  28.1   A =  28.09 g/mole  ElmMassFraction:  29.22 %  ElmAbundance  11.12 %
    --->  Element: Oxygen (O)   Z =  8.0   N =  16.0   A =  16.00 g/mole  ElmMassFraction:  66.49 %  ElmAbundance  44.42 %
@@ -46,50 +46,19 @@
    --->  Element: Carbon (C)   Z =  6.0   N =  12.0   A =  12.01 g/mole  ElmMassFraction:   0.10 %  ElmAbundance   0.09 %
 
- Material: CarbonicGas     density: 27.000 mg/cm3  temperature: 325.00 K  pressure:  50.00 atm  RadLength:  13.406 m  
+ Material: CarbonicGas     density: 27.000 mg/cm3  RadL:  13.406 m    Imean:  90.164 eV   temperature: 325.00 K  pressure:  50.00 atm
    --->  Element: Carbon (C)   Z =  6.0   N =  12.0   A =  12.01 g/mole  ElmMassFraction:  27.29 %  ElmAbundance  33.33 %
    --->  Element: Oxygen (O)   Z =  8.0   N =  16.0   A =  16.00 g/mole  ElmMassFraction:  72.71 %  ElmAbundance  66.67 %
 
- Material: WaterSteam     density:  0.300 mg/cm3  temperature: 500.00 K  pressure:   2.00 atm  RadLength:   1.203 km 
+ Material: WaterSteam     density:  0.300 mg/cm3  RadL:   1.203 km   Imean:  70.893 eV   temperature: 500.00 K  pressure:   2.00 atm
    --->  Element: Hydrogen (H)   Z =  1.0   N =   1.0   A =   1.01 g/mole  ElmMassFraction:  11.21 %  ElmAbundance  66.67 %
    --->  Element: Oxygen (O)   Z =  8.0   N =  16.0   A =  16.00 g/mole  ElmMassFraction:  88.79 %  ElmAbundance  33.33 %
 
- Material: Galactic     density:  0.000 mg/cm3  temperature:   2.73 K  pressure:   0.00 atm  RadLength: 204727576.737 pc 
+ Material: Galactic     density:  0.000 mg/cm3  RadL: 204727576.737 pc   Imean:  21.800 eV   temperature:   2.73 K  pressure:   0.00 atm
    --->  Element: Galactic ( )   Z =  1.0   N =   1.0   A =   1.01 g/mole  ElmMassFraction: 100.00 %  ElmAbundance 100.00 %
 
- Material:     Beam     density:  0.010 mg/cm3  temperature: 273.15 K  pressure:   0.02 atm  RadLength:  36.786 km 
+ Material:     Beam     density:  0.010 mg/cm3  RadL:  36.786 km   Imean:  85.684 eV   temperature: 273.15 K  pressure:   0.02 atm
    --->  Element: Nitrogen (N)   Z =  7.0   N =  14.0   A =  14.01 g/mole  ElmMassFraction:  70.00 %  ElmAbundance  72.71 %
    --->  Element: Oxygen (O)   Z =  8.0   N =  16.0   A =  16.00 g/mole  ElmMassFraction:  30.00 %  ElmAbundance  27.29 %
 
-
-Visualization Manager instantiating...
-Visualization Manager initialising...
-Registering graphics systems...
-
-You have successfully registered the following graphics systems.
-Current available graphics systems are:
-  ASCIITree (ATree)
-  DAWNFILE (DAWNFILE)
-  GAGTree (GAGTree)
-  G4HepRep (HepRepXML)
-  G4HepRepFile (HepRepFile)
-  RayTracer (RayTracer)
-  VRML1FILE (VRML1FILE)
-  VRML2FILE (VRML2FILE)
-
-Registering model factories...
-
-You have successfully registered the following model factories.
-Registered model factories:
-  generic
-  drawByCharge
-  drawByParticleID
-  drawByOriginVolume
-  drawByAttribute
-
-Registered filter factories:
-  chargeFilter
-  particleFilter
-  originVolumeFilter
-  attributeFilter
 
 
@@ -114,5 +83,6 @@
 msc:  Model variant of multiple scattering for e-
       Lambda tables from 100 eV  to 100 TeV in 120 bins.
-      Boundary/stepping algorithm is active with facrange= 0.02  Step limitation 1
+      LateralDisplacementFlag=  1   Skin= 0
+      Boundary/stepping algorithm is active with RangeFactor= 0.02  Step limit type 1
 
 eIoni:   tables are built for  e-
@@ -127,5 +97,5 @@
       Lambda tables from threshold to 100 TeV in 120 bins.
       Total cross sections and sampling from StandBrem model (based on the EEDL data library) 
-      Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV.
+      Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. LPM flag 1
 
 eIoni:   tables are built for  e+
@@ -140,5 +110,5 @@
       Lambda tables from threshold to 100 TeV in 120 bins.
       Total cross sections and sampling from StandBrem model (based on the EEDL data library) 
-      Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV.
+      Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. LPM flag 1
 
 annihil:       Sampling according eplus2gg model
@@ -148,5 +118,6 @@
 msc:  Model variant of multiple scattering for proton
       Lambda tables from 100 eV  to 100 TeV in 120 bins.
-      Boundary/stepping algorithm is active with facrange= 0.02  Step limitation 1
+      LateralDisplacementFlag=  1   Skin= 0
+      Boundary/stepping algorithm is active with RangeFactor= 0.02  Step limit type 1
 
 hIoni:   tables are built for  proton
@@ -168,5 +139,6 @@
 msc:  Model variant of multiple scattering for mu+
       Lambda tables from 100 eV  to 100 TeV in 120 bins.
-      Boundary/stepping algorithm is active with facrange= 0.02  Step limitation 1
+      LateralDisplacementFlag=  1   Skin= 0
+      Boundary/stepping algorithm is active with RangeFactor= 0.02  Step limit type 1
 
 muIoni:   tables are built for  mu+
@@ -214,5 +186,6 @@
 msc:  Model variant of multiple scattering for pi-
       Lambda tables from 100 eV  to 100 TeV in 120 bins.
-      Boundary/stepping algorithm is active with facrange= 0.02  Step limitation 1
+      LateralDisplacementFlag=  1   Skin= 0
+      Boundary/stepping algorithm is active with RangeFactor= 0.02  Step limit type 1
 
 hIoni:   tables are built for  pi-
@@ -258,14 +231,14 @@
 ----------------------------------------
 ---> End of event: 0
-   Absorber: total energy: 255.24989 MeV       total track length: 17.775532 cm 
-        Gap: total energy: 12.751693 MeV       total track length: 6.4347173 cm 
+   Absorber: total energy: 274.30763 MeV       total track length: 19.20204 cm 
+        Gap: total energy: 11.230804 MeV       total track length: 5.7413344 cm 
 
 --------------------End of Run------------------------------
 
- mean Energy in Absorber : 255.24989 MeV +- 0 eV 
- mean Energy in Gap      : 12.751693 MeV +- 0 eV 
-
- mean trackLength in Absorber : 17.775532 cm  +- 0 fm 
- mean trackLength in Gap      : 6.4347173 cm  +- 0 fm 
+ mean Energy in Absorber : 274.30763 MeV +- 0 eV 
+ mean Energy in Gap      : 11.230804 MeV +- 0 eV 
+
+ mean trackLength in Absorber : 19.20204 cm  +- 0 fm 
+ mean trackLength in Gap      : 5.7413344 cm  +- 0 fm 
 ------------------------------------------------------------
 
@@ -290,5 +263,6 @@
 msc:  Model variant of multiple scattering for e-
       Lambda tables from 100 eV  to 100 TeV in 120 bins.
-      Boundary/stepping algorithm is active with facrange= 0.02  Step limitation 1
+      LateralDisplacementFlag=  1   Skin= 0
+      Boundary/stepping algorithm is active with RangeFactor= 0.02  Step limit type 1
 
 eIoni:   tables are built for  e-
@@ -303,5 +277,5 @@
       Lambda tables from threshold to 100 TeV in 120 bins.
       Total cross sections and sampling from StandBrem model (based on the EEDL data library) 
-      Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV.
+      Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. LPM flag 1
 
 eIoni:   tables are built for  e+
@@ -316,5 +290,5 @@
       Lambda tables from threshold to 100 TeV in 120 bins.
       Total cross sections and sampling from StandBrem model (based on the EEDL data library) 
-      Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV.
+      Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. LPM flag 1
 
 annihil:       Sampling according eplus2gg model
@@ -324,5 +298,6 @@
 msc:  Model variant of multiple scattering for proton
       Lambda tables from 100 eV  to 100 TeV in 120 bins.
-      Boundary/stepping algorithm is active with facrange= 0.02  Step limitation 1
+      LateralDisplacementFlag=  1   Skin= 0
+      Boundary/stepping algorithm is active with RangeFactor= 0.02  Step limit type 1
 
 hIoni:   tables are built for  proton
@@ -344,5 +319,6 @@
 msc:  Model variant of multiple scattering for mu+
       Lambda tables from 100 eV  to 100 TeV in 120 bins.
-      Boundary/stepping algorithm is active with facrange= 0.02  Step limitation 1
+      LateralDisplacementFlag=  1   Skin= 0
+      Boundary/stepping algorithm is active with RangeFactor= 0.02  Step limit type 1
 
 muIoni:   tables are built for  mu+
@@ -390,5 +366,6 @@
 msc:  Model variant of multiple scattering for pi-
       Lambda tables from 100 eV  to 100 TeV in 120 bins.
-      Boundary/stepping algorithm is active with facrange= 0.02  Step limitation 1
+      LateralDisplacementFlag=  1   Skin= 0
+      Boundary/stepping algorithm is active with RangeFactor= 0.02  Step limit type 1
 
 hIoni:   tables are built for  pi-
@@ -405,17 +382,17 @@
 --------- Ranecu engine status ---------
  Initial seed (index) = 0
- Current couple of seeds = 1363400685, 1475368346
+ Current couple of seeds = 2047602749, 788414929
 ----------------------------------------
 ---> End of event: 0
-   Absorber: total energy: 273.78056 MeV       total track length: 18.732667 cm 
-        Gap: total energy: 22.74196 MeV       total track length: 11.196324 cm 
+   Absorber: total energy: 276.31409 MeV       total track length: 19.072115 cm 
+        Gap: total energy: 20.135479 MeV       total track length: 9.906299 cm 
 
 --------------------End of Run------------------------------
 
- mean Energy in Absorber : 273.78056 MeV +- 0 eV 
- mean Energy in Gap      : 22.74196 MeV +- 0 eV 
-
- mean trackLength in Absorber : 18.732667 cm  +- 0 fm 
- mean trackLength in Gap      : 11.196324 cm  +- 0 fm 
+ mean Energy in Absorber : 276.31409 MeV +- 0 eV 
+ mean Energy in Gap      : 20.135479 MeV +- 0 eV 
+
+ mean trackLength in Absorber : 19.072115 cm  +- 0 fm 
+ mean trackLength in Gap      : 9.906299 cm  +- 0 fm 
 ------------------------------------------------------------
 
@@ -440,5 +417,6 @@
 msc:  Model variant of multiple scattering for e-
       Lambda tables from 100 eV  to 100 TeV in 120 bins.
-      Boundary/stepping algorithm is active with facrange= 0.02  Step limitation 1
+      LateralDisplacementFlag=  1   Skin= 0
+      Boundary/stepping algorithm is active with RangeFactor= 0.02  Step limit type 1
 
 eIoni:   tables are built for  e-
@@ -453,5 +431,5 @@
       Lambda tables from threshold to 100 TeV in 120 bins.
       Total cross sections and sampling from StandBrem model (based on the EEDL data library) 
-      Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV.
+      Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. LPM flag 1
 
 eIoni:   tables are built for  e+
@@ -466,5 +444,5 @@
       Lambda tables from threshold to 100 TeV in 120 bins.
       Total cross sections and sampling from StandBrem model (based on the EEDL data library) 
-      Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV.
+      Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. LPM flag 1
 
 annihil:       Sampling according eplus2gg model
@@ -474,5 +452,6 @@
 msc:  Model variant of multiple scattering for proton
       Lambda tables from 100 eV  to 100 TeV in 120 bins.
-      Boundary/stepping algorithm is active with facrange= 0.02  Step limitation 1
+      LateralDisplacementFlag=  1   Skin= 0
+      Boundary/stepping algorithm is active with RangeFactor= 0.02  Step limit type 1
 
 hIoni:   tables are built for  proton
@@ -494,5 +473,6 @@
 msc:  Model variant of multiple scattering for mu+
       Lambda tables from 100 eV  to 100 TeV in 120 bins.
-      Boundary/stepping algorithm is active with facrange= 0.02  Step limitation 1
+      LateralDisplacementFlag=  1   Skin= 0
+      Boundary/stepping algorithm is active with RangeFactor= 0.02  Step limit type 1
 
 muIoni:   tables are built for  mu+
@@ -540,5 +520,6 @@
 msc:  Model variant of multiple scattering for pi-
       Lambda tables from 100 eV  to 100 TeV in 120 bins.
-      Boundary/stepping algorithm is active with facrange= 0.02  Step limitation 1
+      LateralDisplacementFlag=  1   Skin= 0
+      Boundary/stepping algorithm is active with RangeFactor= 0.02  Step limit type 1
 
 hIoni:   tables are built for  pi-
@@ -555,17 +536,17 @@
 --------- Ranecu engine status ---------
  Initial seed (index) = 0
- Current couple of seeds = 606835024, 988202660
+ Current couple of seeds = 220670736, 1247745483
 ----------------------------------------
 ---> End of event: 0
-   Absorber: total energy: 408.66702 MeV       total track length: 97.709788 cm 
-        Gap: total energy: 83.799117 MeV       total track length: 2.3229686 m  
+   Absorber: total energy: 393.70133 MeV       total track length: 92.810449 cm 
+        Gap: total energy: 105.36422 MeV       total track length: 2.959901 m  
 
 --------------------End of Run------------------------------
 
- mean Energy in Absorber : 408.66702 MeV +- 0 eV 
- mean Energy in Gap      : 83.799117 MeV +- 0 eV 
-
- mean trackLength in Absorber : 97.709788 cm  +- 0 fm 
- mean trackLength in Gap      : 2.3229686 m   +- 0 fm 
-------------------------------------------------------------
-
+ mean Energy in Absorber : 393.70133 MeV +- 0 eV 
+ mean Energy in Gap      : 105.36422 MeV +- 0 eV 
+
+ mean trackLength in Absorber : 92.810449 cm  +- 0 fm 
+ mean trackLength in Gap      : 2.959901 m   +- 0 fm 
+------------------------------------------------------------
+
Index: trunk/geant4/N03/g4_00.prim
===================================================================
--- trunk/geant4/N03/g4_00.prim	(revision 608)
+++ trunk/geant4/N03/g4_00.prim	(revision 609)
@@ -221,2 +221,6 @@
 /BaseVector                 1                 0                 0                 0                 1                 0
 /Box               2.5                50                50
+#--------------------
+!EndModeling
+!DrawAll
+!CloseDevice
Index: trunk/geant4/N03/g4_01.prim
===================================================================
--- trunk/geant4/N03/g4_01.prim	(revision 608)
+++ trunk/geant4/N03/g4_01.prim	(revision 609)
@@ -221,2 +221,6 @@
 /BaseVector                 1                 0                 0                 0                 1                 0
 /Box               2.5                50                50
+#--------------------
+!EndModeling
+!DrawAll
+!CloseDevice
Index: trunk/geant4/N03/g4_02.prim
===================================================================
--- trunk/geant4/N03/g4_02.prim	(revision 608)
+++ trunk/geant4/N03/g4_02.prim	(revision 609)
@@ -1,79 +1,224 @@
 ##G4.PRIM-FORMAT-2.4
-/BoundingBox       -866.025404       -866.025404       -866.025404        866.025404        866.025404        866.025404
+/BoundingBox       -103.077641       -103.077641       -103.077641        103.077641        103.077641        103.077641
 !SetCamera
 !OpenDevice
 !BeginModeling
-/ColorRGB                 1                 0                 0
+#--------------------
+#/PVName          Calorimeter.0
+/ColorRGB                 1                 1                 1
 /ForceWireframe  0
 /Origin                 0                 0                 0
 /BaseVector                 1                 0                 0                 0                 1                 0
-/Polyline
-/PLVertex                 0                 0                 0
-/PLVertex               500                 0                 0
-/EndPolyline
-/ColorRGB                 0                 1                 0
-/ForceWireframe  0
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
-/Polyline
-/PLVertex                 0                 0                 0
-/PLVertex                 0               500                 0
-/EndPolyline
-/ColorRGB                 0                 0                 1
-/ForceWireframe  0
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
-/Polyline
-/PLVertex                 0                 0                 0
-/PLVertex                 0                 0               500
-/EndPolyline
-/ColorRGB                 0                 0                 1
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
-/MarkText2DS                 0                0                0               40             -100             -140 Absorber
-/ColorRGB                 1                 0                 0
-/ForceWireframe  0
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
-/Polyline
-/PLVertex               -25               -50                50
-/PLVertex               -25               -50               -50
-/EndPolyline
-/ColorRGB                 1                 0                 0
-/ForceWireframe  0
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
-/Polyline
-/PLVertex               -25               -45                50
-/PLVertex               -25               -55                50
-/EndPolyline
-/ColorRGB                 1                 0                 0
-/ForceWireframe  0
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
-/Polyline
-/PLVertex               -20               -50                50
-/PLVertex               -30               -50                50
-/EndPolyline
-/ColorRGB                 1                 0                 0
-/ForceWireframe  0
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
-/Polyline
-/PLVertex               -25               -45               -50
-/PLVertex               -25               -55               -50
-/EndPolyline
-/ColorRGB                 1                 0                 0
-/ForceWireframe  0
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
-/Polyline
-/PLVertex               -20               -50               -50
-/PLVertex               -30               -50               -50
-/EndPolyline
-/ColorRGB                 0                 0                 1
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
-/MarkText2DS               -25              -45                0               12                0                0 10 cm
+/Box                75                50                50
+#--------------------
+#/PVName               Layer.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin             -67.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               7.5                50                50
+#--------------------
+#/PVName                    Lead.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin               -70                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box                 5                50                50
+#--------------------
+#/PVName                    liquidArgon.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin             -62.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               2.5                50                50
+#--------------------
+#/PVName               Layer.1
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin             -52.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               7.5                50                50
+#--------------------
+#/PVName                    Lead.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin               -55                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box                 5                50                50
+#--------------------
+#/PVName                    liquidArgon.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin             -47.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               2.5                50                50
+#--------------------
+#/PVName               Layer.2
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin             -37.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               7.5                50                50
+#--------------------
+#/PVName                    Lead.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin               -40                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box                 5                50                50
+#--------------------
+#/PVName                    liquidArgon.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin             -32.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               2.5                50                50
+#--------------------
+#/PVName               Layer.3
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin             -22.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               7.5                50                50
+#--------------------
+#/PVName                    Lead.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin               -25                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box                 5                50                50
+#--------------------
+#/PVName                    liquidArgon.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin             -17.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               2.5                50                50
+#--------------------
+#/PVName               Layer.4
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin              -7.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               7.5                50                50
+#--------------------
+#/PVName                    Lead.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin               -10                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box                 5                50                50
+#--------------------
+#/PVName                    liquidArgon.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin              -2.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               2.5                50                50
+#--------------------
+#/PVName               Layer.5
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin               7.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               7.5                50                50
+#--------------------
+#/PVName                    Lead.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin                 5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box                 5                50                50
+#--------------------
+#/PVName                    liquidArgon.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin              12.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               2.5                50                50
+#--------------------
+#/PVName               Layer.6
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin              22.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               7.5                50                50
+#--------------------
+#/PVName                    Lead.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin                20                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box                 5                50                50
+#--------------------
+#/PVName                    liquidArgon.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin              27.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               2.5                50                50
+#--------------------
+#/PVName               Layer.7
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin              37.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               7.5                50                50
+#--------------------
+#/PVName                    Lead.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin                35                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box                 5                50                50
+#--------------------
+#/PVName                    liquidArgon.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin              42.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               2.5                50                50
+#--------------------
+#/PVName               Layer.8
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin              52.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               7.5                50                50
+#--------------------
+#/PVName                    Lead.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin                50                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box                 5                50                50
+#--------------------
+#/PVName                    liquidArgon.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin              57.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               2.5                50                50
+#--------------------
+#/PVName               Layer.9
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin              67.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               7.5                50                50
+#--------------------
+#/PVName                    Lead.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin                65                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box                 5                50                50
+#--------------------
+#/PVName                    liquidArgon.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin              72.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               2.5                50                50
 #--------------------
 !EndModeling
Index: trunk/geant4/N03/g4_03.prim
===================================================================
--- trunk/geant4/N03/g4_03.prim	(revision 608)
+++ trunk/geant4/N03/g4_03.prim	(revision 609)
@@ -1,79 +1,224 @@
 ##G4.PRIM-FORMAT-2.4
-/BoundingBox       -866.025404       -866.025404       -866.025404        866.025404        866.025404        866.025404
+/BoundingBox       -103.077641       -103.077641       -103.077641        103.077641        103.077641        103.077641
 !SetCamera
 !OpenDevice
 !BeginModeling
-/ColorRGB                 1                 0                 0
+#--------------------
+#/PVName          Calorimeter.0
+/ColorRGB                 1                 1                 1
 /ForceWireframe  0
 /Origin                 0                 0                 0
 /BaseVector                 1                 0                 0                 0                 1                 0
-/Polyline
-/PLVertex                 0                 0                 0
-/PLVertex               500                 0                 0
-/EndPolyline
-/ColorRGB                 0                 1                 0
-/ForceWireframe  0
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
-/Polyline
-/PLVertex                 0                 0                 0
-/PLVertex                 0               500                 0
-/EndPolyline
-/ColorRGB                 0                 0                 1
-/ForceWireframe  0
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
-/Polyline
-/PLVertex                 0                 0                 0
-/PLVertex                 0                 0               500
-/EndPolyline
-/ColorRGB                 0                 0                 1
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
-/MarkText2DS                 0                0                0               50             -100             -140 Gap
-/ColorRGB                 1                 0                 0
-/ForceWireframe  0
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
-/Polyline
-/PLVertex               -25               -50                50
-/PLVertex               -25               -50               -50
-/EndPolyline
-/ColorRGB                 1                 0                 0
-/ForceWireframe  0
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
-/Polyline
-/PLVertex               -25               -45                50
-/PLVertex               -25               -55                50
-/EndPolyline
-/ColorRGB                 1                 0                 0
-/ForceWireframe  0
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
-/Polyline
-/PLVertex               -20               -50                50
-/PLVertex               -30               -50                50
-/EndPolyline
-/ColorRGB                 1                 0                 0
-/ForceWireframe  0
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
-/Polyline
-/PLVertex               -25               -45               -50
-/PLVertex               -25               -55               -50
-/EndPolyline
-/ColorRGB                 1                 0                 0
-/ForceWireframe  0
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
-/Polyline
-/PLVertex               -20               -50               -50
-/PLVertex               -30               -50               -50
-/EndPolyline
-/ColorRGB                 0                 0                 1
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
-/MarkText2DS               -25              -45                0               12                0                0 10 cm
+/Box                75                50                50
+#--------------------
+#/PVName               Layer.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin             -67.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               7.5                50                50
+#--------------------
+#/PVName                    Lead.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin               -70                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box                 5                50                50
+#--------------------
+#/PVName                    liquidArgon.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin             -62.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               2.5                50                50
+#--------------------
+#/PVName               Layer.1
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin             -52.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               7.5                50                50
+#--------------------
+#/PVName                    Lead.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin               -55                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box                 5                50                50
+#--------------------
+#/PVName                    liquidArgon.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin             -47.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               2.5                50                50
+#--------------------
+#/PVName               Layer.2
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin             -37.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               7.5                50                50
+#--------------------
+#/PVName                    Lead.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin               -40                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box                 5                50                50
+#--------------------
+#/PVName                    liquidArgon.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin             -32.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               2.5                50                50
+#--------------------
+#/PVName               Layer.3
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin             -22.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               7.5                50                50
+#--------------------
+#/PVName                    Lead.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin               -25                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box                 5                50                50
+#--------------------
+#/PVName                    liquidArgon.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin             -17.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               2.5                50                50
+#--------------------
+#/PVName               Layer.4
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin              -7.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               7.5                50                50
+#--------------------
+#/PVName                    Lead.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin               -10                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box                 5                50                50
+#--------------------
+#/PVName                    liquidArgon.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin              -2.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               2.5                50                50
+#--------------------
+#/PVName               Layer.5
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin               7.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               7.5                50                50
+#--------------------
+#/PVName                    Lead.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin                 5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box                 5                50                50
+#--------------------
+#/PVName                    liquidArgon.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin              12.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               2.5                50                50
+#--------------------
+#/PVName               Layer.6
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin              22.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               7.5                50                50
+#--------------------
+#/PVName                    Lead.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin                20                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box                 5                50                50
+#--------------------
+#/PVName                    liquidArgon.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin              27.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               2.5                50                50
+#--------------------
+#/PVName               Layer.7
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin              37.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               7.5                50                50
+#--------------------
+#/PVName                    Lead.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin                35                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box                 5                50                50
+#--------------------
+#/PVName                    liquidArgon.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin              42.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               2.5                50                50
+#--------------------
+#/PVName               Layer.8
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin              52.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               7.5                50                50
+#--------------------
+#/PVName                    Lead.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin                50                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box                 5                50                50
+#--------------------
+#/PVName                    liquidArgon.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin              57.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               2.5                50                50
+#--------------------
+#/PVName               Layer.9
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin              67.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               7.5                50                50
+#--------------------
+#/PVName                    Lead.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin                65                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box                 5                50                50
+#--------------------
+#/PVName                    liquidArgon.0
+/ColorRGB                 1                 1                 1
+/ForceWireframe  0
+/Origin              72.5                 0                 0
+/BaseVector                 1                 0                 0                 0                 1                 0
+/Box               2.5                50                50
 #--------------------
 !EndModeling
Index: trunk/geant4/N03/g4_04.prim
===================================================================
--- trunk/geant4/N03/g4_04.prim	(revision 608)
+++ trunk/geant4/N03/g4_04.prim	(revision 609)
@@ -1,20 +1,13 @@
 ##G4.PRIM-FORMAT-2.4
-/BoundingBox       -875.138588       -897.492158       -873.986342        896.339912        873.986342        897.492158
+/BoundingBox       -103.077641       -103.077641       -103.077641        103.077641        103.077641        103.077641
 !SetCamera
 !OpenDevice
 !BeginModeling
 #--------------------
-#/PVName     World.0
+#/PVName          Calorimeter.0
 /ColorRGB                 1                 1                 1
 /ForceWireframe  0
 /Origin                 0                 0                 0
 /BaseVector                 1                 0                 0                 0                 1                 0
-/Box                90                60                60
-#--------------------
-#/PVName          Calorimeter.0
-/ColorRGB                 1                 1                 1
-/ForceWireframe  0
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
 /Box                75                50                50
 #--------------------
@@ -228,76 +221,4 @@
 /BaseVector                 1                 0                 0                 0                 1                 0
 /Box               2.5                50                50
-/ColorRGB                 1                 0                 0
-/ForceWireframe  0
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
-/Polyline
-/PLVertex                 0                 0                 0
-/PLVertex               500                 0                 0
-/EndPolyline
-/ColorRGB                 0                 1                 0
-/ForceWireframe  0
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
-/Polyline
-/PLVertex                 0                 0                 0
-/PLVertex                 0               500                 0
-/EndPolyline
-/ColorRGB                 0                 0                 1
-/ForceWireframe  0
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
-/Polyline
-/PLVertex                 0                 0                 0
-/PLVertex                 0                 0               500
-/EndPolyline
-/ColorRGB                 0                 0                 1
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
-/MarkText2DS                 0                0                0               50             -100             -240 World
-/ColorRGB                 1                 0                 0
-/ForceWireframe  0
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
-/Polyline
-/PLVertex               410              -510               510
-/PLVertex               510              -510               510
-/EndPolyline
-/ColorRGB                 1                 0                 0
-/ForceWireframe  0
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
-/Polyline
-/PLVertex               410              -505               510
-/PLVertex               410              -515               510
-/EndPolyline
-/ColorRGB                 1                 0                 0
-/ForceWireframe  0
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
-/Polyline
-/PLVertex               410              -510               515
-/PLVertex               410              -510               505
-/EndPolyline
-/ColorRGB                 1                 0                 0
-/ForceWireframe  0
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
-/Polyline
-/PLVertex               510              -505               510
-/PLVertex               510              -515               510
-/EndPolyline
-/ColorRGB                 1                 0                 0
-/ForceWireframe  0
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
-/Polyline
-/PLVertex               510              -510               515
-/PLVertex               510              -510               505
-/EndPolyline
-/ColorRGB                 0                 0                 1
-/Origin                 0                 0                 0
-/BaseVector                 1                 0                 0                 0                 1                 0
-/MarkText2DS               460             -505              510               12                0                0 10 cm
 #--------------------
 !EndModeling
Index: trunk/geant4/N03/g4_05.prim
===================================================================
--- trunk/geant4/N03/g4_05.prim	(revision 608)
+++ trunk/geant4/N03/g4_05.prim	(revision 609)
@@ -221,2 +221,6 @@
 /BaseVector                 1                 0                 0                 0                 1                 0
 /Box               2.5                50                50
+#--------------------
+!EndModeling
+!DrawAll
+!CloseDevice
Index: trunk/geant4/N03/include/ExN03DetectorConstruction.hh
===================================================================
--- trunk/geant4/N03/include/ExN03DetectorConstruction.hh	(revision 608)
+++ trunk/geant4/N03/include/ExN03DetectorConstruction.hh	(revision 609)
@@ -26,5 +26,5 @@
 //
 // $Id: ExN03DetectorConstruction.hh,v 1.7 2006/06/29 17:48:32 gunter Exp $
-// GEANT4 tag $Name: geant4-08-01-patch-01 $
+// GEANT4 tag $Name:  $
 //
 // 
Index: trunk/geant4/N03/include/ExN03DetectorMessenger.hh
===================================================================
--- trunk/geant4/N03/include/ExN03DetectorMessenger.hh	(revision 608)
+++ trunk/geant4/N03/include/ExN03DetectorMessenger.hh	(revision 609)
@@ -26,5 +26,5 @@
 //
 // $Id: ExN03DetectorMessenger.hh,v 1.7 2006/06/29 17:48:34 gunter Exp $
-// GEANT4 tag $Name: geant4-08-01-patch-01 $
+// GEANT4 tag $Name:  $
 //
 // 
Index: trunk/geant4/N03/include/ExN03EventAction.hh
===================================================================
--- trunk/geant4/N03/include/ExN03EventAction.hh	(revision 608)
+++ trunk/geant4/N03/include/ExN03EventAction.hh	(revision 609)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: ExN03EventAction.hh,v 1.11 2006/10/26 14:30:05 allison Exp $
-// GEANT4 tag $Name: geant4-08-02-patch-01-ref $
+// $Id: ExN03EventAction.hh,v 1.12 2007/07/02 13:22:08 vnivanch Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -46,18 +46,17 @@
 class ExN03EventAction : public G4UserEventAction
 {
- public:
-   ExN03EventAction(ExN03RunAction*);
-  ~ExN03EventAction();
+public:
+  ExN03EventAction(ExN03RunAction*);
+  virtual ~ExN03EventAction();
 
- public:
-   void  BeginOfEventAction(const G4Event*);
-   void    EndOfEventAction(const G4Event*);
+  void  BeginOfEventAction(const G4Event*);
+  void    EndOfEventAction(const G4Event*);
     
-   void AddAbs(G4double de, G4double dl) {EnergyAbs += de; TrackLAbs += dl;};
-   void AddGap(G4double de, G4double dl) {EnergyGap += de; TrackLGap += dl;};
+  void AddAbs(G4double de, G4double dl) {EnergyAbs += de; TrackLAbs += dl;};
+  void AddGap(G4double de, G4double dl) {EnergyGap += de; TrackLGap += dl;};
                      
-   void SetPrintModulo(G4int    val)  {printModulo = val;};
+  void SetPrintModulo(G4int    val)  {printModulo = val;};
     
- private:
+private:
    ExN03RunAction*  runAct;
    
Index: trunk/geant4/N03/include/ExN03EventActionMessenger.hh
===================================================================
--- trunk/geant4/N03/include/ExN03EventActionMessenger.hh	(revision 608)
+++ trunk/geant4/N03/include/ExN03EventActionMessenger.hh	(revision 609)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: ExN03EventActionMessenger.hh,v 1.9 2006/10/26 14:28:00 allison Exp $
-// GEANT4 tag $Name: geant4-08-02-patch-01-ref $
+// $Id: ExN03EventActionMessenger.hh,v 1.10 2007/07/02 13:22:08 vnivanch Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -47,14 +47,14 @@
 class ExN03EventActionMessenger: public G4UImessenger
 {
-  public:
-    ExN03EventActionMessenger(ExN03EventAction*);
-   ~ExN03EventActionMessenger();
+public:
+  ExN03EventActionMessenger(ExN03EventAction*);
+  virtual ~ExN03EventActionMessenger();
     
-    void SetNewValue(G4UIcommand*, G4String);
+  void SetNewValue(G4UIcommand*, G4String);
     
-  private:
-    ExN03EventAction*     eventAction;
-    G4UIdirectory*        eventDir;   
-    G4UIcmdWithAnInteger* PrintCmd;    
+private:
+  ExN03EventAction*     eventAction;
+  G4UIdirectory*        eventDir;   
+  G4UIcmdWithAnInteger* PrintCmd;    
 };
 
Index: trunk/geant4/N03/include/ExN03PhysicsList.hh
===================================================================
--- trunk/geant4/N03/include/ExN03PhysicsList.hh	(revision 608)
+++ trunk/geant4/N03/include/ExN03PhysicsList.hh	(revision 609)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: ExN03PhysicsList.hh,v 1.12 2006/06/29 17:48:40 gunter Exp $
-// GEANT4 tag $Name: geant4-08-01-patch-01 $
+// $Id: ExN03PhysicsList.hh,v 1.13 2007/07/02 13:22:08 vnivanch Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -43,27 +43,24 @@
 class ExN03PhysicsList: public G4VUserPhysicsList
 {
-  public:
-    ExN03PhysicsList();
-   ~ExN03PhysicsList();
+public:
+  ExN03PhysicsList();
+  virtual ~ExN03PhysicsList();
 
-  protected:
-    // Construct particle and physics
-    void ConstructParticle();
-    void ConstructProcess();
+  // Construct particle and physics
+  void ConstructParticle();
+  void ConstructProcess();
  
-    void SetCuts();
+  void SetCuts();
+   
+private:
+  // these methods Construct particles 
+  void ConstructBosons();
+  void ConstructLeptons();
+  void ConstructMesons();
+  void ConstructBaryons();
 
-   
-  protected:
-    // these methods Construct particles 
-    void ConstructBosons();
-    void ConstructLeptons();
-    void ConstructMesons();
-    void ConstructBaryons();
-
-  protected:
-    // these methods Construct physics processes and register them
-    void ConstructGeneral();
-    void ConstructEM();
+  // these methods Construct physics processes and register them
+  void ConstructDecay();
+  void ConstructEM();
 };
 
Index: trunk/geant4/N03/include/ExN03PrimaryGeneratorAction.hh
===================================================================
--- trunk/geant4/N03/include/ExN03PrimaryGeneratorAction.hh	(revision 608)
+++ trunk/geant4/N03/include/ExN03PrimaryGeneratorAction.hh	(revision 609)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: ExN03PrimaryGeneratorAction.hh,v 1.7 2006/06/29 17:48:42 gunter Exp $
-// GEANT4 tag $Name: geant4-08-01-patch-01 $
+// $Id: ExN03PrimaryGeneratorAction.hh,v 1.8 2007/07/02 13:22:08 vnivanch Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -48,18 +48,17 @@
 class ExN03PrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction
 {
-  public:
-    ExN03PrimaryGeneratorAction(ExN03DetectorConstruction*);    
-   ~ExN03PrimaryGeneratorAction();
+public:
+  ExN03PrimaryGeneratorAction(ExN03DetectorConstruction*);    
+  virtual ~ExN03PrimaryGeneratorAction();
 
-  public:
-    void GeneratePrimaries(G4Event*);
-    void SetRndmFlag(G4String val) { rndmFlag = val;}
+  void GeneratePrimaries(G4Event*);
+  void SetRndmFlag(G4String val) { rndmFlag = val;}
 
-  private:
-    G4ParticleGun*                particleGun;	  //pointer a to G4  class
-    ExN03DetectorConstruction*    ExN03Detector;  //pointer to the geometry
+private:
+  G4ParticleGun*                particleGun;	  //pointer a to G4  class
+  ExN03DetectorConstruction*    ExN03Detector;    //pointer to the geometry
     
-    ExN03PrimaryGeneratorMessenger* gunMessenger; //messenger of this class
-    G4String                      rndmFlag;	  //flag for a rndm impact point
+  ExN03PrimaryGeneratorMessenger* gunMessenger;   //messenger of this class
+  G4String                      rndmFlag;	  //flag for a rndm impact point
 };
 
Index: trunk/geant4/N03/include/ExN03PrimaryGeneratorMessenger.hh
===================================================================
--- trunk/geant4/N03/include/ExN03PrimaryGeneratorMessenger.hh	(revision 608)
+++ trunk/geant4/N03/include/ExN03PrimaryGeneratorMessenger.hh	(revision 609)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: ExN03PrimaryGeneratorMessenger.hh,v 1.7 2006/06/29 17:48:44 gunter Exp $
-// GEANT4 tag $Name: geant4-08-01-patch-01 $
+// $Id: ExN03PrimaryGeneratorMessenger.hh,v 1.8 2007/07/02 13:22:08 vnivanch Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -47,14 +47,14 @@
 class ExN03PrimaryGeneratorMessenger: public G4UImessenger
 {
-  public:
-    ExN03PrimaryGeneratorMessenger(ExN03PrimaryGeneratorAction*);
-   ~ExN03PrimaryGeneratorMessenger();
+public:
+  ExN03PrimaryGeneratorMessenger(ExN03PrimaryGeneratorAction*);
+  virtual ~ExN03PrimaryGeneratorMessenger();
     
-    void SetNewValue(G4UIcommand*, G4String);
+  void SetNewValue(G4UIcommand*, G4String);
     
-  private:
-    ExN03PrimaryGeneratorAction* ExN03Action;
-    G4UIdirectory*               gunDir; 
-    G4UIcmdWithAString*          RndmCmd;
+private:
+  ExN03PrimaryGeneratorAction* ExN03Action;
+  G4UIdirectory*               gunDir; 
+  G4UIcmdWithAString*          RndmCmd;
 };
 
Index: trunk/geant4/N03/include/ExN03RunAction.hh
===================================================================
--- trunk/geant4/N03/include/ExN03RunAction.hh	(revision 608)
+++ trunk/geant4/N03/include/ExN03RunAction.hh	(revision 609)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: ExN03RunAction.hh,v 1.10 2006/06/29 17:48:47 gunter Exp $
-// GEANT4 tag $Name: geant4-08-01-patch-01 $
+// $Id: ExN03RunAction.hh,v 1.11 2007/07/02 13:22:08 vnivanch Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -45,20 +45,19 @@
 class ExN03RunAction : public G4UserRunAction
 {
-  public:
-    ExN03RunAction();
-   ~ExN03RunAction();
+public:
+  ExN03RunAction();
+  virtual ~ExN03RunAction();
 
-  public:
-    void BeginOfRunAction(const G4Run*);
-    void   EndOfRunAction(const G4Run*);
+  void BeginOfRunAction(const G4Run*);
+  void   EndOfRunAction(const G4Run*);
     
-    void fillPerEvent(G4double, G4double, G4double, G4double); 
+  void fillPerEvent(G4double, G4double, G4double, G4double); 
 
-  private:
-    G4double sumEAbs, sum2EAbs;
-    G4double sumEGap, sum2EGap;
+private:
+  G4double sumEAbs, sum2EAbs;
+  G4double sumEGap, sum2EGap;
     
-    G4double sumLAbs, sum2LAbs;
-    G4double sumLGap, sum2LGap;    
+  G4double sumLAbs, sum2LAbs;
+  G4double sumLGap, sum2LGap;    
 };
 
Index: trunk/geant4/N03/include/ExN03SteppingAction.hh
===================================================================
--- trunk/geant4/N03/include/ExN03SteppingAction.hh	(revision 608)
+++ trunk/geant4/N03/include/ExN03SteppingAction.hh	(revision 609)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: ExN03SteppingAction.hh,v 1.9 2006/06/29 17:48:49 gunter Exp $
-// GEANT4 tag $Name: geant4-08-01-patch-01 $
+// $Id: ExN03SteppingAction.hh,v 1.10 2007/07/02 13:22:08 vnivanch Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -45,13 +45,13 @@
 class ExN03SteppingAction : public G4UserSteppingAction
 {
-  public:
-    ExN03SteppingAction(ExN03DetectorConstruction*, ExN03EventAction*);
-   ~ExN03SteppingAction();
+public:
+  ExN03SteppingAction(ExN03DetectorConstruction*, ExN03EventAction*);
+  virtual ~ExN03SteppingAction();
 
-    void UserSteppingAction(const G4Step*);
+  void UserSteppingAction(const G4Step*);
     
-  private:
-    ExN03DetectorConstruction* detector;
-    ExN03EventAction*          eventaction;  
+private:
+  ExN03DetectorConstruction* detector;
+  ExN03EventAction*          eventaction;  
 };
 
Index: trunk/geant4/N03/include/ExN03SteppingVerbose.hh
===================================================================
--- trunk/geant4/N03/include/ExN03SteppingVerbose.hh	(revision 608)
+++ trunk/geant4/N03/include/ExN03SteppingVerbose.hh	(revision 609)
@@ -26,5 +26,5 @@
 //
 // $Id: ExN03SteppingVerbose.hh,v 1.9 2006/06/29 17:48:52 gunter Exp $
-// GEANT4 tag $Name: geant4-08-01-patch-01 $
+// GEANT4 tag $Name:  $
 //
 //
Index: trunk/geant4/N03/rndmSeed.mac
===================================================================
--- trunk/geant4/N03/rndmSeed.mac	(revision 608)
+++ trunk/geant4/N03/rndmSeed.mac	(revision 609)
@@ -1,3 +1,3 @@
-# $Id: rndmSeed.mac,v 1.1 2003/01/27 17:55:47 maire Exp $
+# $Id: rndmSeed.mac,v 1.2 2007/06/13 10:36:39 maire Exp $
 #
 # This macro illustrates how to save and reset the random number seed
@@ -24,10 +24,10 @@
 /run/beamOn 4
 #
-# restart run 2
+# run3 : restart run 2
 #
 /random/resetEngineFrom currentRun.rndm
 /run/beamOn 4
 #
-# restart run 1 
+# run4 : restart run 1 
 #
 /random/resetEngineFrom run1.rndm
Index: trunk/geant4/N03/src/ExN03DetectorConstruction.cc
===================================================================
--- trunk/geant4/N03/src/ExN03DetectorConstruction.cc	(revision 608)
+++ trunk/geant4/N03/src/ExN03DetectorConstruction.cc	(revision 609)
@@ -26,5 +26,5 @@
 //
 // $Id: ExN03DetectorConstruction.cc,v 1.23 2006/06/29 17:48:54 gunter Exp $
-// GEANT4 tag $Name: geant4-08-01-patch-01 $
+// GEANT4 tag $Name:  $
 //
 // 
Index: trunk/geant4/N03/src/ExN03DetectorMessenger.cc
===================================================================
--- trunk/geant4/N03/src/ExN03DetectorMessenger.cc	(revision 608)
+++ trunk/geant4/N03/src/ExN03DetectorMessenger.cc	(revision 609)
@@ -26,5 +26,5 @@
 //
 // $Id: ExN03DetectorMessenger.cc,v 1.10 2006/06/29 17:48:58 gunter Exp $
-// GEANT4 tag $Name: geant4-08-01-patch-01 $
+// GEANT4 tag $Name:  $
 //
 // 
Index: trunk/geant4/N03/src/ExN03EventAction.cc
===================================================================
--- trunk/geant4/N03/src/ExN03EventAction.cc	(revision 608)
+++ trunk/geant4/N03/src/ExN03EventAction.cc	(revision 609)
@@ -26,5 +26,5 @@
 //
 // $Id: ExN03EventAction.cc,v 1.28 2006/10/26 14:30:05 allison Exp $
-// GEANT4 tag $Name: geant4-08-02-patch-01-ref $
+// GEANT4 tag $Name:  $
 //
 // 
Index: trunk/geant4/N03/src/ExN03EventActionMessenger.cc
===================================================================
--- trunk/geant4/N03/src/ExN03EventActionMessenger.cc	(revision 608)
+++ trunk/geant4/N03/src/ExN03EventActionMessenger.cc	(revision 609)
@@ -26,5 +26,5 @@
 //
 // $Id: ExN03EventActionMessenger.cc,v 1.12 2006/10/26 14:28:00 allison Exp $
-// GEANT4 tag $Name: geant4-08-02-patch-01-ref $
+// GEANT4 tag $Name:  $
 //
 // 
Index: trunk/geant4/N03/src/ExN03PhysicsList.cc
===================================================================
--- trunk/geant4/N03/src/ExN03PhysicsList.cc	(revision 608)
+++ trunk/geant4/N03/src/ExN03PhysicsList.cc	(revision 609)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: ExN03PhysicsList.cc,v 1.20 2006/06/29 17:49:05 gunter Exp $
-// GEANT4 tag $Name: geant4-08-01-patch-01 $
+// $Id: ExN03PhysicsList.cc,v 1.21 2007/07/02 13:22:08 vnivanch Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -42,6 +42,6 @@
 ExN03PhysicsList::ExN03PhysicsList():  G4VUserPhysicsList()
 {
- defaultCutValue = 1.0*mm;
- SetVerboseLevel(1);
+  defaultCutValue = 1.0*mm;
+  SetVerboseLevel(1);
 }
 
@@ -119,5 +119,5 @@
 void ExN03PhysicsList::ConstructBaryons()
 {
-//  barions
+  //  barions
   G4Proton::ProtonDefinition();
   G4AntiProton::AntiProtonDefinition();
@@ -133,5 +133,5 @@
   AddTransportation();
   ConstructEM();
-  ConstructGeneral();
+  ConstructDecay();
 }
 
@@ -205,8 +205,8 @@
 #include "G4Decay.hh"
 
-void ExN03PhysicsList::ConstructGeneral()
+void ExN03PhysicsList::ConstructDecay()
 {
   // Add Decay Process
-   G4Decay* theDecayProcess = new G4Decay();
+  G4Decay* theDecayProcess = new G4Decay();
   theParticleIterator->reset();
   while( (*theParticleIterator)() ){
Index: trunk/geant4/N03/src/ExN03PrimaryGeneratorAction.cc
===================================================================
--- trunk/geant4/N03/src/ExN03PrimaryGeneratorAction.cc	(revision 608)
+++ trunk/geant4/N03/src/ExN03PrimaryGeneratorAction.cc	(revision 609)
@@ -26,5 +26,5 @@
 //
 // $Id: ExN03PrimaryGeneratorAction.cc,v 1.8 2006/06/29 17:49:07 gunter Exp $
-// GEANT4 tag $Name: geant4-08-01-patch-01 $
+// GEANT4 tag $Name:  $
 //
 // 
Index: trunk/geant4/N03/src/ExN03PrimaryGeneratorMessenger.cc
===================================================================
--- trunk/geant4/N03/src/ExN03PrimaryGeneratorMessenger.cc	(revision 608)
+++ trunk/geant4/N03/src/ExN03PrimaryGeneratorMessenger.cc	(revision 609)
@@ -26,5 +26,5 @@
 //
 // $Id: ExN03PrimaryGeneratorMessenger.cc,v 1.9 2006/06/29 17:49:09 gunter Exp $
-// GEANT4 tag $Name: geant4-08-01-patch-01 $
+// GEANT4 tag $Name:  $
 //
 // 
Index: trunk/geant4/N03/src/ExN03RunAction.cc
===================================================================
--- trunk/geant4/N03/src/ExN03RunAction.cc	(revision 608)
+++ trunk/geant4/N03/src/ExN03RunAction.cc	(revision 609)
@@ -26,5 +26,5 @@
 //
 // $Id: ExN03RunAction.cc,v 1.18 2006/06/29 17:49:11 gunter Exp $
-// GEANT4 tag $Name: geant4-08-01-patch-01 $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
Index: trunk/geant4/N03/src/ExN03SteppingAction.cc
===================================================================
--- trunk/geant4/N03/src/ExN03SteppingAction.cc	(revision 608)
+++ trunk/geant4/N03/src/ExN03SteppingAction.cc	(revision 609)
@@ -26,5 +26,5 @@
 //
 // $Id: ExN03SteppingAction.cc,v 1.15 2006/06/29 17:49:13 gunter Exp $
-// GEANT4 tag $Name: geant4-08-01-patch-01 $
+// GEANT4 tag $Name:  $
 //
 // 
Index: trunk/geant4/N03/src/ExN03SteppingVerbose.cc
===================================================================
--- trunk/geant4/N03/src/ExN03SteppingVerbose.cc	(revision 608)
+++ trunk/geant4/N03/src/ExN03SteppingVerbose.cc	(revision 609)
@@ -26,5 +26,5 @@
 //
 // $Id: ExN03SteppingVerbose.cc,v 1.13 2006/06/29 17:49:16 gunter Exp $
-// GEANT4 tag $Name: geant4-08-01-patch-01 $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
Index: trunk/geant4/N03/vis.mac
===================================================================
--- trunk/geant4/N03/vis.mac	(revision 608)
+++ trunk/geant4/N03/vis.mac	(revision 609)
@@ -18,5 +18,5 @@
 # Use this open statement to get an .eps and .prim files
 # suitable for viewing in DAWN.
-/vis/open DAWNFILE
+###/vis/open DAWNFILE
 #
 # Use this open statement instead for OpenGL in immediate mode.
Index: trunk/geant4/N03/visTutor/exN03Vis12.loop
===================================================================
--- trunk/geant4/N03/visTutor/exN03Vis12.loop	(revision 608)
+++ trunk/geant4/N03/visTutor/exN03Vis12.loop	(revision 609)
@@ -2,3 +2,3 @@
 /vis/ogl/set/startTime {startTime} ns {timeRange} ns
 # Print eps file
-#/vis/oglx/printEPS
+#/vis/ogl/printEPS
Index: trunk/geant4/N03/visTutor/exN03Vis12.mac
===================================================================
--- trunk/geant4/N03/visTutor/exN03Vis12.mac	(revision 608)
+++ trunk/geant4/N03/visTutor/exN03Vis12.mac	(revision 609)
@@ -1,70 +1,97 @@
 #######################################################################
-#  MACRO FILE NAME: exN03Vis12.mac                                     #
+#  MACRO FILE NAME: exN03Vis12.mac                                    #
 #                                                                     #
-#  AUTHOR(S): Laurent Garnier                                         #
+#  AUTHOR(S): John Allison                                            #
 #                                                                     #
-#  DATE: July 01, 2007                                                #
+#  DATE: 16th August 2006                                             #
 #                                                                     #
-#  CONTENTS: A basic macro for demonstrating Inventor driver          #
+#  CONTENTS: A basic macro for demonstrating time slicing             #
 #                                                                     #
-#  USAGE:  % $G4BINDIR/exampleN03  visTutor/exN03Vis12.mac            #
+#  USAGE:  % $G4BINDIR/exampleN03  visTutor/exN03Vis12.mac             #
 #                                                                     #
-#  REQUIRED PLATFORMS & SOFTWARES: Unix, Motif, X-window, OpenGL,Qt   #
-#                                  HEPVis                             #
-#                                  Inventor (TGS or SoFree)           #
+#  REQUIRED PLATFORMS & SOFTWARES: Mac/Unix with X-Windows, OpenGL    #
 #                                                                     #
-#  ENVIRONMENTAL VARIABLES (C-MACROS) FOR INSTALLATION:               #
-#  (See geant4/source/visualization/README for details.)              #
-#                                                                     #
-#    % setenv G4VIS_BUILD_OIX_DRIVER       1                          # 
-#                                                                     #
-#  ENVIRONMENTAL VARIABLES (C-MACROS) FOR COMPILATION:                #
-#  (See geant4/source/visualization/README for details.)              #
-#                                                                     #
-#    % setenv G4VIS_USE_OIQT               1                          #
-#                                                                     # 
 #  ADDITIONAL NOTES:                                                  #
 #                                                                     # 
 #######################################################################
 
-# Create "scene-0" 
-/vis/scene/create
+/control/verbose 2
+/vis/verbose confirmations
 
-# Invoke the OpenInventor driver 
-/vis/sceneHandler/create OGLIQT
-/vis/viewer/create
+/vis/open OGLSX
+/vis/drawVolume
+/vis/scene/add/eventID
+/vis/scene/add/trajectories rich
 
-# Add the world volume to the current scene
-/vis/scene/add/volume
-#/vis/scene/add/volume Layer
-# Name of the absorbers = name of their material (Lead) !
-#/vis/scene/add/volume Lead
-# Name of the gaps = name of their material (liquidArgon) !
-#/vis/scene/add/volume liquidArgon
-#/vis/scene/add/trajectories
-/tracking/storeTrajectory 1
+# Set up drawByCharge with time slicing
+/vis/modeling/trajectories/create/drawByCharge
+/vis/modeling/trajectories/drawByCharge-0/default/setDrawStepPts true
+/vis/modeling/trajectories/drawByCharge-0/default/setStepPtsSize 5
+/vis/modeling/trajectories/drawByCharge-0/default/setDrawAuxPts true
+/vis/modeling/trajectories/drawByCharge-0/default/setAuxPtsSize 5
+/vis/modeling/trajectories/drawByCharge-0/default/setTimeSliceInterval 0.001 ns
+/vis/modeling/trajectories/list
+#/N03/det/setField 5 T
+#/N03/det/update
+/run/beamOn
 
-# Bird-eye view of events
-/vis/viewer/reset
-/vis/viewer/set/viewpointThetaPhi   45 45 
+# Configure OpenGL for display-by-time
+/vis/ogl/set/fade 1
+/vis/ogl/set/displayHeadTime true
+/control/alias timeRange 0.1
+/vis/verbose warnings
+/control/verbose 0
+/control/loop visTutor/exN03Vis12.loop startTime -{timeRange} 0.7 0.005
+/control/verbose 2
+/vis/verbose confirmations
+/vis/ogl/set/displayHeadTime false
 
-/vis/scene/notifyHandlers
+# Set up drawByParticleID with time slicing
+/vis/modeling/trajectories/create/drawByParticleID
+/vis/modeling/trajectories/drawByParticleID-0/set e- red
+/vis/modeling/trajectories/drawByParticleID-0/set e+ blue
+/vis/modeling/trajectories/drawByParticleID-0/set pi- cyan
+/vis/modeling/trajectories/drawByParticleID-0/set pi+ magenta
+#/vis/modeling/trajectories/drawByParticleID-0/default/setDrawStepPts true
+/vis/modeling/trajectories/drawByParticleID-0/default/setStepPtsSize 5
+#/vis/modeling/trajectories/drawByParticleID-0/default/setDrawAuxPts true
+/vis/modeling/trajectories/drawByParticleID-0/default/setAuxPtsSize 5
+/vis/modeling/trajectories/drawByParticleID-0/default/setTimeSliceInterval 0.001 ns
+/vis/modeling/trajectories/list
 
+# Remove gammas
+/vis/filtering/trajectories/create/particleFilter
+/vis/filtering/trajectories/particleFilter-0/add gamma
+/vis/filtering/trajectories/particleFilter-0/invert true
+
+/gun/energy 1 GeV
+/run/beamOn
+/control/alias timeRange 0.1
+/vis/ogl/set/displayHeadTime true
+/vis/ogl/set/displayLightFront true -90 0 0 mm
+/vis/verbose warnings
+/control/verbose 0
+/control/loop visTutor/exN03Vis12.loop startTime -{timeRange} 0.7 0.001
 /control/verbose 2
-#######################################################################
-#   Controls on an Inventor examiner viewer are :                     #
-#  - in picking mode (cursor is the upper left arrow)                 #
-#   Ctrl + pick a volume : see daughters.                             #
-#   Shift + pick a volume : see mother.                               #
-#  - in viewing mode (cursor is the hand)                             #
-#   Left-button + pointer move : rotate.                              #
-#   Ctrl+Left-button + pointer move : pane.                           #
-#   Ctrl+Shift+Left-button + pointer move : scale.                    #
-#   Middle-button + pointer move : pane.                              #
-#                                                                     #
-#######################################################################
+/vis/verbose confirmations
+/vis/ogl/set/displayLightFront false
+/vis/ogl/set/displayHeadTime false
 
-/vis/viewer/update
-
-/run/beamOn 1
-
+# To see pi -> mu -> e decay.
+/gun/particle pi+
+/vis/filtering/trajectories/particleFilter-0/add anti_nu_mu
+/vis/filtering/trajectories/particleFilter-0/add nu_mu
+/vis/filtering/trajectories/particleFilter-0/add anti_nu_e
+/vis/filtering/trajectories/particleFilter-0/add nu_e
+# Accumulate several events for effect
+# /vis/scene/endOfEventAction accumulate
+/gun/energy 100 MeV
+#/vis/viewer/set/globalLineWidthScale 2
+/run/beamOn
+/control/alias timeRange 1000
+/vis/ogl/set/displayHeadTime true
+/vis/verbose warnings
+/control/verbose 0
+/control/loop visTutor/exN03Vis12.loop startTime -{timeRange} 3000 5
+/control/verbose 2
+/vis/verbose confirmations
Index: trunk/geant4/N03/visTutor/exN03Vis13.loop
===================================================================
--- trunk/geant4/N03/visTutor/exN03Vis13.loop	(revision 608)
+++ trunk/geant4/N03/visTutor/exN03Vis13.loop	(revision 609)
@@ -5,3 +5,3 @@
 /vis/viewer/refresh
 # Print eps file
-#/vis/oglx/printEPS
+#/vis/ogl/printEPS
Index: trunk/geant4/N03/visTutor/exN03Vis15.mac
===================================================================
--- trunk/geant4/N03/visTutor/exN03Vis15.mac	(revision 609)
+++ trunk/geant4/N03/visTutor/exN03Vis15.mac	(revision 609)
@@ -0,0 +1,70 @@
+#######################################################################
+#  MACRO FILE NAME: exN03Vis12.mac                                     #
+#                                                                     #
+#  AUTHOR(S): Laurent Garnier                                         #
+#                                                                     #
+#  DATE: July 01, 2007                                                #
+#                                                                     #
+#  CONTENTS: A basic macro for demonstrating Inventor driver          #
+#                                                                     #
+#  USAGE:  % $G4BINDIR/exampleN03  visTutor/exN03Vis12.mac            #
+#                                                                     #
+#  REQUIRED PLATFORMS & SOFTWARES: Unix, Motif, X-window, OpenGL,Qt   #
+#                                  HEPVis                             #
+#                                  Inventor (TGS or SoFree)           #
+#                                                                     #
+#  ENVIRONMENTAL VARIABLES (C-MACROS) FOR INSTALLATION:               #
+#  (See geant4/source/visualization/README for details.)              #
+#                                                                     #
+#    % setenv G4VIS_BUILD_OIX_DRIVER       1                          # 
+#                                                                     #
+#  ENVIRONMENTAL VARIABLES (C-MACROS) FOR COMPILATION:                #
+#  (See geant4/source/visualization/README for details.)              #
+#                                                                     #
+#    % setenv G4VIS_USE_OIQT               1                          #
+#                                                                     # 
+#  ADDITIONAL NOTES:                                                  #
+#                                                                     # 
+#######################################################################
+
+# Create "scene-0" 
+/vis/scene/create
+
+# Invoke the OpenInventor driver 
+/vis/sceneHandler/create OGLIQT
+/vis/viewer/create
+
+# Add the world volume to the current scene
+/vis/scene/add/volume
+#/vis/scene/add/volume Layer
+# Name of the absorbers = name of their material (Lead) !
+#/vis/scene/add/volume Lead
+# Name of the gaps = name of their material (liquidArgon) !
+#/vis/scene/add/volume liquidArgon
+#/vis/scene/add/trajectories
+/tracking/storeTrajectory 1
+
+# Bird-eye view of events
+/vis/viewer/reset
+/vis/viewer/set/viewpointThetaPhi   45 45 
+
+/vis/scene/notifyHandlers
+
+/control/verbose 2
+#######################################################################
+#   Controls on an Inventor examiner viewer are :                     #
+#  - in picking mode (cursor is the upper left arrow)                 #
+#   Ctrl + pick a volume : see daughters.                             #
+#   Shift + pick a volume : see mother.                               #
+#  - in viewing mode (cursor is the hand)                             #
+#   Left-button + pointer move : rotate.                              #
+#   Ctrl+Left-button + pointer move : pane.                           #
+#   Ctrl+Shift+Left-button + pointer move : scale.                    #
+#   Middle-button + pointer move : pane.                              #
+#                                                                     #
+#######################################################################
+
+/vis/viewer/update
+
+/run/beamOn 1
+
Index: trunk/geant4/N03/visTutor/gui.mac
===================================================================
--- trunk/geant4/N03/visTutor/gui.mac	(revision 608)
+++ trunk/geant4/N03/visTutor/gui.mac	(revision 609)
@@ -33,5 +33,5 @@
 /gui/addButton vis Vis3(OGLSX) "/control/execute visTutor/exN03Vis3.mac"
 /gui/addButton vis Vis4(OGLIX) "/control/execute visTutor/exN03Vis4.mac"
-/gui/addButton vis Vis12(OGLIQT) "/control/execute visTutor/exN03Vis12.mac"
+/gui/addButton vis Vis15(OGLIQT) "/control/execute visTutor/exN03Vis15.mac"
 /gui/addButton vis Vis14(OGLSQT) "/control/execute visTutor/exN03Vis14.mac"
 /gui/addButton vis Vis5(OIX)   "/control/execute visTutor/exN03Vis5.mac"
Index: trunk/geant4/config/History
===================================================================
--- trunk/geant4/config/History	(revision 608)
+++ trunk/geant4/config/History	(revision 609)
@@ -1,3 +1,3 @@
-$Id: History,v 1.303 2007/11/02 15:58:08 gcosmo Exp $
+$Id: History,v 1.305 2007/11/16 10:44:51 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -16,4 +16,9 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+15th November 2007  Ben Morgan (config-V09-00-07)
+- Update Configure script to handle new 'gdml' sub-module and new data
+  libraries (G4ABLADATA and new G4EMLOW version).
+- Updated internal scripts for Configure accordingly.
 
 2nd November 2007  Gabriele Cosmo (config-V09-00-06)
@@ -27,4 +32,14 @@
 10th October 2007  Gunter Folger (config-V09-00-05)
 - Added "incl" (Liege cascade) hadronic model module to binmake.gmk. 
+
+3th October 2007  Laurent Garnier
+- Added setup for Qt in those files :
+ - config/G4UI_BUILD.gmk
+ - config/G4UI_USE.gmk
+ - config/G4VIS_BUILD.gmk
+ - config/G4VIS_USE.gmk
+ - config/interactivity.gmk
+ - config/sys/Darwin-g++.gmk
+ - config/sys/Linux-g++.gmk
  
 16th August 2007  Gabriele Cosmo (config-V09-00-04)
Index: trunk/geant4/interfaces/GAG/src/G4UIGAG.cc
===================================================================
--- trunk/geant4/interfaces/GAG/src/G4UIGAG.cc	(revision 608)
+++ trunk/geant4/interfaces/GAG/src/G4UIGAG.cc	(revision 609)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4UIGAG.cc,v 1.18 2006/06/29 19:09:23 gunter Exp $
-// GEANT4 tag $Name: geant4-09-00-ref-01 $
+// $Id: G4UIGAG.cc,v 1.19 2007/10/30 10:14:34 kmura Exp $
+// GEANT4 tag $Name:  $
 //
 // G4UIGAG.cc
@@ -414,5 +414,5 @@
 {
   G4UIcommandTree * treeTop = UI->GetTree();
-  /*int*/unsigned i = newCommand.index(" ");
+  /*int*/str_size i = newCommand.index(" ");
   if( i != std::string::npos )
   {
Index: trunk/geant4/interfaces/History
===================================================================
--- trunk/geant4/interfaces/History	(revision 608)
+++ trunk/geant4/interfaces/History	(revision 609)
@@ -1,3 +1,3 @@
-$Id: History,v 1.82 2007/06/19 10:38:28 gcosmo Exp $
+$Id: History,v 1.89 2007/11/16 10:41:54 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -17,4 +17,36 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+15 Nov 2007, Laurent Garnier
+ - G4UIQt,G4Qt : Adding a GEANT4_QT_DEBUG flag to hide all debug messages
+ - G4UIQt,G4Qt : Compilation improvements for Qt3
+ - G4UIQt,G4Qt : Minors corrections on G4UIQt helpWidget
+
+13 Nov 2007, Laurent Garnier
+ - G4UIQt,G4Qt : Moving all moc in one big file interface/G4UIQT_moc.cc,
+   including Qt3 and Qt4 moc support
+
+09 Nov 2007, Laurent Garnier
+ - G4UIQt,G4Qt : Change all include directive to be compatible with Qt3
+
+27 Sept 2007, Laurent Garnier
+ - Adding sur files for G4UIQt driver
+
+06 November Koichi Murakami
+- G4UItcsh.cc: store shell histoty accross sessrions.
+
+30 October 2007 Koichi Murakami (interfaces-V09-00-02)
+- Guy committed the new Qt interface (28/Sep).
+- Add "#ifdef G4UI_BUILD_QT_SESSION" protection in src/G4UIQt_moc.cc.
+- Remove Qt interface from the current tag.
+- G4UIGAG.cc: suppress a compilation warning.
+
+30 October 2007 Koichi Murakami (interfaces-V09-00-01)
+- Makoto updated the implementation of the signal handler for Ctrl-C.
+
+28 October 2007, Makoto Asai
+- Remove improper dependency from interfaces/basic to run in GNUmakefile
+
+02 August 2007, Koichi Murakami (interfaces-V09-00-00)
+- Fix compilation warning on SUN-CC in G4UIterminal.cc
 
 19 June 2007, Gabriele Cosmo (interfaces-V08-03-02)
Index: trunk/geant4/interfaces/basic/GNUmakefile
===================================================================
--- trunk/geant4/interfaces/basic/GNUmakefile	(revision 608)
+++ trunk/geant4/interfaces/basic/GNUmakefile	(revision 609)
@@ -1,3 +1,3 @@
-# $Id: GNUmakefile,v 1.3 2007/05/21 07:30:33 kmura Exp $
+# $Id: GNUmakefile,v 1.4 2007/10/29 18:49:45 asaim Exp $
 # -------------------------------------------------------------
 # GNUmakefile for interfaces/basic library.  John Allison, 6/7/98.
@@ -16,30 +16,4 @@
 CPPFLAGS += -I$(G4BASE)/interfaces/common/include
 CPPFLAGS += -I$(G4BASE)/intercoms/include
-CPPFLAGS += -I$(G4BASE)/global/management/include \
-            -I$(G4BASE)/global/HEPRandom/include \
-            -I$(G4BASE)/global/HEPGeometry/include \
-            -I$(G4BASE)/run/include \
-            -I$(G4BASE)/event/include \
-            -I$(G4BASE)/track/include \
-            -I$(G4BASE)/tracking/include \
-            -I$(G4BASE)/particles/management/include \
-            -I$(G4BASE)/processes/management/include \
-            -I$(G4BASE)/processes/cuts/include \
-            -I$(G4BASE)/processes/electromagnetic/utils/include \
-            -I$(G4BASE)/processes/transportation/include \
-            -I$(G4BASE)/processes/decay/include \
-            -I$(G4BASE)/materials/include \
-            -I$(G4BASE)/geometry/management/include \
-            -I$(G4BASE)/geometry/volumes/include \
-            -I$(G4BASE)/geometry/navigation/include \
-            -I$(G4BASE)/geometry/magneticfield/include \
-            -I$(G4BASE)/geometry/biasing/include \
-            -I$(G4BASE)/digits_hits/detector/include \
-            -I$(G4BASE)/digits_hits/hits/include \
-            -I$(G4BASE)/digits_hits/digits/include \
-            -I$(G4BASE)/interfaces/common/include \
-            -I$(G4BASE)/interfaces/basic/include \
-            -I$(G4BASE)/intercoms/include \
-            -I$(G4BASE)/graphics_reps/include
 
 include $(G4INSTALL)/config/common.gmk
Index: trunk/geant4/interfaces/basic/include/G4UIQt.hh
===================================================================
--- trunk/geant4/interfaces/basic/include/G4UIQt.hh	(revision 608)
+++ trunk/geant4/interfaces/basic/include/G4UIQt.hh	(revision 609)
@@ -25,5 +25,5 @@
 //
 //
-// $Id: G4UIQt.hh,v 1.6 2007/11/15 18:24:27 lgarnier Exp $
+// $Id: G4UIQt.hh,v 1.7 2007/11/15 18:53:59 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -149,5 +149,9 @@
   void ButtonCallback(const QString&);
   void HelpTreeClicCallback();
+#if QT_VERSION < 0x040000
+  void HelpTreeDoubleClicCallback( QListViewItem*, int);
+#else
   void HelpTreeDoubleClicCallback( QTreeWidgetItem*, int);
+#endif
   void ShowHelpCallback();
   void CommandHistoryCallback();
Index: trunk/geant4/specific-geant4-dev.sh
===================================================================
--- trunk/geant4/specific-geant4-dev.sh	(revision 608)
+++ trunk/geant4/specific-geant4-dev.sh	(revision 609)
@@ -27,5 +27,5 @@
   export G4RADIOACTIVEDATA=$G4DATA/RadiativeDecay
   export G4LEDATA=$G4DATA/G4EMLOW3.0
-  export QTHOME=/usr/local/Qt/3.3.8
+  export QTHOME=/usr/local/Qt/4.3.0
   #//////////////////////////////////////////////////////////
   # GUI, Visualization :
Index: trunk/geant4/visualization/History
===================================================================
--- trunk/geant4/visualization/History	(revision 608)
+++ trunk/geant4/visualization/History	(revision 609)
@@ -1,3 +1,3 @@
-$Id: History,v 1.414 2007/07/10 17:54:09 allison Exp $
+$Id: History,v 1.417 2007/11/15 10:18:32 allison Exp $
 -------------------------------------------------------------------
 
@@ -24,4 +24,15 @@
 History file for visualization category
 ---------------------------------------
+
+15th November 2007  John Allison
+- opengl-V09-00-03: Re-introduced Qt files. (All files now properly protected.)
+
+13th November 2007  John Allison  (vis-V09-00-02)
+- Removed OpenGL Qt files from tag.  File are still at head - need fixing.
+
+10th November 2007  John Allison  (vis-V09-00-01)
+- opengl-V09-00-01: Minor improvements in design and messaging.
+- modeling-V09-00-00: Minor improvements in messaging.
+- visman-V09-00-01:Minor improvement in messaging.
 
 10th July 2007  John Allison  (vis-V09-00-00)
Index: trunk/geant4/visualization/OpenGL/History
===================================================================
--- trunk/geant4/visualization/OpenGL/History	(revision 608)
+++ trunk/geant4/visualization/OpenGL/History	(revision 609)
@@ -1,3 +1,3 @@
-$Id: History,v 1.94 2007/08/21 14:05:50 allison Exp $
+$Id: History,v 1.100 2007/11/16 10:41:54 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -21,4 +21,54 @@
 -------------------------------------
 
+<<<<<<< History
+15 Nov 2007, Laurent Garnier
+ - G4UIQt,G4Qt : Adding a GEANT4_QT_DEBUG flag to hide all debug messages
+ - G4UIQt,G4Qt : Compilation improvements for Qt3
+ - G4UIQt,G4Qt : Minors corrections on G4UIQt helpWidget
+
+14 Nov 2007, Laurent Garnier
+ - G4OpenGLStoredQtViewer.cc : Correction of a bug with mouse move event in
+     Qt4
+ - G4OpenGLQtExportDialog_moc.cc, G4OpenGLQtViewer.cc, G4OpenGLQtViewer_moc.cc :
+     Adding protection for Qt version between 4.0 and 4.2
+
+13 Nov 2007, Laurent Garnier
+ - G4UIQt,G4Qt : Moving all moc in one big file interface/G4UIQT_moc.cc,
+   including Qt3 and Qt4 moc support
+
+09 Nov 2007, Laurent Garnier
+ - G4UIQt,G4Qt : Change all include directive to be compatible with Qt3
+
+08 Nov 2007, Laurent Garnier
+ - moc_G4OpenGLQtExportDialog.cc move in G4OpenGLQtExportDialog_moc.cc
+ - moc_G4OpenGLQtViewer.cc move to G4OpenGLQtViewer_moc.cc
+
+27 Sept 2007, Laurent Garnier
+ - Adding sur files for G4UIQt driver :
+   - G4OpenGLImmediateQt.cc
+   - G4OpenGLImmediateQtViewer.cc
+   - G4OpenGLQtExportDialog.cc
+   - G4OpenGLQtViewer.cc
+   - G4OpenGLStoredQt.cc
+   - G4OpenGLStoredQtViewer.cc
+   - moc_G4OpenGLQtExportDialog.cc
+   - moc_G4OpenGLQtViewer.cc
+
+=======
+15th November 2007  John Allison  (opengl-V09-00-03)
+- Re-introduced Qt files, now properly protected by cpp flags.
+- cpp flags also added to some other files not previously properly protected.
+
+13th November 2007  John Allison  (opengl-V09-00-02)
+- Removed Qt files from tag.  File are still at head - need fixing.
+
+10th November 2007  John Allison  (opengl-V09-00-01)
+- Moved WinSize_x, y to base class G4OpenGLViewer.
+- Minor improvement in guidance for /vis/ogl/printEPS.
+
+28th September 2007  lgarnier
+- first import of G4UI Qt files : Do not try to compil them
+
+>>>>>>> 1.99
 21st August 2007  John Allison  (opengl-V09-00-00)
 - Removed redundant G4OpenGLXViewerMessenger.
@@ -27,6 +77,4 @@
 - G4OpenGLSceneHandler and G4OpenGLXViewerMessenger:
   Fixed gcc-4.1.2 compiler warnings.
-
-G4OpenGLXViewer: Trapped glXMakeCurrent in Initialise function.
 
 25th May 2007  John Allison  (opengl-V08-03-02)
Index: trunk/geant4/visualization/OpenInventor/History
===================================================================
--- trunk/geant4/visualization/OpenInventor/History	(revision 608)
+++ trunk/geant4/visualization/OpenInventor/History	(revision 609)
@@ -1,3 +1,3 @@
-$Id: History,v 1.93 2007/04/03 13:35:48 allison Exp $
+$Id: History,v 1.94 2007/10/23 14:56:35 gcosmo Exp $
 -------------------------------------------------------------------
 
@@ -20,4 +20,8 @@
 History file for visualization/OpenInventor
 -------------------------------------------
+
+23rd October 2007  Gabriele Cosmo
+- Initialise local vectors in SoPolyhedron.cc to fix compilation warnings
+  on gcc-4.2.2 for use of non-initialised values.
 
 3rd April 2007  John Allison  (openinventor-V08-02-02 - needs visman-V08-02-03)
Index: trunk/geant4/visualization/OpenInventor/include/SoG4Polyhedron.h
===================================================================
--- trunk/geant4/visualization/OpenInventor/include/SoG4Polyhedron.h	(revision 608)
+++ trunk/geant4/visualization/OpenInventor/include/SoG4Polyhedron.h	(revision 609)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: SoG4Polyhedron.h,v 1.2 2006/12/13 15:49:56 gunter Exp $
-// GEANT4 tag $Name: geant4-09-00-ref-01 $
+// $Id: SoG4Polyhedron.h,v 1.3 2007/09/17 16:08:00 gcosmo Exp $
+// GEANT4 tag $Name:  $
 //
 // John Allison  26th October 2006
@@ -35,5 +35,5 @@
 
 // Inheritance :
-#include <Geant4_SoPolyhedron.h>
+#include "Geant4_SoPolyhedron.h"
 #include "G4AttHolder.hh"
 
Index: trunk/geant4/visualization/OpenInventor/src/SoPolyhedron.cc
===================================================================
--- trunk/geant4/visualization/OpenInventor/src/SoPolyhedron.cc	(revision 608)
+++ trunk/geant4/visualization/OpenInventor/src/SoPolyhedron.cc	(revision 609)
@@ -129,5 +129,5 @@
      SoTextureCoordinateElement::FUNCTION);
   const SoTextureCoordinateElement *tce = NULL;
-  SbVec4f texCoord;
+  SbVec4f texCoord(0.,0.,0.,0.);
   if (useTexFunction) {
     tce = SoTextureCoordinateElement::getInstance(state);
@@ -416,5 +416,5 @@
     int32_t* coords = new int32_t[ncoord];
 
-    SbVec3f pvb,pve;
+    SbVec3f pvb(0.,0.,0.), pve(0.,0.,0.);
 
     SbBool empty = TRUE;
Index: trunk/geant4/visualization/management/History
===================================================================
--- trunk/geant4/visualization/management/History	(revision 608)
+++ trunk/geant4/visualization/management/History	(revision 609)
@@ -1,3 +1,3 @@
-$Id: History,v 1.101 2007/07/10 17:52:25 allison Exp $
+$Id: History,v 1.102 2007/11/10 15:05:46 allison Exp $
 
 -------------------------------------------------------------------
@@ -26,4 +26,8 @@
 History file for visualization management sub-category
 ------------------------------------------------------
+
+10th November 2007  John Allison  (visman-V09-00-01)
+- G4VisManager.cc: Minor improvement in messaging.
+- G4VisCommandsScene.cc: Improvements in /vis/scene/endOfEventAction messaging.
 
 10th July 2007  John Allison  (visman-V09-00-00)
Index: trunk/geant4/visualization/vis.mac
===================================================================
--- trunk/geant4/visualization/vis.mac	(revision 608)
+++ trunk/geant4/visualization/vis.mac	(revision 609)
@@ -18,5 +18,5 @@
 # Use this open statement to get an .eps and .prim files
 # suitable for viewing in DAWN.
-/vis/open DAWNFILE
+###/vis/open DAWNFILE
 #
 # Use this open statement instead for OpenGL in immediate mode.
Index: trunk/geant4/visualization/visTutor/exN03Vis12.loop
===================================================================
--- trunk/geant4/visualization/visTutor/exN03Vis12.loop	(revision 608)
+++ trunk/geant4/visualization/visTutor/exN03Vis12.loop	(revision 609)
@@ -2,3 +2,3 @@
 /vis/ogl/set/startTime {startTime} ns {timeRange} ns
 # Print eps file
-#/vis/oglx/printEPS
+#/vis/ogl/printEPS
Index: trunk/geant4/visualization/visTutor/exN03Vis12.mac
===================================================================
--- trunk/geant4/visualization/visTutor/exN03Vis12.mac	(revision 608)
+++ trunk/geant4/visualization/visTutor/exN03Vis12.mac	(revision 609)
@@ -1,70 +1,97 @@
 #######################################################################
-#  MACRO FILE NAME: exN03Vis12.mac                                     #
+#  MACRO FILE NAME: exN03Vis12.mac                                    #
 #                                                                     #
-#  AUTHOR(S): Laurent Garnier                                         #
+#  AUTHOR(S): John Allison                                            #
 #                                                                     #
-#  DATE: July 01, 2007                                                #
+#  DATE: 16th August 2006                                             #
 #                                                                     #
-#  CONTENTS: A basic macro for demonstrating Inventor driver          #
+#  CONTENTS: A basic macro for demonstrating time slicing             #
 #                                                                     #
-#  USAGE:  % $G4BINDIR/exampleN03  visTutor/exN03Vis12.mac            #
+#  USAGE:  % $G4BINDIR/exampleN03  visTutor/exN03Vis12.mac             #
 #                                                                     #
-#  REQUIRED PLATFORMS & SOFTWARES: Unix, Motif, X-window, OpenGL,Qt   #
-#                                  HEPVis                             #
-#                                  Inventor (TGS or SoFree)           #
+#  REQUIRED PLATFORMS & SOFTWARES: Mac/Unix with X-Windows, OpenGL    #
 #                                                                     #
-#  ENVIRONMENTAL VARIABLES (C-MACROS) FOR INSTALLATION:               #
-#  (See geant4/source/visualization/README for details.)              #
-#                                                                     #
-#    % setenv G4VIS_BUILD_OIX_DRIVER       1                          # 
-#                                                                     #
-#  ENVIRONMENTAL VARIABLES (C-MACROS) FOR COMPILATION:                #
-#  (See geant4/source/visualization/README for details.)              #
-#                                                                     #
-#    % setenv G4VIS_USE_OIQT               1                          #
-#                                                                     # 
 #  ADDITIONAL NOTES:                                                  #
 #                                                                     # 
 #######################################################################
 
-# Create "scene-0" 
-/vis/scene/create
+/control/verbose 2
+/vis/verbose confirmations
 
-# Invoke the OpenInventor driver 
-/vis/sceneHandler/create OGLIQT
-/vis/viewer/create
+/vis/open OGLSX
+/vis/drawVolume
+/vis/scene/add/eventID
+/vis/scene/add/trajectories rich
 
-# Add the world volume to the current scene
-/vis/scene/add/volume
-#/vis/scene/add/volume Layer
-# Name of the absorbers = name of their material (Lead) !
-#/vis/scene/add/volume Lead
-# Name of the gaps = name of their material (liquidArgon) !
-#/vis/scene/add/volume liquidArgon
-#/vis/scene/add/trajectories
-/tracking/storeTrajectory 1
+# Set up drawByCharge with time slicing
+/vis/modeling/trajectories/create/drawByCharge
+/vis/modeling/trajectories/drawByCharge-0/default/setDrawStepPts true
+/vis/modeling/trajectories/drawByCharge-0/default/setStepPtsSize 5
+/vis/modeling/trajectories/drawByCharge-0/default/setDrawAuxPts true
+/vis/modeling/trajectories/drawByCharge-0/default/setAuxPtsSize 5
+/vis/modeling/trajectories/drawByCharge-0/default/setTimeSliceInterval 0.001 ns
+/vis/modeling/trajectories/list
+#/N03/det/setField 5 T
+#/N03/det/update
+/run/beamOn
 
-# Bird-eye view of events
-/vis/viewer/reset
-/vis/viewer/set/viewpointThetaPhi   45 45 
+# Configure OpenGL for display-by-time
+/vis/ogl/set/fade 1
+/vis/ogl/set/displayHeadTime true
+/control/alias timeRange 0.1
+/vis/verbose warnings
+/control/verbose 0
+/control/loop visTutor/exN03Vis12.loop startTime -{timeRange} 0.7 0.005
+/control/verbose 2
+/vis/verbose confirmations
+/vis/ogl/set/displayHeadTime false
 
-/vis/scene/notifyHandlers
+# Set up drawByParticleID with time slicing
+/vis/modeling/trajectories/create/drawByParticleID
+/vis/modeling/trajectories/drawByParticleID-0/set e- red
+/vis/modeling/trajectories/drawByParticleID-0/set e+ blue
+/vis/modeling/trajectories/drawByParticleID-0/set pi- cyan
+/vis/modeling/trajectories/drawByParticleID-0/set pi+ magenta
+#/vis/modeling/trajectories/drawByParticleID-0/default/setDrawStepPts true
+/vis/modeling/trajectories/drawByParticleID-0/default/setStepPtsSize 5
+#/vis/modeling/trajectories/drawByParticleID-0/default/setDrawAuxPts true
+/vis/modeling/trajectories/drawByParticleID-0/default/setAuxPtsSize 5
+/vis/modeling/trajectories/drawByParticleID-0/default/setTimeSliceInterval 0.001 ns
+/vis/modeling/trajectories/list
 
+# Remove gammas
+/vis/filtering/trajectories/create/particleFilter
+/vis/filtering/trajectories/particleFilter-0/add gamma
+/vis/filtering/trajectories/particleFilter-0/invert true
+
+/gun/energy 1 GeV
+/run/beamOn
+/control/alias timeRange 0.1
+/vis/ogl/set/displayHeadTime true
+/vis/ogl/set/displayLightFront true -90 0 0 mm
+/vis/verbose warnings
+/control/verbose 0
+/control/loop visTutor/exN03Vis12.loop startTime -{timeRange} 0.7 0.001
 /control/verbose 2
-#######################################################################
-#   Controls on an Inventor examiner viewer are :                     #
-#  - in picking mode (cursor is the upper left arrow)                 #
-#   Ctrl + pick a volume : see daughters.                             #
-#   Shift + pick a volume : see mother.                               #
-#  - in viewing mode (cursor is the hand)                             #
-#   Left-button + pointer move : rotate.                              #
-#   Ctrl+Left-button + pointer move : pane.                           #
-#   Ctrl+Shift+Left-button + pointer move : scale.                    #
-#   Middle-button + pointer move : pane.                              #
-#                                                                     #
-#######################################################################
+/vis/verbose confirmations
+/vis/ogl/set/displayLightFront false
+/vis/ogl/set/displayHeadTime false
 
-/vis/viewer/update
-
-/run/beamOn 1
-
+# To see pi -> mu -> e decay.
+/gun/particle pi+
+/vis/filtering/trajectories/particleFilter-0/add anti_nu_mu
+/vis/filtering/trajectories/particleFilter-0/add nu_mu
+/vis/filtering/trajectories/particleFilter-0/add anti_nu_e
+/vis/filtering/trajectories/particleFilter-0/add nu_e
+# Accumulate several events for effect
+# /vis/scene/endOfEventAction accumulate
+/gun/energy 100 MeV
+#/vis/viewer/set/globalLineWidthScale 2
+/run/beamOn
+/control/alias timeRange 1000
+/vis/ogl/set/displayHeadTime true
+/vis/verbose warnings
+/control/verbose 0
+/control/loop visTutor/exN03Vis12.loop startTime -{timeRange} 3000 5
+/control/verbose 2
+/vis/verbose confirmations
Index: trunk/geant4/visualization/visTutor/exN03Vis13.loop
===================================================================
--- trunk/geant4/visualization/visTutor/exN03Vis13.loop	(revision 608)
+++ trunk/geant4/visualization/visTutor/exN03Vis13.loop	(revision 609)
@@ -5,3 +5,3 @@
 /vis/viewer/refresh
 # Print eps file
-#/vis/oglx/printEPS
+#/vis/ogl/printEPS
Index: trunk/geant4/visualization/visTutor/gui.mac
===================================================================
--- trunk/geant4/visualization/visTutor/gui.mac	(revision 608)
+++ trunk/geant4/visualization/visTutor/gui.mac	(revision 609)
@@ -33,5 +33,5 @@
 /gui/addButton vis Vis3(OGLSX) "/control/execute visTutor/exN03Vis3.mac"
 /gui/addButton vis Vis4(OGLIX) "/control/execute visTutor/exN03Vis4.mac"
-/gui/addButton vis Vis12(OGLIQT) "/control/execute visTutor/exN03Vis12.mac"
+/gui/addButton vis Vis15(OGLIQT) "/control/execute visTutor/exN03Vis15.mac"
 /gui/addButton vis Vis14(OGLSQT) "/control/execute visTutor/exN03Vis14.mac"
 /gui/addButton vis Vis5(OIX)   "/control/execute visTutor/exN03Vis5.mac"
