Changeset 1209 for trunk/examples


Ignore:
Timestamp:
Dec 2, 2009, 3:57:26 PM (15 years ago)
Author:
garnier
Message:

CVS update

Location:
trunk/examples/novice/N03
Files:
32 edited

Legend:

Unmodified
Added
Removed

  • trunk/examples/novice/N03/G4History.macro

    r1143 r1209  
    11/run/verbose 2
    22/vis/scene/create
    3 /vis/open OGLIX
    4 /vis/sceneHandler/create OGLIX
     3/vis/open OGLSQt
     4/vis/sceneHandler/create OGLSQt
    55/vis/sceneHandler/attach
    66/vis/viewer/create ! ! 600
    … …  
    1010/vis/viewer/refresh viewer-0
    1111/vis/viewer/update viewer-0
    12 /vis/scene/add/trajectories
    13 /tracking/storeTrajectory 1
     12/vis/scene/add/trajectories smooth
     13/tracking/storeTrajectory 2
    1414/vis/scene/notifyHandlers
    1515/vis/modeling/trajectories/create/drawByCharge
    … …  
    5151/gui/addButton vis Vis10(OIWin32) "/control/execute visTutor/exN03Vis10.mac"
    5252/gui/addButton vis Vis11(OGLSXm) "/control/execute visTutor/exN03Vis11.mac"
    53 /gui/addButton vis Vis12(OGLSQt) "/control/execute visTutor/exN03Vis12.mac"
    54 /gui/addButton vis Vis12(OGLSQt) "/control/execute visTutor/exN03Vis13.mac"
    5553/gui/addMenu viewer Viewer
    5654/gui/addButton viewer "Set style solid" "/vis/viewer/set/style solid"

  • trunk/examples/novice/N03/exampleN03.cc

    r1143 r1209  
    2626//
    2727// $Id: exampleN03.cc,v 1.37 2009/10/30 15:06:01 allison Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//
    … …  
    117117    {  // interactive mode : define UI session
    118118#ifdef G4UI_USE
    119       G4UIExecutive* ui = new G4UIExecutive(argc, argv);
     119      G4UIExecutive* ui = new G4UIExecutive(argc,argv);
    120120#ifdef G4VIS_USE
    121121      UImanager->ApplyCommand("/control/execute vis.mac");     

  • trunk/examples/novice/N03/include/ExN03DetectorConstruction.hh

    r609 r1209  
    2626//
    2727// $Id: ExN03DetectorConstruction.hh,v 1.7 2006/06/29 17:48:32 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/examples/novice/N03/include/ExN03DetectorMessenger.hh

    r609 r1209  
    2626//
    2727// $Id: ExN03DetectorMessenger.hh,v 1.7 2006/06/29 17:48:34 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/examples/novice/N03/include/ExN03EventAction.hh

    r609 r1209  
    2626//
    2727// $Id: ExN03EventAction.hh,v 1.12 2007/07/02 13:22:08 vnivanch Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/examples/novice/N03/include/ExN03EventActionMessenger.hh

    r609 r1209  
    2626//
    2727// $Id: ExN03EventActionMessenger.hh,v 1.10 2007/07/02 13:22:08 vnivanch Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/examples/novice/N03/include/ExN03PhysicsList.hh

    r609 r1209  
    2626//
    2727// $Id: ExN03PhysicsList.hh,v 1.13 2007/07/02 13:22:08 vnivanch Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/examples/novice/N03/include/ExN03PrimaryGeneratorAction.hh

    r609 r1209  
    2626//
    2727// $Id: ExN03PrimaryGeneratorAction.hh,v 1.8 2007/07/02 13:22:08 vnivanch Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/examples/novice/N03/include/ExN03PrimaryGeneratorMessenger.hh

    r609 r1209  
    2626//
    2727// $Id: ExN03PrimaryGeneratorMessenger.hh,v 1.8 2007/07/02 13:22:08 vnivanch Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/examples/novice/N03/include/ExN03RunAction.hh

    r609 r1209  
    2626//
    2727// $Id: ExN03RunAction.hh,v 1.11 2007/07/02 13:22:08 vnivanch Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/examples/novice/N03/include/ExN03SteppingAction.hh

    r609 r1209  
    2626//
    2727// $Id: ExN03SteppingAction.hh,v 1.10 2007/07/02 13:22:08 vnivanch Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/examples/novice/N03/include/ExN03SteppingVerbose.hh

    r609 r1209  
    2626//
    2727// $Id: ExN03SteppingVerbose.hh,v 1.9 2006/06/29 17:48:52 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/examples/novice/N03/src/ExN03DetectorConstruction.cc

    r609 r1209  
    2525//
    2626//
    27 // $Id: ExN03DetectorConstruction.cc,v 1.23 2006/06/29 17:48:54 gunter Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: ExN03DetectorConstruction.cc,v 1.24 2008/08/12 20:00:03 gum Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//
    … …  
    184184
    185185G4Material* CO2 =
    186 new G4Material("CarbonicGas", density= 27.*mg/cm3, ncomponents=2,
     186new G4Material("CarbonicGas", density= 1.842*mg/cm3, ncomponents=2,
    187187                              kStateGas, 325.*kelvin, 50.*atmosphere);
    188188CO2->AddElement(C, natoms=1);

  • trunk/examples/novice/N03/src/ExN03DetectorMessenger.cc

    r609 r1209  
    2626//
    2727// $Id: ExN03DetectorMessenger.cc,v 1.10 2006/06/29 17:48:58 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/examples/novice/N03/src/ExN03EventAction.cc

    r609 r1209  
    2525//
    2626//
    27 // $Id: ExN03EventAction.cc,v 1.28 2006/10/26 14:30:05 allison Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: ExN03EventAction.cc,v 1.29 2008/01/17 17:31:32 maire Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//
    … …  
    6666void ExN03EventAction::BeginOfEventAction(const G4Event* evt)
    6767{ 
    68  G4int evtNb = evt->GetEventID();
    69  if (evtNb%printModulo == 0) {
    70    G4cout << "\n---> Begin of event: " << evtNb << G4endl;
    71    CLHEP::HepRandom::showEngineStatus();
    72  }
     68  G4int evtNb = evt->GetEventID();
     69  if (evtNb%printModulo == 0) {
     70    G4cout << "\n---> Begin of event: " << evtNb << G4endl;
     71    CLHEP::HepRandom::showEngineStatus();
     72}
    7373 
    7474 // initialisation per event
    … …  
    103103       << G4endl;
    104104         
    105   } 
     105  }
    106106} 
    107107

  • trunk/examples/novice/N03/src/ExN03EventActionMessenger.cc

    r609 r1209  
    2626//
    2727// $Id: ExN03EventActionMessenger.cc,v 1.12 2006/10/26 14:28:00 allison Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/examples/novice/N03/src/ExN03PhysicsList.cc

    r609 r1209  
    2525//
    2626//
    27 // $Id: ExN03PhysicsList.cc,v 1.21 2007/07/02 13:22:08 vnivanch Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: ExN03PhysicsList.cc,v 1.26 2009/11/15 14:48:40 maire Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//
    … …  
    142142#include "G4PhotoElectricEffect.hh"
    143143
    144 #include "G4MultipleScattering.hh"
    145 
     144#include "G4eMultipleScattering.hh"
    146145#include "G4eIonisation.hh"
    147146#include "G4eBremsstrahlung.hh"
    148147#include "G4eplusAnnihilation.hh"
    149148
     149#include "G4MuMultipleScattering.hh"
    150150#include "G4MuIonisation.hh"
    151151#include "G4MuBremsstrahlung.hh"
    152152#include "G4MuPairProduction.hh"
    153153
     154#include "G4hMultipleScattering.hh"
    154155#include "G4hIonisation.hh"
     156#include "G4hBremsstrahlung.hh"
     157#include "G4hPairProduction.hh"
     158
     159#include "G4ionIonisation.hh"
    155160
    156161//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    172177    } else if (particleName == "e-") {
    173178      //electron
    174       pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
    175       pmanager->AddProcess(new G4eIonisation,       -1, 2,2);
    176       pmanager->AddProcess(new G4eBremsstrahlung,   -1, 3,3);     
     179      pmanager->AddProcess(new G4eMultipleScattering,-1, 1, 1);
     180      pmanager->AddProcess(new G4eIonisation,        -1, 2, 2);
     181      pmanager->AddProcess(new G4eBremsstrahlung,    -1, 3, 3);     
    177182
    178183    } else if (particleName == "e+") {
    179184      //positron
    180       pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
    181       pmanager->AddProcess(new G4eIonisation,       -1, 2,2);
    182       pmanager->AddProcess(new G4eBremsstrahlung,   -1, 3,3);
    183       pmanager->AddProcess(new G4eplusAnnihilation,  0,-1,4);
    184 
     185      pmanager->AddProcess(new G4eMultipleScattering,-1, 1, 1);
     186      pmanager->AddProcess(new G4eIonisation,        -1, 2, 2);
     187      pmanager->AddProcess(new G4eBremsstrahlung,    -1, 3, 3);
     188      pmanager->AddProcess(new G4eplusAnnihilation,   0,-1, 4);
     189   
    185190    } else if( particleName == "mu+" ||
    186191               particleName == "mu-"    ) {
    187192      //muon 
    188       pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
    189       pmanager->AddProcess(new G4MuIonisation,      -1, 2,2);
    190       pmanager->AddProcess(new G4MuBremsstrahlung,  -1, 3,3);
    191       pmanager->AddProcess(new G4MuPairProduction,  -1, 4,4);       
     193      pmanager->AddProcess(new G4MuMultipleScattering,-1, 1, 1);
     194      pmanager->AddProcess(new G4MuIonisation,       -1, 2, 2);
     195      pmanager->AddProcess(new G4MuBremsstrahlung,   -1, 3, 3);
     196      pmanager->AddProcess(new G4MuPairProduction,   -1, 4, 4);
     197             
     198    } else if( particleName == "proton" ||
     199               particleName == "pi-" ||
     200               particleName == "pi+"    ) {
     201      //proton 
     202      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
     203      pmanager->AddProcess(new G4hIonisation,         -1, 2, 2);
     204      pmanager->AddProcess(new G4hBremsstrahlung,     -1, 3, 3);
     205      pmanager->AddProcess(new G4hPairProduction,     -1, 4, 4);       
    192206     
    193     } else if ((!particle->IsShortLived()) &&
     207    } else if( particleName == "alpha" ||
     208               particleName == "He3" )     {
     209      //alpha
     210      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
     211      pmanager->AddProcess(new G4ionIonisation,       -1, 2, 2);
     212     
     213    } else if( particleName == "GenericIon" ) {
     214      //Ions
     215      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
     216      pmanager->AddProcess(new G4ionIonisation,       -1, 2, 2);     
     217     
     218      } else if ((!particle->IsShortLived()) &&
    194219               (particle->GetPDGCharge() != 0.0) &&
    195220               (particle->GetParticleName() != "chargedgeantino")) {
    196221      //all others charged particles except geantino
    197       pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
    198       pmanager->AddProcess(new G4hIonisation,       -1, 2,2);
    199     }
     222      pmanager->AddProcess(new G4hMultipleScattering,-1, 1, 1);
     223      pmanager->AddProcess(new G4hIonisation,        -1, 2, 2);       
     224    }     
    200225  }
    201226}
    … …  
    237262  SetCutValue(defaultCutValue, "e-");
    238263  SetCutValue(defaultCutValue, "e+");
     264  SetCutValue(defaultCutValue, "proton");
    239265
    240266  if (verboseLevel>0) DumpCutValuesTable();

  • trunk/examples/novice/N03/src/ExN03PrimaryGeneratorAction.cc

    r609 r1209  
    2626//
    2727// $Id: ExN03PrimaryGeneratorAction.cc,v 1.8 2006/06/29 17:49:07 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/examples/novice/N03/src/ExN03PrimaryGeneratorMessenger.cc

    r609 r1209  
    2626//
    2727// $Id: ExN03PrimaryGeneratorMessenger.cc,v 1.9 2006/06/29 17:49:09 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/examples/novice/N03/src/ExN03RunAction.cc

    r609 r1209  
    2525//
    2626//
    27 // $Id: ExN03RunAction.cc,v 1.18 2006/06/29 17:49:11 gunter Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: ExN03RunAction.cc,v 1.19 2008/01/17 17:31:32 maire Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    5555  //inform the runManager to save random number seed
    5656  G4RunManager::GetRunManager()->SetRandomNumberStore(true);
    57  
     57   
    5858  //initialize cumulative quantities
    5959  //
    … …  
    117117     << " +- "                               << G4BestUnit(rmsLGap,"Length")
    118118     << "\n------------------------------------------------------------\n"
    119      << G4endl;   
     119     << G4endl;
    120120}
    121121

  • trunk/examples/novice/N03/src/ExN03SteppingAction.cc

    r609 r1209  
    2626//
    2727// $Id: ExN03SteppingAction.cc,v 1.15 2006/06/29 17:49:13 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/examples/novice/N03/src/ExN03SteppingVerbose.cc

    r609 r1209  
    2626//
    2727// $Id: ExN03SteppingVerbose.cc,v 1.13 2006/06/29 17:49:16 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/novice/N03/vis.mac

    r1143 r1209  
    1 # $Id: vis.mac,v 1.6 2007/06/13 10:36:39 maire Exp $
     1# $Id: vis.mac,v 1.7 2009/11/15 14:48:40 maire Exp $
    22#
    33# Macro file for the initialization phase of "exampleN03.cc"
    … …  
    2222#
    2323# Use this open statement instead for OpenGL in immediate mode.
    24 /vis/open OGLIX
     24/vis/open OGLSQt
    2525#
    2626# Use this open statement instead to get a HepRep version 1 file
    … …  
    3737# Draw trajectories at end of event, showing trajectory points as
    3838# markers of size 2 pixels
    39 /vis/scene/add/trajectories
     39/vis/scene/add/trajectories smooth
    4040/vis/modeling/trajectories/create/drawByCharge
    4141/vis/modeling/trajectories/drawByCharge-0/default/setDrawStepPts true

  • trunk/examples/novice/N03/visTutor/exN03Vis10.mac

    r921 r1209  
    88#  CONTENTS: A basic macro for demonstrating Inventor driver          #
    99#                                                                     #
    10 #  USAGE:  % $G4BINDIR/exampleN03  visTutor/exN03Vis10.mac            #
     10#  USAGE:  % $G4BINDIR/exampleN03  visTutor/exN03Vis6.mac             #
    1111#                                                                     #
    1212#  REQUIRED PLATFORMS & SOFTWARES: Windows,                           #

  • trunk/examples/novice/N03/visTutor/exN03Vis11.mac

    r921 r1209  
    5858#
    5959/vis/viewer/reset
    60 /vis/viewer/scale 1 1 2
    6160/vis/viewer/set/viewpointThetaPhi  20 70
    6261/vis/viewer/zoom               0.8

  • trunk/examples/novice/N03/visTutor/exN03Vis12.mac

    r1143 r1209  
    88#  CONTENTS: A basic macro for demonstrating time slicing             #
    99#                                                                     #
    10 #  USAGE:  % $G4BINDIR/exampleN03  visTutor/exN03Vis12.mac            #
     10#  USAGE:  % $G4BINDIR/exampleN03  visTutor/exN03Vis12.mac             #
    1111#                                                                     #
    1212#  REQUIRED PLATFORMS & SOFTWARES: Mac/Unix with X-Windows, OpenGL    #
    … …  
    1919/vis/verbose confirmations
    2020
    21 /vis/open OGLSQt
     21/vis/open OGLSX
    2222/vis/drawVolume
    2323/vis/scene/add/eventID

  • trunk/examples/novice/N03/visTutor/exN03Vis13.mac

    r1143 r1209  
    88#  CONTENTS: Time development of an electrmagnetic shower.            #
    99#                                                                     #
    10 #  USAGE:  % $G4BINDIR/exampleN03  visTutor/exN03Vis13.mac            #
     10#  USAGE:  % $G4BINDIR/exampleN03  visTutor/exN03Vis12.mac             #
    1111#                                                                     #
    1212#  REQUIRED PLATFORMS & SOFTWARES: Mac/Unix with X-Windows, OpenGL    #
    … …  
    1919/vis/verbose confirmations
    2020
    21 /vis/open OGLSQt 600x600-0+0
     21/vis/open OGLSX 600x600-0+0
    2222/vis/drawVolume
    2323/vis/scene/add/eventID

  • trunk/examples/novice/N03/visTutor/exN03Vis5.mac

    r921 r1209  
    88#  CONTENTS: A basic macro for demonstrating Inventor driver          #
    99#                                                                     #
    10 #  USAGE:  % $G4BINDIR/exampleN03  visTutor/exN03Vis5.mac             #
     10#  USAGE:  % $G4BINDIR/exampleN03  visTutor/exN03Vis6.mac             #
    1111#                                                                     #
    1212#  REQUIRED PLATFORMS & SOFTWARES: Unix, Motif, X-window, OpenGL,     #
    … …  
    4242# Name of the gaps = name of their material (liquidArgon) !
    4343#/vis/scene/add/volume liquidArgon
    44 /vis/scene/add/trajectories
     44#/vis/scene/add/trajectories
    4545/tracking/storeTrajectory 1
    4646

  • trunk/examples/novice/N03/visTutor/exN03Vis6.mac

    r921 r1209  
    1515#  USAGE:  % gmake visclean                                           #
    1616#          % $G4BINDIR/exampleN03                                     #
    17 #          Idle> /control/execute visTutor/exN03Vis6.mac              #
     17#          Idle> /control/execute visTutor/exN03Vis7.mac              #
    1818#                                                                     #
    1919#  REQUIRED PLATFORMS & SOFTWARES: Unix, X-window,                    #

  • trunk/examples/novice/N03/visTutor/exN03Vis7.mac

    r921 r1209  
    1313#          % make visclean                                            #
    1414#          % $G4BINDIR/exampleN03                                     #
    15 #          Idle> /control/execute visTutor/exN03Vis7.mac              #
     15#          Idle> /control/execute visTutor/exN03Vis8.mac              #
    1616#          Idle> exit                                                 #
    1717#          % gv g4_00.eps &                                           #

  • trunk/examples/novice/N03/visTutor/exN03Vis8.mac

    r921 r1209  
    1919#          % gmake visclean                                           #
    2020#          % $G4BINDIR/exampleN03                                     #
    21 #          Idle> /control/execute visTutor/exN03Vis8.mac              #
     21#          Idle> /control/execute visTutor/exN03Vis9.mac              #
    2222#          Idle> exit                                                 #
    2323#          % gv g4_00.eps                                             #

  • trunk/examples/novice/N03/visTutor/gui.mac

    r1143 r1209  
    11#
    22#  This file permits to customize, with commands,
    3 # the menu bar of the G4UIXm, G4UIWin32 sessions.
     3# the menu bar of the G4UIXm, G4UIQt, G4UIWin32 sessions.
    44# It has no effect with G4UIterminal.
    55#
    … …  
    4242/gui/addButton vis Vis10(OIWin32) "/control/execute visTutor/exN03Vis10.mac"
    4343/gui/addButton vis Vis11(OGLSXm) "/control/execute visTutor/exN03Vis11.mac"
    44 /gui/addButton vis Vis12(OGLSQt) "/control/execute visTutor/exN03Vis12.mac"
    45 /gui/addButton vis Vis12(OGLSQt) "/control/execute visTutor/exN03Vis13.mac"
    4644#
    4745# Viewer menu :
Note: See TracChangeset for help on using the changeset viewer.