Ignore:
Timestamp:
Sep 30, 2010, 2:47:17 PM (14 years ago)
Author:
garnier
Message:

tag geant4.9.4 beta 1 + modifs locales

Location:
trunk/examples/extended/parallel
Files:
155 edited

Legend:

Unmodified
Added
Removed

  • trunk/examples/extended/parallel/ExDiane/Brachy.cc

    r1230 r1337  
    2626//
    2727// $Id: Brachy.cc
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030// --------------------------------------------------------------

  • trunk/examples/extended/parallel/ExDiane/GNUmakefile

    r1230 r1337  
    1 # $Id: GNUmakefile,v 1.4 2009/03/06 09:51:42 gbarrand Exp $
     1# $Id: GNUmakefile,v 1.5 2010/01/11 16:49:50 gcosmo Exp $
    22# --------------------------------------------------------------
    33
    … …  
    77
    88ifndef G4INSTALL
    9   G4INSTALL = ../../..
     9  G4INSTALL = ../../../..
    1010endif
    1111

  • trunk/examples/extended/parallel/ExDiane/History

    r807 r1337  
    11-------------------------------------------------------------------
    2 $Id: History,v 1.5 2005/12/06 14:53:47 gcosmo Exp $
     2$Id: History,v 1.8 2010/06/06 05:06:03 perl Exp $
    33-------------------------------------------------------------------
    44
    … …  
    99                      Category History file
    1010                      ---------------------
     11
     1203.06.2010 - Joseph Perl (ExDiane-V09-03-00)
     13- Updated vis usage
     14
     1506.03.2009 - Guy Barrand (ExDiane-V09-02-00)
     16- GNUmakefile: removed logic for setting AIDA with G4ANALYSIS_USE.
     17  since it already handled in the internal configuration scripts.
    1118
    121906.12.2005 - Gabriele Cosmo

  • trunk/examples/extended/parallel/ExDiane/IodiumSourceMacro.mac

    r807 r1337  
    66/run/energy Iodium                                             
    77/run/initialize
     8#
     9#/control/execute vis.mac
     10#
    811/run/beamOn  500

  • trunk/examples/extended/parallel/ExDiane/IridiumSourceMacro.mac

    r807 r1337  
    44/event/verbose 0
    55/run/initialize
     6#
     7#/control/execute vis.mac
     8#
    69/run/beamOn  500

  • trunk/examples/extended/parallel/ExDiane/include/BrachyAnalysisManager.hh

    r1230 r1337  
    3030//
    3131// $Id: BrachyAnalysisManager.hh,v 1.3 2006/06/29 17:30:48 gunter Exp $
    32 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     32// GEANT4 tag $Name: geant4-09-04-beta-01 $
    3333//
    3434//    **********************************

  • trunk/examples/extended/parallel/ExDiane/include/BrachyDetectorConstruction.hh

    r1230 r1337  
    2626//
    2727// $Id: BrachyDetectorConstruction.hh,v 1.3 2006/06/29 17:30:50 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929// 
    3030//    ****************************************

  • trunk/examples/extended/parallel/ExDiane/include/BrachyDetectorConstructionI.hh

    r1230 r1337  
    2626//
    2727// $Id: BrachyDetectorConstructionI.hh,v 1.3 2006/06/29 17:31:10 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//    ****************************************

  • trunk/examples/extended/parallel/ExDiane/include/BrachyDetectorConstructionIr.hh

    r1230 r1337  
    2626//
    2727// $Id: BrachyDetectorConstructionIr.hh,v 1.3 2006/06/29 17:31:13 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//    ****************************************

  • trunk/examples/extended/parallel/ExDiane/include/BrachyDetectorConstructionLeipzig.hh

    r1230 r1337  
    2626//
    2727// $Id: BrachyDetectorConstructionLeipzig.hh,v 1.3 2006/06/29 17:31:16 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//Author: Susanna Guatelli

  • trunk/examples/extended/parallel/ExDiane/include/BrachyDetectorMessenger.hh

    r1230 r1337  
    3434//
    3535// $Id: BrachyDetectorMessenger.hh,v 1.3 2006/06/29 17:31:19 gunter Exp $
    36 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     36// GEANT4 tag $Name: geant4-09-04-beta-01 $
    3737//
    3838//

  • trunk/examples/extended/parallel/ExDiane/include/BrachyFactory.hh

    r1230 r1337  
    2727//
    2828// $Id: BrachyFactory.hh,v 1.2 2006/06/29 17:31:39 gunter Exp $
    29 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     29// GEANT4 tag $Name: geant4-09-04-beta-01 $
    3030//
    3131//    **********************************

  • trunk/examples/extended/parallel/ExDiane/include/BrachyFactoryI.hh

    r1230 r1337  
    3636//
    3737// $Id: BrachyFactoryI.hh,v 1.2 2006/06/29 17:32:05 gunter Exp $
    38 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     38// GEANT4 tag $Name: geant4-09-04-beta-01 $
    3939//
    4040//

  • trunk/examples/extended/parallel/ExDiane/include/BrachyFactoryIr.hh

    r1230 r1337  
    2626//
    2727// $Id: BrachyFactoryIr.hh,v 1.2 2006/06/29 17:32:07 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//    **********************************

  • trunk/examples/extended/parallel/ExDiane/include/BrachyFactoryLeipzig.hh

    r1230 r1337  
    2626//
    2727// $Id: BrachyFactoryLeipzig.hh,v 1.2 2006/06/29 17:32:10 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//    **********************************

  • trunk/examples/extended/parallel/ExDiane/include/BrachyMaterial.hh

    r1230 r1337  
    2626//
    2727// $Id: BrachyMaterial.hh,v 1.2 2006/06/29 17:32:12 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//    **********************************

  • trunk/examples/extended/parallel/ExDiane/include/BrachyPhantomHit.hh

    r1230 r1337  
    2626//
    2727// $Id: BrachyPhantomHit.hh,v 1.3 2006/06/29 17:32:14 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/parallel/ExDiane/include/BrachyPhantomROGeometry.hh

    r1230 r1337  
    2626//
    2727// $Id: BrachyPhantomROGeometry.hh,v 1.3 2006/06/29 17:32:16 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//    ************************************

  • trunk/examples/extended/parallel/ExDiane/include/BrachyPhantomSD.hh

    r1230 r1337  
    2626//
    2727// $Id: BrachyPhantomSD.hh,v 1.2 2006/06/29 17:32:19 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//    ********************************

  • trunk/examples/extended/parallel/ExDiane/include/BrachyPhysicsList.hh

    r1230 r1337  
    2626//
    2727// $Id: BrachyPhysicsList.hh,v 1.3 2006/06/29 17:32:21 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//    **********************************

  • trunk/examples/extended/parallel/ExDiane/include/BrachyPrimaryGeneratorAction.hh

    r1230 r1337  
    2626//
    2727// $Id: BrachyPrimaryGeneratorAction.hh,v 1.2 2006/06/29 17:32:23 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//    ********************************************

  • trunk/examples/extended/parallel/ExDiane/include/BrachyPrimaryGeneratorActionI.hh

    r1230 r1337  
    2626//
    2727// $Id: BrachyPrimaryGeneratorActionI.hh,v 1.3 2006/06/29 17:32:26 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/parallel/ExDiane/include/BrachyPrimaryGeneratorActionIr.hh

    r1230 r1337  
    2727//
    2828// $Id: BrachyPrimaryGeneratorActionIr.hh,v 1.3 2006/06/29 17:32:28 gunter Exp $
    29 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     29// GEANT4 tag $Name: geant4-09-04-beta-01 $
    3030//
    3131//    *************************************************

  • trunk/examples/extended/parallel/ExDiane/include/BrachyRunAction.hh

    r1230 r1337  
    2626//
    2727// $Id: BrachyRunAction.hh,v 1.3 2006/06/29 17:32:30 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//Author: Susanna Guatelli

  • trunk/examples/extended/parallel/ExDiane/include/BrachyRunMessenger.hh

    r1230 r1337  
    2626//
    2727// $Id: BrachyRunMessenger.hh,v 1.3 2006/06/29 17:32:32 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//Author: Susanna Guatelli

  • trunk/examples/extended/parallel/ExDiane/include/BrachySimulation.hh

    r1230 r1337  
    2626//
    2727// $Id: BrachySimulation.hh
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030// --------------------------------------------------------------

  • trunk/examples/extended/parallel/ExDiane/src/BrachyAnalysisManager.cc

    r1230 r1337  
    3434//
    3535// $Id: BrachyAnalysisManager.cc,v 1.3 2006/06/29 17:32:37 gunter Exp $
    36 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     36// GEANT4 tag $Name: geant4-09-04-beta-01 $
    3737//
    3838#ifdef  G4ANALYSIS_USE

  • trunk/examples/extended/parallel/ExDiane/src/BrachyDetectorConstruction.cc

    r1230 r1337  
    3838//
    3939// $Id: BrachyDetectorConstruction.cc,v 1.3 2006/06/29 17:32:51 gunter Exp $
    40 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     40// GEANT4 tag $Name: geant4-09-04-beta-01 $
    4141//
    4242#include "BrachyPhantomROGeometry.hh"

  • trunk/examples/extended/parallel/ExDiane/src/BrachyDetectorConstructionI.cc

    r1230 r1337  
    3838//
    3939// $Id: BrachyDetectorConstructionI.cc,v 1.3 2006/06/29 17:32:54 gunter Exp $
    40 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     40// GEANT4 tag $Name: geant4-09-04-beta-01 $
    4141//
    4242#include "globals.hh"

  • trunk/examples/extended/parallel/ExDiane/src/BrachyDetectorConstructionIr.cc

    r1230 r1337  
    3838//
    3939// $Id: BrachyDetectorConstructionIr.cc,v 1.3 2006/06/29 17:32:56 gunter Exp $
    40 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     40// GEANT4 tag $Name: geant4-09-04-beta-01 $
    4141//
    4242#include "globals.hh"

  • trunk/examples/extended/parallel/ExDiane/src/BrachyDetectorConstructionLeipzig.cc

    r1230 r1337  
    3939//
    4040// $Id: BrachyDetectorConstructionLeipzig.cc,v 1.3 2006/06/29 17:32:59 gunter Exp $
    41 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     41// GEANT4 tag $Name: geant4-09-04-beta-01 $
    4242//
    4343

  • trunk/examples/extended/parallel/ExDiane/src/BrachyDetectorMessenger.cc

    r1230 r1337  
    3636//
    3737// $Id: BrachyDetectorMessenger.cc,v 1.3 2006/06/29 17:33:01 gunter Exp $
    38 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     38// GEANT4 tag $Name: geant4-09-04-beta-01 $
    3939//
    4040//

  • trunk/examples/extended/parallel/ExDiane/src/BrachyFactory.cc

    r1230 r1337  
    3636//
    3737// $Id: BrachyFactory.cc,v 1.3 2006/06/29 17:33:12 gunter Exp $
    38 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     38// GEANT4 tag $Name: geant4-09-04-beta-01 $
    3939//
    4040#include"BrachyFactory.hh"

  • trunk/examples/extended/parallel/ExDiane/src/BrachyFactoryI.cc

    r1230 r1337  
    3434//
    3535// $Id: BrachyFactoryI.cc,v 1.2 2006/06/29 17:33:14 gunter Exp $
    36 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     36// GEANT4 tag $Name: geant4-09-04-beta-01 $
    3737//
    3838#include "BrachyFactoryI.hh"

  • trunk/examples/extended/parallel/ExDiane/src/BrachyFactoryIr.cc

    r1230 r1337  
    3434//
    3535// $Id: BrachyFactoryIr.cc,v 1.3 2006/06/29 17:33:16 gunter Exp $
    36 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     36// GEANT4 tag $Name: geant4-09-04-beta-01 $
    3737//
    3838#include "globals.hh"

  • trunk/examples/extended/parallel/ExDiane/src/BrachyFactoryLeipzig.cc

    r1230 r1337  
    3434//
    3535// $Id: BrachyFactoryLeipzig.cc,v 1.3 2006/06/29 17:33:19 gunter Exp $
    36 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     36// GEANT4 tag $Name: geant4-09-04-beta-01 $
    3737//
    3838

  • trunk/examples/extended/parallel/ExDiane/src/BrachyMaterial.cc

    r1230 r1337  
    3434//
    3535// $Id: BrachyMaterial.cc,v 1.3 2006/06/29 17:33:21 gunter Exp $
    36 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     36// GEANT4 tag $Name: geant4-09-04-beta-01 $
    3737//
    3838

  • trunk/examples/extended/parallel/ExDiane/src/BrachyPhantomHit.cc

    r1230 r1337  
    3434//
    3535// $Id: BrachyPhantomHit.cc,v 1.3 2006/06/29 17:33:23 gunter Exp $
    36 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     36// GEANT4 tag $Name: geant4-09-04-beta-01 $
    3737//
    3838#include "BrachyPhantomHit.hh"

  • trunk/examples/extended/parallel/ExDiane/src/BrachyPhantomROGeometry.cc

    r1230 r1337  
    3434//
    3535// $Id: BrachyPhantomROGeometry.cc,v 1.3 2006/06/29 17:33:25 gunter Exp $
    36 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     36// GEANT4 tag $Name: geant4-09-04-beta-01 $
    3737//
    3838#include "BrachyPhantomROGeometry.hh"

  • trunk/examples/extended/parallel/ExDiane/src/BrachyPhantomSD.cc

    r1230 r1337  
    3434//
    3535// $Id: BrachyPhantomSD.cc,v 1.4 2006/06/29 17:33:27 gunter Exp $
    36 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     36// GEANT4 tag $Name: geant4-09-04-beta-01 $
    3737//
    3838#include "BrachyPhantomSD.hh"

  • trunk/examples/extended/parallel/ExDiane/src/BrachyPhysicsList.cc

    r1230 r1337  
    3434//
    3535// $Id: BrachyPhysicsList.cc,v 1.3 2006/06/29 17:33:29 gunter Exp $
    36 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     36// GEANT4 tag $Name: geant4-09-04-beta-01 $
    3737//
    3838#include "BrachyPhysicsList.hh"

  • trunk/examples/extended/parallel/ExDiane/src/BrachyPrimaryGeneratorAction.cc

    r1230 r1337  
    3939//
    4040// $Id: BrachyPrimaryGeneratorAction.cc,v 1.2 2006/06/29 17:33:31 gunter Exp $
    41 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     41// GEANT4 tag $Name: geant4-09-04-beta-01 $
    4242//
    4343#include "globals.hh"

  • trunk/examples/extended/parallel/ExDiane/src/BrachyPrimaryGeneratorActionI.cc

    r1230 r1337  
    3838//
    3939// $Id: BrachyPrimaryGeneratorActionI.cc,v 1.4 2006/06/29 17:33:34 gunter Exp $
    40 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     40// GEANT4 tag $Name: geant4-09-04-beta-01 $
    4141//
    4242#include "BrachyPrimaryGeneratorActionI.hh"

  • trunk/examples/extended/parallel/ExDiane/src/BrachyPrimaryGeneratorActionIr.cc

    r1230 r1337  
    3838//
    3939// $Id: BrachyPrimaryGeneratorActionIr.cc,v 1.4 2006/06/29 17:33:36 gunter Exp $
    40 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     40// GEANT4 tag $Name: geant4-09-04-beta-01 $
    4141//
    4242#include "BrachyPrimaryGeneratorActionIr.hh"

  • trunk/examples/extended/parallel/ExDiane/src/BrachyRunAction.cc

    r1230 r1337  
    3939//    *******************************
    4040//
    41 // $Id: BrachyRunAction.cc,v 1.3 2006/06/29 17:33:38 gunter Exp $
    42 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     41// $Id: BrachyRunAction.cc,v 1.4 2010/06/06 05:06:03 perl Exp $
     42// GEANT4 tag $Name: geant4-09-04-beta-01 $
    4343//
    4444
    4545#include "BrachyRunAction.hh"
    46 #include "BrachyEventAction.hh"
    4746
    4847#ifdef G4ANALYSIS_USE

  • trunk/examples/extended/parallel/ExDiane/src/BrachyRunMessenger.cc

    r1230 r1337  
    2828//
    2929// $Id: BrachyRunMessenger.cc,v 1.3 2006/06/29 17:33:41 gunter Exp $
    30 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     30// GEANT4 tag $Name: geant4-09-04-beta-01 $
    3131//
    3232//

  • trunk/examples/extended/parallel/ExDiane/src/BrachySimulation.cc

    r1230 r1337  
    2626//
    2727// $Id: BrachySimulation.cc
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030// --------------------------------------------------------------
    … …  
    5454#endif
    5555
    56 #include "BrachyEventAction.hh"
    5756#include "BrachyDetectorConstruction.hh"
    5857#include "BrachyPhysicsList.hh"
    … …  
    110109#endif
    111110
    112   BrachyEventAction *pEventAction = new BrachyEventAction();
    113   pRunManager -> SetUserAction(pEventAction );
    114 
    115111  BrachyRunAction *pRunAction = new BrachyRunAction();
    116112  pRunManager -> SetUserAction(pRunAction);

  • trunk/examples/extended/parallel/MPI/History

    r807 r1337  
    1 $Id: History,v 1.1 2007/11/16 04:02:10 kmura Exp $
     1$Id: History,v 1.3 2010/06/06 05:07:23 perl Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1313     ----------------------------------------------------------
    1414
     154 June 2010 J.Perl (MPI-V09-03-01)
     16 - Updated vis usage.
     17
     1818 May 2010 K.Murakami (MPI-V09-03-00)
     19 == code review was performed. ==
     20 << mpi_ineterface >>
     21 - OpenMPI as default MPI library instead of LAM/MPI
     22 - improve /mpi/status command. (waste of CPU, time measurement)
     23 - /mpi/wait command is introduced for waiting until beamOn ends.
     24 - improve macro file parser
     25    * same parser as G4UIbatch
     26    * fixed unexpected behavior at the end of batch mode
     27 - changed "beamOn" behavior for better performance
     28    * thread-out for interactive, on-thread for batch
     29 << exMPI01 >>
     30 - use G4UIcsh instead of G4UItcsh because OpenMPI is now default.
     31 - use G4eMultipleScattering instead of obsolete G4MultipleScattering.
     32 << exMPI02 >>
     33 - use G4UIcsh instead of G4UItcsh because OpenMPI is now default.
     34
     35
    153616 Nov. 2007 K.Murakami
    1637 - commited to G4 CVS.

  • trunk/examples/extended/parallel/MPI/README

    r807 r1337  
    1 $Id: README,v 1.2 2007/11/16 14:04:05 kmura Exp $
     1$Id: README,v 1.3 2010/05/18 06:09:09 kmura Exp $
    22==========================================================================
    33Geant4 MPI Interface
    … …  
    1212a Geant4 UI library and a couple of parallelized examples.
    1313Using this interface, users applications can be parllelized with
    14 different MPI compliant libraries, such as LAM/MPI, MPICH2, OpenMPI,
     14different MPI compliant libraries, such as OpenMPI, LAM/MPI, MPICH2,
    1515and so on.
    1616
    … …  
    2525* MPI implementation
    2626
    27 - LAM/MPI (7.1.3)
     27- Open MPI (1.4.2)
     28  http://www.open-mpi.org/
     29
     30- LAM/MPI (7.1.3) (development is terminated. maintenance only)
    2831  http://www.lam-mpi.org/
    2932
    30 - MPICH2 (1.0.6p1)
     33- MPICH2 (1.2.1p1)
    3134  http://www.mcs.anl.gov/research/projects/mpich2/
    32 
    33 - Open MPI (1.2.4)
    34   http://www.open-mpi.org/
    35 
    3635
    3736* Optional
    … …  
    4241----------------
    4342G4MPI UI library is provided in the "mpi_interface" directory.
    44 Start with building the G4MPI UI library according to the instruction 
     43Start with building the G4MPI UI library according to the instruction
    4544in the directory.
    4645
    … …  
    6059  // MPI session (G4MPIsession) instead of G4UIterminal
    6160  G4MPIsession* session= g4MPI-> GetMPIsession();
    62 
    63   // LAM users can use G4tcsh.
    64   G4String prompt= "G4MPI";
    65   G4UItcsh* tcsh= new G4UItcsh(prompt);
    66   session-> SetShell(tcsh);
    6761
    6862  // user application setting
    … …  
    8680For other users (Open MPI/MPICH2), plese use G4csh (default).
    8781
     82In case of OpenMPI, LD_LIBRARY_PATH for OpenMPI runtime libraries
     83should be set at run time. Alternatively, you can add this path
     84to the dynamic linker configuration using `ldconfig`.
     85(needs sys-admin authorization)
     86
    8887
    8988How to use:
    … …  
    93921. Make hosts/cluster configuration of your MPI environment.
    9493
    95 2. Launch MPI runtime environment, typically executing 
     942. Launch MPI runtime environment, typically executing
    9695   lamboot (LAM) / mpdboot (MPICH2).
    9796
    … …  
    119118   execute *        Execute a macro file. (=/control/execute)
    120119   beamOn *         Start a parallel run w/ thread.
    121    .beamOn *        Start a parallel run w/o thread. (=/run/beamOn)
     120   .beamOn *        Start a parallel run w/o thread.
    122121   masterWeight *   Set weight for master node.
     122   wait *           Wait until beamOn-s on all nodes are done. (batch mode only)
    123123   showSeeds *      Show seeds of MPI nodes.
    124124   setMasterSeed *  Set a master seed for the seed generator.
    … …  
    126126
    127127* Notes:
    128 While "/run/beamOn" is executed in foreground, the "/mpi/beamOn"
    129 command invokes beam-on in background, so you can input UI commands
    130 even while event processing.
     128While "/run/beamOn" and "/mpi/beamOn" commands invoke beam-on in background,
     129so you can input UI commands even while event processing.
    131130
    132 The original "/control/execute" and "/run/beamOn" are overwritten 
    133 with "/mpi/execute" and "/mpi/.beamOn" commands, customized for
    134 the MPI interface.
     131The original "/control/execute" and "/run/beamOn" are overwritten
     132with "/mpi/execute" and "/mpi/beamOn" commands respectively,
     133customized for the MPI interface.
    135134
    136135
    … …  
    142141for running examples:
    143142
    144 - G4LEVELGAMMADATA : directory path for the data of 
     143- G4LEVELGAMMADATA : directory path for the data of
    145144                     "low energy electromagnetic processes".
    146145
    147 For running ROOT applications, 
     146For running ROOT applications,
    148147
    149148- ROOTSYS         : root path of the ROOT package
    … …  
    174173  * treat multiple outputs properly:
    175174    each slave node generate a ROOT file, whose file name should
    176     be different from each other. 
     175    be different from each other.
    177176

  • trunk/examples/extended/parallel/MPI/exMPI01/GNUmakefile

    r1230 r1337  
    1 # $Id: GNUmakefile,v 1.1 2007/11/16 14:16:46 kmura Exp $
    2 # $Name: geant4-09-03-cand-01 $
     1# $Id: GNUmakefile,v 1.2 2010/01/11 16:53:51 gcosmo Exp $
     2# $Name: geant4-09-04-beta-01 $
    33# ===========================================================
    44#   Makefile for building G4 MPI aplication
    55# ===========================================================
    6 name := exMPI01#
     6
     7name := exMPI01
    78G4TARGET := $(name)
    89G4EXLIB := true
    910
    10 G4WORKDIR := .
     11ifndef G4INSTALL
     12  G4INSTALL = ../../../../..
     13endif
    1114
    1215.PHONY: all

  • trunk/examples/extended/parallel/MPI/exMPI01/History

    r807 r1337  
    1 $Id: History,v 1.1 2007/11/16 14:16:46 kmura Exp $
     1$Id: History,v 1.3 2010/06/06 05:07:23 perl Exp $
    22-------------------------------------------------------------------
    33
    … …  
    99                          ---------------
    1010
     114 June 2010 J.Perl
     12 - Updated vis usage.
     13
     1418 May 2010 K.Murakami
     15 - use G4UIcsh instead of G4UItcsh because OpenMPI is now default.
     16 - use G4eMultipleScattering instead of obsolete G4MultipleScattering.
     17
    111816 Nov. 2007 K.Murakami
    1219 - commited to G4 CVS.
    1320
    14 

  • trunk/examples/extended/parallel/MPI/exMPI01/exMPI01.cc

    r1230 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: exMPI01.cc,v 1.1 2007/11/16 14:16:46 kmura Exp $
    27 // $Name: geant4-09-03-cand-01 $
     26// $Id: exMPI01.cc,v 1.2 2010/05/18 06:07:43 kmura Exp $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================
    … …  
    4343#include "G4MPImanager.hh"
    4444#include "G4MPIsession.hh"
    45 #include "G4UItcsh.hh"
    4645
    4746#ifdef G4VIS_USE
    … …  
    7069  prompt+= "G4MPI";
    7170  prompt+= "[40;31m(%s)[40;36m[%/][00;30m:";
    72 
    73   G4UItcsh* tcsh= new G4UItcsh(prompt);
    74   tcsh-> SetLsColor(BLUE,RED);
    75   session-> SetShell(tcsh);
     71  session-> SetPrompt(prompt);
    7672
    7773  // --------------------------------------------------------------------

  • trunk/examples/extended/parallel/MPI/exMPI01/include/DetectorConstruction.hh

    r807 r1337  
    2525//
    2626// $Id: DetectorConstruction.hh,v 1.1 2007/11/16 14:16:46 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================

  • trunk/examples/extended/parallel/MPI/exMPI01/include/Materials.hh

    r807 r1337  
    2525//
    2626// $Id: Materials.hh,v 1.1 2007/11/16 14:16:46 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================

  • trunk/examples/extended/parallel/MPI/exMPI01/include/Particles.hh

    r807 r1337  
    2525//
    2626// $Id: Particles.hh,v 1.1 2007/11/16 14:16:46 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================

  • trunk/examples/extended/parallel/MPI/exMPI01/include/PhysicsList.hh

    r807 r1337  
    2525//
    2626// $Id: PhysicsList.hh,v 1.1 2007/11/16 14:16:46 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================

  • trunk/examples/extended/parallel/MPI/exMPI01/include/PhysicsListEMstd.hh

    r807 r1337  
    2525//
    2626// $Id: PhysicsListEMstd.hh,v 1.1 2007/11/16 14:16:46 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================

  • trunk/examples/extended/parallel/MPI/exMPI01/include/PrimaryGeneratorAction.hh

    r807 r1337  
    2525//
    2626// $Id: PrimaryGeneratorAction.hh,v 1.1 2007/11/16 14:16:46 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================

  • trunk/examples/extended/parallel/MPI/exMPI01/src/DetectorConstruction.cc

    r807 r1337  
    2525//
    2626// $Id: DetectorConstruction.cc,v 1.1 2007/11/16 14:16:46 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================

  • trunk/examples/extended/parallel/MPI/exMPI01/src/Materials.cc

    r807 r1337  
    2525//
    2626// $Id: Materials.cc,v 1.1 2007/11/16 14:16:46 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================

  • trunk/examples/extended/parallel/MPI/exMPI01/src/Particles.cc

    r807 r1337  
    2525//
    2626// $Id: Particles.cc,v 1.1 2007/11/16 14:16:46 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================

  • trunk/examples/extended/parallel/MPI/exMPI01/src/PhysicsList.cc

    r807 r1337  
    2525//
    2626// $Id: PhysicsList.cc,v 1.1 2007/11/16 14:16:46 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================

  • trunk/examples/extended/parallel/MPI/exMPI01/src/PhysicsListEMstd.cc

    r807 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: PhysicsListEMstd.cc,v 1.1 2007/11/16 14:16:46 kmura Exp $
    27 // $Name: $
     26// $Id: PhysicsListEMstd.cc,v 1.2 2010/05/13 03:12:00 kmura Exp $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================
    … …  
    4848#include "G4GammaConversion.hh"
    4949#include "G4PhotoElectricEffect.hh"
    50 #include "G4MultipleScattering.hh"
     50#include "G4eMultipleScattering.hh"
    5151#include "G4eIonisation.hh"
    5252#include "G4eBremsstrahlung.hh"
    … …  
    8787  G4ProcessManager* pm;
    8888
    89   // ---------------------------------------------------------- 
     89  // ----------------------------------------------------------
    9090  // gamma physics
    9191  // ----------------------------------------------------------
    … …  
    9898  // electron physics
    9999  // ----------------------------------------------------------
    100   G4MultipleScattering* msc=    new G4MultipleScattering;
     100  G4eMultipleScattering* msc=   new G4eMultipleScattering;
    101101  G4eIonisation*        eion=   new G4eIonisation;
    102102  G4eBremsstrahlung*    ebrems= new G4eBremsstrahlung;
    … …  
    110110  // positron physics
    111111  // ----------------------------------------------------------
    112   msc=    new G4MultipleScattering;
     112  msc=    new G4eMultipleScattering;
    113113  eion=   new G4eIonisation;
    114114  ebrems= new G4eBremsstrahlung;
    … …  
    123123}
    124124
     125

  • trunk/examples/extended/parallel/MPI/exMPI01/src/PrimaryGeneratorAction.cc

    r807 r1337  
    2525//
    2626// $Id: PrimaryGeneratorAction.cc,v 1.1 2007/11/16 14:16:46 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================

  • trunk/examples/extended/parallel/MPI/exMPI01/v.mac

    r807 r1337  
    1 /vis/open OGLIX
    2 
    3 /vis/scene/create
    4 /vis/scene/add/volume
    5 
    6 /vis/sceneHandler/attach
    7 
     1# Use this open statement to create an OpenGL view:
     2/vis/open OGL 600x600-0+0
     3#
     4# Use this open statement to create a .prim file suitable for
     5# viewing in DAWN:
     6#/vis/open DAWNFILE
     7#
     8# Use this open statement to create a .heprep file suitable for
     9# viewing in HepRApp:
     10#/vis/open HepRepFile
     11#
     12# Use this open statement to create a .wrl file suitable for
     13# viewing in a VRML viewer:
     14#/vis/open VRML2FILE
     15#
     16# Disable auto refresh and quieten vis messages whilst scene and
     17# trajectories are established:
     18/vis/viewer/set/autoRefresh false
     19/vis/verbose errors
     20#
     21# Draw geometry:
     22/vis/drawVolume
     23#
     24# Specify view angle:
    825/vis/viewer/set/viewpointThetaPhi 90. 270.
    9 
    10 /tracking/storeTrajectory 1
    11 /vis/scene/add/trajectories
     26#
     27# Specify zoom value:
     28#/vis/viewer/zoom 2.
     29#
     30# Specify style (surface or wireframe):
     31#/vis/viewer/set/style wireframe
     32#
     33# Draw coordinate axes:
     34#/vis/scene/add/axes 0 0 0 1 m
     35#
     36# Draw smooth trajectories at end of event, showing trajectory points
     37# as markers 2 pixels wide:
     38/vis/scene/add/trajectories smooth
     39/vis/modeling/trajectories/create/drawByCharge
     40/vis/modeling/trajectories/drawByCharge-0/default/setDrawStepPts true
     41/vis/modeling/trajectories/drawByCharge-0/default/setStepPtsSize 2
     42# (if too many tracks cause core dump => /tracking/storeTrajectory 0)
     43#
     44# Draw hits at end of event:
     45#/vis/scene/add/hits
     46#
     47# To draw only gammas:
     48#/vis/filtering/trajectories/create/particleFilter
     49#/vis/filtering/trajectories/particleFilter-0/add gamma
     50#
     51# To invert the above, drawing all particles except gammas,
     52# keep the above two lines but also add:
     53#/vis/filtering/trajectories/particleFilter-0/invert true
     54#
     55# Many other options are available with /vis/modeling and /vis/filtering.
     56# For example, to select colour by particle ID:
     57#/vis/modeling/trajectories/create/drawByParticleID
     58#/vis/modeling/trajectories/drawByParticleID-0/set e- blue
     59#
     60# To superimpose all of the events from a given run:
    1261/vis/scene/endOfEventAction accumulate
    13 #/vis/scene/endOfEventAction refresh
    14 
    15 
     62#
     63# Re-establish auto refreshing and verbosity:
     64/vis/viewer/set/autoRefresh true
     65/vis/verbose warnings
     66#
     67# For file-based drivers, use this to create an empty detector view:
     68#/vis/viewer/flush

  • trunk/examples/extended/parallel/MPI/exMPI02/GNUmakefile

    r1230 r1337  
    1 # $Id: GNUmakefile,v 1.1 2007/11/16 14:28:34 kmura Exp $
    2 # $Name: geant4-09-03-cand-01 $
     1# $Id: GNUmakefile,v 1.2 2010/01/11 16:55:08 gcosmo Exp $
     2# $Name: geant4-09-04-beta-01 $
    33# ===========================================================
    44#   Makefile for building G4 MPI aplication
    55# ===========================================================
    6 name := exMPI02#
     6
     7name := exMPI02
    78G4TARGET := $(name)
    89G4EXLIB := true
    910
    10 G4WORKDIR := .
     11ifndef G4INSTALL
     12  G4INSTALL = ../../../../..
     13endif
    1114
    1215.PHONY: all

  • trunk/examples/extended/parallel/MPI/exMPI02/History

    r807 r1337  
    1 $Id: History,v 1.1 2007/11/16 14:28:34 kmura Exp $
     1$Id: History,v 1.3 2010/06/06 05:07:23 perl Exp $
    22-------------------------------------------------------------------
    33
    … …  
    99                          ---------------
    1010
     114 June 2010 J.Perl
     12 - Updated vis usage.
     13
     1418 May 2010 K.Murakami
     15 - use G4UIcsh instead of G4UItcsh because OpenMPI is now default.
     16
    111716 Nov. 2007 K.Murakami
    1218 - commited to G4 CVS.
    1319
    14 

  • trunk/examples/extended/parallel/MPI/exMPI02/exMPI02.cc

    r1230 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: exMPI02.cc,v 1.1 2007/11/16 14:28:34 kmura Exp $
    27 // $Name: geant4-09-03-cand-01 $
     26// $Id: exMPI02.cc,v 1.2 2010/05/18 06:08:30 kmura Exp $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================
    … …  
    4545#include "G4MPImanager.hh"
    4646#include "G4MPIsession.hh"
    47 #include "G4UItcsh.hh"
    4847
    4948#ifdef G4VIS_USE
    … …  
    7170  prompt+= "G4MPI";
    7271  prompt+= "[40;31m(%s)[40;36m[%/][00;30m:";
    73 
    74   G4UItcsh* tcsh= new G4UItcsh(prompt);
    75   tcsh-> SetLsColor(BLUE,RED);
    76   session-> SetShell(tcsh);
     72  session-> SetPrompt(prompt);
    7773
    7874  // --------------------------------------------------------------------

  • trunk/examples/extended/parallel/MPI/exMPI02/include/Analysis.hh

    r807 r1337  
    2525//
    2626// $Id: Analysis.hh,v 1.1 2007/11/16 14:29:32 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================

  • trunk/examples/extended/parallel/MPI/exMPI02/include/DetectorConstruction.hh

    r807 r1337  
    2525//
    2626// $Id: DetectorConstruction.hh,v 1.1 2007/11/16 14:29:32 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================

  • trunk/examples/extended/parallel/MPI/exMPI02/include/EventAction.hh

    r807 r1337  
    2525//
    2626// $Id: EventAction.hh,v 1.2 2007/12/10 16:28:34 gunter Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828// ====================================================================
    2929//   EventAction.hh

  • trunk/examples/extended/parallel/MPI/exMPI02/include/MedicalBeam.hh

    r807 r1337  
    2525//
    2626// $Id: MedicalBeam.hh,v 1.1 2007/11/16 14:29:33 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828// ====================================================================
    2929//   MedicalBeam.hh

  • trunk/examples/extended/parallel/MPI/exMPI02/include/RunAction.hh

    r807 r1337  
    2525//
    2626// $Id: RunAction.hh,v 1.2 2007/12/10 16:28:39 gunter Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828// ====================================================================
    2929//   RunAction.hh

  • trunk/examples/extended/parallel/MPI/exMPI02/include/VoxelParam.hh

    r807 r1337  
    2525//
    2626// $Id: VoxelParam.hh,v 1.1 2007/11/16 14:29:33 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================

  • trunk/examples/extended/parallel/MPI/exMPI02/include/VoxelSD.hh

    r807 r1337  
    2525//
    2626// $Id: VoxelSD.hh,v 1.1 2007/11/16 14:29:33 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================

  • trunk/examples/extended/parallel/MPI/exMPI02/src/Analysis.cc

    r807 r1337  
    2525//
    2626// $Id: Analysis.cc,v 1.1 2007/11/16 14:29:33 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================

  • trunk/examples/extended/parallel/MPI/exMPI02/src/DetectorConstruction.cc

    r807 r1337  
    2525//
    2626// $Id: DetectorConstruction.cc,v 1.1 2007/11/16 14:29:33 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================

  • trunk/examples/extended/parallel/MPI/exMPI02/src/EventAction.cc

    r807 r1337  
    2525//
    2626// $Id: EventAction.cc,v 1.2 2007/12/10 16:28:52 gunter Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828// ====================================================================
    2929//   EventAction.cc

  • trunk/examples/extended/parallel/MPI/exMPI02/src/MedicalBeam.cc

    r807 r1337  
    2525//
    2626// $Id: MedicalBeam.cc,v 1.1 2007/11/16 14:29:33 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828// ====================================================================
    2929//   MedicalBeam.cc

  • trunk/examples/extended/parallel/MPI/exMPI02/src/RunAction.cc

    r807 r1337  
    2525//
    2626// $Id: RunAction.cc,v 1.2 2007/12/10 16:28:54 gunter Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828// ====================================================================
    2929//   RunAction.cc

  • trunk/examples/extended/parallel/MPI/exMPI02/src/VoxelParam.cc

    r807 r1337  
    2525//
    2626// $Id: VoxelParam.cc,v 1.1 2007/11/16 14:29:33 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================

  • trunk/examples/extended/parallel/MPI/exMPI02/src/VoxelSD.cc

    r807 r1337  
    2525//
    2626// $Id: VoxelSD.cc,v 1.1 2007/11/16 14:29:33 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================

  • trunk/examples/extended/parallel/MPI/exMPI02/v.mac

    r807 r1337  
    1 /vis/verbose 0
    2 
    3 /vis/open OGLIX
    4 
    5 /vis/scene/create
    6 /vis/scene/add/volume
    7 
    8 /vis/sceneHandler/attach
    9 
     1# Use this open statement to create an OpenGL view:
     2/vis/open OGL 600x600-0+0
     3#
     4# Use this open statement to create a .prim file suitable for
     5# viewing in DAWN:
     6#/vis/open DAWNFILE
     7#
     8# Use this open statement to create a .heprep file suitable for
     9# viewing in HepRApp:
     10#/vis/open HepRepFile
     11#
     12# Use this open statement to create a .wrl file suitable for
     13# viewing in a VRML viewer:
     14#/vis/open VRML2FILE
     15#
     16# Disable auto refresh and quieten vis messages whilst scene and
     17# trajectories are established:
     18/vis/viewer/set/autoRefresh false
     19/vis/verbose errors
     20#
     21# Draw geometry:
     22/vis/drawVolume
     23#
     24# Specify view angle:
    1025/vis/viewer/set/viewpointThetaPhi 90. 270.
    11 
    12 /tracking/storeTrajectory 1
    13 /vis/scene/add/trajectories
     26#
     27# Specify zoom value:
     28#/vis/viewer/zoom 2.
     29#
     30# Specify style (surface or wireframe):
     31#/vis/viewer/set/style wireframe
     32#
     33# Draw coordinate axes:
     34#/vis/scene/add/axes 0 0 0 1 m
     35#
     36# Draw smooth trajectories at end of event, showing trajectory points
     37# as markers 2 pixels wide:
     38/vis/scene/add/trajectories smooth
     39/vis/modeling/trajectories/create/drawByCharge
     40/vis/modeling/trajectories/drawByCharge-0/default/setDrawStepPts true
     41/vis/modeling/trajectories/drawByCharge-0/default/setStepPtsSize 2
     42# (if too many tracks cause core dump => /tracking/storeTrajectory 0)
     43#
     44# Draw hits at end of event:
     45#/vis/scene/add/hits
     46#
     47# To draw only gammas:
     48#/vis/filtering/trajectories/create/particleFilter
     49#/vis/filtering/trajectories/particleFilter-0/add gamma
     50#
     51# To invert the above, drawing all particles except gammas,
     52# keep the above two lines but also add:
     53#/vis/filtering/trajectories/particleFilter-0/invert true
     54#
     55# Many other options are available with /vis/modeling and /vis/filtering.
     56# For example, to select colour by particle ID:
     57#/vis/modeling/trajectories/create/drawByParticleID
     58#/vis/modeling/trajectories/drawByParticleID-0/set e- blue
     59#
     60# To superimpose all of the events from a given run:
    1461/vis/scene/endOfEventAction accumulate
    15 #/vis/scene/endOfEventAction refresh
    16 
    17 
     62#
     63# Re-establish auto refreshing and verbosity:
     64/vis/viewer/set/autoRefresh true
     65/vis/verbose warnings
     66#
     67# For file-based drivers, use this to create an empty detector view:
     68#/vis/viewer/flush

  • trunk/examples/extended/parallel/MPI/mpi_interface/G4MPI-lam.gmk

    r807 r1337  
    11# $Id: G4MPI-lam.gmk,v 1.1 2007/11/16 13:32:56 kmura Exp $
    2 # $Name: $
     2# $Name: geant4-09-04-beta-01 $
    33# ===========================================================
    44#  Makefile for building G4MPI (LAM)

  • trunk/examples/extended/parallel/MPI/mpi_interface/G4MPI-mpich2.gmk

    r807 r1337  
    11# $Id: G4MPI-mpich2.gmk,v 1.1 2007/11/16 13:32:56 kmura Exp $
    2 # $Name: $
     2# $Name: geant4-09-04-beta-01 $
    33# ===========================================================
    44#  Makefile for building G4MPI (MPICH2)

  • trunk/examples/extended/parallel/MPI/mpi_interface/G4MPI-openmpi.gmk

    r807 r1337  
    1 # $Id: G4MPI-openmpi.gmk,v 1.1 2007/11/16 13:32:56 kmura Exp $
    2 # $Name: $
     1# $Id: G4MPI-openmpi.gmk,v 1.3 2010/05/18 06:02:01 kmura Exp $
     2# $Name: geant4-09-04-beta-01 $
    33# ===========================================================
    4 #  Makefile for building G4MPI (LAM)
     4#  Makefile for building G4MPI (OpenMPI)
    55# ===========================================================
    66
    … …  
    1313CPPFLAGS += -I$(G4MPIROOT)/include -I$(G4MPIROOT)/include/openmpi
    1414
     15# to suppress compiler warnings for OpenMPI headers
     16CXXFLAGS := $(subst -Wall, , $(CXXFLAGS))

  • trunk/examples/extended/parallel/MPI/mpi_interface/G4MPI.gmk

    r807 r1337  
    1 # $Id: G4MPI.gmk,v 1.1 2007/11/16 13:32:56 kmura Exp $
    2 # $Name: $
     1# $Id: G4MPI.gmk,v 1.3 2010/05/18 06:01:09 kmura Exp $
     2# $Name: geant4-09-04-beta-01 $
    33# ===========================================================
    4 #  Makefile for building G4MPI (LAM)
     4#  Makefile for building G4MPI (OpenMPI)
    55# ===========================================================
    66
    77ifndef G4MPIROOT
    8   G4MPIROOT = /opt/lam
     8  G4MPIROOT = /opt/ompi
    99endif
    1010
    1111# additional flags
    1212CXX := mpic++
    13 CPPFLAGS += -I$(G4MPIROOT)/include
     13CPPFLAGS += -I$(G4MPIROOT)/include -I$(G4MPIROOT)/include/openmpi
    1414
     15# to suppress compiler warnings for OpenMPI headers
     16CXXFLAGS := $(subst -Wall, , $(CXXFLAGS))

  • trunk/examples/extended/parallel/MPI/mpi_interface/GNUmakefile

    r1230 r1337  
    11# $Id: GNUmakefile,v 1.1 2007/11/16 13:32:56 kmura Exp $
    2 # $Name: geant4-09-03-cand-01 $
     2# $Name: geant4-09-04-beta-01 $
    33# ===========================================================
    44#   Makefile for building MPI interface

  • trunk/examples/extended/parallel/MPI/mpi_interface/History

    r807 r1337  
    1 $Id: History,v 1.1 2007/11/16 13:32:56 kmura Exp $
     1$Id: History,v 1.2 2010/05/18 06:00:40 kmura Exp $
    22-------------------------------------------------------------------
    33
    … …  
    99                         ------------------
    1010
     1118 May 2010 K.Murakami
     12 == Code reviewed ==
     13 - OpenMPI as default MPI library instead of LAM/MPI
     14 - improve /mpi/status command. (waste of CPU, time measurement)
     15 - /mpi/wait command is introduced for waiting until beamOn ends.
     16 - improve macro file parser
     17    * same parser as G4UIbatch
     18    * fixed unexpected behavior at the end of batch mode
     19 - changed "beamOn" behavior for better performance
     20    * thread-out for interactive, on-thread for batch
     21
    112216 Nov. 2007 K.Murakami
    1223 - commited to G4 CVS.
    1324
    14 
    15 
    16 

  • trunk/examples/extended/parallel/MPI/mpi_interface/README

    r807 r1337  
    1 $Id: README,v 1.1 2007/11/16 13:32:56 kmura Exp $
     1$Id: README,v 1.2 2010/05/18 06:00:18 kmura Exp $
    22==========================================================================
    33Geant4 MPI Interface
    … …  
    1616* Specify additional include paths and compiler flags to "CPPFLAGS".
    1717
    18 Sample makefiles for (LAM, MPICH2, OpenMPI) are also presented.
     18Sample makefiles for (OpnMPI, LAM, MPICH2) are also presented.
    1919An example of "G4MPI.gmk":
    2020
    21   # ===========================================================
    22   #  Makefile for building G4MPI (LAM)
    23   # ===========================================================
     21# ===========================================================
     22#  Makefile for building G4MPI (OpenMPI)
     23# ===========================================================
    2424
    25   ifndef G4MPIROOT
    26     G4MPIROOT = /opt/lam
    27   endif
     25ifndef G4MPIROOT
     26  G4MPIROOT = /opt/ompi
     27endif
    2828
    29   # additional flags
    30   CXX := mpic++
    31   CPPFLAGS += -I$(G4MPIROOT)/include
     29# additional flags
     30CXX := mpic++
     31CXXFLAGS := $(subst -Wall, , $(CXXFLAGS))
     32CPPFLAGS += -I$(G4MPIROOT)/include -I$(G4MPIROOT)/include/openmpi
    3233
    3334

  • trunk/examples/extended/parallel/MPI/mpi_interface/include/G4MPIbatch.hh

    r807 r1337  
    2525//
    2626// $Id: G4MPIbatch.hh,v 1.1 2007/11/16 14:05:39 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================

  • trunk/examples/extended/parallel/MPI/mpi_interface/include/G4MPImanager.hh

    r807 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: G4MPImanager.hh,v 1.1 2007/11/16 14:05:40 kmura Exp $
    27 // $Name: $
     26// $Id: G4MPImanager.hh,v 1.2 2010/05/18 06:03:27 kmura Exp $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================
    … …  
    5555  G4MPImessenger* messenger;
    5656  G4MPIsession* session;
    57  
     57
    5858  G4int verbose;
    5959  G4MPIstatus* status; // status for each node
    … …  
    140140  void ShowSeeds();
    141141  void SetSeed(G4int inode, G4long seed);
     142  void WaitBeamOn();
    142143
    143144  // methods for MPI environment
    … …  
    226227{
    227228  masterWeight= aweight;
    228  
     229
    229230  if(aweight<0.) masterWeight= 0.;
    230231  if(aweight>1.) masterWeight= 1.;

  • trunk/examples/extended/parallel/MPI/mpi_interface/include/G4MPImessenger.hh

    r807 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: G4MPImessenger.hh,v 1.1 2007/11/16 14:05:40 kmura Exp $
    27 // $Name: $
     26// $Id: G4MPImessenger.hh,v 1.2 2010/05/18 06:03:54 kmura Exp $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================
    … …  
    6363
    6464  G4UIcommand* beamOn;
    65   G4UIcmdWithAnInteger* dotbeamOn;
     65  G4UIcommand* dotbeamOn;
    6666  G4UIcmdWithADouble* masterWeight;
     67  G4UIcmdWithoutParameter* waitall;
    6768
    6869  G4UIcmdWithoutParameter* showSeeds;
    … …  
    7374  G4MPImessenger(G4MPImanager* manager);
    7475  ~G4MPImessenger();
    75  
     76
    7677  virtual void SetNewValue(G4UIcommand* command, G4String newValue);
    7778  virtual G4String GetCurrentValue(G4UIcommand* command);
    78  
     79
    7980};
    8081

  • trunk/examples/extended/parallel/MPI/mpi_interface/include/G4MPIrandomSeedGenerator.hh

    r807 r1337  
    2525//
    2626// $Id: G4MPIrandomSeedGenerator.hh,v 1.1 2007/11/16 14:05:40 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================

  • trunk/examples/extended/parallel/MPI/mpi_interface/include/G4MPIsession.hh

    r807 r1337  
    2525//
    2626// $Id: G4MPIsession.hh,v 1.1 2007/11/16 14:05:41 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================

  • trunk/examples/extended/parallel/MPI/mpi_interface/include/G4MPIstatus.hh

    r807 r1337  
    2525//
    2626// $Id: G4MPIstatus.hh,v 1.1 2007/11/16 14:05:41 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================

  • trunk/examples/extended/parallel/MPI/mpi_interface/include/G4UImpish.hh

    r807 r1337  
    2525//
    2626// $Id: G4UImpish.hh,v 1.1 2007/11/16 14:05:41 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================

  • trunk/examples/extended/parallel/MPI/mpi_interface/include/G4VMPIseedGenerator.hh

    r807 r1337  
    2525//
    2626// $Id: G4VMPIseedGenerator.hh,v 1.1 2007/11/16 14:05:41 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================

  • trunk/examples/extended/parallel/MPI/mpi_interface/include/G4VMPIsession.hh

    r807 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: G4VMPIsession.hh,v 1.1 2007/11/16 14:05:41 kmura Exp $
    27 // $Name: $
     26// $Id: G4VMPIsession.hh,v 1.2 2010/05/18 06:05:05 kmura Exp $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================
    … …  
    5858  G4int rank;
    5959
    60   G4int ExecCommand(G4String aCommand);
     60  G4int ExecCommand(G4String acommand);
    6161  G4String TruncateCommand(const G4String& command) const;
    6262  G4String BypassCommand(const G4String& command) const;

  • trunk/examples/extended/parallel/MPI/mpi_interface/src/G4MPIbatch.cc

    r807 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: G4MPIbatch.cc,v 1.1 2007/11/16 14:05:41 kmura Exp $
    27 // $Name: $
     26// $Id: G4MPIbatch.cc,v 1.2 2010/05/18 06:06:21 kmura Exp $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================
    … …  
    3434#include "G4MPIbatch.hh"
    3535#include "G4MPImanager.hh"
     36#include "G4UImanager.hh"
    3637#include "G4UIcommandStatus.hh"
     38#include <vector>
     39
     40////////////////////////////////////////////////////////////////////////
     41static void Tokenize(const G4String& str, std::vector<G4String>& tokens)
     42////////////////////////////////////////////////////////////////////////
     43{
     44  const char* delimiter= " ";
     45
     46  str_size pos0= str.find_first_not_of(delimiter);
     47  str_size pos = str.find_first_of(delimiter, pos0);
     48
     49  while (pos != G4String::npos || pos0 != G4String::npos) {
     50    if (str[pos0] == '\"') {
     51      pos = str.find_first_of("\"", pos0+1);
     52      if(pos != G4String::npos) pos++;
     53    }
     54    if (str[pos0] == '\'') {
     55      pos = str.find_first_of("\'", pos0+1);
     56      if(pos != G4String::npos) pos++;
     57    }
     58
     59    tokens.push_back(str.substr(pos0, pos-pos0));
     60    pos0 = str.find_first_not_of(delimiter, pos);
     61    pos = str.find_first_of(delimiter, pos0);
     62  }
     63}
    3764
    3865// ====================================================================
    … …  
    7299//////////////////////////////////
    73100{
    74   enum { BUFSIZE= 256 };
    75   char linebuf[BUFSIZE];
    76  
     101  enum { BUFSIZE= 4096 };
     102  static char linebuf[BUFSIZE];
     103
     104  G4String cmdtotal= "";
     105  G4bool qcontinued= false;
    77106  while(batchStream.good()) {
    78107    batchStream.getline(linebuf, BUFSIZE);
    79    
     108
    80109    G4String cmdline(linebuf);
    81     cmdline= cmdline.strip(G4String::both);
    82     cmdline= cmdline.strip(G4String::both, '\011'); // remove TAB
    83     cmdline= TruncateCommand(cmdline);
    84    
    85     str_size ic= cmdline.find_first_of('#');
    86     if(ic != G4String::npos) {
    87       cmdline= cmdline(0, ic);
    88     }
    89    
    90     if(batchStream.eof()) {
    91       if(cmdline.size()==0) {
    92         return "exit";
    93       } else {
    94         return cmdline;
    95       }
     110
     111    // TAB-> ' ' conversion
     112    str_size nb=0;
     113    while ((nb= cmdline.find('\t',nb)) != G4String::npos) {
     114      cmdline.replace(nb, 1, " ");
    96115    }
    97116
    98     if(cmdline.size()==0) continue; // skip null line
    99     return cmdline;   
    100   } 
     117    // strip
     118    cmdline= cmdline.strip(G4String::both);
    101119
    102   return "exit"; // dummy
     120    // skip null line if single line
     121    if(!qcontinued && cmdline.size()==0) continue;
     122
     123    // '#' is treated as echoing something
     124    if(cmdline[(size_t)0]=='#') return cmdline;
     125
     126    // tokenize...
     127    std::vector<G4String> tokens;
     128    Tokenize(cmdline, tokens);
     129    qcontinued= false;
     130    for (G4int i=0; i< G4int(tokens.size()); i++) {
     131      // string after '#" is ignored
     132      if(tokens[i][(size_t)0] == '#' ) break;
     133      // '\' or '_' is treated as continued line.
     134      if(tokens[i] == '\\' || tokens[i] == '_' ) {
     135        qcontinued= true;
     136        // check nothing after line continuation character
     137        if( i != G4int(tokens.size())-1) {
     138          G4Exception("unexpected character after "
     139                      "line continuation character");
     140        }
     141        break; // stop parsing
     142      }
     143      cmdtotal+= tokens[i];
     144      cmdtotal+= " ";
     145    }
     146
     147    if(qcontinued) continue; // read the next line
     148
     149    if(cmdtotal.size() != 0) break;
     150    if(batchStream.eof()) break;
     151  }
     152
     153  // strip again
     154  cmdtotal= cmdtotal.strip(G4String::both);
     155
     156  // bypass some commands
     157  cmdtotal= BypassCommand(cmdtotal);
     158
     159  // finally,
     160  if(batchStream.eof() && cmdtotal.size()==0) {
     161    return "exit";
     162  }
     163
     164  return cmdtotal;
    103165}
    104166
    … …  
    110172  G4String newCommand="", scommand; // newCommand is always "" in slaves
    111173
    112   if(isMaster) newCommand= ReadCommand();
    113   // broadcast a new G4 command
    114   scommand= g4MPI-> BcastCommand(newCommand);
    115   if(scommand == "exit" ) return 0;
    116  
    117   while(1){
    118     G4int rc= ExecCommand(scommand);
    119     if(rc != fCommandSucceeded) break;
    120    
    121     if(isMaster) newCommand= ReadCommand();
    122     scommand= g4MPI-> BcastCommand(newCommand);
    123     if(scommand == "exit" ) {
    124       if(isBatchMode) {
    125         if(g4MPI-> CheckThreadStatus()) {
    126           g4MPI-> JoinBeamOnThread();
    127           break;
    128         }
    129       } else {
    130         break;
     174  while(1) {
     175    if (isMaster) newCommand = ReadCommand();
     176    // broadcast a new G4 command
     177    scommand = g4MPI-> BcastCommand(newCommand);
     178    if(scommand == "exit") return 0;
     179
     180    // just echo something
     181    if( scommand[(size_t)0] == '#') {
     182      if(G4UImanager::GetUIpointer()-> GetVerboseLevel()==2) {
     183        G4cout << scommand << G4endl;
    131184      }
     185      continue;
     186    }
     187
     188    G4int rc = ExecCommand(scommand);
     189    if (rc != fCommandSucceeded) {
     190      G4cerr << G4endl << "***** Batch is interupted!! *****" << G4endl;
     191      break;
    132192    }
    133193  }
    134  
     194
    135195  return 0;
    136196}

  • trunk/examples/extended/parallel/MPI/mpi_interface/src/G4MPImanager.cc

    r807 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: G4MPImanager.cc,v 1.1 2007/11/16 14:05:41 kmura Exp $
    27 // $Name: $
     26// $Id: G4MPImanager.cc,v 1.2 2010/05/18 06:06:21 kmura Exp $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================
    … …  
    6868////////////////////////////
    6969G4MPImanager::G4MPImanager()
    70   : verbose(0), 
     70  : verbose(0),
    7171    qfcout(false),
    7272    qinitmacro(false),
    … …  
    7575    masterWeight(1.)
    7676////////////////////////////
    77 { 
     77{
    7878  //MPI::Init();
    7979  MPI::Init_thread(MPI::THREAD_SERIALIZED);
    … …  
    8686  : verbose(0), qfcout(false),
    8787    qinitmacro(false), qbatchmode(false),
    88     threadID(0), 
     88    threadID(0),
    8989    masterWeight(1.)
    9090/////////////////////////////////////////////////
    … …  
    140140  isMaster= (rank == RANK_MASTER);
    141141  isSlave= (rank != RANK_MASTER);
    142  
     142
    143143  // initialize MPI communicator
    144144  COMM_G4COMMAND= MPI::COMM_WORLD.Dup();
    … …  
    231231    char str[1024];
    232232    sprintf(str, prefix.c_str(), rank);
    233     G4String fname(str);   
     233    G4String fname(str);
    234234    fscout.open(fname.c_str(), std::ios::out);
    235235  }
    … …  
    265265  G4int runid, eventid, neventTBP;
    266266
    267   if (run) { // running...
     267  G4StateManager* stateManager= G4StateManager::GetStateManager();
     268  G4ApplicationState g4state= stateManager-> GetCurrentState();
     269
     270  if (run) {
    268271    runid= run-> GetRunID();
    269272    neventTBP= run -> GetNumberOfEventToBeProcessed();
    270273    eventid= run-> GetNumberOfEvent();
     274    if(g4state == G4State_GeomClosed || g4state == G4State_EventProc) {
     275      status-> StopTimer();
     276    }
    271277  } else {
    272278    runid= 0;
    … …  
    274280    neventTBP= 0;
    275281  }
    276 
    277   G4StateManager* stateManager= G4StateManager::GetStateManager();
    278   G4ApplicationState g4state= stateManager-> GetCurrentState();
    279282
    280283  status-> SetStatus(rank, runid, neventTBP, eventid, g4state);
    … …  
    308311      nev+= status-> GetEventID();
    309312      nevtp+= status-> GetNEventToBeProcessed();
    310       //mpistate= status-> GetG4State();
    311313      cputime+= status-> GetCPUTime();
    312314    }
    … …  
    322324           << G4endl
    323325           << "* #ranks= " << size
    324            << "   event= " << nev << "/" << nevtp 
    325            << " state= " << strStatus 
     326           << "   event= " << nev << "/" << nevtp
     327           << " state= " << strStatus
    326328           << " time= " << cputime << "s"
    327329           << G4endl;
    328330  } else {
    329331    status-> Pack(buff);
    330     COMM_G4COMMAND.Send(buff, G4MPIstatus::NSIZE, MPI::INT, 
     332    COMM_G4COMMAND.Send(buff, G4MPIstatus::NSIZE, MPI::INT,
    331333                        RANK_MASTER, TAG_G4STATUS);
    332334  }
    … …  
    352354  if(isMaster) {
    353355    // print master
    354     G4cout << "* rank= " << rank 
    355            << " seed= " << CLHEP::HepRandom::getTheSeed()     
     356    G4cout << "* rank= " << rank
     357           << " seed= " << CLHEP::HepRandom::getTheSeed()
    356358           << G4endl;
    357359    // receive from each slave
    358360    for (G4int islave=1; islave< size; islave++) {
    359361      COMM_G4COMMAND.Recv(&buff, 1, MPI::LONG, islave, TAG_G4SEED);
    360       G4cout << "* rank= " << islave 
     362      G4cout << "* rank= " << islave
    361363             << " seed= " << buff
    362364             << G4endl;
    … …  
    391393    // get slave status
    392394    for (G4int islave=1; islave< size; islave++) {
    393       COMM_G4COMMAND.Recv(&buff, 1, MPI::UNSIGNED, islave, TAG_G4STATUS);
     395      MPI::Request request= COMM_G4COMMAND.Irecv(&buff, 1, MPI::UNSIGNED,
     396                                                 islave, TAG_G4STATUS);
     397      MPI::Status status;
     398      while(! request.Test(status)) {
     399        Wait(100);
     400      }
    394401      qstatus |= buff;
    395402    }
    … …  
    452459    static G4String cmdstr;
    453460    cmdstr= command;
    454     G4int rc= pthread_create(&threadID, 0, 
     461    G4int rc= pthread_create(&threadID, 0,
    455462                             (Func_t)thread_ExecuteThreadCommand,
    456463                             (void*)&cmdstr);
    … …  
    487494
    488495  // waiting message exhausts CPU in LAM!
    489   //COMM_G4COMMAND.Bcast(sbuff, BUFF_SIZE, MPI::CHAR, RANK_MASTER);
     496  //COMM_G4COMMAND.Bcast(sbuff, ssize, MPI::CHAR, RANK_MASTER);
    490497
    491498  // another implementation
    … …  
    514521/////////////////////////////////////////////////////////////////////////
    515522{
     523  G4bool currentmode= qbatchmode;
     524  qbatchmode= true;
    516525  G4MPIbatch* batchSession= new G4MPIbatch(fname, qbatch);
    517526  batchSession-> SessionStart();
    518527  delete batchSession;
     528  qbatchmode= currentmode;
    519529}
    520530
    … …  
    552562}
    553563
     564///////////////////////////////
     565void G4MPImanager::WaitBeamOn()
     566///////////////////////////////
     567{
     568  G4int buff= 0;
     569  if (qbatchmode) {  // valid only in batch mode
     570    if(isMaster) {
     571      // receive from each slave
     572      for (G4int islave=1; islave< size; islave++) {
     573        MPI::Request request= COMM_G4COMMAND.Irecv(&buff, 1, MPI::INT,
     574                                                   islave, TAG_G4STATUS);
     575        MPI::Status status;
     576        while(! request.Test(status)) {
     577           Wait(1000);
     578        }
     579      }
     580    } else {
     581      buff= 1;
     582      COMM_G4COMMAND.Send(&buff, 1, MPI::INT, RANK_MASTER, TAG_G4STATUS);
     583    }
     584  }
     585}
    554586
    555587/////////////////////////////////////////////////

  • trunk/examples/extended/parallel/MPI/mpi_interface/src/G4MPImessenger.cc

    r807 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: G4MPImessenger.cc,v 1.1 2007/11/16 14:05:41 kmura Exp $
    27 // $Name: $
     26// $Id: G4MPImessenger.cc,v 1.2 2010/05/18 06:06:21 kmura Exp $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================
    … …  
    7272  execute= new G4UIcmdWithAString("/mpi/execute", this);
    7373  execute-> SetGuidance("Execute a macro file. (=/control/execute)");
    74   execute-> SetParameterName("fileName", false, false); 
     74  execute-> SetParameterName("fileName", false, false);
    7575
    7676  // /mpi/beamOn
    … …  
    8888
    8989  // /mpi/.beamOn
    90   dotbeamOn= new G4UIcmdWithAnInteger("/mpi/.beamOn", this);
    91   dotbeamOn-> SetGuidance("Start a parallel run w/o thread. (=/run/beamOn)");
    92   dotbeamOn-> SetParameterName("numberOfEvent", true, false);
    93   dotbeamOn-> SetDefaultValue(1);
    94   dotbeamOn-> SetRange("numberOfEvent>=0");
     90  dotbeamOn= new G4UIcommand("/mpi/.beamOn", this);
     91  dotbeamOn-> SetGuidance("Start a parallel run w/o thread.");
     92
     93  p1= new G4UIparameter("numberOfEvent", 'i', true);
     94  p1-> SetDefaultValue(1);
     95  p1-> SetParameterRange("numberOfEvent>=0");
     96  dotbeamOn-> SetParameter(p1);
     97
     98  p2= new G4UIparameter("divide", 'b', true);
     99  p2-> SetDefaultValue(true);
     100  dotbeamOn-> SetParameter(p2);
    95101
    96102  // /mpi/weightForMaster
    … …  
    99105  masterWeight-> SetParameterName("weight", false, false);
    100106  masterWeight-> SetRange("weight>=0. && weight<=1.");
     107
     108  // /mpi/wait
     109  waitall= new G4UIcmdWithoutParameter("/mpi/wait", this);
     110  waitall-> SetGuidance( "Wait until beamOn-s on all nodes are done. "
     111                         "(batch mode only)");
    101112
    102113  // /mpi/showSeeds
    … …  
    132143  delete dotbeamOn;
    133144  delete masterWeight;
     145  delete waitall;
    134146  delete showSeeds;
    135147  delete setMasterSeed;
    136148  delete setSeed;
    137  
     149
    138150  delete dir;
    139151}
    … …  
    162174
    163175  } else if (command == dotbeamOn){ // /mpi/.beamOn
    164     G4int nevent= dotbeamOn-> GetNewIntValue(newValue);
    165     g4MPI-> BeamOn(nevent);
     176    std::istringstream is(newValue);
     177    G4int nevent;
     178    G4bool qdivide;
     179    is >> nevent >> qdivide;
     180    g4MPI-> BeamOn(nevent, qdivide);
    166181
    167182  } else if (command == masterWeight){ // /mpi/masterWeight
    168183    G4double weight= masterWeight-> GetNewDoubleValue(newValue);
    169184    g4MPI-> SetMasterWeight(weight);
    170    
     185
     186  } else if (command == waitall) {
     187    g4MPI-> WaitBeamOn();
     188
    171189  } else if (command == showSeeds){ // /mpi/showSeeds
    172190    g4MPI-> ShowSeeds();
    173  
     191
    174192  } else if (command == setMasterSeed){ // /mpi/setMasterSeed
    175193    std::istringstream is(newValue);
    … …  
    178196    g4MPI-> GetSeedGenerator()-> SetMasterSeed(seed);
    179197    g4MPI-> DistributeSeeds();
    180    
     198
    181199  } else if (command == setSeed){ // /mpi/setSeed
    182200    std::istringstream is(newValue);

  • trunk/examples/extended/parallel/MPI/mpi_interface/src/G4MPIrandomSeedGenerator.cc

    r807 r1337  
    2525//
    2626// $Id: G4MPIrandomSeedGenerator.cc,v 1.1 2007/11/16 14:05:41 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================

  • trunk/examples/extended/parallel/MPI/mpi_interface/src/G4MPIsession.cc

    r807 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: G4MPIsession.cc,v 1.1 2007/11/16 14:05:41 kmura Exp $
    27 // $Name: $
     26// $Id: G4MPIsession.cc,v 1.2 2010/05/18 06:06:21 kmura Exp $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================
    … …  
    125125  } else if(nC == "pwd") { // show current directory
    126126    G4cout << "Current Command Directory : "
    127            << GetCurrentWorkingDirectory() << G4endl;
     127     << GetCurrentWorkingDirectory() << G4endl;
    128128    newCommand= nullString;
    129129
    … …  
    195195    g4MPI-> ExecuteMacroFile(g4MPI->GetMacroFileName(), true);
    196196    return 0;
    197   } 
    198  
     197  }
     198
    199199  // interactive session
    200200  G4String newCommand="", scommand; // newCommand is always "" in slaves
    201  
    202   if(isMaster) newCommand= GetCommand();
    203   // broadcast a new G4 command
    204   scommand= g4MPI-> BcastCommand(newCommand);
    205   if(scommand == "exit" ) return 0;
    206  
    207   while(1){
     201
     202  while(1) {
     203    if(isMaster) newCommand = GetCommand();
     204    // broadcast a new G4 command
     205    scommand = g4MPI-> BcastCommand(newCommand);
     206    if(scommand == "exit") {
     207      G4bool qexit = TryForcedTerminate();
     208      if(qexit) break;
     209      else scommand = "";
     210    }
    208211    ExecCommand(scommand);
    209 
    210     // get next ...
    211     if(isMaster) newCommand= GetCommand();
    212     scommand= g4MPI-> BcastCommand(newCommand);
    213     if(scommand == "exit" ) {
    214       G4bool qexit= TryForcedTerminate();
    215       if(qexit) break;
    216       else scommand="";
    217     }
    218212  }
    219213
    … …  
    254248    xmessage= g4MPI->BcastCommand("");
    255249  }
    256  
     250
    257251  if(xmessage == "kill me") {
    258252    G4RunManager* runManager= G4RunManager::GetRunManager();

  • trunk/examples/extended/parallel/MPI/mpi_interface/src/G4MPIstatus.cc

    r807 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: G4MPIstatus.cc,v 1.1 2007/11/16 14:05:41 kmura Exp $
    27 // $Name: $
     26// $Id: G4MPIstatus.cc,v 1.2 2010/05/18 06:06:21 kmura Exp $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================
    … …  
    4343//////////////////////////
    4444G4MPIstatus::G4MPIstatus()
    45   : rank(0), runID(0), 
     45  : rank(0), runID(0),
    4646    nEventToBeProcessed(0),
    4747    eventID(0),
    … …  
    5151{
    5252  timer= new G4Timer;
    53   timer-> Start();
    5453}
    5554
    … …  
    6463
    6564/////////////////////////////////////////////////////
    66 void G4MPIstatus::SetStatus(G4int arank, G4int runid, 
     65void G4MPIstatus::SetStatus(G4int arank, G4int runid,
    6766                            G4int noe, G4int evtid,
    6867                            G4ApplicationState state)
    … …  
    7473  eventID= evtid;
    7574  g4state= state;
    76 
    77   timer-> Stop();
    78   cputime= timer-> GetUserElapsed();
     75  if (timer-> IsValid()) cputime= timer-> GetUserElapsed();
     76  else cputime = 0.;
    7977}
    8078
    … …  
    8381void G4MPIstatus::Pack(G4int* data) const
    8482/////////////////////////////////////////
    85 { 
     83{
    8684  data[0]= rank;
    8785  data[1]= runID;
    … …  
    115113{
    116114  // * rank= 001 run= 10002 event= 00001 / 100000 state= Idle"
    117   G4cout << "* rank= " << rank 
    118          << " run= " << runID 
     115  G4cout << "* rank= " << rank
     116         << " run= " << runID
    119117         << " event= " << eventID << " / " << nEventToBeProcessed
    120118         << " state= " << GetStateString(g4state)

  • trunk/examples/extended/parallel/MPI/mpi_interface/src/G4UImpish.cc

    r807 r1337  
    2525//
    2626// $Id: G4UImpish.cc,v 1.1 2007/11/16 14:05:41 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================

  • trunk/examples/extended/parallel/MPI/mpi_interface/src/G4VMPIseedGenerator.cc

    r807 r1337  
    2525//
    2626// $Id: G4VMPIseedGenerator.cc,v 1.1 2007/11/16 14:05:41 kmura Exp $
    27 // $Name: $
     27// $Name: geant4-09-04-beta-01 $
    2828// ====================================================================
    2929//   G4VMPIseedGenerator.cc

  • trunk/examples/extended/parallel/MPI/mpi_interface/src/G4VMPIsession.cc

    r807 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: G4VMPIsession.cc,v 1.1 2007/11/16 14:05:41 kmura Exp $
    27 // $Name: $
     26// $Id: G4VMPIsession.cc,v 1.2 2010/05/18 06:06:21 kmura Exp $
     27// $Name: geant4-09-04-beta-01 $
    2828//
    2929// ====================================================================
    … …  
    9494
    9595///////////////////////////////////////////////////
    96 G4int G4VMPIsession::ExecCommand(G4String aCommand)
     96G4int G4VMPIsession::ExecCommand(G4String acommand)
    9797///////////////////////////////////////////////////
    9898{
    99   if(aCommand.length()<2) return fCommandSucceeded;
     99  if(acommand.length()<2) return fCommandSucceeded;
    100100
    101101  G4UImanager* UI= G4UImanager::GetUIpointer();
    102102  G4int returnVal= 0;
    103103
    104   G4String command= BypassCommand(aCommand);
    105  
     104  G4String command= BypassCommand(acommand);
     105
    106106  // "/mpi/beamOn is threaded out.
    107107  if(command(0,11) == "/mpi/beamOn") {
    108     g4MPI-> ExecuteBeamOnThread(aCommand);
     108    g4MPI-> ExecuteBeamOnThread(command);
    109109    returnVal= fCommandSucceeded;
    110110  } else if(command(0,12) == "/mpi/.beamOn") { // care for beamOn
    … …  
    183183  str_size idx;
    184184  while( (idx= acommand.find("//")) != G4String::npos)  {
    185     G4String command1= acommand(0,idx+1); 
     185    G4String command1= acommand(0,idx+1);
    186186    G4String command2= acommand(idx+2, acommand.size()-idx-2);
    187187    acommand= command1 + command2;
    … …  
    199199{
    200200  // bypass some commands
    201   // /run/beamon -> /mpi/.beamOn
    202   // /control/execute -> /mpi/execute
     201  // * /mpi/beamOn
     202  //    -> /mpi/.beamOn (batch session)
     203  //
     204  // * /run/beamOn
     205  //    -> /mpi/.beamOn (batch session)
     206  //    -> /mpi/beamOn  (interactive session)
     207  //
     208  // * /control/execute -> /mpi/execute
    203209
    204210  G4String acommand= command;
    205211
     212  // /mpi/beamOn
     213  if(acommand(0,11) == "/mpi/beamOn") {
     214    if(g4MPI-> IsBatchMode()) {
     215      acommand= "/mpi/.beamOn";
     216      if(command.length() > 11) {
     217        acommand +=command.substr(11);
     218      }
     219    }
     220  }
     221
     222  // /run/beamOn
    206223  if(acommand(0,11) == "/run/beamOn") {
    207     if(g4MPI-> GetVerbose()>0 && isMaster) {
    208       G4cout << "/run/beamOn is overridden by /mpi/.beamOn"
    209              << G4endl;
    210     }
    211 
    212     acommand= "/mpi/.beamOn ";
    213 
    214224    G4String strarg= "";
    215225    G4bool qget= false;
    … …  
    222232        continue;
    223233      }
    224 
    225234      if(qget) {
    226235        strarg+= command[idx];
    … …  
    228237      }
    229238    }
    230     acommand += strarg;
    231   } 
    232 
     239
     240    if(g4MPI-> IsBatchMode()) { // batch session
     241      acommand= "/mpi/.beamOn ";
     242      if(command.length() > 11) acommand += strarg;
     243    } else { // interactive session
     244      if(g4MPI-> GetVerbose()>0 && isMaster) {
     245        G4cout << "/run/beamOn is overridden by /mpi/.beamOn" << G4endl;
     246      }
     247      acommand= "/mpi/beamOn ";
     248      if(command.length() > 11) acommand += strarg;
     249    }
     250  }
     251
     252  // /control/execute
    233253  if(acommand(0,16) == "/control/execute") {
    234254    if(g4MPI-> GetVerbose()>0 && isMaster) {
    235       G4cout << "/control/execute is overridden by /mpi/execute" 
     255      G4cout << "/control/execute is overridden by /mpi/execute"
    236256             << G4endl;
    237257    }
    238    
    239258    acommand.replace(0, 16, "/mpi/execute    ");
    240259  }

  • trunk/examples/extended/parallel/ParN02/AnnotatedFiles/G4HCofThisEvent.hh

    r1230 r1337  
    2626//
    2727// $Id: G4HCofThisEvent.hh,v 1.3 2006/06/29 17:33:53 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030

  • trunk/examples/extended/parallel/ParN02/AnnotatedFiles/G4THitsCollection.hh

    r1230 r1337  
    2626//
    2727// $Id: G4THitsCollection.hh,v 1.3 2006/06/29 17:33:58 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030

  • trunk/examples/extended/parallel/ParN02/AnnotatedFiles/G4VHitsCollection.hh

    r1230 r1337  
    2626//
    2727// $Id: G4VHitsCollection.hh,v 1.3 2006/06/29 17:34:00 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030

  • trunk/examples/extended/parallel/ParN02/GNUmakefile

    r807 r1337  
    1 # $Id: GNUmakefile,v 1.1 2002/03/05 15:21:51 gcosmo Exp $
     1# $Id: GNUmakefile,v 1.2 2010/01/11 16:56:29 gcosmo Exp $
    22# --------------------------------------------------------------
    33# GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
    … …  
    1111
    1212ifndef G4INSTALL
    13   G4INSTALL = ../../..
     13  G4INSTALL = ../../../..
    1414endif
    1515

  • trunk/examples/extended/parallel/ParN02/History

    r807 r1337  
    1 $Id: History,v 1.12 2006/07/05 12:47:48 gcosmo Exp $
     1$Id: History,v 1.13 2010/06/06 05:08:01 perl Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1515     * Reverse chronological order (last date on top), please *
    1616     ----------------------------------------------------------
     17
     18June 2, 2010 - J.Perl - ParN02-V09-03-00
     19-------------------------
     20- Updated vis usage
    1721
    1822Jul 5th, 2006  G.Cosmo - ParN02-V08-01-00

  • trunk/examples/extended/parallel/ParN02/ParN02.cc

    r1230 r1337  
    2626//
    2727// $Id: ParN02.cc,v 1.5 2006/07/05 12:45:59 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/parallel/ParN02/ParTopC.icc

    r1230 r1337  
    2525//
    2626// $Id: ParTopC.icc,v 1.2 2006/06/29 17:33:49 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929// --------------------------------------------------------------------

  • trunk/examples/extended/parallel/ParN02/include/ExN02ChamberParameterisation.hh

    r1230 r1337  
    2626//
    2727// $Id: ExN02ChamberParameterisation.hh,v 1.4 2006/06/29 17:34:02 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/parallel/ParN02/include/ExN02DetectorConstruction.hh

    r1230 r1337  
    2626//
    2727// $Id: ExN02DetectorConstruction.hh,v 1.2 2006/06/29 17:34:05 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/parallel/ParN02/include/ExN02DetectorMessenger.hh

    r1230 r1337  
    2626//
    2727// $Id: ExN02DetectorMessenger.hh,v 1.3 2006/06/29 17:34:08 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/parallel/ParN02/include/ExN02EventAction.hh

    r1230 r1337  
    2626//
    2727// $Id: ExN02EventAction.hh,v 1.2 2006/06/29 17:34:10 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/parallel/ParN02/include/ExN02MagneticField.hh

    r1230 r1337  
    2626//
    2727// $Id: ExN02MagneticField.hh,v 1.2 2006/06/29 17:34:12 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/parallel/ParN02/include/ExN02PhysicsList.hh

    r1230 r1337  
    2626//
    2727// $Id: ExN02PhysicsList.hh,v 1.2 2006/06/29 17:34:14 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/parallel/ParN02/include/ExN02PrimaryGeneratorAction.hh

    r1230 r1337  
    2626//
    2727// $Id: ExN02PrimaryGeneratorAction.hh,v 1.2 2006/06/29 17:34:17 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/parallel/ParN02/include/ExN02RunAction.hh

    r1230 r1337  
    2626//
    2727// $Id: ExN02RunAction.hh,v 1.3 2006/07/05 12:46:00 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/parallel/ParN02/include/ExN02SteppingAction.hh

    r1230 r1337  
    2626//
    2727// $Id: ExN02SteppingAction.hh,v 1.2 2006/06/29 17:34:21 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/parallel/ParN02/include/ExN02SteppingVerbose.hh

    r1230 r1337  
    2626//
    2727// $Id: ExN02SteppingVerbose.hh,v 1.2 2006/06/29 17:34:23 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//   This class manages the verbose outputs in G4SteppingManager.

  • trunk/examples/extended/parallel/ParN02/include/ExN02TrackerSD.hh

    r1230 r1337  
    2626//
    2727// $Id: ExN02TrackerSD.hh,v 1.2 2006/06/29 17:34:28 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/parallel/ParN02/include/ParRunManager.hh

    r1230 r1337  
    2525//
    2626// $Id: ParRunManager.hh,v 1.3 2006/06/29 17:34:30 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929// --------------------------------------------------------------------

  • trunk/examples/extended/parallel/ParN02/initInter.mac

    r807 r1337  
    1 #
     1surface#
    22# Macro file for the initialization phase of "ParN02.cc"
    33# when runing in interactive mode
    … …  
    88/run/verbose 2
    99#
    10 # create empty scene
     10# Use this open statement to create an OpenGL view:
     11/vis/open OGL 600x600-0+0
    1112#
    12 /vis/scene/create
    13 #
    14 # Create a scene handler for a specific graphics system
    15 # (Edit the next line(s) to choose another graphic system)
    16 #
    17 /vis/open OGLIX
     13# Use this open statement to create a .prim file suitable for
     14# viewing in DAWN:
    1815#/vis/open DAWNFILE
    1916#
    20 # draw scene
     17# Use this open statement to create a .heprep file suitable for
     18# viewing in HepRApp:
     19#/vis/open HepRepFile
    2120#
    22 /vis/camera/zoom 1.4
    23 /vis/camera/viewpoint 90 180
     21# Use this open statement to create a .wrl file suitable for
     22# viewing in a VRML viewer:
     23#/vis/open VRML2FILE
     24#
     25# Disable auto refresh and quieten vis messages whilst scene and
     26# trajectories are established:
     27/vis/viewer/set/autoRefresh false
     28/vis/verbose errors
     29#
     30# Draw geometry:
    2431/vis/drawVolume
    2532#
    26 # for drawing the tracks
    27 # (if too many tracks cause core dump => storeTrajectory 0)
    28 /tracking/storeTrajectory 1
    29 /vis/scene/add/trajectories
     33# Specify view angle:
     34/vis/viewer/set/viewpointThetaPhi 90. 180.
     35#
     36# Specify zoom value:
     37/vis/viewer/zoom 1.4
     38#
     39# Specify style (surface or wireframe):
     40#/vis/viewer/set/style wireframe
     41#
     42# Draw coordinate axes:
     43#/vis/scene/add/axes 0 0 0 1 m
     44#
     45# Draw smooth trajectories at end of event, showing trajectory points
     46# as markers 2 pixels wide:
     47/vis/scene/add/trajectories smooth
     48/vis/modeling/trajectories/create/drawByCharge
     49/vis/modeling/trajectories/drawByCharge-0/default/setDrawStepPts true
     50/vis/modeling/trajectories/drawByCharge-0/default/setStepPtsSize 2
     51# (if too many tracks cause core dump => /tracking/storeTrajectory 0)
     52#
     53# Draw hits at end of event:
     54#/vis/scene/add/hits
     55#
     56# To draw only gammas:
     57#/vis/filtering/trajectories/create/particleFilter
     58#/vis/filtering/trajectories/particleFilter-0/add gamma
     59#
     60# To invert the above, drawing all particles except gammas,
     61# keep the above two lines but also add:
     62#/vis/filtering/trajectories/particleFilter-0/invert true
     63#
     64# Many other options are available with /vis/modeling and /vis/filtering.
     65# For example, to select colour by particle ID:
     66#/vis/modeling/trajectories/create/drawByParticleID
     67#/vis/modeling/trajectories/drawByParticleID-0/set e- blue
     68#
     69# To superimpose all of the events from a given run:
     70#/vis/scene/endOfEventAction accumulate
     71#
     72# Re-establish auto refreshing and verbosity:
     73/vis/viewer/set/autoRefresh true
     74/vis/verbose warnings
     75#
     76# For file-based drivers, use this to create an empty detector view:
     77#/vis/viewer/flush

  • trunk/examples/extended/parallel/ParN02/src/ExN02ChamberParameterisation.cc

    r1230 r1337  
    2626//
    2727// $Id: ExN02ChamberParameterisation.cc,v 1.3 2006/06/29 17:34:32 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/parallel/ParN02/src/ExN02DetectorConstruction.cc

    r1230 r1337  
    2626//
    2727// $Id: ExN02DetectorConstruction.cc,v 1.3 2006/06/29 17:34:35 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/parallel/ParN02/src/ExN02DetectorMessenger.cc

    r1230 r1337  
    2626//
    2727// $Id: ExN02DetectorMessenger.cc,v 1.4 2006/06/29 17:34:38 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/parallel/ParN02/src/ExN02EventAction.cc

    r1230 r1337  
    2525//
    2626//
    27 // $Id: ExN02EventAction.cc,v 1.2 2006/06/29 17:34:41 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// $Id: ExN02EventAction.cc,v 1.3 2010/06/06 05:08:01 perl Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    3636#include "G4EventManager.hh"
    3737#include "G4TrajectoryContainer.hh"
    38 #include "G4Trajectory.hh"
    39 #include "G4VVisManager.hh"
    4038#include "G4ios.hh"
    4139
    … …  
    7472           << " trajectories stored in this event." << G4endl;
    7573  }
    76    
    77   // extract the trajectories and draw them
    78   //
    79   if (G4VVisManager::GetConcreteInstance())
    80     {
    81      for (G4int i=0; i<n_trajectories; i++)
    82         { G4Trajectory* trj = (G4Trajectory*)
    83                                     ((*(evt->GetTrajectoryContainer()))[i]);
    84           trj->DrawTrajectory(50);
    85         }
    86     }
    8774}
    8875

  • trunk/examples/extended/parallel/ParN02/src/ExN02MagneticField.cc

    r1230 r1337  
    2626//
    2727// $Id: ExN02MagneticField.cc,v 1.2 2006/06/29 17:34:44 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929// 
    3030//   User Field class implementation.

  • trunk/examples/extended/parallel/ParN02/src/ExN02PhysicsList.cc

    r1230 r1337  
    2626//
    2727// $Id: ExN02PhysicsList.cc,v 1.4 2006/06/29 17:34:47 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/parallel/ParN02/src/ExN02PrimaryGeneratorAction.cc

    r1230 r1337  
    2626//
    2727// $Id: ExN02PrimaryGeneratorAction.cc,v 1.2 2006/06/29 17:34:50 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/parallel/ParN02/src/ExN02RunAction.cc

    r1230 r1337  
    2626//
    2727// $Id: ExN02RunAction.cc,v 1.3 2006/07/05 12:46:00 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/parallel/ParN02/src/ExN02SteppingAction.cc

    r1230 r1337  
    2626//
    2727// $Id: ExN02SteppingAction.cc,v 1.2 2006/06/29 17:35:04 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/parallel/ParN02/src/ExN02SteppingVerbose.cc

    r1230 r1337  
    2626//
    2727// $Id: ExN02SteppingVerbose.cc,v 1.4 2006/06/29 17:35:07 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/parallel/ParN02/src/ExN02TrackerHit.cc

    r1230 r1337  
    2626//
    2727// $Id: ExN02TrackerHit.cc,v 1.3 2006/06/29 17:35:09 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/parallel/ParN02/src/ExN02TrackerSD.cc

    r1230 r1337  
    2626//
    2727// $Id: ExN02TrackerSD.cc,v 1.3 2006/06/29 17:35:11 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/parallel/ParN04/AnnotatedFiles/G4HCofThisEvent.hh

    r1230 r1337  
    2626//
    2727// $Id: G4HCofThisEvent.hh,v 1.3 2006/06/29 17:35:30 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030

  • trunk/examples/extended/parallel/ParN04/AnnotatedFiles/G4THitsCollection.hh

    r1230 r1337  
    2626//
    2727// $Id: G4THitsCollection.hh,v 1.3 2006/06/29 17:35:35 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030

  • trunk/examples/extended/parallel/ParN04/AnnotatedFiles/G4VHitsCollection.hh

    r1230 r1337  
    2626//
    2727// $Id: G4VHitsCollection.hh,v 1.3 2006/06/29 17:35:37 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030

  • trunk/examples/extended/parallel/ParN04/GNUmakefile

    r807 r1337  
    1 # $Id: GNUmakefile,v 1.3 2006/11/16 13:38:46 gunter Exp $
     1# $Id: GNUmakefile,v 1.4 2010/01/11 16:57:10 gcosmo Exp $
    22# --------------------------------------------------------------
    33# GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
    … …  
    1111
    1212ifndef G4INSTALL
    13   G4INSTALL = ../../..
     13  G4INSTALL = ../../../..
    1414endif
    1515

  • trunk/examples/extended/parallel/ParN04/History

    r807 r1337  
    1 $Id: History,v 1.13 2006/11/18 03:45:57 asaim Exp $
     1$Id: History,v 1.15 2010/06/06 05:08:32 perl Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1515     * Reverse chronological order (last date on top), please *
    1616     ----------------------------------------------------------
     17
     18June 5th, 2010 - J.Perl ParN04-V09-03-01
     19-------------------------
     20- Updated vis usage
     21
     22June 4th, 2010 V.Ivant - ParN04-V09-03-00
     23---------------------
     24- Substituted QGSP by QGSP_BERT
    1725
    1826Nov 17th, 2006 M.Asai - ParN04-V08-01-02

  • trunk/examples/extended/parallel/ParN04/ParN04.cc

    r1230 r1337  
    2525//
    2626//
    27 // $Id: ParN04.cc,v 1.6 2006/07/05 13:07:54 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// $Id: ParN04.cc,v 1.7 2010/06/04 17:58:50 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//
    … …  
    4040
    4141#include "ExN04DetectorConstruction.hh"
    42 #include "QGSP.hh"
     42#include "QGSP_BERT.hh"
    4343#include "ExN04PrimaryGeneratorAction.hh"
    4444#include "ExN04RunAction.hh"
    … …  
    7171  runManager->SetUserInitialization(detector);
    7272  //
    73   G4VUserPhysicsList* physics = new QGSP;
     73  G4VUserPhysicsList* physics = new QGSP_BERT();
    7474  runManager->SetUserInitialization(physics);
    7575 

  • trunk/examples/extended/parallel/ParN04/ParTopC.icc

    r1230 r1337  
    2525//
    2626// $Id: ParTopC.icc,v 1.2 2006/06/29 17:35:18 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929// --------------------------------------------------------------------

  • trunk/examples/extended/parallel/ParN04/include/ExN04EMPhysics.hh

    r1230 r1337  
    2626//
    2727// $Id: ExN04EMPhysics.hh,v 1.2 2006/06/29 17:36:01 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/parallel/ParN04/include/ExN04RunAction.hh

    r1230 r1337  
    2626//
    2727// $Id: ExN04RunAction.hh,v 1.3 2006/07/05 13:07:55 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/parallel/ParN04/include/ExN04SteppingVerbose.hh

    r1230 r1337  
    2626//
    2727// $Id: ExN04SteppingVerbose.hh,v 1.2 2006/06/29 17:36:36 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//   This class manages the verbose outputs in G4SteppingManager.

  • trunk/examples/extended/parallel/ParN04/include/ParRunManager.hh

    r1230 r1337  
    2525//
    2626// $Id: ParRunManager.hh,v 1.4 2006/06/29 17:36:47 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929// --------------------------------------------------------------------

  • trunk/examples/extended/parallel/ParN04/src/ExN04EventAction.cc

    r807 r1337  
    3535#include "G4HCofThisEvent.hh"
    3636#include "G4VHitsCollection.hh"
    37 #include "G4TrajectoryContainer.hh"
    38 #include "G4Trajectory.hh"
    39 #include "G4VVisManager.hh"
    4037#include "G4SDManager.hh"
    4138#include "G4UImanager.hh"

  • trunk/examples/extended/parallel/ParN04/src/ExN04RunAction.cc

    r1230 r1337  
    2626//
    2727// $Id: ExN04RunAction.cc,v 1.3 2006/07/05 13:07:56 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/parallel/ParN04/src/ExN04SteppingVerbose.cc

    r1230 r1337  
    2626//
    2727// $Id: ExN04SteppingVerbose.cc,v 1.2 2006/06/29 17:37:37 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/parallel/ParN04/vis.mac

    r807 r1337  
     1surface# Use this open statement to create an OpenGL view:
     2/vis/open OGL 600x600-0+0
    13#
    2 # Macro file for the initialization phase of "exampleN02.cc"
    3 # when runing in interactive mode
     4# Use this open statement to create a .prim file suitable for
     5# viewing in DAWN:
     6#/vis/open DAWNFILE
    47#
    5 # Sets some default verbose
     8# Use this open statement to create a .heprep file suitable for
     9# viewing in HepRApp:
     10#/vis/open HepRepFile
    611#
    7 /control/verbose 2
    8 /run/verbose 2
     12# Use this open statement to create a .wrl file suitable for
     13# viewing in a VRML viewer:
     14#/vis/open VRML2FILE
    915#
    10 # create empty scene
     16# Disable auto refresh and quieten vis messages whilst scene and
     17# trajectories are established:
     18/vis/viewer/set/autoRefresh false
     19/vis/verbose errors
    1120#
    12 /vis/scene/create
     21# Draw geometry:
     22/vis/drawVolume
    1323#
    14 # Create a scene handler for a specific graphics system
    15 # (Edit the next line(s) to choose another graphic system)
     24# Specify view angle:
     25#/vis/viewer/set/viewpointThetaPhi 90. 0.
    1626#
    17 /vis/open OGLIX
     27# Specify zoom value:
     28#/vis/viewer/zoom 2.
    1829#
    19 ####/vis/open DAWNFILE
     30# Specify style (surface or wireframe):
     31#/vis/viewer/set/style wireframe
    2032#
    21 # draw scene
     33# Draw coordinate axes:
     34#/vis/scene/add/axes 0 0 0 1 m
    2235#
    23 /vis/viewer/set/viewpointThetaPhi 90 180 deg
    24 /vis/viewer/zoom 1.4
    25 /vis/viewer/flush
     36# Draw smooth trajectories at end of event, showing trajectory points
     37# as markers 2 pixels wide:
     38/vis/scene/add/trajectories smooth
     39/vis/modeling/trajectories/create/drawByCharge
     40/vis/modeling/trajectories/drawByCharge-0/default/setDrawStepPts true
     41/vis/modeling/trajectories/drawByCharge-0/default/setStepPtsSize 2
     42# (if too many tracks cause core dump => /tracking/storeTrajectory 0)
    2643#
    27 # for drawing the tracks
    28 # (if too many tracks cause core dump => storeTrajectory 0)
    29 /tracking/storeTrajectory 1
    30 /vis/scene/endOfEventAction accumulate
    31 
     44# Draw hits at end of event:
     45#/vis/scene/add/hits
     46#
     47# To draw only gammas:
     48#/vis/filtering/trajectories/create/particleFilter
     49#/vis/filtering/trajectories/particleFilter-0/add gamma
     50#
     51# To invert the above, drawing all particles except gammas,
     52# keep the above two lines but also add:
     53#/vis/filtering/trajectories/particleFilter-0/invert true
     54#
     55# Many other options are available with /vis/modeling and /vis/filtering.
     56# For example, to select colour by particle ID:
     57#/vis/modeling/trajectories/create/drawByParticleID
     58#/vis/modeling/trajectories/drawByParticleID-0/set e- blue
     59#
     60# To superimpose all of the events from a given run:
     61#/vis/scene/endOfEventAction accumulate
     62#
     63# Re-establish auto refreshing and verbosity:
     64/vis/viewer/set/autoRefresh true
     65/vis/verbose warnings
     66#
     67# For file-based drivers, use this to create an empty detector view:
     68#/vis/viewer/flush
Note: See TracChangeset for help on using the changeset viewer.