Changeset 483


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
Files:
4 added
71 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#######################################################################

  • trunk/geant4/config/G4UI_BUILD.gmk

    r473 r483  
    3838endif
    3939
    40 ifdef G4UI_BUILD_QT_SESSION
    41   G4UI_BUILD = 1
    42   G4UI_BUILD_BASIC_SESSION = 1
    43   G4INTY_BUILD_QT = 1
    44   CPPFLAGS += -DG4UI_BUILD_QT_SESSION
    45 endif
    46 
    4740########################### interfaces/XVT - not currently implemented #####
    4841
    … …  
    6356   endif
    6457
    65    ifdef G4UI_BUILD_QT_SESSION
    66      G4UI_USE_QT = 1
    67    endif
    68 
    6958  include $(G4INSTALL)/config/G4UI_USE.gmk
    7059

  • trunk/geant4/config/G4UI_USE.gmk

    r473 r483  
    7373endif
    7474
    75 ifdef G4UI_USE_QT
    76   G4UI_USE  = 1
    77   G4INTY_USE_QT = 1
    78   CPPFLAGS    += -DG4UI_USE_QT
    79 endif
    80 
    8175########################### interfaces/XVT - not currently implemented #####
    8276

  • trunk/geant4/config/G4VIS_BUILD.gmk

    r473 r483  
    4040  CPPFLAGS += -DG4VIS_BUILD_OPENGLWIN32_DRIVER
    4141endif
    42 ifdef G4VIS_BUILD_OPENGLQT_DRIVER
    43   G4VIS_BUILD_OPENGL_DRIVER = 1
    44   G4INTY_BUILD_QT = 1
    45   CPPFLAGS += -DG4VIS_BUILD_OPENGLQT_DRIVER
    46 endif
    4742ifdef G4VIS_BUILD_OPENGL_DRIVER
    4843  INC_GL      = 1
    … …  
    5954  G4INTY_BUILD_WIN32  = 1
    6055  CPPFLAGS += -DG4VIS_BUILD_OIWIN32_DRIVER
    61 endif
    62 ifdef G4VIS_BUILD_OIQT_DRIVER
    63   G4VIS_BUILD_OI_DRIVER = 1
    64   G4INTY_BUILD_QT  = 1
    65   CPPFLAGS += -DG4VIS_BUILD_OIQT_DRIVER
    6656endif
    6757ifdef G4VIS_BUILD_OI_DRIVER
    … …  
    9383  endif
    9484
    95   ifdef G4VIS_BUILD_OPENGLQT_DRIVER
    96     G4VIS_USE_OPENGLQT = 1
    97   endif
    98 
    9985  ifdef G4VIS_BUILD_OPENGLXM_DRIVER
    10086    G4VIS_USE_OPENGLXM = 1
    … …  
    11197  ifdef G4VIS_BUILD_OIWIN32_DRIVER
    11298    G4VIS_USE_OIWIN32 = 1
    113   endif
    114 
    115   ifdef G4VIS_BUILD_OIQT_DRIVER
    116     G4VIS_USE_OIQT = 1
    11799  endif
    118100

  • trunk/geant4/config/G4VIS_USE.gmk

    r473 r483  
    6161  CPPFLAGS += -DG4VIS_USE_OPENGLWIN32
    6262endif
    63 ifdef G4VIS_USE_OPENGLQT
    64   G4VIS_USE_OPENGL = 1
    65   CPPFLAGS += -DG4VIS_USE_OPENGLQT
    66 endif
    6763ifdef G4VIS_USE_OPENGL
    6864  CPPFLAGS += -DG4VIS_USE_OPENGL
    … …  
    8480  G4VIS_USE_OI = 1
    8581  CPPFLAGS += -DG4VIS_USE_OIWIN32
    86 endif
    87 ifdef G4VIS_USE_OIQT
    88   G4VIS_USE_OI = 1
    89   CPPFLAGS += -DG4VIS_USE_OIQT
    9082endif
    9183ifdef G4VIS_USE_OI

  • trunk/geant4/config/History

    r472 r483  
    1 $Id: History,v 1.278 2006/06/13 15:37:35 gcosmo Exp $
     1$Id: History,v 1.288 2006/11/30 15:47:16 gcosmo Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1616     * Reverse chronological order (last date on top), please *
    1717     ----------------------------------------------------------
     18
     193rd November 2006  Gunter Folger (config-V08-01-07)
     20- architecture.gmk: added G4LIB_BUILD_LISTS with default value 1 to build physics lists.
     21- binmake.gmk: added physics lists include directories to INCFLAGS.
     22
     2315th October 2006  Makoto Asai (config-V08-01-06)
     24- binmake.gmk: added 'processes/scoring' module.
     25
     2610th October 2006  Gabriele Cosmo (config-V08-01-05)
     27- Darwin-g++.gmk: use standard -echo- command.
     28  Removed ECHO overloaded variable.
     29
     305th October 2006  Gabriele Cosmo (config-V08-01-04)
     31- liblist.c: added .dylib search for list of libraries.
     32  Addressing problem report #885.
     33
     343rd October 2006  Gabriele Cosmo (config-V08-01-03)
     35- architecture.gmk: added variables for commands: echo, cat, cut, sed;
     36  to be eventually overloaded in system dependent configurations.
     37- WIN32-VC.gmk: overload commands [echo, grep, cat, cut, sed], to force
     38  usage of the original CygWin built-in commands.
     39
     4021st September 2006  Vladimir Ivantchenko (config-V08-01-02)
     41- binmake.gmk: added electromagnetic/polarisation module.
     42
     4318th August 2006  Gabriele Cosmo (config-V08-01-01)
     44- Linux-icc: corrected G4RUNPATHOPTION flag to allow linking of applications
     45  with shared libraries.
     46
     4718th August 2006  Gabriele Cosmo (config-V08-01-00)
     48- Linux-icc: updated setup to support icc-9.X series.
    1849
    195013th June 2006  Gabriele Cosmo (config-V08-00-02)

  • trunk/geant4/config/architecture.gmk

    r472 r483  
    1 # $Id: architecture.gmk,v 1.105 2006/06/13 15:36:30 gcosmo Exp $
     1# $Id: architecture.gmk,v 1.107 2006/10/31 11:35:43 gunter Exp $
    22# ------------------------------------------------------------------------
    33#       GEANT 4 - Architecture configuration script for GNU Make
    … …  
    111111  G4LIB_BUILD_ZLIB = 1
    112112  G4LIB_USE_ZLIB = 1
     113endif
     114
     115# Allow to disable building of physics_lists module. Default is to build these
     116#
     117ifneq ($(G4LIB_BUILD_LISTS),NO)
     118  G4LIB_BUILD_LISTS = 1
    113119endif
    114120
    … …  
    268274AR := ar r
    269275
    270 # Default echo used with makedepend. Changed for SUN-CC, Linux-g++.
     276# Default echo used with makedepend. Changed for SUN-CC, Linux-g++, WIN32.
    271277#
    272278ECHO:= echo
    273279
    274 # Default grep used with source/GNUmakfile.  Changed for SUN-CC.
     280# Default grep used with source/GNUmakefile.  Changed for SUN-CC.
    275281#
    276282GREP := grep
     283
     284# Default cut used with source/GNUmakefile.  Changed for WIN32.
     285#
     286CUT := cut
     287
     288# Default cat used with source/GNUmakefile.  Changed for WIN32.
     289#
     290CAT := cat
     291
     292# Default sed used with source/GNUmakefile.  Changed for WIN32.
     293#
     294SED := sed
    277295
    278296# Include architecture dependent setups...

  • trunk/geant4/config/binmake.gmk

    r472 r483  
    1 # $Id: binmake.gmk,v 1.112 2006/04/24 10:54:18 gcosmo Exp $
     1# $Id: binmake.gmk,v 1.116 2006/11/08 16:52:19 gunter Exp $
    22# ----------------------------------------------------------
    33# Script defining rules and paths for making binaries.
    … …  
    6161              -I$(G4BASE)/particles/hadrons/mesons/include \
    6262              -I$(G4BASE)/particles/shortlived/include \
     63              -I$(G4BASE)/physics_lists/lists/include \
     64              -I$(G4BASE)/physics_lists/builders/include \
    6365              -I$(G4BASE)/processes/management/include \
    6466              -I$(G4BASE)/processes/cuts/include \
     67              -I$(G4BASE)/processes/scoring/include \
    6568              -I$(G4BASE)/processes/decay/include \
    6669              -I$(G4BASE)/processes/optical/include \
    … …  
    7376              -I$(G4BASE)/processes/electromagnetic/lowenergy/include \
    7477              -I$(G4BASE)/processes/electromagnetic/highenergy/include \
     78              -I$(G4BASE)/processes/electromagnetic/polarisation/include \
    7579              -I$(G4BASE)/processes/hadronic/cross_sections/include \
    7680              -I$(G4BASE)/processes/hadronic/management/include \
    … …  
    203207  endif
    204208
    205   LDLIBS2 += -lG4readout \
    206              -lG4run \
     209  LDLIBS2 += -lG4readout
     210
     211  ifeq ($(G4LIB_BUILD_LISTS),1)
     212    LDLIBS2 += -lG4physicslists
     213  endif
     214   
     215  LDLIBS2 += -lG4run \
    207216             -lG4event \
    208217             -lG4tracking \

  • trunk/geant4/config/liblist.c

    r472 r483  
    1 /* $Id: liblist.c,v 1.17 2002/11/22 11:53:10 gcosmo Exp $ */
     1/* $Id: liblist.c,v 1.18 2006/10/05 14:22:06 gcosmo Exp $ */
    22
    33/*
    … …  
    550550            printf("-l%s ",libmapPtr->lib);
    551551          }
     552          else  /* case MacOS .dylib */
     553          {
     554            sprintf(libname, "%s/lib%s.dylib", libpath, libmapPtr->lib);
     555            if (!access(libname,R_OK))
     556            {
     557              printf("-l%s ",libmapPtr->lib);
     558            }
     559          }
    552560        }
    553561        else

  • trunk/geant4/config/scripts/env.csh.SH

    r472 r483  
    2525######################################
    2626#
     27# Clean all G4 envs
     28unsetenv  CLHEP_BASE_DIR
     29unsetenv  CLHEP_INCLUDE_DIR
     30unsetenv  CLHEP_LIB
     31unsetenv  CLHEP_LIB_DIR
     32
     33unsetenv  G4ANALYSIS_USE
     34unsetenv  G4DEBUG
     35unsetenv  G4INCLUDE
     36unsetenv  G4INSTALL
     37
     38unsetenv  G4LEDATA
     39unsetenv  G4LEVELGAMMADATA
     40unsetenv  NeutronHPCrossSections
     41unsetenv  G4RADIOACTIVEDATA
     42
     43unsetenv  G4LIB
     44unsetenv  G4LIB_BUILD_G3TOG4
     45unsetenv  G4LIB_BUILD_SHARED
     46unsetenv  G4LIB_BUILD_STATIC
     47unsetenv  G4LIB_BUILD_ZLIB
     48unsetenv  G4LIB_USE_G3TOG4
     49unsetenv  G4LIB_USE_GRANULAR
     50unsetenv  G4LIB_USE_ZLIB
     51
     52unsetenv  G4SYSTEM
     53
     54unsetenv  G4UI_BUILD_WIN32_SESSION
     55unsetenv  G4UI_BUILD_XAW_SESSION
     56unsetenv  G4UI_BUILD_XM_SESSION
     57unsetenv  G4UI_USE_TCSH
     58unsetenv  G4UI_USE_WIN32
     59unsetenv  G4UI_USE_XAW
     60unsetenv  G4UI_USE_XM
     61
     62unsetenv  G4VIS_BUILD_DAWN_DRIVER
     63unsetenv  G4VIS_BUILD_OIWIN32_DRIVER
     64unsetenv  G4VIS_BUILD_OIX_DRIVER
     65unsetenv  G4VIS_BUILD_OPENGLWIN32_DRIVER
     66unsetenv  G4VIS_BUILD_OPENGLXM_DRIVER
     67unsetenv  G4VIS_BUILD_OPENGLX_DRIVER
     68unsetenv  G4VIS_BUILD_RAYTRACERX_DRIVER
     69unsetenv  G4VIS_BUILD_VRML_DRIVER
     70
     71unsetenv  G4VIS_USE_DAWN
     72unsetenv  G4VIS_USE_OIWIN32
     73unsetenv  G4VIS_USE_OIX
     74unsetenv  G4VIS_USE_OPENGLWIN32
     75unsetenv  G4VIS_USE_OPENGLX
     76unsetenv  G4VIS_USE_OPENGLXM
     77unsetenv  G4VIS_USE_RAYTRACERX
     78unsetenv  G4VIS_USE_VRML
     79
     80######################################
     81#
    2782# g4system.U
    2883#
    … …  
    91146
    92147#+
    93 if ( X$g4elasticdata != X ) then
    94 setenv G4ELASTICDATA "$g4elasticdata"
    95 echo "On this machine the G4ELASTICDATA=\$G4ELASTICDATA"
    96 endif
     148#if ( X$g4elasticdata != X ) then
     149#setenv G4ELASTICDATA "$g4elasticdata"
     150#echo "On this machine the G4ELASTICDATA=\$G4ELASTICDATA"
     151#endif
    97152
    98153#
    … …  
    126181# g4debug
    127182#
    128 if ( X$g4debug != X ) then
    129 setenv G4DEBUG "$g4debug"
     183if ( X$g4debug == Xy ) then
     184setenv G4DEBUG 1
    130185echo "On this machine the G4DEBUG=\$G4DEBUG"
    131186endif
    … …  
    417472#
    418473if ( ${?G4LIB_BUILD_SHARED} ) then
     474
     475#
     476# Warning about LD_LIBRARY_PATH
     477#
     478echo ''
     479echo 'LD_LIBRARY_PATH is set to include CLHEP and Geant4 libraries. '
     480echo ''
     481echo 'NOTE : verify that the correct path for the CLHEP library'
     482echo '- $CLHEP_BASE_DIR/lib - is included in the $LD_LIBRARY_PATH'
     483echo 'variable in your environment, and no other outdated installations'
     484echo 'of CLHEP are by chance referenced through $LD_LIBRARY_PATH and'
     485echo 'present in your system !'
     486echo ''
     487
    419488if ( ${?LD_LIBRARY_PATH} )  then
    420489setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
     490setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
    421491else
    422492setenv LD_LIBRARY_PATH ${G4LIB}/${G4SYSTEM}
    423 endif
     493setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
     494endif
     495endif
     496
     497#
     498# Shared libraries for Mac
     499#
     500if ( "X$G4SYSTEM" == "XDarwin-g++" ) then
     501
     502if ( ${?G4LIB_BUILD_SHARED} ) then
     503if ( ${?DYLD_LIBRARY_PATH} )  then
     504setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
     505setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
     506else
     507setenv DYLD_LIBRARY_PATH ${G4LIB}/${G4SYSTEM}
     508setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
     509endif
     510endif
     511
    424512endif
    425513

  • trunk/geant4/config/scripts/env.sh.SH

    r472 r483  
    2525######################################
    2626#
     27# Clean all G4 envs
     28unset  CLHEP_BASE_DIR
     29unset  CLHEP_INCLUDE_DIR
     30unset  CLHEP_LIB
     31unset  CLHEP_LIB_DIR
     32
     33unset  G4ANALYSIS_USE
     34unset  G4DEBUG
     35unset  G4INCLUDE
     36unset  G4INSTALL
     37
     38unset  G4LEDATA
     39unset  G4LEVELGAMMADATA
     40unset  NeutronHPCrossSections
     41unset  G4RADIOACTIVEDATA
     42
     43unset  G4LIB
     44unset  G4LIB_BUILD_G3TOG4
     45unset  G4LIB_BUILD_SHARED
     46unset  G4LIB_BUILD_STATIC
     47unset  G4LIB_BUILD_ZLIB
     48unset  G4LIB_USE_G3TOG4
     49unset  G4LIB_USE_GRANULAR
     50unset  G4LIB_USE_ZLIB
     51
     52unset  G4SYSTEM
     53
     54unset  G4UI_BUILD_WIN32_SESSION
     55unset  G4UI_BUILD_XAW_SESSION
     56unset  G4UI_BUILD_XM_SESSION
     57unset  G4UI_USE_TCSH
     58unset  G4UI_USE_WIN32
     59unset  G4UI_USE_XAW
     60unset  G4UI_USE_XM
     61
     62unset  G4VIS_BUILD_DAWN_DRIVER
     63unset  G4VIS_BUILD_OIWIN32_DRIVER
     64unset  G4VIS_BUILD_OIX_DRIVER
     65unset  G4VIS_BUILD_OPENGLWIN32_DRIVER
     66unset  G4VIS_BUILD_OPENGLXM_DRIVER
     67unset  G4VIS_BUILD_OPENGLX_DRIVER
     68unset  G4VIS_BUILD_RAYTRACERX_DRIVER
     69unset  G4VIS_BUILD_VRML_DRIVER
     70
     71unset  G4VIS_USE_DAWN
     72unset  G4VIS_USE_OIWIN32
     73unset  G4VIS_USE_OIX
     74unset  G4VIS_USE_OPENGLWIN32
     75unset  G4VIS_USE_OPENGLX
     76unset  G4VIS_USE_OPENGLXM
     77unset  G4VIS_USE_RAYTRACERX
     78unset  G4VIS_USE_VRML
     79
     80
     81#
    2782# g4system.U
    2883#
    … …  
    117172
    118173#+
    119 if [ X$g4elasticdata != X ] ; then
    120 G4ELASTICDATA="$g4elasticdata"
    121 export G4ELASTICDATA
    122 if [ X\$g4non_display = X ] ; then
    123 echo "On this machine the G4ELASTICDATA=\$G4ELASTICDATA"
    124 fi
    125 fi
     174#if [ X$g4elasticdata != X ] ; then
     175#G4ELASTICDATA="$g4elasticdata"
     176#export G4ELASTICDATA
     177#if [ X\$g4non_display = X ] ; then
     178#echo "On this machine the G4ELASTICDATA=\$G4ELASTICDATA"
     179#fi
     180#fi
    126181
    127182#
    … …  
    167222# g4debug
    168223#
    169 if [ X$g4debug != X ] ; then
    170 G4DEBUG="$g4debug"
     224if [ X$g4debug = Xy ] ; then
     225G4DEBUG=1
    171226export G4DEBUG
    172227if [ X\$g4non_display = X ] ; then
    … …  
    490545G4LIB_BUILD_ZLIB=1
    491546export G4LIB_BUILD_ZLIB
     547if [ X\$g4non_display = X ] ; then
    492548echo "On this machine the G4LIB_BUILD_ZLIB=\$G4LIB_BUILD_ZLIB"
     549fi
    493550fi
    494551
    … …  
    496553G4LIB_USE_ZLIB=1
    497554export G4LIB_USE_ZLIB
     555if [ X\$g4non_display = X ] ; then
    498556echo "On this machine the G4LIB_USE_ZLIB=\$G4LIB_USE_ZLIB"
     557fi
    499558fi
    500559
    … …  
    561620if [ X$g4non_display = X ] ; then
    562621echo "In your environment you have the G4WORKDIR=$G4WORKDIR"
    563 fi # if non_display
     622fi
    564623
    565624else
    566 
    567 if [ X$g4non_display = X ] ; then
    568625
    569626# Check for Windows!
    570627if test "X$G4SYSTEM" = "XWIN32-VC" -o "X$G4SYSTEM" = "XWIN32-VC7"; then
    571628
     629if [ X$g4non_display = X ] ; then
    572630echo "G4WORKDIR will be set to c:/geant4 (in "native" Windows syntax)"
     631fi
     632
    573633G4WORKDIR="c:/geant4"
    574634export G4WORKDIR
    … …  
    576636else # if Unix
    577637
     638if [ X$g4non_display = X ] ; then
    578639echo "G4WORKDIR will be set to HOME/geant4=$HOME/geant4"
    579 export G4WORKDIR=$HOME/geant4
     640fi
     641
     642G4WORKDIR=$HOME/geant4
     643export G4WORKDIR
    580644
    581645fi # if platforms
    … …  
    583647fi
    584648
    585 fi
     649
     650
    586651
    587652#
    … …  
    589654#
    590655if [ $G4LIB_BUILD_SHARED ] ; then
     656#
     657# Warning about LD_LIBRARY_PATH
     658#
     659if [ X$g4non_display = X ] ; then
     660echo ''
     661echo 'LD_LIBRARY_PATH is set to include CLHEP and Geant4 libraries. '
     662echo ''
     663echo 'NOTE : verify that the correct path for the CLHEP library'
     664echo '- $CLHEP_BASE_DIR/lib - is included in the $LD_LIBRARY_PATH'
     665echo 'variable in your environment, and no other outdated installations'
     666echo 'of CLHEP are by chance referenced through $LD_LIBRARY_PATH and'
     667echo 'present in your system !'
     668echo ''
     669fi
     670
    591671if [ $LD_LIBRARY_PATH ] ; then
    592672LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
     673LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
    593674export LD_LIBRARY_PATH
    594675else
    595676LD_LIBRARY_PATH=${G4LIB}/${G4SYSTEM}
     677LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
    596678export LD_LIBRARY_PATH
    597679fi
     680fi
     681
     682#
     683# Shared libraries for Mac
     684#
     685if test "X$G4SYSTEM" = "XDarwin-g++" ; then
     686
     687if [ $G4LIB_BUILD_SHARED ] ; then
     688if [ $DYLD_LIBRARY_PATH ] ; then
     689DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
     690DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
     691export DYLD_LIBRARY_PATH
     692else
     693DYLD_LIBRARY_PATH=${G4LIB}/${G4SYSTEM}
     694DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
     695export DYLD_LIBRARY_PATH
     696fi
     697fi
     698
    598699fi
    599700

  • trunk/geant4/config/scripts/install.sh.SH

    r472 r483  
    2525######################################
    2626#
     27# Clean all G4 envs
     28unset  CLHEP_BASE_DIR
     29unset  CLHEP_INCLUDE_DIR
     30unset  CLHEP_LIB
     31unset  CLHEP_LIB_DIR
     32
     33unset  G4ANALYSIS_USE
     34unset  G4DEBUG
     35unset  G4INCLUDE
     36unset  G4INSTALL
     37
     38unset  G4LEDATA
     39unset  G4LEVELGAMMADATA
     40unset  NeutronHPCrossSections
     41unset  G4RADIOACTIVEDATA
     42
     43unset  G4LIB
     44unset  G4LIB_BUILD_G3TOG4
     45unset  G4LIB_BUILD_SHARED
     46unset  G4LIB_BUILD_STATIC
     47unset  G4LIB_BUILD_ZLIB
     48unset  G4LIB_USE_G3TOG4
     49unset  G4LIB_USE_GRANULAR
     50unset  G4LIB_USE_ZLIB
     51
     52unset  G4SYSTEM
     53
     54unset  G4UI_BUILD_WIN32_SESSION
     55unset  G4UI_BUILD_XAW_SESSION
     56unset  G4UI_BUILD_XM_SESSION
     57unset  G4UI_USE_TCSH
     58unset  G4UI_USE_WIN32
     59unset  G4UI_USE_XAW
     60unset  G4UI_USE_XM
     61
     62unset  G4VIS_BUILD_DAWN_DRIVER
     63unset  G4VIS_BUILD_OIWIN32_DRIVER
     64unset  G4VIS_BUILD_OIX_DRIVER
     65unset  G4VIS_BUILD_OPENGLWIN32_DRIVER
     66unset  G4VIS_BUILD_OPENGLXM_DRIVER
     67unset  G4VIS_BUILD_OPENGLX_DRIVER
     68unset  G4VIS_BUILD_RAYTRACERX_DRIVER
     69unset  G4VIS_BUILD_VRML_DRIVER
     70
     71unset  G4VIS_USE_DAWN
     72unset  G4VIS_USE_OIWIN32
     73unset  G4VIS_USE_OIX
     74unset  G4VIS_USE_OPENGLWIN32
     75unset  G4VIS_USE_OPENGLX
     76unset  G4VIS_USE_OPENGLXM
     77unset  G4VIS_USE_RAYTRACERX
     78unset  G4VIS_USE_VRML
     79
     80######################################
     81#
    2782# g4system.U
    2883#
    … …  
    96151
    97152#+
    98 if [ X$g4elasticdata != X ] ; then
    99 G4ELASTICDATA="$g4elasticdata"
    100 export G4ELASTICDATA
    101 echo "On this machine the G4ELASTICDATA=\$g4elasticdata"
    102 fi
     153#if [ X$g4elasticdata != X ] ; then
     154#G4ELASTICDATA="$g4elasticdata"
     155#export G4ELASTICDATA
     156#echo "On this machine the G4ELASTICDATA=\$g4elasticdata"
     157#fi
    103158
    104159#
    … …  
    142197# g4debug
    143198#
    144 if [ X$g4debug != X ] ; then
    145 G4DEBUG="$g4debug"
     199if [ X$g4debug = Xy ] ; then
     200G4DEBUG=1
    146201export G4DEBUG
    147202echo "On this machine the G4DEBUG=\$G4DEBUG"

  • trunk/geant4/config/scripts/move.sh.SH

    r472 r483  
    9696
    9797#+
    98 if [ X$g4elasticdata != X ] ; then
    99 G4ELASTICDATA="$g4elasticdata"
    100 export G4ELASTICDATA
    101 echo "On this machine the G4ELASTICDATA=\$G4ELASTICDATA"
    102 fi
     98#if [ X$g4elasticdata != X ] ; then
     99#G4ELASTICDATA="$g4elasticdata"
     100#export G4ELASTICDATA
     101#echo "On this machine the G4ELASTICDATA=\$G4ELASTICDATA"
     102#fi
    103103
    104104#
    … …  
    136136# g4debug
    137137#
    138 if [ X$g4debug != X ] ; then
    139 G4DEBUG="$g4debug"
     138if [ X$g4debug = Xy ] ; then
     139G4DEBUG=1
    140140export G4DEBUG
    141141echo "On this machine the G4DEBUG=\$G4DEBUG"

  • trunk/geant4/config/sys/Darwin-g++.gmk

    r472 r483  
    3232  LDFLAGS += -bind_at_load
    3333  FCLIBS := -lg2c -lnsl
    34   ECHO    := /bin/echo -n
    3534  SHEXT   := dylib
    3635  ifndef X11FLAGS

  • trunk/geant4/config/sys/Linux-icc.gmk

    r472 r483  
    11#
    2 # ------ GNU/LINUX ------     !!! not supported !!!
    3 #                                 Intel icc 8.0
     2# ------ GNU/LINUX ------         Intel icc 9.1
     3#
    44ifeq ($(G4SYSTEM),Linux-icc)
    55  CXX       := icc
    66  CXXFLAGS  := -ansi -mp -no-gcc -w1
    77  ifdef G4OPTIMISE
    8     CXXFLAGS  += -O
    9     FCFLAGS   := -O
    10     CCFLAGS   := -O
     8    CXXFLAGS  += -O2
     9    FCFLAGS   := -O2
     10    CCFLAGS   := -O2
    1111  else
    1212    ifdef G4DEBUG
    … …  
    2626    CCFLAGS   += -fPIC
    2727  endif
    28   G4RUNPATHOPTION := -Xlinker -rpath
     28  G4RUNPATHOPTION := -Wl,-rpath -Wl,
    2929  CC := gcc
    3030  FC := g77
    3131  FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
    3232  FCLIBS := -lg2c -lnsl
    33   AR := xiar r
     33  AR := ar r
    3434  ECHO    := /bin/echo -e
    3535  SHEXT   := so
    … …  
    5353  endif
    5454  DLDLIBS   := -ldl
     55  LOADLIBS  += -lcxa -lunwind
    5556  ifndef OGLFLAGS
    5657    OGLFLAGS  := -I$(OGLHOME)/include

  • trunk/geant4/config/sys/WIN32-VC.gmk

    r472 r483  
    11#
    2 # ------ WIN32/VC ------    Visual-C++ 7 .NET
     2# ------ WIN32/VC ------    Visual-C++ 7 .NET and higher
    33#
    44ifeq ($(G4SYSTEM),WIN32-VC)
    … …  
    1818  SHEXT := dll
    1919  AR := LIB
    20   ECHO := echo -e
     20  ECHO := /usr/bin/echo -e
     21  GREP := /usr/bin/grep
     22  SED  := /usr/bin/sed
     23  CAT  := /usr/bin/cat
     24  CUT  := /usr/bin/cut
     25
    2126  FC := g77
    2227#  FCLIBS := -lf2c
    … …  
    5863    @libdir=`(cd $(@D);/bin/pwd)`;\
    5964    cd $(G4TMP)/$(G4SYSTEM);\
    60     echo "Building $(name).dumpbin file ...";\
     65    $(ECHO) "Building $(name).dumpbin file ...";\
    6166    $(RM) $(name).dumpbin;\
    6267    dumpbin /symbols $(G4LIBDIR)/lib$(name).a > $(name).dumpbin;\
    63     echo "Building $(name).def file ...";\
     68    $(ECHO) "Building $(name).def file ...";\
    6469    $(RM) $(name).def;\
    6570    $(G4LIB)/$(G4SYSTEM)/win32def.exe $(name) < $(name).dumpbin > $(name).def;\
    6671    $(RM) $(name).dumpbin;\
    67     echo "Building lib$(name).exp and lib$(name).lib file ...";\
     72    $(ECHO) "Building lib$(name).exp and lib$(name).lib file ...";\
    6873    $(RM) $(G4LIBDIR)/lib$(name).exp;\
    6974    $(RM) $(G4LIBDIR)/lib$(name).lib;\
    … …  
    7176            /out:$(G4LIBDIR)/lib$(name).lib;\
    7277    $(RM) $(G4LIBDIR)/$(name).dll;\
    73     echo "Building $(name).dll file ...";\
     78    $(ECHO) "Building $(name).dll file ...";\
    7479    link.exe /nologo /dll /out:$(G4LIBDIR)/$(name).dll \
    7580             $(G4LIBDIR)/lib$(name).exp $(G4LIBDIR)/lib$(name).a \
    … …  
    8186    @libdir=`(cd $(@D);/bin/pwd)`;\
    8287    cd $(G4TMP)/$(G4SYSTEM);\
    83     echo "Building $(name).dumpbin file ...";\
     88    $(ECHO) "Building $(name).dumpbin file ...";\
    8489    $(RM) $(name).dumpbin;\
    8590    dumpbin /symbols $(G4LIBDIR)/lib$(name).a > $(name).dumpbin;\
    86     echo "Building $(name).def file ...";\
     91    $(ECHO) "Building $(name).def file ...";\
    8792    $(RM) $(name).def;\
    8893    $(G4LIB)/$(G4SYSTEM)/win32def.exe $(name) < $(name).dumpbin > $(name).def;\
    8994    $(RM) $(name).dumpbin;\
    90     echo "Building lib$(name).exp and lib$(name).lib ...";\
     95    $(ECHO) "Building lib$(name).exp and lib$(name).lib ...";\
    9196    $(RM) $(G4LIBDIR)/lib$(name).exp;\
    9297    $(RM) $(G4LIBDIR)/lib$(name).lib;\
    … …  
    9499            /out:$(G4LIBDIR)/lib$(name).lib;\
    95100    $(RM) $(G4LIBDIR)/$(name).dll;\
    96     echo "Building $(name).dll ...";\
     101    $(ECHO) "Building $(name).dll ...";\
    97102    link.exe /nologo /dll /out:$(G4LIBDIR)/$(name).dll \
    98103             $(G4LIBDIR)/lib$(name).exp $(G4LIBDIR)/lib$(name).a \

  • trunk/geant4/config/sys/WIN32-g++.gmk

    r472 r483  
    11#
    2 # ------ GNU/WIN32 CYGNUS ------   !!! not supported !!!
     2# ------ GNU/WIN32 CYGWIN ------   !!! not supported !!!
    33#                             Cygnus CygWin - gcc-3.2 and higher
    4 #                                     Windows 2000/XP
     4#                                       Windows XP
    55#
    66# Stefano Agostinelli (agos001@pn.itnet.it) - IST Group, Genova
    … …  
    2626    CCFLAGS   += -fPIC
    2727  endif
     28
    2829  G4RUNPATHOPTION := -Wl,-rpath
     30  SHEXT   := so
     31  ECHO    := echo -e
     32  GREP := /usr/bin/grep
     33  SED  := /usr/bin/sed
     34  CAT  := /usr/bin/cat
     35  CUT  := /usr/bin/cut
     36
    2937  FC := g77
    3038  FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
    3139  FCLIBS := -lg2c -lnsl
    32   ECHO    := echo -e
    33   SHEXT   := so
    3440  ifndef X11FLAGS
    3541    X11FLAGS  := -I/usr/include/X11/extensions -I/usr/include/X11

  • trunk/geant4/interfaces/GAG/include/G4UIGAG.hh

    r476 r483  
    2626//
    2727// $Id: G4UIGAG.hh,v 1.7 2006/06/29 19:09:18 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030// G4UIGAG.hh

  • trunk/geant4/interfaces/GAG/include/G4UIGainServer.hh

    r476 r483  
    2626//
    2727// $Id: G4UIGainServer.hh,v 1.5 2006/06/29 19:09:21 gunter Exp $
    28 // $Name: geant4-08-01 $
     28// $Name: geant4-08-01-patch-01 $
    2929//
    3030

  • trunk/geant4/interfaces/GAG/src/G4UIGAG.cc

    r476 r483  
    2626//
    2727// $Id: G4UIGAG.cc,v 1.18 2006/06/29 19:09:23 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030// G4UIGAG.cc

  • trunk/geant4/interfaces/GAG/src/G4UIGainServer.cc

    r476 r483  
    2727// 12/06/2002 G4UIGainServer H. MInamimoto and H. Yoshida created
    2828// $Id: G4UIGainServer.cc,v 1.10 2006/06/29 19:09:25 gunter Exp $
    29 // $Name: geant4-08-01 $
     29// $Name: geant4-08-01-patch-01 $
    3030//
    3131#ifndef WIN32

  • trunk/geant4/interfaces/basic/include/G4UIArrayString.hh

    r476 r483  
    2626//
    2727// $Id: G4UIArrayString.hh,v 1.3 2006/06/29 19:09:27 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030

  • trunk/geant4/interfaces/basic/include/G4UIWin32.hh

    r476 r483  
    2626//
    2727// $Id: G4UIWin32.hh,v 1.14 2006/06/29 19:09:29 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030#ifndef G4UIWin32_h

  • trunk/geant4/interfaces/basic/include/G4UIXaw.hh

    r476 r483  
    2626//
    2727// $Id: G4UIXaw.hh,v 1.6 2006/06/29 19:09:31 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030#ifndef G4UIXaw_h

  • trunk/geant4/interfaces/basic/include/G4UIXm.hh

    r476 r483  
    2626//
    2727// $Id: G4UIXm.hh,v 1.13 2006/06/29 19:09:33 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030#ifndef G4UIXm_h

  • trunk/geant4/interfaces/basic/include/G4UIcsh.hh

    r476 r483  
    2626//
    2727// $Id: G4UIcsh.hh,v 1.4 2006/06/29 19:09:35 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030

  • trunk/geant4/interfaces/basic/include/G4UItcsh.hh

    r476 r483  
    2626//
    2727// $Id: G4UItcsh.hh,v 1.7 2006/06/29 19:09:37 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030

  • trunk/geant4/interfaces/basic/include/G4UIterminal.hh

    r476 r483  
    2626//
    2727// $Id: G4UIterminal.hh,v 1.9 2006/06/29 19:09:39 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030

  • trunk/geant4/interfaces/basic/include/G4VUIshell.hh

    r476 r483  
    2626//
    2727// $Id: G4VUIshell.hh,v 1.6 2006/06/29 19:09:41 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030

  • trunk/geant4/interfaces/basic/src/G4UIArrayString.cc

    r476 r483  
    2626//
    2727// $Id: G4UIArrayString.cc,v 1.8 2006/06/29 19:09:43 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030

  • trunk/geant4/interfaces/basic/src/G4UIWin32.cc

    r476 r483  
    2626//
    2727// $Id: G4UIWin32.cc,v 1.13 2006/06/29 19:09:45 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030// G.Barrand

  • trunk/geant4/interfaces/basic/src/G4UIXaw.cc

    r476 r483  
    2626//
    2727// $Id: G4UIXaw.cc,v 1.6 2006/06/29 19:09:47 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030// G.Barrand

  • trunk/geant4/interfaces/basic/src/G4UIXm.cc

    r476 r483  
    2626//
    2727// $Id: G4UIXm.cc,v 1.14 2006/06/29 19:09:49 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030// G.Barrand

  • trunk/geant4/interfaces/basic/src/G4UIcsh.cc

    r476 r483  
    2626//
    2727// $Id: G4UIcsh.cc,v 1.8 2006/06/29 19:09:51 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030

  • trunk/geant4/interfaces/basic/src/G4UItcsh.cc

    r476 r483  
    2626//
    2727// $Id: G4UItcsh.cc,v 1.12 2006/06/29 19:09:54 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030

  • trunk/geant4/interfaces/basic/src/G4UIterminal.cc

    r476 r483  
    2626//
    2727// $Id: G4UIterminal.cc,v 1.21 2006/06/29 19:09:56 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030

  • trunk/geant4/interfaces/basic/src/G4VUIshell.cc

    r476 r483  
    2626//
    2727// $Id: G4VUIshell.cc,v 1.9 2006/06/29 19:09:59 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030

  • trunk/geant4/interfaces/common/include/G4VBasicShell.hh

    r476 r483  
    2626//
    2727// $Id: G4VBasicShell.hh,v 1.7 2006/06/29 19:10:03 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030

  • trunk/geant4/interfaces/common/include/G4VInteractorManager.hh

    r476 r483  
    2626//
    2727// $Id: G4VInteractorManager.hh,v 1.9 2006/06/29 19:10:08 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030// G.Barrand

  • trunk/geant4/interfaces/common/include/G4Win32.hh

    r476 r483  
    2626//
    2727// $Id: G4Win32.hh,v 1.8 2006/06/29 19:10:11 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030//  To unify Windows message treatment between

  • trunk/geant4/interfaces/common/include/G4Xt.hh

    r476 r483  
    2626//
    2727// $Id: G4Xt.hh,v 1.6 2006/06/29 19:10:14 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030//  To unify X11 event treatment between

  • trunk/geant4/interfaces/common/src/G4VBasicShell.cc

    r476 r483  
    2626//
    2727// $Id: G4VBasicShell.cc,v 1.12 2006/06/29 19:10:20 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030

  • trunk/geant4/interfaces/common/src/G4VInteractorManager.cc

    r476 r483  
    2626//
    2727// $Id: G4VInteractorManager.cc,v 1.13 2006/06/29 19:10:24 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030// G.Barrand

  • trunk/geant4/interfaces/common/src/G4Win32.cc

    r476 r483  
    2626//
    2727// $Id: G4Win32.cc,v 1.9 2006/06/29 19:10:26 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030// G.Barrand

  • trunk/geant4/interfaces/common/src/G4Xt.cc

    r476 r483  
    2626//
    2727// $Id: G4Xt.cc,v 1.11 2006/06/29 19:10:28 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01 $
     28// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030// G.Barrand

  • trunk/geant4/specific.sh

    r475 r483  
    1212  export G4DEBUG=1
    1313  export CPPVERBOSE=1
     14  export G4LIB_USE_GRANULAR=1
     15#  unset G4LIB_USE_GRANULAR
    1416  # Shareable library
    1517  export G4LIB_BUILD_SHARED=1
    1618  #FIXME export G4LIB_BUILD_SHARED 1
    1719  export DYLD_LIBRARY_PATH=$G4LIB/$G4SYSTEM
    18   export CLHEP_BASE_DIR=/usr/local/clhep/2.0.3.1/
     20  export CLHEP_BASE_DIR=/sw/
    1921  export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
    2022  # data :
Note: See TracChangeset for help on using the changeset viewer.