Changeset 483 for trunk/geant4/N03


Ignore:
Timestamp:
Jun 5, 2007, 3:50:26 PM (17 years ago)
Author:
garnier
Message:

r569@mac-90108: laurentgarnier | 2007-06-05 15:53:34 +0200
version contre geant4.8.2.p01

Location:
trunk/geant4/N03
Files:
4 added
26 edited

Legend:

Unmodified
Added
Removed

  • trunk/geant4/N03/G4History.macro

    r474 r483  
    1414/vis/viewer/refresh viewer-1
    1515/vis/viewer/update viewer-1
     16/vis/scene/add/trajectories
    1617/tracking/storeTrajectory 1
     18/vis/scene/notifyHandlers
     19/vis/modeling/trajectories/create/drawByCharge
     20/vis/modeling/trajectories/drawByCharge-0/default/setDrawStepPts true
     21/vis/modeling/trajectories/drawByCharge-0/default/setStepPtsSize 2
    1722/vis/scene/endOfEventAction accumulate
     23/vis/scene/notifyHandlers
    1824/control/execute visTutor/gui.mac
    1925/gui/addMenu file File

  • trunk/geant4/N03/History

    r474 r483  
    1 $Id: History,v 1.104 2006/06/16 10:18:05 gcosmo Exp $
     1$Id: History,v 1.111 2006/10/26 14:58:59 allison Exp $
    22--------------------------------------------------
    33
    … …  
    1616     ----------------------------------------------------------
    1717     
     1826-10-06 John Allison (exampleN03-V08-01-04)
     19- Migrate to new trajectory modeling commands:
     20  o vis.mac: Add new trajectory commands and helpful comments.
     21  o ExN03EventActionMessenger: Remove /N03/event/drawTracks.
     22  o ExN03EventAction: Remove SetDrawFlag and code for drawing
     23    trajectories in EndOfEventAction.
     24  o ExN03TrackingAction: Remove.  (Trajectory choice now available
     25    by vis commands - see exN03Vis12.mac and exN03Vis13.mac.)
     26  o exN03Vis12.mac and exN03Vis13.mac: Further refinement.
     27
     2819-09-06 John Allison (exampleN03-V08-01-03)
     29- exN03Vis12.mac and exN03Vis13.mac: Further refinement.
     30
     3112-09-06 John Allison (exampleN03-V08-01-02)
     32- exN03Vis12.mac and exN03Vis13.mac: Switched off local trajectory
     33  drawing (/N03/event/drawTracks none) so as not to interfere with
     34  drawing from /vis/scene/add/trajectories.
     35
     3631-08-06 mma
     37- Code tidy.
     38
     3930-08-06 John Allison (exampleN03-V08-01-01)
     40- Improved visTutor/exN03Vis12.mac.
     41- Added visTutor/exN03Vis13.mac: Further demonstration of time slicing.
     42
     4316-08-06 John Allison (exampleN03-V08-01-00)
     44- Added ExN03TrackingAction.  Active code is commented out so it
     45  continues to use G4Trajectory.  Introduced so that the code can
     46  easily be instated to get G4RichTrajectory for exN03Vis12.mac.
     47- Added visTutor/exN03Vis12.mac: demonstration of time slicing.
     48
    184916-06-06 Gabriele Cosmo (exampleN03-V08-00-06)
    1950- Use coherent allocation scheme for user-classes and

  • trunk/geant4/N03/exampleN03.cc

    r474 r483  
    2525//
    2626//
    27 // $Id: exampleN03.cc,v 1.28 2006/06/29 17:48:30 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     27// $Id: exampleN03.cc,v 1.30 2006/10/26 14:58:24 allison Exp $
     28// GEANT4 tag $Name: geant4-08-02-patch-01-ref $
    2929//
    3030//

  • trunk/geant4/N03/exampleN03.out

    r474 r483  
    11
    22*************************************************************
    3  Geant4 version Name: global-V08-00-04    (30-June-2006)
     3 Geant4 version Name: geant4-08-02-patch-01-ref    (23-February-2007)
    44                      Copyright : Geant4 Collaboration
    55                      Reference : NIM A 506 (2003), 250-303
    … …  
    8585  drawByParticleID
    8686  drawByOriginVolume
    87 
    88 Registered models:
    89   None
     87  drawByAttribute
    9088
    9189Registered filter factories:
    … …  
    9391  particleFilter
    9492  originVolumeFilter
    95 
    96 Registered filters:
    97   None
     93  attributeFilter
    9894
    9995
    … …  
    104100
    105101phot:  Total cross sections from Sandia parametrisation.
     102      Sampling according PhotoElectric model
    106103
    107104compt:  Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV
    … …  
    111108
    112109conv:  Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z;
    113       sampling secondary e+e- according to the Bethe-Heitler model
     110      sampling secondary e+e- according Bethe-Heitler model
    114111      tables are built for  gamma
    115112      Lambda tables from 1.022 MeV to 100 GeV in 100 bins.
    … …  
    122119      dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    123120      Lambda tables from threshold to 100 TeV in 120 bins.
    124       Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV.
     121      Delta cross sections and sampling from MollerBhabha model
     122      Good description from 1 KeV to 100 GeV.
    125123      Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1
    126124
    … …  
    128126      dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    129127      Lambda tables from threshold to 100 TeV in 120 bins.
    130       Total cross sections from a parametrisation based on the EEDL data library.
     128      Total cross sections and sampling from StandBrem model (based on the EEDL data library)
    131129      Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV.
    132130
    … …  
    134132      dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    135133      Lambda tables from threshold to 100 TeV in 120 bins.
    136       Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV.
     134      Delta cross sections and sampling from MollerBhabha model
     135      Good description from 1 KeV to 100 GeV.
    137136      Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1
    138137
    … …  
    140139      dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    141140      Lambda tables from threshold to 100 TeV in 120 bins.
    142       Total cross sections from a parametrisation based on the EEDL data library.
     141      Total cross sections and sampling from StandBrem model (based on the EEDL data library)
    143142      Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV.
    144143
    145 annihil:       Heilter model of formula of annihilation into 2 photons
     144annihil:       Sampling according eplus2gg model
    146145      tables are built for  e+
    147146      Lambda tables from 100 eV  to 100 TeV in 120 bins.
    … …  
    154153      dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    155154      Lambda tables from threshold to 100 TeV in 120 bins.
    156       Scaling relation is used to proton dE/dx and range
    157       Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for protons below.
     155      Scaling relation is used from proton dE/dx and range.
     156      Delta cross sections and sampling from BetheBloch model for scaled energy > 2 MeV
     157      Parametrisation from Bragg for protons below.
    158158      Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1
    159159
    … …  
    161161      dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    162162      Lambda tables from threshold to 100 TeV in 120 bins.
    163       Scaling relation is used to proton dE/dx and range
    164       Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for protons below.
     163      Scaling relation is used from proton dE/dx and range.
     164      Delta cross sections and sampling from BetheBloch model for scaled energy > 2 MeV
     165      Parametrisation from Bragg for protons below.
    165166      Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1
    166167
    … …  
    206207      dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    207208      Lambda tables from threshold to 100 TeV in 120 bins.
    208       Scaling relation is used to proton dE/dx and range
    209       Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below.
     209      Scaling relation is used from proton dE/dx and range.
     210      Delta cross sections and sampling from BetheBloch model for scaled energy > 0.297504 MeV
     211      Parametrisation from Bragg for protons below.
    210212      Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1
    211213
    … …  
    217219      dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    218220      Lambda tables from threshold to 100 TeV in 120 bins.
    219       Scaling relation is used to proton dE/dx and range
    220       Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below.
     221      Scaling relation is used from proton dE/dx and range.
     222      Delta cross sections and sampling from BetheBloch model for scaled energy > 0.297504 MeV
     223      Parametrisation from Bragg for protons below.
    221224      Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1
    222225
    … …  
    255258----------------------------------------
    256259---> End of event: 0
    257    Absorber: total energy: 283.57012 MeV       total track length: 19.954777 cm
    258         Gap: total energy: 4.4491408 MeV       total track length: 2.1543629 cm
     260   Absorber: total energy: 255.24989 MeV       total track length: 17.775532 cm
     261        Gap: total energy: 12.751693 MeV       total track length: 6.4347173 cm
    259262
    260263--------------------End of Run------------------------------
    261264
    262  mean Energy in Absorber : 283.57012 MeV +- 0 eV
    263  mean Energy in Gap      : 4.4491408 MeV +- 0 eV
    264 
    265  mean trackLength in Absorber : 19.954777 cm  +- 0 fm
    266  mean trackLength in Gap      : 2.1543629 cm  +- 0 fm
     265 mean Energy in Absorber : 255.24989 MeV +- 0 eV
     266 mean Energy in Gap      : 12.751693 MeV +- 0 eV
     267
     268 mean trackLength in Absorber : 17.775532 cm  +- 0 fm
     269 mean trackLength in Gap      : 6.4347173 cm  +- 0 fm
    267270------------------------------------------------------------
    268271
    … …  
    273276
    274277phot:  Total cross sections from Sandia parametrisation.
     278      Sampling according PhotoElectric model
    275279
    276280compt:  Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV
    … …  
    280284
    281285conv:  Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z;
    282       sampling secondary e+e- according to the Bethe-Heitler model
     286      sampling secondary e+e- according Bethe-Heitler model
    283287      tables are built for  gamma
    284288      Lambda tables from 1.0219981 MeV to 100 GeV in 100 bins.
    … …  
    291295      dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    292296      Lambda tables from threshold to 100 TeV in 120 bins.
    293       Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV.
     297      Delta cross sections and sampling from MollerBhabha model
     298      Good description from 1 KeV to 100 GeV.
    294299      Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1
    295300
    … …  
    297302      dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    298303      Lambda tables from threshold to 100 TeV in 120 bins.
    299       Total cross sections from a parametrisation based on the EEDL data library.
     304      Total cross sections and sampling from StandBrem model (based on the EEDL data library)
    300305      Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV.
    301306
    … …  
    303308      dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    304309      Lambda tables from threshold to 100 TeV in 120 bins.
    305       Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV.
     310      Delta cross sections and sampling from MollerBhabha model
     311      Good description from 1 KeV to 100 GeV.
    306312      Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1
    307313
    … …  
    309315      dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    310316      Lambda tables from threshold to 100 TeV in 120 bins.
    311       Total cross sections from a parametrisation based on the EEDL data library.
     317      Total cross sections and sampling from StandBrem model (based on the EEDL data library)
    312318      Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV.
    313319
    314 annihil:       Heilter model of formula of annihilation into 2 photons
     320annihil:       Sampling according eplus2gg model
    315321      tables are built for  e+
    316322      Lambda tables from 100 eV  to 100 TeV in 120 bins.
    … …  
    323329      dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    324330      Lambda tables from threshold to 100 TeV in 120 bins.
    325       Scaling relation is used to proton dE/dx and range
    326       Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for protons below.
     331      Scaling relation is used from proton dE/dx and range.
     332      Delta cross sections and sampling from BetheBloch model for scaled energy > 2 MeV
     333      Parametrisation from Bragg for protons below.
    327334      Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1
    328335
    … …  
    330337      dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    331338      Lambda tables from threshold to 100 TeV in 120 bins.
    332       Scaling relation is used to proton dE/dx and range
    333       Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for protons below.
     339      Scaling relation is used from proton dE/dx and range.
     340      Delta cross sections and sampling from BetheBloch model for scaled energy > 2 MeV
     341      Parametrisation from Bragg for protons below.
    334342      Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1
    335343
    … …  
    375383      dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    376384      Lambda tables from threshold to 100 TeV in 120 bins.
    377       Scaling relation is used to proton dE/dx and range
    378       Bether-Bloch model for Escaled > 0.29750425 MeV, ICRU49 parametrisation for protons below.
     385      Scaling relation is used from proton dE/dx and range.
     386      Delta cross sections and sampling from BetheBloch model for scaled energy > 0.29750425 MeV
     387      Parametrisation from Bragg for protons below.
    379388      Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1
    380389
    … …  
    386395      dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    387396      Lambda tables from threshold to 100 TeV in 120 bins.
    388       Scaling relation is used to proton dE/dx and range
    389       Bether-Bloch model for Escaled > 0.29750425 MeV, ICRU49 parametrisation for protons below.
     397      Scaling relation is used from proton dE/dx and range.
     398      Delta cross sections and sampling from BetheBloch model for scaled energy > 0.29750425 MeV
     399      Parametrisation from Bragg for protons below.
    390400      Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1
    391401### Run 1 start.
    … …  
    395405--------- Ranecu engine status ---------
    396406 Initial seed (index) = 0
    397  Current couple of seeds = 338525291, 1799411122
     407 Current couple of seeds = 1363400685, 1475368346
    398408----------------------------------------
    399409---> End of event: 0
    400    Absorber: total energy: 276.14261 MeV       total track length: 19.058263 cm
    401         Gap: total energy: 16.389271 MeV       total track length: 8.0132117 cm
     410   Absorber: total energy: 273.78056 MeV       total track length: 18.732667 cm
     411        Gap: total energy: 22.74196 MeV       total track length: 11.196324 cm
    402412
    403413--------------------End of Run------------------------------
    404414
    405  mean Energy in Absorber : 276.14261 MeV +- 0 eV
    406  mean Energy in Gap      : 16.389271 MeV +- 0 eV
    407 
    408  mean trackLength in Absorber : 19.058263 cm  +- 0 fm
    409  mean trackLength in Gap      : 8.0132117 cm  +- 0 fm
     415 mean Energy in Absorber : 273.78056 MeV +- 0 eV
     416 mean Energy in Gap      : 22.74196 MeV +- 0 eV
     417
     418 mean trackLength in Absorber : 18.732667 cm  +- 0 fm
     419 mean trackLength in Gap      : 11.196324 cm  +- 0 fm
    410420------------------------------------------------------------
    411421
    … …  
    416426
    417427phot:  Total cross sections from Sandia parametrisation.
     428      Sampling according PhotoElectric model
    418429
    419430compt:  Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV
    … …  
    423434
    424435conv:  Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z;
    425       sampling secondary e+e- according to the Bethe-Heitler model
     436      sampling secondary e+e- according Bethe-Heitler model
    426437      tables are built for  gamma
    427438      Lambda tables from 1.0219981 MeV to 100 GeV in 100 bins.
    … …  
    434445      dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    435446      Lambda tables from threshold to 100 TeV in 120 bins.
    436       Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV.
     447      Delta cross sections and sampling from MollerBhabha model
     448      Good description from 1 KeV to 100 GeV.
    437449      Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1
    438450
    … …  
    440452      dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    441453      Lambda tables from threshold to 100 TeV in 120 bins.
    442       Total cross sections from a parametrisation based on the EEDL data library.
     454      Total cross sections and sampling from StandBrem model (based on the EEDL data library)
    443455      Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV.
    444456
    … …  
    446458      dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    447459      Lambda tables from threshold to 100 TeV in 120 bins.
    448       Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV.
     460      Delta cross sections and sampling from MollerBhabha model
     461      Good description from 1 KeV to 100 GeV.
    449462      Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1
    450463
    … …  
    452465      dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    453466      Lambda tables from threshold to 100 TeV in 120 bins.
    454       Total cross sections from a parametrisation based on the EEDL data library.
     467      Total cross sections and sampling from StandBrem model (based on the EEDL data library)
    455468      Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV.
    456469
    457 annihil:       Heilter model of formula of annihilation into 2 photons
     470annihil:       Sampling according eplus2gg model
    458471      tables are built for  e+
    459472      Lambda tables from 100 eV  to 100 TeV in 120 bins.
    … …  
    466479      dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    467480      Lambda tables from threshold to 100 TeV in 120 bins.
    468       Scaling relation is used to proton dE/dx and range
    469       Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for protons below.
     481      Scaling relation is used from proton dE/dx and range.
     482      Delta cross sections and sampling from BetheBloch model for scaled energy > 2 MeV
     483      Parametrisation from Bragg for protons below.
    470484      Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1
    471485
    … …  
    473487      dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    474488      Lambda tables from threshold to 100 TeV in 120 bins.
    475       Scaling relation is used to proton dE/dx and range
    476       Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for protons below.
     489      Scaling relation is used from proton dE/dx and range.
     490      Delta cross sections and sampling from BetheBloch model for scaled energy > 2 MeV
     491      Parametrisation from Bragg for protons below.
    477492      Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1
    478493
    … …  
    518533      dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    519534      Lambda tables from threshold to 100 TeV in 120 bins.
    520       Scaling relation is used to proton dE/dx and range
    521       Bether-Bloch model for Escaled > 0.29750425 MeV, ICRU49 parametrisation for protons below.
     535      Scaling relation is used from proton dE/dx and range.
     536      Delta cross sections and sampling from BetheBloch model for scaled energy > 0.29750425 MeV
     537      Parametrisation from Bragg for protons below.
    522538      Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1
    523539
    … …  
    529545      dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    530546      Lambda tables from threshold to 100 TeV in 120 bins.
    531       Scaling relation is used to proton dE/dx and range
    532       Bether-Bloch model for Escaled > 0.29750425 MeV, ICRU49 parametrisation for protons below.
     547      Scaling relation is used from proton dE/dx and range.
     548      Delta cross sections and sampling from BetheBloch model for scaled energy > 0.29750425 MeV
     549      Parametrisation from Bragg for protons below.
    533550      Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1
    534551### Run 2 start.
    … …  
    538555--------- Ranecu engine status ---------
    539556 Initial seed (index) = 0
    540  Current couple of seeds = 977943917, 671671507
     557 Current couple of seeds = 606835024, 988202660
    541558----------------------------------------
    542559---> End of event: 0
    543    Absorber: total energy: 267.17807 MeV       total track length: 62.771551 cm
    544         Gap: total energy: 66.70026 MeV       total track length: 1.8562679 m 
     560   Absorber: total energy: 408.66702 MeV       total track length: 97.709788 cm
     561        Gap: total energy: 83.799117 MeV       total track length: 2.3229686 m 
    545562
    546563--------------------End of Run------------------------------
    547564
    548  mean Energy in Absorber : 267.17807 MeV +- 0 eV
    549  mean Energy in Gap      : 66.70026 MeV +- 0 eV
    550 
    551  mean trackLength in Absorber : 62.771551 cm  +- 0 fm
    552  mean trackLength in Gap      : 1.8562679 m   +- 0 fm
    553 ------------------------------------------------------------
    554 
     565 mean Energy in Absorber : 408.66702 MeV +- 0 eV
     566 mean Energy in Gap      : 83.799117 MeV +- 0 eV
     567
     568 mean trackLength in Absorber : 97.709788 cm  +- 0 fm
     569 mean trackLength in Gap      : 2.3229686 m   +- 0 fm
     570------------------------------------------------------------
     571

  • trunk/geant4/N03/include/ExN03DetectorConstruction.hh

    r474 r483  
    2626//
    2727// $Id: ExN03DetectorConstruction.hh,v 1.7 2006/06/29 17:48:32 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030//

  • trunk/geant4/N03/include/ExN03DetectorMessenger.hh

    r474 r483  
    2626//
    2727// $Id: ExN03DetectorMessenger.hh,v 1.7 2006/06/29 17:48:34 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030//

  • trunk/geant4/N03/include/ExN03EventAction.hh

    r474 r483  
    2525//
    2626//
    27 // $Id: ExN03EventAction.hh,v 1.10 2006/06/29 17:48:36 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     27// $Id: ExN03EventAction.hh,v 1.11 2006/10/26 14:30:05 allison Exp $
     28// GEANT4 tag $Name: geant4-08-02-patch-01-ref $
    2929//
    3030//
    … …  
    5757   void AddGap(G4double de, G4double dl) {EnergyGap += de; TrackLGap += dl;};
    5858                     
    59    void SetDrawFlag   (G4String val)  {drawFlag = val;};
    6059   void SetPrintModulo(G4int    val)  {printModulo = val;};
    6160   
    … …  
    6665   G4double  TrackLAbs, TrackLGap;
    6766                     
    68    G4String  drawFlag;
    6967   G4int     printModulo;
    7068                             

  • trunk/geant4/N03/include/ExN03EventActionMessenger.hh

    r474 r483  
    2525//
    2626//
    27 // $Id: ExN03EventActionMessenger.hh,v 1.8 2006/06/29 17:48:38 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     27// $Id: ExN03EventActionMessenger.hh,v 1.9 2006/10/26 14:28:00 allison Exp $
     28// GEANT4 tag $Name: geant4-08-02-patch-01-ref $
    2929//
    3030//
    … …  
    4141class ExN03EventAction;
    4242class G4UIdirectory;
    43 class G4UIcmdWithAString;
    4443class G4UIcmdWithAnInteger;
    4544
    … …  
    5756    ExN03EventAction*     eventAction;
    5857    G4UIdirectory*        eventDir;   
    59     G4UIcmdWithAString*   DrawCmd;
    6058    G4UIcmdWithAnInteger* PrintCmd;   
    6159};

  • trunk/geant4/N03/include/ExN03PhysicsList.hh

    r474 r483  
    2626//
    2727// $Id: ExN03PhysicsList.hh,v 1.12 2006/06/29 17:48:40 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030//

  • trunk/geant4/N03/include/ExN03PrimaryGeneratorAction.hh

    r474 r483  
    2626//
    2727// $Id: ExN03PrimaryGeneratorAction.hh,v 1.7 2006/06/29 17:48:42 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030//

  • trunk/geant4/N03/include/ExN03PrimaryGeneratorMessenger.hh

    r474 r483  
    2626//
    2727// $Id: ExN03PrimaryGeneratorMessenger.hh,v 1.7 2006/06/29 17:48:44 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030//

  • trunk/geant4/N03/include/ExN03RunAction.hh

    r474 r483  
    2626//
    2727// $Id: ExN03RunAction.hh,v 1.10 2006/06/29 17:48:47 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030//

  • trunk/geant4/N03/include/ExN03SteppingAction.hh

    r474 r483  
    2626//
    2727// $Id: ExN03SteppingAction.hh,v 1.9 2006/06/29 17:48:49 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030//

  • trunk/geant4/N03/include/ExN03SteppingVerbose.hh

    r474 r483  
    2626//
    2727// $Id: ExN03SteppingVerbose.hh,v 1.9 2006/06/29 17:48:52 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030//

  • trunk/geant4/N03/src/ExN03DetectorConstruction.cc

    r474 r483  
    2626//
    2727// $Id: ExN03DetectorConstruction.cc,v 1.23 2006/06/29 17:48:54 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030//

  • trunk/geant4/N03/src/ExN03DetectorMessenger.cc

    r474 r483  
    2626//
    2727// $Id: ExN03DetectorMessenger.cc,v 1.10 2006/06/29 17:48:58 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030//

  • trunk/geant4/N03/src/ExN03EventAction.cc

    r474 r483  
    2525//
    2626//
    27 // $Id: ExN03EventAction.cc,v 1.27 2006/06/29 17:49:00 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     27// $Id: ExN03EventAction.cc,v 1.28 2006/10/26 14:30:05 allison Exp $
     28// GEANT4 tag $Name: geant4-08-02-patch-01-ref $
    2929//
    3030//
    … …  
    5050
    5151ExN03EventAction::ExN03EventAction(ExN03RunAction* run)
    52 :runAct(run),drawFlag("all"),printModulo(1),eventMessenger(0)
     52:runAct(run),printModulo(1),eventMessenger(0)
    5353{
    5454  eventMessenger = new ExN03EventActionMessenger(this);
    … …  
    103103       << G4endl;
    104104         
    105   }
    106  
    107   // extract the trajectories and draw them
    108 
    109   // You can get a default drawing without this code by using, e.g.,
    110   // /vis/scene/add/trajectories 1000
    111   // The code here adds sophistication under control of drawFlag.
    112 
    113   // See comments in G4VTrajectory::DrawTrajectory for the
    114   // interpretation of the argument, 1000.
    115  
    116   G4VVisManager* pVisManager = G4VVisManager::GetConcreteInstance();
    117   if (pVisManager)
    118     {
    119      G4TrajectoryContainer* trajectoryContainer = evt->GetTrajectoryContainer();
    120      G4int n_trajectories = 0;
    121      if (trajectoryContainer) n_trajectories = trajectoryContainer->entries();
    122 
    123      for (G4int i=0; i<n_trajectories; i++)
    124         { G4VTrajectory* trj = ((*(evt->GetTrajectoryContainer()))[i]);
    125           if (drawFlag == "all") pVisManager->Draw(*trj,100);
    126           else if ((drawFlag == "charged")&&(trj->GetCharge() != 0.))
    127                                   pVisManager->Draw(*trj,100);
    128           else if ((drawFlag == "neutral")&&(trj->GetCharge() == 0.))
    129                                   pVisManager->Draw(*trj,100);
    130         }
    131   }
     105  } 
    132106} 
    133107

  • trunk/geant4/N03/src/ExN03EventActionMessenger.cc

    r474 r483  
    2525//
    2626//
    27 // $Id: ExN03EventActionMessenger.cc,v 1.11 2006/06/29 17:49:03 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     27// $Id: ExN03EventActionMessenger.cc,v 1.12 2006/10/26 14:28:00 allison Exp $
     28// GEANT4 tag $Name: geant4-08-02-patch-01-ref $
    2929//
    3030//
    … …  
    3737#include "ExN03EventAction.hh"
    3838#include "G4UIdirectory.hh"
    39 #include "G4UIcmdWithAString.hh"
    4039#include "G4UIcmdWithAnInteger.hh"
    4140#include "globals.hh"
    … …  
    4948  eventDir->SetGuidance("event control");
    5049   
    51   DrawCmd = new G4UIcmdWithAString("/N03/event/drawTracks",this);
    52   DrawCmd->SetGuidance("Draw the tracks in the event");
    53   DrawCmd->SetGuidance("  Choice : none, charged(default),neutral, all");
    54   DrawCmd->SetParameterName("choice",true);
    55   DrawCmd->SetDefaultValue("all");
    56   DrawCmd->SetCandidates("none charged neutral all");
    57   DrawCmd->AvailableForStates(G4State_Idle);
    58  
    5950  PrintCmd = new G4UIcmdWithAnInteger("/N03/event/printModulo",this);
    6051  PrintCmd->SetGuidance("Print events modulo n");
    … …  
    6758ExN03EventActionMessenger::~ExN03EventActionMessenger()
    6859{
    69   delete DrawCmd;
    7060  delete PrintCmd;
    7161  delete eventDir;   
    … …  
    7767                                        G4UIcommand* command,G4String newValue)
    7868{
    79   if(command == DrawCmd)
    80     {eventAction->SetDrawFlag(newValue);}
    81        
    8269  if(command == PrintCmd)
    8370    {eventAction->SetPrintModulo(PrintCmd->GetNewIntValue(newValue));}

  • trunk/geant4/N03/src/ExN03PhysicsList.cc

    r474 r483  
    2626//
    2727// $Id: ExN03PhysicsList.cc,v 1.20 2006/06/29 17:49:05 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030//

  • trunk/geant4/N03/src/ExN03PrimaryGeneratorAction.cc

    r474 r483  
    2626//
    2727// $Id: ExN03PrimaryGeneratorAction.cc,v 1.8 2006/06/29 17:49:07 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030//

  • trunk/geant4/N03/src/ExN03PrimaryGeneratorMessenger.cc

    r474 r483  
    2626//
    2727// $Id: ExN03PrimaryGeneratorMessenger.cc,v 1.9 2006/06/29 17:49:09 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030//

  • trunk/geant4/N03/src/ExN03RunAction.cc

    r474 r483  
    2626//
    2727// $Id: ExN03RunAction.cc,v 1.18 2006/06/29 17:49:11 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/geant4/N03/src/ExN03SteppingAction.cc

    r474 r483  
    2626//
    2727// $Id: ExN03SteppingAction.cc,v 1.15 2006/06/29 17:49:13 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030//

  • trunk/geant4/N03/src/ExN03SteppingVerbose.cc

    r474 r483  
    2626//
    2727// $Id: ExN03SteppingVerbose.cc,v 1.13 2006/06/29 17:49:16 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/geant4/N03/vis.mac

    r474 r483  
    3434/vis/viewer/flush
    3535#
    36 # for drawing the tracks
    37 # (if too many tracks cause core dump => storeTrajectory 0)
     36# Draw trajectories at end of event, showing trajectory points as
     37# markers of size 2 pixels
     38/vis/scene/add/trajectories
     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)
    3843#
    39 /tracking/storeTrajectory 1
     44# To draw gammas only
     45#/vis/filtering/trajectories/create/particleFilter
     46#/vis/filtering/trajectories/particleFilter-0/add gamma
     47#
     48# To draw charged particles only
     49#/vis/filtering/trajectories/particleFilter-0/invert true
     50#
     51# Many other options available with /vis/modeling and /vis/filtering.
     52# For example, select colour by particle ID
     53#/vis/modeling/trajectories/create/drawByParticleID
     54#/vis/modeling/trajectories/drawByParticleID-0/set e- red
     55#
    4056/vis/scene/endOfEventAction accumulate
    4157#

  • trunk/geant4/N03/visTutor/exN03Vis10.mac

    r474 r483  
    6060#  - in viewing mode (cursor is the hand)                             #
    6161#   Left-button + pointer move : rotate.                              #
    62 #   Ctrl+Left-button + pointer move : pane.                           #
     62#   Ctrl+Left-button + pointer move : pan.                            #
    6363#   Ctrl+Shift+Left-button + pointer move : scale.                    #
    64 #   Middle-button + pointer move : pane.                              #
     64#   Middle-button + pointer move : pan.                               #
    6565#                                                                     #
    6666#######################################################################
Note: See TracChangeset for help on using the changeset viewer.