From ca1c8cb059e5777bc01b1f5d9c7767166e71a260 Mon Sep 17 00:00:00 2001 From: Gabriele Cosmo Date: Wed, 8 Jun 2016 15:28:20 +0200 Subject: [PATCH] Import Geant4 1.0.0 source tree --- ReleaseNotes/ReleaseNotes4.1.0.txt | 357 + config/G4ODBMS_BUILD.gmk | 3 +- config/History | 168 +- config/architecture.gmk | 745 +- config/binmake.gmk | 96 +- config/common.gmk | 100 +- config/globlib.gmk | 24 +- config/interactivity.gmk | 17 +- config/liblist.c | 100 +- config/makeshlib.sh | 18 +- environments/History | 6 +- environments/OPACS/History | 6 +- environments/OPACS/app/EXPO.cc | 20 +- environments/OPACS/app/TEST.cc | 6 +- environments/OPACS/include/EXPO_Detector.icc | 6 +- .../OPACS/include/EXPO_PhysicsList.hh | 6 +- .../OPACS/include/EXPO_PhysicsList.icc | 6 +- environments/OPACS/include/EXPO_Primary.icc | 6 +- environments/OPACS/include/EXPO_Templates.hh | 144 +- environments/OPACS/include/G4o.h | 6 +- environments/OPACS/include/G4oCommon.hh | 6 +- environments/OPACS/include/G4oCommon.icc | 6 +- environments/OPACS/include/G4oDrawer.hh | 6 +- environments/OPACS/include/G4oEXPO.h | 6 +- environments/OPACS/include/G4oScene.hh | 6 +- environments/OPACS/include/G4oState.hh | 13 +- environments/OPACS/include/WoG4o.h | 6 +- environments/OPACS/mgr/Makefile | 10 +- environments/OPACS/mgr/setup.csh | 22 +- environments/OPACS/src/G4o.cc | 10 +- environments/OPACS/src/G4oDrawer.cc | 10 +- environments/OPACS/src/G4oScene.cc | 10 +- environments/OPACS/src/G4oState.cc | 51 +- examples/History | 74 +- examples/extended/E01/GNUmakefile | 35 - examples/extended/E01/History | 46 - examples/extended/E01/README | 47 - examples/extended/E01/exampleE01.cc | 31 - examples/extended/E01/exampleE01.out | 175 - .../E01/include/ExE01DetectorConstruction.hh | 34 - .../extended/E01/include/ExE01PhysicsList.hh | 37 - .../include/ExE01PrimaryGeneratorAction.hh | 25 - .../extended/E01/include/ExE01RunAction.hh | 33 - .../E01/include/ExE01SteppingAction.hh | 24 - .../E01/src/ExE01DetectorConstruction.cc | 102 - examples/extended/E01/src/ExE01PhysicsList.cc | 130 - .../E01/src/ExE01PrimaryGeneratorAction.cc | 36 - examples/extended/E01/src/ExE01RunAction.cc | 49 - .../extended/E01/src/ExE01SteppingAction.cc | 22 - examples/extended/E02/GNUmakefile | 53 - examples/extended/E02/README | 151 - examples/extended/E02/exampleE02.cc | 64 - examples/extended/E02/exampleE02.in | 18 - examples/extended/E02/exampleE02.out | 112 - examples/extended/E02/exampleE02run | 43 - .../E02/include/ExE02DetectorConstruction.hh | 20 - .../include/ExE02PrimaryGeneratorAction.hh | 25 - .../extended/E02/include/ExE02TrackerHit.hh | 60 - .../extended/E02/include/ExE02TrackerSD.hh | 30 - examples/extended/E02/src/ExE02EventAction.cc | 53 - examples/extended/E02/src/ExE02TrackerHit.cc | 38 - examples/extended/E03/GNUmakefile | 17 - examples/extended/E03/History | 35 - examples/extended/E03/README | 19 - examples/extended/E03/exampleE03.cc | 52 - examples/extended/E03/exampleE03.err | 2 - examples/extended/E03/exampleE03.in | 15 - examples/extended/E03/exampleE03.out | 2098 - .../E03/include/ExE03DetectorConstruction.hh | 42 - .../include/ExE03PrimaryGeneratorAction.hh | 25 - .../extended/E03/include/ExE03RunAction.hh | 33 - .../E03/src/ExE03DetectorConstruction.cc | 112 - .../E03/src/ExE03PrimaryGeneratorAction.cc | 40 - examples/extended/E03/src/ExE03RunAction.cc | 34 - examples/extended/E03/stepfiles/CMS2.step | 183517 --------------- .../extended/E03/stepfiles/CMSTracker.step | 81896 ------- .../E03/stepfiles/G4rod_place_asm.stp | 980 - .../extended/E03/stepfiles/G4rod_solid.stp | 2055 - examples/extended/E03/stepfiles/correct.pl | 41 - .../electromagnetic/TestEm1/GNUmakefile | 22 + .../extended/electromagnetic/TestEm1/History | 43 + .../extended/electromagnetic/TestEm1/README | 102 + .../electromagnetic/TestEm1/TestEm1.cc | 107 + .../electromagnetic/TestEm1/geant3/README | 26 + .../electromagnetic/TestEm1/geant3/gmakeB | 43 + .../electromagnetic/TestEm1/geant3/gmakeT | 37 + .../electromagnetic/TestEm1/geant3/run00.dat | 14 + .../electromagnetic/TestEm1/geant3/run01.dat | 18 + .../electromagnetic/TestEm1/geant3/run02.dat | 18 + .../electromagnetic/TestEm1/geant3/run03.dat | 18 + .../electromagnetic/TestEm1/geant3/run04.dat | 18 + .../electromagnetic/TestEm1/geant3/run05.dat | 18 + .../electromagnetic/TestEm1/geant3/run06.dat | 18 + .../electromagnetic/TestEm1/geant3/run07.dat | 19 + .../electromagnetic/TestEm1/geant3/run08.dat | 14 + .../electromagnetic/TestEm1/geant3/run09.dat | 14 + .../electromagnetic/TestEm1/geant3/run11.dat | 14 + .../TestEm1/geant3/testem1.cra | 423 + .../include/Em1DetectorConstruction.hh | 77 + .../TestEm1/include/Em1DetectorMessenger.hh | 51 + .../TestEm1/include/Em1EventAction.hh | 53 + .../include/Em1EventActionMessenger.hh | 42 + .../TestEm1/include/Em1PhysicsList.hh | 66 + .../include/Em1PhysicsListMessenger.hh | 44 + .../include/Em1PrimaryGeneratorAction.hh | 43 + .../TestEm1/include/Em1RunAction.hh | 69 + .../TestEm1/include/Em1RunActionMessenger.hh | 45 + .../TestEm1/include/Em1SteppingAction.hh | 39 + .../TestEm1/include/Em1TrackingAction.hh | 34 + .../TestEm1/include/Em1VisManager.hh | 50 + .../TestEm1/include/ProcessesCount.hh | 61 + .../extended/electromagnetic/TestEm1/init.mac | 41 + .../electromagnetic/TestEm1/run00.mac | 17 + .../electromagnetic/TestEm1/run01.mac | 29 + .../electromagnetic/TestEm1/run02.mac | 29 + .../electromagnetic/TestEm1/run03.mac | 28 + .../electromagnetic/TestEm1/run04.mac | 28 + .../electromagnetic/TestEm1/run05.mac | 28 + .../electromagnetic/TestEm1/run06.mac | 26 + .../electromagnetic/TestEm1/run07.mac | 27 + .../electromagnetic/TestEm1/run08.mac | 24 + .../electromagnetic/TestEm1/run09.mac | 25 + .../electromagnetic/TestEm1/run11.mac | 19 + .../TestEm1/src/Em1DetectorConstruction.cc | 224 + .../TestEm1/src/Em1DetectorMessenger.cc | 86 + .../TestEm1/src/Em1EventAction.cc | 92 + .../TestEm1/src/Em1EventActionMessenger.cc | 63 + .../TestEm1/src/Em1PhysicsList.cc | 325 + .../TestEm1/src/Em1PhysicsListMessenger.cc | 91 + .../TestEm1/src/Em1PrimaryGeneratorAction.cc | 55 + .../TestEm1/src/Em1RunAction.cc | 153 + .../TestEm1/src/Em1RunActionMessenger.cc | 72 + .../TestEm1/src/Em1SteppingAction.cc | 52 + .../TestEm1/src/Em1TrackingAction.cc | 48 + .../TestEm1/src/Em1VisManager.cc | 141 + .../electromagnetic/TestEm2/GNUmakefile | 22 + .../extended/electromagnetic/TestEm2/README | 110 + .../electromagnetic/TestEm2/TestEm2.cc | 90 + .../electromagnetic/TestEm2/geant3/README | 37 + .../electromagnetic/TestEm2/geant3/gmakeB | 43 + .../electromagnetic/TestEm2/geant3/gmakeT | 37 + .../electromagnetic/TestEm2/geant3/run01.dat | 18 + .../electromagnetic/TestEm2/geant3/run02.dat | 20 + .../electromagnetic/TestEm2/geant3/run03.dat | 20 + .../electromagnetic/TestEm2/geant3/run04.dat | 20 + .../TestEm2/geant3/testem2.cra | 586 + .../include/Em2DetectorConstruction.hh | 97 + .../TestEm2/include/Em2DetectorMessenger.hh | 51 + .../TestEm2/include/Em2EventAction.hh | 52 + .../include/Em2EventActionMessenger.hh | 42 + .../TestEm2/include/Em2PhysicsList.hh | 50 + .../include/Em2PrimaryGeneratorAction.hh | 46 + .../TestEm2/include/Em2RunAction.hh | 153 + .../TestEm2/include/Em2RunActionMessenger.hh | 45 + .../TestEm2/include/Em2SteppingAction.hh | 39 + .../TestEm2/include/Em2TrackingAction.hh | 34 + .../TestEm2/include/Em2VisManager.hh | 50 + .../extended/electromagnetic/TestEm2/init.mac | 35 + .../electromagnetic/TestEm2/run01.mac | 22 + .../electromagnetic/TestEm2/run02.mac | 30 + .../electromagnetic/TestEm2/run03.mac | 30 + .../electromagnetic/TestEm2/run04.mac | 29 + .../TestEm2/src/Em2DetectorConstruction.cc | 256 + .../TestEm2/src/Em2DetectorMessenger.cc | 98 + .../TestEm2/src/Em2EventAction.cc | 89 + .../TestEm2/src/Em2EventActionMessenger.cc | 63 + .../TestEm2/src/Em2PhysicsList.cc | 235 + .../TestEm2/src/Em2PrimaryGeneratorAction.cc | 60 + .../TestEm2/src/Em2RunAction.cc | 389 + .../TestEm2/src/Em2RunActionMessenger.cc | 83 + .../TestEm2/src/Em2SteppingAction.cc | 64 + .../TestEm2/src/Em2TrackingAction.cc | 40 + .../TestEm2/src/Em2VisManager.cc | 141 + .../electromagnetic/TestEm3/GNUmakefile | 22 + .../extended/electromagnetic/TestEm3/README | 127 + .../electromagnetic/TestEm3/TestEm3.cc | 89 + .../electromagnetic/TestEm3/geant3/README | 27 + .../electromagnetic/TestEm3/geant3/gmakeB | 43 + .../electromagnetic/TestEm3/geant3/gmakeT | 37 + .../electromagnetic/TestEm3/geant3/run01.dat | 17 + .../electromagnetic/TestEm3/geant3/run02.dat | 17 + .../electromagnetic/TestEm3/geant3/run03.dat | 21 + .../electromagnetic/TestEm3/geant3/run04.dat | 21 + .../electromagnetic/TestEm3/geant3/run05.dat | 20 + .../electromagnetic/TestEm3/geant3/run06.dat | 20 + .../electromagnetic/TestEm3/geant3/run07.dat | 17 + .../TestEm3/geant3/testem3.cra | 518 + .../TestEm3/include/Em3CalorHit.hh | 81 + .../TestEm3/include/Em3CalorimeterSD.hh | 51 + .../include/Em3DetectorConstruction.hh | 133 + .../TestEm3/include/Em3DetectorMessenger.hh | 53 + .../TestEm3/include/Em3EventAction.hh | 53 + .../include/Em3EventActionMessenger.hh | 42 + .../TestEm3/include/Em3PhysicsList.hh | 53 + .../include/Em3PrimaryGeneratorAction.hh | 48 + .../include/Em3PrimaryGeneratorMessenger.hh | 41 + .../TestEm3/include/Em3RunAction.hh | 81 + .../TestEm3/include/Em3RunActionMessenger.hh | 47 + .../TestEm3/include/Em3SteppingAction.hh | 32 + .../TestEm3/include/Em3VisManager.hh | 50 + .../extended/electromagnetic/TestEm3/init.mac | 32 + .../electromagnetic/TestEm3/run01.mac | 20 + .../electromagnetic/TestEm3/run02.mac | 27 + .../electromagnetic/TestEm3/run03.mac | 40 + .../electromagnetic/TestEm3/run04.mac | 41 + .../electromagnetic/TestEm3/run05.mac | 33 + .../electromagnetic/TestEm3/run06.mac | 33 + .../electromagnetic/TestEm3/run07.mac | 28 + .../TestEm3/src/Em3CalorHit.cc | 70 + .../TestEm3/src/Em3CalorimeterSD.cc | 120 + .../TestEm3/src/Em3DetectorConstruction.cc | 495 + .../TestEm3/src/Em3DetectorMessenger.cc | 141 + .../TestEm3/src/Em3EventAction.cc | 136 + .../TestEm3/src/Em3EventActionMessenger.cc | 62 + .../TestEm3/src/Em3PhysicsList.cc | 237 + .../TestEm3/src/Em3PrimaryGeneratorAction.cc | 73 + .../src/Em3PrimaryGeneratorMessenger.cc | 47 + .../TestEm3/src/Em3RunAction.cc | 146 + .../TestEm3/src/Em3RunActionMessenger.cc | 83 + .../TestEm3/src/Em3SteppingAction.cc | 35 + .../TestEm3/src/Em3VisManager.cc | 141 + .../electromagnetic/TestEm4/GNUmakefile | 22 + .../extended/electromagnetic/TestEm4/History | 20 + .../extended/electromagnetic/TestEm4/README | 68 + .../electromagnetic/TestEm4/TestEm4.cc | 97 + .../electromagnetic/TestEm4/geant3/gmakeB | 43 + .../electromagnetic/TestEm4/geant3/gmakeT | 37 + .../electromagnetic/TestEm4/geant3/run01.dat | 10 + .../TestEm4/geant3/testem4.cra | 314 + .../include/Em4DetectorConstruction.hh | 36 + .../TestEm4/include/Em4EventAction.hh | 52 + .../include/Em4EventActionMessenger.hh | 42 + .../TestEm4/include/Em4PhysicsList.hh | 52 + .../include/Em4PrimaryGeneratorAction.hh | 43 + .../TestEm4/include/Em4RunAction.hh | 59 + .../TestEm4/include/Em4RunActionMessenger.hh | 46 + .../TestEm4/include/Em4SteppingAction.hh | 39 + .../TestEm4/include/Em4SteppingVerbose.hh | 47 + .../TestEm4/include/Em4VisManager.hh | 50 + .../extended/electromagnetic/TestEm4/init.mac | 34 + .../electromagnetic/TestEm4/run01.mac | 17 + .../TestEm4/src/Em4DetectorConstruction.cc | 99 + .../TestEm4/src/Em4EventAction.cc | 98 + .../TestEm4/src/Em4EventActionMessenger.cc | 62 + .../TestEm4/src/Em4PhysicsList.cc | 154 + .../TestEm4/src/Em4PrimaryGeneratorAction.cc | 66 + .../TestEm4/src/Em4RunAction.cc | 102 + .../TestEm4/src/Em4RunActionMessenger.cc | 83 + .../TestEm4/src/Em4SteppingAction.cc | 41 + .../TestEm4/src/Em4SteppingVerbose.cc | 170 + .../TestEm4/src/Em4VisManager.cc | 141 + .../electromagnetic/TestEm5/GNUmakefile | 22 + .../extended/electromagnetic/TestEm5/History | 27 + .../extended/electromagnetic/TestEm5/README | 132 + .../electromagnetic/TestEm5/TestEm5.cc | 100 + .../electromagnetic/TestEm5/geant3/README | 45 + .../electromagnetic/TestEm5/geant3/gmakeB | 43 + .../electromagnetic/TestEm5/geant3/gmakeT | 37 + .../electromagnetic/TestEm5/geant3/run01.dat | 15 + .../electromagnetic/TestEm5/geant3/run01a.dat | 15 + .../electromagnetic/TestEm5/geant3/run02.dat | 15 + .../electromagnetic/TestEm5/geant3/run02a.dat | 15 + .../electromagnetic/TestEm5/geant3/run03.dat | 15 + .../electromagnetic/TestEm5/geant3/run04.dat | 15 + .../electromagnetic/TestEm5/geant3/run05.dat | 15 + .../electromagnetic/TestEm5/geant3/run11.dat | 15 + .../electromagnetic/TestEm5/geant3/run12.dat | 15 + .../electromagnetic/TestEm5/geant3/run13.dat | 15 + .../electromagnetic/TestEm5/geant3/run14.dat | 15 + .../electromagnetic/TestEm5/geant3/run15.dat | 15 + .../electromagnetic/TestEm5/geant3/run16.dat | 15 + .../electromagnetic/TestEm5/geant3/run21.dat | 15 + .../electromagnetic/TestEm5/geant3/run22.dat | 15 + .../TestEm5/geant3/testem5.cra | 758 + .../TestEm5/include/Em5CalorHit.hh | 81 + .../TestEm5/include/Em5CalorimeterSD.hh | 50 + .../include/Em5DetectorConstruction.hh | 129 + .../TestEm5/include/Em5DetectorMessenger.hh | 60 + .../TestEm5/include/Em5EventAction.hh | 67 + .../include/Em5EventActionMessenger.hh | 44 + .../TestEm5/include/Em5PhysicsList.hh | 77 + .../include/Em5PhysicsListMessenger.hh | 49 + .../include/Em5PrimaryGeneratorAction.hh | 51 + .../include/Em5PrimaryGeneratorMessenger.hh | 41 + .../TestEm5/include/Em5RunAction.hh | 170 + .../TestEm5/include/Em5RunMessenger.hh | 99 + .../TestEm5/include/Em5StepCut.hh | 119 + .../TestEm5/include/Em5SteppingAction.hh | 52 + .../TestEm5/include/Em5SteppingMessenger.hh | 47 + .../TestEm5/include/Em5VisManager.hh | 50 + .../extended/electromagnetic/TestEm5/init.mac | 30 + .../electromagnetic/TestEm5/run01.mac | 33 + .../electromagnetic/TestEm5/run01a.mac | 34 + .../electromagnetic/TestEm5/run02.mac | 34 + .../electromagnetic/TestEm5/run02a.mac | 34 + .../electromagnetic/TestEm5/run03.mac | 33 + .../electromagnetic/TestEm5/run04.mac | 33 + .../electromagnetic/TestEm5/run05.mac | 36 + .../electromagnetic/TestEm5/run11.mac | 33 + .../electromagnetic/TestEm5/run12.mac | 33 + .../electromagnetic/TestEm5/run13.mac | 33 + .../electromagnetic/TestEm5/run14.mac | 33 + .../electromagnetic/TestEm5/run15.mac | 33 + .../electromagnetic/TestEm5/run16.mac | 33 + .../electromagnetic/TestEm5/run21.mac | 34 + .../electromagnetic/TestEm5/run22.mac | 34 + .../TestEm5/src/Em5CalorHit.cc | 63 + .../TestEm5/src/Em5CalorimeterSD.cc | 115 + .../TestEm5/src/Em5DetectorConstruction.cc | 347 + .../TestEm5/src/Em5DetectorMessenger.cc | 140 + .../TestEm5/src/Em5EventAction.cc | 233 + .../TestEm5/src/Em5EventActionMessenger.cc | 72 + .../TestEm5/src/Em5PhysicsList.cc | 361 + .../TestEm5/src/Em5PhysicsListMessenger.cc | 99 + .../TestEm5/src/Em5PrimaryGeneratorAction.cc | 93 + .../src/Em5PrimaryGeneratorMessenger.cc | 47 + .../TestEm5/src/Em5RunAction.cc | 1268 + .../TestEm5/src/Em5RunMessenger.cc | 374 + .../electromagnetic/TestEm5/src/Em5StepCut.cc | 49 + .../TestEm5/src/Em5SteppingAction.cc | 192 + .../TestEm5/src/Em5SteppingMessenger.cc | 44 + .../TestEm5/src/Em5VisManager.cc | 141 + .../electromagnetic/TestEm6/GNUmakefile | 22 + .../electromagnetic/TestEm6/TestEm6.cc | 104 + .../electromagnetic/TestEm6/batch.mac | 47 + .../TestEm6/include/Em6CalorHit.hh | 81 + .../TestEm6/include/Em6CalorimeterSD.hh | 50 + .../include/Em6DetectorConstruction.hh | 138 + .../TestEm6/include/Em6DetectorMessenger.hh | 66 + .../TestEm6/include/Em6EventAction.hh | 65 + .../include/Em6EventActionMessenger.hh | 44 + .../TestEm6/include/Em6PhysicsList.hh | 78 + .../include/Em6PhysicsListMessenger.hh | 49 + .../include/Em6PrimaryGeneratorAction.hh | 47 + .../TestEm6/include/Em6RunAction.hh | 194 + .../TestEm6/include/Em6RunMessenger.hh | 95 + .../TestEm6/include/Em6StepCut.hh | 120 + .../TestEm6/include/Em6SteppingAction.hh | 53 + .../TestEm6/include/Em6SteppingMessenger.hh | 48 + .../TestEm6/include/Em6VisManager.hh | 48 + .../TestEm6/include/G4IonAr40.hh | 81 + .../TestEm6/include/G4IonC12.hh | 82 + .../TestEm6/include/G4IonFe56.hh | 82 + .../TestEm6/src/Em6CalorHit.cc | 60 + .../TestEm6/src/Em6DetectorConstruction.cc | 371 + .../TestEm6/src/Em6DetectorMessenger.cc | 137 + .../TestEm6/src/Em6DetectorSD.cc | 119 + .../TestEm6/src/Em6EventAction.cc | 210 + .../TestEm6/src/Em6EventActionMessenger.cc | 59 + .../TestEm6/src/Em6PhysicsList.cc | 424 + .../TestEm6/src/Em6PhysicsList.cc.ions | 423 + .../TestEm6/src/Em6PhysicsList.cc.protons | 376 + .../TestEm6/src/Em6PhysicsListMessenger.cc | 96 + .../TestEm6/src/Em6PrimaryGeneratorAction.cc | 80 + .../TestEm6/src/Em6RunAction.cc | 1748 + .../TestEm6/src/Em6RunAction.cc.ions | 1728 + .../TestEm6/src/Em6RunAction.cc.protons | 1748 + .../TestEm6/src/Em6RunMessenger.cc | 343 + .../electromagnetic/TestEm6/src/Em6StepCut.cc | 48 + .../TestEm6/src/Em6SteppingAction.cc | 199 + .../TestEm6/src/Em6SteppingMessenger.cc | 42 + .../TestEm6/src/Em6VisManager.cc | 138 + .../electromagnetic/TestEm6/src/G4IonAr40.cc | 77 + .../electromagnetic/TestEm6/src/G4IonC12.cc | 76 + .../electromagnetic/TestEm6/src/G4IonFe56.cc | 76 + .../persistency/PersistentEx01/GNUmakefile | 34 + .../PersistentEx01}/History | 42 +- .../PersistentEx01/PersistentEx01.cc | 82 + .../PersistentEx01/PersistentEx01.in | 15 + .../PersistentEx01/PersistentEx01.out | 173 + .../PersistentEx01/PersistentEx01run | 48 + .../persistency/PersistentEx01/README | 265 + .../PersistentEx01/createTag/GNUmakefile | 59 + .../PersistentEx01/createTag/README | 35 + .../PersistentEx01/createTag/createTag.cpp | 80 + .../PersistentEx01/createTag/setup.csh | 2 + .../PersistentEx01/createTag/setup.sh | 2 + .../PersistentEx01}/g4odbms_setup.csh | 10 +- .../PersistentEx01/g4odbms_setup.sh | 32 + .../include/PersEx01DetectorConstruction.hh | 20 + .../include/PersEx01EventAction.hh} | 10 +- .../include/PersEx01PhysicsList.hh} | 14 +- .../include/PersEx01PrimaryGeneratorAction.hh | 25 + .../include/PersEx01RunAction.hh} | 10 +- .../include/PersEx01StackingAction.hh} | 11 +- .../include/PersEx01TrackerHit.hh | 60 + .../include/PersEx01TrackerSD.hh | 30 + .../PersistentEx01/prerunPEx01.mac | 6 + .../PersistentEx01/readDB/GNUmakefile | 59 + .../persistency/PersistentEx01/readDB/README | 32 + .../PersistentEx01/readDB/readDB.cpp | 117 + .../PersistentEx01/readDB/setup.csh | 2 + .../PersistentEx01/readDB/setup.sh | 2 + .../PersistentEx01/readTag/GNUmakefile | 59 + .../persistency/PersistentEx01/readTag/README | 25 + .../PersistentEx01/readTag/readTag.cpp | 93 + .../PersistentEx01/readTag/setup.csh | 2 + .../PersistentEx01/readTag/setup.sh | 2 + .../PersistentEx01/setup_lhcxx.csh | 22 + .../persistency/PersistentEx01/setup_lhcxx.sh | 23 + .../src/PersEx01DetectorConstruction.cc} | 12 +- .../PersistentEx01/src/PersEx01EventAction.cc | 53 + .../src/PersEx01PhysicsList.cc} | 42 +- .../src/PersEx01PrimaryGeneratorAction.cc} | 8 +- .../PersistentEx01/src/PersEx01RunAction.cc} | 10 +- .../src/PersEx01StackingAction.cc} | 12 +- .../PersistentEx01/src/PersEx01TrackerHit.cc | 38 + .../PersistentEx01/src/PersEx01TrackerSD.cc} | 26 +- .../persistency/PersistentEx02/GNUmakefile | 34 + .../persistency/PersistentEx02/History | 38 + .../PersistentEx02/PersistentEx02.cc | 82 + .../PersistentEx02/PersistentEx02.in | 15 + .../PersistentEx02/PersistentEx02.out | 805 + .../PersistentEx02/PersistentEx02run | 48 + .../persistency/PersistentEx02/README | 142 + .../include/PersEx02DetectorConstruction.hh | 30 + .../include/PersEx02EventAction.hh | 36 + .../include/PersEx02PhysicsList.hh} | 29 +- .../include/PersEx02PrimaryGeneratorAction.hh | 35 + .../include/PersEx02RunAction.hh | 34 + .../include/PersEx02StackingAction.hh | 35 + .../include/PersEx02TrackerHit.ddl | 53 + .../include/PersEx02TrackerHitsCollection.ddl | 64 + .../include/PersEx02TrackerSD.hh | 44 + .../PersistentEx02/prerunPEx02.mac | 6 + .../PersistentEx02/readDB/GNUmakefile | 63 + .../persistency/PersistentEx02/readDB/README | 18 + .../PersistentEx02/readDB/readDB.cpp | 125 + .../PersistentEx02/readDB/setup.csh | 2 + .../PersistentEx02/readDB/setup.sh | 2 + .../src/PersEx02DetectorConstruction.cc | 128 + .../PersistentEx02/src/PersEx02EventAction.cc | 85 + .../src/PersEx02PhysicsList.cc} | 57 +- .../src/PersEx02PrimaryGeneratorAction.cc | 48 + .../PersistentEx02/src/PersEx02RunAction.cc | 58 + .../src/PersEx02StackingAction.cc | 40 + .../PersistentEx02/src/PersEx02TrackerHit.cc | 46 + .../src/PersEx02TrackerHitsCollection.cc | 28 + .../PersistentEx02/src/PersEx02TrackerSD.cc | 99 + examples/novice/N01/exampleN01.cc | 6 +- examples/novice/N01/exampleN01.out | 7 +- .../N01/include/ExN01DetectorConstruction.hh | 6 +- .../novice/N01/include/ExN01PhysicsList.hh | 6 +- .../include/ExN01PrimaryGeneratorAction.hh | 6 +- .../N01/src/ExN01DetectorConstruction.cc | 6 +- examples/novice/N01/src/ExN01PhysicsList.cc | 6 +- .../N01/src/ExN01PrimaryGeneratorAction.cc | 6 +- examples/novice/N02/exampleN02.cc | 6 +- examples/novice/N02/exampleN02.out | 3642 +- .../include/ExN02ChamberParameterisation.hh | 6 +- .../N02/include/ExN02DetectorConstruction.hh | 6 +- .../N02/include/ExN02DetectorMessenger.hh | 6 +- .../novice/N02/include/ExN02EventAction.hh | 6 +- .../novice/N02/include/ExN02MagneticField.hh | 6 +- .../novice/N02/include/ExN02PhysicsList.hh | 8 +- .../include/ExN02PrimaryGeneratorAction.hh | 6 +- .../include/ExN02PrimaryGeneratorMessenger.hh | 6 +- examples/novice/N02/include/ExN02RunAction.hh | 6 +- .../novice/N02/include/ExN02SteppingAction.hh | 6 +- .../novice/N02/include/ExN02TrackerHit.hh | 6 +- examples/novice/N02/include/ExN02TrackerSD.hh | 6 +- .../novice/N02/include/ExN02VisManager.hh | 6 +- .../N02/src/ExN02ChamberParameterisation.cc | 6 +- .../N02/src/ExN02DetectorConstruction.cc | 21 +- .../novice/N02/src/ExN02DetectorMessenger.cc | 6 +- examples/novice/N02/src/ExN02EventAction.cc | 6 +- examples/novice/N02/src/ExN02MagneticField.cc | 6 +- examples/novice/N02/src/ExN02PhysicsList.cc | 10 +- .../N02/src/ExN02PrimaryGeneratorAction.cc | 6 +- .../N02/src/ExN02PrimaryGeneratorMessenger.cc | 6 +- examples/novice/N02/src/ExN02RunAction.cc | 6 +- .../novice/N02/src/ExN02SteppingAction.cc | 6 +- examples/novice/N02/src/ExN02TrackerHit.cc | 6 +- examples/novice/N02/src/ExN02TrackerSD.cc | 6 +- examples/novice/N02/src/ExN02VisManager.cc | 14 +- examples/novice/N03/History | 22 +- examples/novice/N03/README | 16 +- examples/novice/N03/exN03Vis0.mac | 95 + examples/novice/N03/exN03Vis1.mac | 175 + examples/novice/N03/exN03Vis2.mac | 131 + examples/novice/N03/exN03Vis3.mac | 137 + examples/novice/N03/exampleN03.cc | 6 +- examples/novice/N03/exampleN03.out | 101 +- examples/novice/N03/include/ExN03CalorHit.hh | 6 +- .../novice/N03/include/ExN03CalorimeterSD.hh | 6 +- .../N03/include/ExN03DetectorConstruction.hh | 6 +- .../N03/include/ExN03DetectorMessenger.hh | 6 +- .../novice/N03/include/ExN03EventAction.hh | 6 +- .../N03/include/ExN03EventActionMessenger.hh | 6 +- .../novice/N03/include/ExN03PhysicsList.hh | 10 +- .../include/ExN03PrimaryGeneratorAction.hh | 6 +- .../include/ExN03PrimaryGeneratorMessenger.hh | 6 +- examples/novice/N03/include/ExN03RunAction.hh | 6 +- .../novice/N03/include/ExN03SteppingAction.hh | 6 +- .../novice/N03/include/ExN03VisManager.hh | 6 +- examples/novice/N03/newgeom.mac | 6 +- examples/novice/N03/prerunN03.mac | 8 +- examples/novice/N03/src/ExN03CalorHit.cc | 6 +- examples/novice/N03/src/ExN03CalorimeterSD.cc | 6 +- .../N03/src/ExN03DetectorConstruction.cc | 6 +- .../novice/N03/src/ExN03DetectorMessenger.cc | 30 +- examples/novice/N03/src/ExN03EventAction.cc | 8 +- .../N03/src/ExN03EventActionMessenger.cc | 6 +- examples/novice/N03/src/ExN03PhysicsList.cc | 34 +- .../N03/src/ExN03PrimaryGeneratorAction.cc | 6 +- .../N03/src/ExN03PrimaryGeneratorMessenger.cc | 10 +- examples/novice/N03/src/ExN03RunAction.cc | 15 +- .../novice/N03/src/ExN03SteppingAction.cc | 6 +- examples/novice/N03/src/ExN03VisManager.cc | 14 +- examples/novice/N04/exampleN04.EMtest.out | 54 +- examples/novice/N04/exampleN04.cc | 6 +- examples/novice/N04/exampleN04.out | 24 +- .../novice/N04/include/ExN04PhysicsList.hh | 2 +- .../novice/N04/include/ExN04StackingAction.hh | 2 +- examples/novice/N04/src/ExN04PhysicsList.cc | 14 +- examples/novice/N05/exampleN05.cc | 10 +- examples/novice/N05/exampleN05.out | 312 +- .../novice/N05/include/ExN05CalorimeterHit.hh | 6 +- .../novice/N05/include/ExN05CalorimeterSD.hh | 6 +- .../N05/include/ExN05DetectorConstruction.hh | 6 +- .../N05/include/ExN05DetectorMessenger.hh | 6 +- .../novice/N05/include/ExN05EMShowerModel.hh | 10 +- .../novice/N05/include/ExN05EnergySpot.hh | 8 +- .../novice/N05/include/ExN05EventAction.hh | 6 +- .../N05/include/ExN05EventActionMessenger.hh | 6 +- .../novice/N05/include/ExN05MaxTimeCuts.hh | 6 +- .../novice/N05/include/ExN05MinEkineCuts.hh | 6 +- .../novice/N05/include/ExN05MinRangeCuts.hh | 6 +- .../novice/N05/include/ExN05PhysicsList.hh | 8 +- examples/novice/N05/include/ExN05PiModel.hh | 6 +- .../N05/include/ExN05PionShowerModel.hh | 10 +- .../include/ExN05PrimaryGeneratorAction.hh | 6 +- examples/novice/N05/include/ExN05RunAction.hh | 6 +- .../novice/N05/include/ExN05SpecialCuts.hh | 6 +- .../novice/N05/include/ExN05SteppingAction.hh | 6 +- .../include/ExN05SteppingActionMessenger.hh | 6 +- .../novice/N05/src/ExN05CalorimeterHit.cc | 6 +- examples/novice/N05/src/ExN05CalorimeterSD.cc | 6 +- .../N05/src/ExN05DetectorConstruction.cc | 6 +- .../novice/N05/src/ExN05DetectorMessenger.cc | 6 +- examples/novice/N05/src/ExN05EMShowerModel.cc | 6 +- examples/novice/N05/src/ExN05EnergySpot.cc | 6 +- examples/novice/N05/src/ExN05EventAction.cc | 8 +- .../N05/src/ExN05EventActionMessenger.cc | 6 +- examples/novice/N05/src/ExN05MaxTimeCuts.cc | 6 +- examples/novice/N05/src/ExN05MinEkineCuts.cc | 6 +- examples/novice/N05/src/ExN05MinRangeCuts.cc | 6 +- examples/novice/N05/src/ExN05PhysicsList.cc | 14 +- examples/novice/N05/src/ExN05PiModel.cc | 6 +- .../novice/N05/src/ExN05PionShowerModel.cc | 6 +- .../N05/src/ExN05PrimaryGeneratorAction.cc | 6 +- examples/novice/N05/src/ExN05RunAction.cc | 6 +- examples/novice/N05/src/ExN05SpecialCuts.cc | 6 +- .../novice/N05/src/ExN05SteppingAction.cc | 6 +- .../N05/src/ExN05SteppingActionMessenger.cc | 6 +- examples/novice/N06/exampleN06.cc | 2 +- examples/novice/N06/exampleN06.out | 21754 +- .../N06/include/ExN06DetectorConstruction.hh | 2 +- .../novice/N06/include/ExN06PhysicsList.hh | 4 +- .../include/ExN06PrimaryGeneratorAction.hh | 2 +- examples/novice/N06/include/ExN06RunAction.hh | 2 +- .../N06/src/ExN06DetectorConstruction.cc | 45 +- examples/novice/N06/src/ExN06PhysicsList.cc | 6 +- .../N06/src/ExN06PrimaryGeneratoraction.cc | 2 +- examples/novice/N06/src/ExN06RunAction.cc | 2 +- source/GNUmakefile | 29 +- source/digits+hits/History | 5 +- .../digits+hits/detector/include/G4HCtable.hh | 24 +- .../detector/include/G4SDManager.hh | 32 +- .../detector/include/G4SDStructure.hh | 20 +- .../detector/include/G4SDmessenger.hh | 17 +- .../detector/include/G4SensitiveVolumeList.hh | 29 +- .../include/G4SensitiveVolumeList.icc | 14 +- .../detector/include/G4VReadOutGeometry.hh | 6 +- .../detector/include/G4VSensitiveDetector.hh | 99 +- source/digits+hits/detector/src/G4HCtable.cc | 8 +- .../digits+hits/detector/src/G4SDManager.cc | 6 +- .../digits+hits/detector/src/G4SDStructure.cc | 12 +- .../digits+hits/detector/src/G4SDmessenger.cc | 6 +- .../detector/src/G4SensitiveVolumeList.cc | 6 +- .../detector/src/G4VReadOutGeometry.cc | 9 +- .../detector/src/G4VSensitiveDetector.cc | 8 +- .../digits/include/G4DCofThisEvent.hh | 39 +- .../digits/include/G4TDigiCollection.hh | 74 +- source/digits+hits/digits/include/G4VDigi.hh | 14 +- .../digits/include/G4VDigiCollection.hh | 15 +- .../digits+hits/digits/src/G4DCofThisEvent.cc | 10 +- .../digits/src/G4TDigiCollection.cc | 6 +- source/digits+hits/digits/src/G4VDigi.cc | 10 +- .../digits/src/G4VDigiCollection.cc | 10 +- .../hits/include/G4HCofThisEvent.hh | 39 +- .../hits/include/G4THitsCollection.hh | 74 +- source/digits+hits/hits/include/G4VHit.hh | 14 +- .../hits/include/G4VHitsCollection.hh | 15 +- .../digits+hits/hits/src/G4HCofThisEvent.cc | 10 +- .../digits+hits/hits/src/G4THitsCollection.cc | 6 +- source/digits+hits/hits/src/G4VHit.cc | 6 +- .../digits+hits/hits/src/G4VHitsCollection.cc | 6 +- source/event/GNUmakefile | 3 +- source/event/History | 9 +- .../include/G4ClassificationOfNewTrack.hh | 12 +- source/event/include/G4EvManMessenger.hh | 15 +- source/event/include/G4Event.hh | 58 +- source/event/include/G4EventManager.hh | 41 +- source/event/include/G4HEPEvtInterface.hh | 49 +- source/event/include/G4HEPEvtParticle.hh | 20 +- source/event/include/G4ParticleGun.hh | 54 +- .../event/include/G4ParticleGunMessenger.hh | 12 +- source/event/include/G4PrimaryParticle.hh | 101 +- source/event/include/G4PrimaryTransformer.hh | 12 +- source/event/include/G4PrimaryVertex.hh | 13 +- source/event/include/G4StackManager.hh | 54 +- source/event/include/G4StackedTrack.hh | 26 +- source/event/include/G4StackingMessenger.hh | 14 +- source/event/include/G4TrackStack.hh | 14 +- source/event/include/G4TrajectoryContainer.hh | 18 +- source/event/include/G4UserEventAction.hh | 21 +- source/event/include/G4UserStackingAction.hh | 15 +- source/event/include/G4VPrimaryGenerator.hh | 14 +- source/event/include/eventgendefs.hh | 6 +- source/event/include/evmandefs.hh | 6 +- source/event/include/trajectoryControl.hh | 6 +- source/event/src/G4EvManMessenger.cc | 6 +- source/event/src/G4Event.cc | 6 +- source/event/src/G4EventManager.cc | 6 +- source/event/src/G4HEPEvtInterface.cc | 6 +- source/event/src/G4HEPEvtParticle.cc | 6 +- source/event/src/G4ParticleGun.cc | 6 +- source/event/src/G4ParticleGunMessenger.cc | 6 +- source/event/src/G4PrimaryParticle.cc | 6 +- source/event/src/G4PrimaryTransformer.cc | 6 +- source/event/src/G4PrimaryVertex.cc | 6 +- source/event/src/G4StackManager.cc | 6 +- source/event/src/G4StackedTrack.cc | 6 +- source/event/src/G4StackingMessenger.cc | 6 +- source/event/src/G4TrackStack.cc | 6 +- source/event/src/G4UserEventAction.cc | 6 +- source/event/src/G4UserStackingAction.cc | 6 +- source/event/src/G4VPrimaryGenerator.cc | 6 +- source/g3tog4/History | 54 +- source/g3tog4/include/G3CalcParams.hh | 6 +- source/g3tog4/include/G3DetTable.hh | 48 +- source/g3tog4/include/G3DetTableEntry.hh | 35 + source/g3tog4/include/G3Division.hh | 67 + source/g3tog4/include/G3EleTable.hh | 10 +- source/g3tog4/include/G3G4Interface.hh | 15 +- source/g3tog4/include/G3MatTable.hh | 49 +- source/g3tog4/include/G3MatTableEntry.hh | 50 + source/g3tog4/include/G3MedTable.hh | 50 +- source/g3tog4/include/G3MedTableEntry.hh | 88 + source/g3tog4/include/G3PartTable.hh | 19 +- source/g3tog4/include/G3Pos.hh | 23 +- source/g3tog4/include/G3RotTable.hh | 55 +- source/g3tog4/include/G3RotTableEntry.hh | 51 + source/g3tog4/include/G3SensVolVector.hh | 21 + source/g3tog4/include/G3VolTable.hh | 31 +- source/g3tog4/include/G3VolTableEntry.hh | 103 + source/g3tog4/include/G3toG4.hh | 17 +- source/g3tog4/include/G3toG4.inc | 6 +- source/g3tog4/include/G3toG4BuildTree.hh | 19 +- source/g3tog4/include/G3toG4MakeSolid.hh | 10 + source/g3tog4/include/G3toG4RotationMatrix.hh | 5 +- source/g3tog4/include/G4makevol.hh | 11 - source/g3tog4/include/VolTableEntry.hh | 82 - source/g3tog4/include/gcbank.inc | 6 +- source/g3tog4/src/G3CalcParams.cc | 186 +- source/g3tog4/src/G3DetTable.cc | 112 +- source/g3tog4/src/G3DetTableEntry.cc | 44 + source/g3tog4/src/G3Division.cc | 826 + source/g3tog4/src/G3EleTable.cc | 7 +- source/g3tog4/src/G3MatTable.cc | 52 +- source/g3tog4/src/G3MatTableEntry.cc | 53 + source/g3tog4/src/G3MedTable.cc | 55 +- source/g3tog4/src/G3MedTableEntry.cc | 65 + source/g3tog4/src/G3NegVolPars.cc | 63 + source/g3tog4/src/G3PartTable.cc | 69 +- source/g3tog4/src/G3Pos.cc | 45 +- source/g3tog4/src/G3RotTable.cc | 54 +- source/g3tog4/src/G3RotTableEntry.cc | 53 + source/g3tog4/src/G3VolTable.cc | 76 +- source/g3tog4/src/G3VolTableEntry.cc | 285 + source/g3tog4/src/G3fillParams.cc | 76 + source/g3tog4/src/G3toG4BuildTree.cc | 153 +- source/g3tog4/src/G3toG4MakeSolid.cc | 18 +- source/g3tog4/src/G3toG4RotationMatrix.cc | 10 + source/g3tog4/src/G4.cc.omit | 10 + source/g3tog4/src/G4BuildGeom.cc | 52 +- source/g3tog4/src/G4ggclos.cc | 11 +- source/g3tog4/src/G4gsatt.cc | 12 +- source/g3tog4/src/G4gsdet.cc | 10 +- source/g3tog4/src/G4gsdeta.cc | 14 +- source/g3tog4/src/G4gsdetd.cc | 12 +- source/g3tog4/src/G4gsdeth.cc | 12 +- source/g3tog4/src/G4gsdetu.cc | 10 +- source/g3tog4/src/G4gsdetv.cc | 10 +- source/g3tog4/src/G4gsdk.cc | 12 +- source/g3tog4/src/G4gsdvn.cc | 139 +- source/g3tog4/src/G4gsdvn2.cc | 95 +- source/g3tog4/src/G4gsdvt.cc | 103 +- source/g3tog4/src/G4gsdvt2.cc | 103 +- source/g3tog4/src/G4gsdvx.cc | 16 +- source/g3tog4/src/G4gsmate.cc | 130 +- source/g3tog4/src/G4gsmixt.cc | 75 +- source/g3tog4/src/G4gspart.cc | 8 +- source/g3tog4/src/G4gspos.cc | 103 +- source/g3tog4/src/G4gsposp.cc | 293 +- source/g3tog4/src/G4gsrotm.cc | 26 +- source/g3tog4/src/G4gstmed.cc | 39 +- source/g3tog4/src/G4gstpar.cc | 15 +- source/g3tog4/src/G4gsvolu.cc | 98 +- source/g3tog4/src/G4makevol.cc | 90 - source/g3tog4/src/VolTableEntry.cc | 172 - source/g3tog4/src/clparse.cc | 93 +- source/g3tog4/src/g3routines.F | 6 +- source/g3tog4/src/{g3test.F => g3test.F.main} | 6 +- source/g3tog4/src/g3tog4.F | 6 +- source/g3tog4/src/g4geom.cc.main | 9 + source/g3tog4/src/jshape.F | 6 +- source/g3tog4/src/mztog4.F | 6 +- source/g3tog4/src/rztog4.F | 6 +- source/g3tog4/src/tog4.F | 6 +- source/g3tog4/test/GNUmakefile | 105 + source/g3tog4/test/README | 12 + source/g3tog4/test/clGeometry.cc | 163 + source/g3tog4/test/clGeometry.x | 29 + source/g3tog4/test/cltog4.cc | 111 + source/g3tog4/test/cltog4.x | 15 + .../include/G3toG4DetectorConstruction.hh | 45 + .../g3tog4/test/include/G3toG4EventAction.hh | 45 + .../include/G3toG4EventActionMessenger.hh | 40 + .../g3tog4/test/include/G3toG4PhysicsList.hh | 68 + .../include/G3toG4PrimaryGeneratorAction.hh | 36 + source/g3tog4/test/include/G3toG4RunAction.hh | 35 + .../g3tog4/test/include/G3toG4VisManager.hh | 50 + source/g3tog4/test/parity.dat | 14 + .../test/src/G3toG4DetectorConstruction.cc | 110 + source/g3tog4/test/src/G3toG4EventAction.cc | 77 + .../test/src/G3toG4EventActionMessenger.cc | 52 + source/g3tog4/test/src/G3toG4PhysicsList.cc | 294 + .../test/src/G3toG4PrimaryGeneratorAction.cc | 76 + source/g3tog4/test/src/G3toG4RunAction.cc | 38 + source/g3tog4/test/src/G3toG4VisManager.cc | 142 + source/g3tog4/test/svtwaf.dat | 598 + source/g3tog4/test/testmodel.dat | 33 + source/geometry/benchmarks/BuildBoxWorld.hh | 6 +- .../geometry/benchmarks/BuildCalorimeter.hh | 6 +- source/geometry/benchmarks/Shoot.hh | 6 +- source/geometry/benchmarks/calorimeter.cc | 6 +- .../benchmarks/f77cppcomparison/G4Box.cc | 6 +- .../benchmarks/f77cppcomparison/G4Box.hh | 6 +- .../f77cppcomparison/G4Box_fastfabs.cc | 6 +- .../f77cppcomparison/G4RotationMatrix.hh | 6 +- .../f77cppcomparison/G4RotationMatrix.icc | 6 +- .../f77cppcomparison/G4ThreeVector.hh | 6 +- .../f77cppcomparison/G4ThreeVector.icc | 6 +- .../benchmarks/f77cppcomparison/boxtoincpp.cc | 6 +- .../benchmarks/f77cppcomparison/geomdefs.hh | 6 +- .../benchmarks/f77cppcomparison/globals.hh | 6 +- source/geometry/benchmarks/replicaCal.cc | 6 +- source/geometry/benchmarks/shooter.cc | 6 +- source/geometry/magneticfield/History | 14 +- .../magneticfield/include/G4CashKarpRKF45.hh | 6 +- .../magneticfield/include/G4ChordFinder.hh | 6 +- .../magneticfield/include/G4ClassicalRK4.hh | 6 +- .../include/G4ElectroMagneticField.hh | 6 +- .../include/G4EqMagElectricField.hh | 6 +- .../include/G4EquationOfMotion.hh | 6 +- .../include/G4EquationOfMotion.icc | 6 +- .../magneticfield/include/G4ExplicitEuler.hh | 6 +- .../geometry/magneticfield/include/G4Field.hh | 6 +- .../magneticfield/include/G4FieldManager.hh | 6 +- .../magneticfield/include/G4FieldTrack.hh | 6 +- .../magneticfield/include/G4FieldTrack.icc | 6 +- .../include/G4HelixExplicitEuler.hh | 6 +- .../magneticfield/include/G4HelixHeum.hh | 6 +- .../include/G4HelixImplicitEuler.hh | 6 +- .../include/G4HelixSimpleRunge.hh | 6 +- .../magneticfield/include/G4ImplicitEuler.hh | 6 +- .../magneticfield/include/G4LineSection.hh | 6 +- .../include/G4MagErrorStepper.hh | 6 +- .../include/G4MagErrorStepper.icc | 6 +- .../include/G4MagHelicalStepper.hh | 6 +- .../include/G4MagHelicalStepper.icc | 6 +- .../include/G4MagIntegratorDriver.hh | 28 +- .../include/G4MagIntegratorDriver.icc | 13 +- .../include/G4MagIntegratorStepper.hh | 6 +- .../include/G4MagIntegratorStepper.icc | 6 +- .../magneticfield/include/G4Mag_EqRhs.hh | 6 +- .../magneticfield/include/G4Mag_UsualEqRhs.hh | 6 +- .../magneticfield/include/G4MagneticField.hh | 6 +- .../magneticfield/include/G4RKG3_Stepper.hh | 6 +- .../magneticfield/include/G4SimpleHeum.hh | 6 +- .../magneticfield/include/G4SimpleRunge.hh | 6 +- .../include/G4UniformElectricField.hh | 6 +- .../include/G4UniformMagField.hh | 6 +- .../magneticfield/src/G4CashKarpRKF45.cc | 6 +- .../magneticfield/src/G4ChordFinder.cc | 31 +- .../magneticfield/src/G4ClassicalRK4.cc | 6 +- .../magneticfield/src/G4EquationOfMotion.cc | 6 +- .../magneticfield/src/G4ExplicitEuler.cc | 6 +- .../magneticfield/src/G4FieldManager.cc | 6 +- .../magneticfield/src/G4FieldTrack.cc | 6 +- .../magneticfield/src/G4HelixExplicitEuler.cc | 6 +- .../geometry/magneticfield/src/G4HelixHeum.cc | 6 +- .../magneticfield/src/G4HelixImplicitEuler.cc | 6 +- .../magneticfield/src/G4HelixSimpleRunge.cc | 6 +- .../magneticfield/src/G4ImplicitEuler.cc | 6 +- .../magneticfield/src/G4LineSection.cc | 6 +- .../magneticfield/src/G4MagErrorStepper.cc | 6 +- .../magneticfield/src/G4MagHelicalStepper.cc | 6 +- .../src/G4MagIntegratorDriver.cc | 212 +- .../src/G4MagIntegratorStepper.cc | 6 +- .../geometry/magneticfield/src/G4Mag_EqRhs.cc | 6 +- .../magneticfield/src/G4Mag_UsualEqRhs.cc | 6 +- .../magneticfield/src/G4RKG3_Stepper.cc | 6 +- .../magneticfield/src/G4SimpleHeum.cc | 6 +- .../magneticfield/src/G4SimpleRunge.cc | 6 +- .../src/G4UniformElectricField.cc | 6 +- .../magneticfield/src/G4UniformMagField.cc | 6 +- source/geometry/management/GNUmakefile | 3 +- source/geometry/management/History | 21 +- .../management/include/G4AffineTransform.hh | 6 +- .../management/include/G4AffineTransform.icc | 6 +- .../management/include/G4DrawVoxels.hh | 73 + .../management/include/G4GeometryManager.hh | 6 +- .../management/include/G4LogicalSurface.hh | 6 +- .../management/include/G4LogicalSurface.icc | 6 +- .../management/include/G4LogicalVolume.hh | 12 +- .../management/include/G4LogicalVolume.icc | 6 +- .../include/G4LogicalVolumeStore.hh | 14 +- .../management/include/G4PVParameterised.hh | 6 +- .../management/include/G4PVPlacement.hh | 6 +- .../management/include/G4PVReplica.hh | 6 +- .../include/G4PhysicalVolumeStore.hh | 14 +- .../management/include/G4SmartVoxelHeader.hh | 24 +- .../management/include/G4SmartVoxelNode.hh | 14 +- .../management/include/G4SmartVoxelProxy.hh | 6 +- .../management/include/G4SolidStore.hh | 14 +- .../include/G4VPVParameterisation.hh | 6 +- .../management/include/G4VPhysicalVolume.hh | 51 +- .../management/include/G4VPhysicalVolume.icc | 19 +- .../geometry/management/include/G4VSolid.hh | 43 +- .../geometry/management/include/G4VSolid.icc | 6 +- .../management/include/G4VTouchable.hh | 6 +- .../management/include/G4VTouchable.icc | 6 +- .../management/include/G4VoxelLimits.hh | 6 +- .../geometry/management/include/meshdefs.hh | 6 +- .../geometry/management/include/voxeldefs.hh | 6 +- .../geometry/management/src/G4DrawVoxels.cc | 236 + .../management/src/G4GeometryManager.cc | 6 +- .../management/src/G4LogicalVolume.cc | 6 +- .../management/src/G4LogicalVolumeStore.cc | 8 +- .../management/src/G4PVParameterised.cc | 6 +- .../geometry/management/src/G4PVPlacement.cc | 6 +- source/geometry/management/src/G4PVReplica.cc | 6 +- .../management/src/G4PhysicalVolumeStore.cc | 8 +- .../management/src/G4SmartVoxelHeader.cc | 6 +- .../management/src/G4SmartVoxelNode.cc | 6 +- .../geometry/management/src/G4SolidStore.cc | 8 +- .../management/src/G4VPVParameterisation.cc | 6 +- .../management/src/G4VPhysicalVolume.cc | 27 +- source/geometry/management/src/G4VSolid.cc | 18 +- .../geometry/management/src/G4VoxelLimits.cc | 6 +- source/geometry/solids/BREPS/GNUmakefile | 7 +- source/geometry/solids/BREPS/History | 56 +- .../solids/BREPS/include/G4Assembly.hh | 2 +- .../solids/BREPS/include/G4BREPSolidBox.hh | 6 +- .../solids/BREPS/include/G4BREPSolidCone.hh | 6 +- .../BREPS/include/G4BREPSolidCylinder.hh | 6 +- .../BREPS/include/G4BREPSolidOpenPCone.hh | 34 + .../solids/BREPS/include/G4BREPSolidPCone.hh | 6 +- .../BREPS/include/G4BREPSolidPolyhedra.hh | 6 +- .../solids/BREPS/include/G4BREPSolidSphere.hh | 6 +- .../solids/BREPS/include/G4BREPSolidTorus.hh | 6 +- .../solids/BREPS/include/G4BSplineCurve.hh | 12 +- .../BREPS/include/G4BSplineCurveWithKnots.hh | 6 +- .../solids/BREPS/include/G4BSplineSurface.hh | 6 +- .../solids/BREPS/include/G4BezierSurface.hh | 6 +- .../solids/BREPS/include/G4CircularCurve.hh | 6 +- .../solids/BREPS/include/G4ConicalSurface.hh | 6 +- .../solids/BREPS/include/G4ControlPoints.hh | 6 +- .../solids/BREPS/include/G4ConvexHull.hh | 6 +- .../geometry/solids/BREPS/include/G4Curve.hh | 6 +- .../solids/BREPS/include/G4CurveVector.hh | 4 +- .../BREPS/include/G4CylindricalSurface.hh | 6 +- .../solids/BREPS/include/G4Ellipse.hh | 6 +- .../solids/BREPS/include/G4FConicalSurface.hh | 6 +- .../BREPS/include/G4FCylindricalSurface.hh | 6 +- .../geometry/solids/BREPS/include/G4FPlane.hh | 6 +- .../solids/BREPS/include/G4Globals.hh | 6 +- .../solids/BREPS/include/G4Hyperbola.hh | 6 +- .../solids/BREPS/include/G4KnotVector.hh | 45 +- .../geometry/solids/BREPS/include/G4Line.hh | 6 +- .../solids/BREPS/include/G4OsloMatrix.hh | 6 +- .../solids/BREPS/include/G4Parabola.hh | 6 +- .../solids/BREPS/include/G4PlacedSolid.hh | 6 +- .../solids/BREPS/include/G4PlacementVector.hh | 4 +- .../geometry/solids/BREPS/include/G4Plane.hh | 6 +- .../solids/BREPS/include/G4Point3DVector.hh | 10 +- .../solids/BREPS/include/G4PointRat.hh | 9 +- .../BREPS/include/G4ProjectedSurface.hh | 6 +- source/geometry/solids/BREPS/include/G4Ray.hh | 6 +- .../include/G4RectangularTrimmedSurface.hh | 6 +- .../geometry/solids/BREPS/include/G4Sort.hh | 6 +- .../BREPS/include/G4SphericalSurface.hh | 6 +- .../solids/BREPS/include/G4SurfaceList.hh | 6 +- .../solids/BREPS/include/G4ThreeMat.hh | 6 +- .../solids/BREPS/include/G4ToroidalSurface.hh | 6 +- .../geometry/solids/BREPS/include/G4UVHit.hh | 6 +- .../geometry/solids/BREPS/src/G4BREPSolid.cc | 7 +- .../solids/BREPS/src/G4BREPSolidBox.cc | 6 +- .../solids/BREPS/src/G4BREPSolidCone.cc | 6 +- .../solids/BREPS/src/G4BREPSolidCylinder.cc | 6 +- .../solids/BREPS/src/G4BREPSolidOpenPCone.cc | 55 + .../solids/BREPS/src/G4BREPSolidPCone.cc | 6 +- .../solids/BREPS/src/G4BREPSolidPolyhedra.cc | 17 +- .../solids/BREPS/src/G4BREPSolidSphere.cc | 6 +- .../solids/BREPS/src/G4BREPSolidTorus.cc | 6 +- .../solids/BREPS/src/G4BSplineCurve.cc | 6 +- .../BREPS/src/G4BSplineCurveWithKnots.cc | 6 +- .../solids/BREPS/src/G4BSplineSurface.cc | 6 +- .../solids/BREPS/src/G4BezierSurface.cc | 6 +- .../solids/BREPS/src/G4CircularCurve.cc | 6 +- .../solids/BREPS/src/G4ConicalSurface.cc | 6 +- .../solids/BREPS/src/G4ControlPoints.cc | 6 +- source/geometry/solids/BREPS/src/G4Curve.cc | 6 +- .../solids/BREPS/src/G4CylindricalSurface.cc | 6 +- source/geometry/solids/BREPS/src/G4Ellipse.cc | 6 +- .../solids/BREPS/src/G4FConicalSurface.cc | 6 +- .../solids/BREPS/src/G4FCylindricalSurface.cc | 6 +- source/geometry/solids/BREPS/src/G4FPlane.cc | 6 +- .../geometry/solids/BREPS/src/G4Hyperbola.cc | 6 +- .../geometry/solids/BREPS/src/G4KnotVector.cc | 6 +- source/geometry/solids/BREPS/src/G4Line.cc | 6 +- .../geometry/solids/BREPS/src/G4OsloMatrix.cc | 6 +- .../geometry/solids/BREPS/src/G4Parabola.cc | 6 +- .../solids/BREPS/src/G4PlacedSolid.cc | 6 +- .../geometry/solids/BREPS/src/G4PointRat.cc | 6 +- .../solids/BREPS/src/G4ProjectedSurface.cc | 6 +- source/geometry/solids/BREPS/src/G4Ray.cc | 6 +- .../BREPS/src/G4RectangularTrimmedSurface.cc | 6 +- source/geometry/solids/BREPS/src/G4Sort.cc | 6 +- .../solids/BREPS/src/G4SphericalSurface.cc | 6 +- .../solids/BREPS/src/G4SurfaceList.cc | 6 +- .../geometry/solids/BREPS/src/G4ThreeMat.cc | 6 +- .../solids/BREPS/src/G4ToroidalSurface.cc | 6 +- source/geometry/solids/Boolean/History | 39 +- .../solids/Boolean/include/G4BooleanSolid.hh | 13 +- .../Boolean/include/G4DisplacedSolid.hh | 45 +- .../solids/Boolean/include/G4UnionSolid.hh | 2 +- .../solids/Boolean/src/G4BooleanSolid.cc | 31 + .../solids/Boolean/src/G4DisplacedSolid.cc | 88 +- .../solids/Boolean/src/G4IntersectionSolid.cc | 22 +- .../solids/Boolean/src/G4SubtractionSolid.cc | 55 +- .../solids/Boolean/src/G4UnionSolid.cc | 42 +- source/geometry/solids/CSG/History | 29 +- source/geometry/solids/CSG/include/G4Box.hh | 20 +- .../geometry/solids/CSG/include/G4CSGSolid.hh | 6 +- .../solids/CSG/include/G4ClippablePolygon.hh | 4 +- source/geometry/solids/CSG/include/G4Cons.hh | 6 +- source/geometry/solids/CSG/include/G4Hype.hh | 11 +- source/geometry/solids/CSG/include/G4Para.hh | 16 +- .../solids/CSG/include/G4ReduciblePolygon.hh | 2 + .../geometry/solids/CSG/include/G4Sphere.hh | 6 +- source/geometry/solids/CSG/include/G4Torus.hh | 6 +- source/geometry/solids/CSG/include/G4Trap.hh | 6 +- source/geometry/solids/CSG/include/G4Trd.hh | 16 +- source/geometry/solids/CSG/include/G4Tubs.hh | 6 +- source/geometry/solids/CSG/src/G4Box.cc | 72 +- source/geometry/solids/CSG/src/G4CSGSolid.cc | 6 +- source/geometry/solids/CSG/src/G4Cons.cc | 541 +- source/geometry/solids/CSG/src/G4Hype.cc | 13 +- .../solids/CSG/src/G4IntersectingCone.cc | 38 +- source/geometry/solids/CSG/src/G4Para.cc | 105 +- source/geometry/solids/CSG/src/G4Polycone.cc | 4 +- .../geometry/solids/CSG/src/G4PolyconeSide.cc | 113 +- source/geometry/solids/CSG/src/G4Polyhedra.cc | 4 +- .../solids/CSG/src/G4ReduciblePolygon.cc | 52 + source/geometry/solids/CSG/src/G4Sphere.cc | 161 +- source/geometry/solids/CSG/src/G4Torus.cc | 164 +- source/geometry/solids/CSG/src/G4Trap.cc | 300 +- source/geometry/solids/CSG/src/G4Trd.cc | 79 +- source/geometry/solids/CSG/src/G4Tubs.cc | 242 +- .../geometry/solids/CSG/src/G4VCSGfaceted.cc | 16 +- .../geometry/solids/STEP/include/EntityInst.h | 2 +- .../solids/STEP/include/Enumeration.h | 2 +- source/geometry/solids/STEP/include/ExpDict.h | 2 +- .../geometry/solids/STEP/include/Registry.h | 2 +- .../solids/STEP/include/STEPaggregate.h | 2 +- .../solids/STEP/include/STEPattribute.h | 2 +- .../solids/STEP/include/STEPattributeList.h | 2 +- .../solids/STEP/include/STEPcomplex.h | 2 +- .../geometry/solids/STEP/include/STEPentity.h | 2 +- .../geometry/solids/STEP/include/STEPfile.h | 2 +- .../geometry/solids/STEP/include/STEPselect.h | 2 +- .../geometry/solids/STEP/include/STEPstring.h | 2 +- .../solids/STEP/include/STEPundefined.h | 2 +- .../geometry/solids/STEP/include/SdaiBinary.h | 2 +- .../STEP/include/SdaiCONFIG_CONTROL_DESIGN.h | 2 +- .../solids/STEP/include/SingleLinkList.h | 2 +- source/geometry/solids/STEP/include/Str.h | 2 +- .../geometry/solids/STEP/include/baseType.h | 2 +- source/geometry/solids/STEP/include/classes.h | 2 +- source/geometry/solids/STEP/include/cmdmgr.h | 2 +- source/geometry/solids/STEP/include/dir.h | 2 +- source/geometry/solids/STEP/include/dirobj.h | 2 +- .../geometry/solids/STEP/include/dispnode.h | 2 +- .../solids/STEP/include/dispnodelist.h | 2 +- .../solids/STEP/include/editordefines.h | 2 +- .../geometry/solids/STEP/include/errordesc.h | 2 +- source/geometry/solids/STEP/include/gennode.h | 2 +- .../solids/STEP/include/gennodearray.h | 2 +- .../solids/STEP/include/gennodelist.h | 2 +- source/geometry/solids/STEP/include/instmgr.h | 2 +- source/geometry/solids/STEP/include/mgrnode.h | 2 +- .../solids/STEP/include/mgrnodearray.h | 2 +- .../solids/STEP/include/mgrnodelist.h | 2 +- .../geometry/solids/STEP/include/read_func.h | 2 +- .../solids/STEP/include/s_HEADER_SCHEMA.h | 2 +- source/geometry/solids/STEP/include/schema.h | 2 +- .../geometry/solids/STEP/include/scl_hash.h | 2 +- .../geometry/solids/STEP/include/scl_string.h | 2 +- source/geometry/solids/STEP/include/sdai.h | 2 +- .../solids/STEP/include/seeinfodefault.h | 2 +- source/geometry/solids/STEP/include/stat.h | 2 +- .../geometry/solids/STEP/src/Enumeration.cc | 2 +- source/geometry/solids/STEP/src/ExpDict.cc | 2 +- .../solids/STEP/src/ExpDict_inline.cc | 2 +- .../solids/STEP/src/Registry_inline.cc | 2 +- .../geometry/solids/STEP/src/STEPaggregate.cc | 2 +- .../geometry/solids/STEP/src/STEPattribute.cc | 2 +- .../solids/STEP/src/STEPattributeList.cc | 2 +- .../solids/STEP/src/STEPattribute_inline.cc | 2 +- .../geometry/solids/STEP/src/STEPcomplex.cc | 2 +- source/geometry/solids/STEP/src/STEPentity.cc | 2 +- source/geometry/solids/STEP/src/STEPfile.cc | 2 +- .../solids/STEP/src/STEPfile_inline.cc | 2 +- source/geometry/solids/STEP/src/STEPselect.cc | 12 +- source/geometry/solids/STEP/src/STEPstring.cc | 2 +- .../geometry/solids/STEP/src/STEPundefined.cc | 2 +- source/geometry/solids/STEP/src/SdaiBinary.cc | 2 +- .../STEP/src/SdaiCONFIG_CONTROL_DESIGN.cc | 2 +- .../src/SdaiCONFIG_CONTROL_DESIGN_init.cc | 2 +- .../solids/STEP/src/SingleLinkList.cc | 2 +- .../solids/STEP/src/SingleLinkList_inline.cc | 2 +- source/geometry/solids/STEP/src/Str.cc | 2 +- source/geometry/solids/STEP/src/cmdmgr.cc | 2 +- source/geometry/solids/STEP/src/dirobj.cc | 2 +- source/geometry/solids/STEP/src/dispnode.cc | 2 +- .../geometry/solids/STEP/src/dispnodelist.cc | 2 +- source/geometry/solids/STEP/src/errordesc.cc | 2 +- .../solids/STEP/src/gennode_inline.cc | 2 +- .../geometry/solids/STEP/src/gennodearray.cc | 2 +- source/geometry/solids/STEP/src/instmgr.cc | 2 +- source/geometry/solids/STEP/src/mgrnode.cc | 2 +- .../geometry/solids/STEP/src/mgrnodearray.cc | 2 +- .../geometry/solids/STEP/src/mgrnodelist.cc | 2 +- source/geometry/solids/STEP/src/read_func.cc | 2 +- .../solids/STEP/src/s_HEADER_SCHEMA.cc | 2 +- .../solids/STEP/src/s_HEADER_SCHEMA_init.cc | 2 +- source/geometry/solids/STEP/src/schema.cc | 2 +- source/geometry/solids/STEP/src/scl_hash.cc | 2 +- source/geometry/solids/STEP/src/scl_string.cc | 2 +- source/geometry/solids/STEPinterface/History | 25 +- .../include/G4GeometryCreator.hh | 16 +- .../STEPinterface/include/G4GeometryTable.hh | 16 +- .../include/G4NISTStepReader.hh | 6 +- .../include/G4StepFileReader.hh | 6 +- .../src/G4BSplineCurveWithKnotsCreator.cc | 2 +- .../src/G4BoundedSurfaceCreator.cc | 1 + .../STEPinterface/src/G4GeometryCreator.cc | 1 + .../src/G4NISTStepReader.cc | 6 +- .../G4RepresentationRelationshipCreator.cc | 1 + source/geometry/volumes/History | 58 +- .../volumes/include/G4AuxiliaryNavServices.hh | 6 +- .../volumes/include/G4BlockingList.hh | 10 +- .../volumes/include/G4BlockingList.icc | 6 +- source/geometry/volumes/include/G4GRSSolid.hh | 6 +- .../geometry/volumes/include/G4GRSSolid.icc | 6 +- .../geometry/volumes/include/G4GRSVolume.hh | 6 +- .../geometry/volumes/include/G4GRSVolume.icc | 6 +- .../volumes/include/G4LogicalBorderSurface.hh | 16 +- .../volumes/include/G4LogicalSkinSurface.hh | 16 +- .../volumes/include/G4NavigationHistory.hh | 14 +- .../volumes/include/G4NavigationHistory.icc | 6 +- .../volumes/include/G4NavigationLevel.hh | 6 +- .../volumes/include/G4NavigationLevel.icc | 6 +- .../volumes/include/G4NavigationLevelRep.hh | 6 +- .../volumes/include/G4NavigationLevelRep.icc | 6 +- .../geometry/volumes/include/G4Navigator.hh | 6 +- .../geometry/volumes/include/G4Navigator.icc | 6 +- .../volumes/include/G4NormalNavigation.hh | 6 +- .../volumes/include/G4NormalNavigation.icc | 6 +- .../include/G4ParameterisedNavigation.hh | 6 +- .../include/G4ParameterisedNavigation.icc | 6 +- .../volumes/include/G4PropagatorInField.hh | 81 +- .../volumes/include/G4PropagatorInField.icc | 37 +- .../volumes/include/G4ReplicaNavigation.hh | 6 +- .../volumes/include/G4ReplicaNavigation.icc | 6 +- .../volumes/include/G4TouchableHistory.hh | 6 +- .../volumes/include/G4TouchableHistory.icc | 35 +- .../geometry/volumes/include/G4Transform.hh | 6 +- .../include/G4TransportationManager.hh | 14 +- .../include/G4TransportationManager.icc | 11 +- .../volumes/include/G4VoxelNavigation.hh | 20 +- .../volumes/include/G4VoxelNavigation.icc | 6 +- source/geometry/volumes/src/G4BlockingList.cc | 6 +- source/geometry/volumes/src/G4GRSSolid.cc | 6 +- source/geometry/volumes/src/G4GRSVolume.cc | 6 +- .../volumes/src/G4LogicalBorderSurface.cc | 6 +- .../volumes/src/G4LogicalSkinSurface.cc | 6 +- .../volumes/src/G4NavigationHistory.cc | 6 +- source/geometry/volumes/src/G4Navigator.cc | 26 +- .../volumes/src/G4NormalNavigation.cc | 6 +- .../volumes/src/G4ParameterisedNavigation.cc | 6 +- .../volumes/src/G4PropagatorInField.cc | 191 +- .../volumes/src/G4ReplicaNavigation.cc | 6 +- .../volumes/src/G4TouchableHistory.cc | 34 +- .../volumes/src/G4TransportationManager.cc | 36 +- .../geometry/volumes/src/G4VoxelNavigation.cc | 6 +- .../HEPGeometry/include/G4LorentzRotation.hh | 6 +- .../HEPGeometry/include/G4LorentzVector.hh | 6 +- .../global/HEPGeometry/include/G4Normal3D.hh | 6 +- .../global/HEPGeometry/include/G4Plane3D.hh | 6 +- .../global/HEPGeometry/include/G4Point3D.hh | 6 +- .../HEPGeometry/include/G4Transform3D.hh | 6 +- .../global/HEPGeometry/include/G4Vector3D.hh | 6 +- source/global/HEPGeometry/include/geomdefs.hh | 11 +- .../include/G4ChebyshevApproximation.hh | 10 +- .../include/G4DataInterpolation.hh | 12 +- .../HEPNumerics/include/G4GaussChebyshevQ.hh | 10 +- .../HEPNumerics/include/G4GaussHermiteQ.hh | 11 +- .../HEPNumerics/include/G4GaussJacobiQ.hh | 10 +- .../HEPNumerics/include/G4GaussLaguerreQ.hh | 10 +- .../HEPNumerics/include/G4GaussLegendreQ.hh | 10 +- .../HEPNumerics/include/G4Integrator.hh | 166 + .../HEPNumerics/include/G4Integrator.icc | 1407 + .../include/G4SimpleIntegration.hh | 10 +- .../include/G4VGaussianQuadrature.hh | 10 +- .../src/G4ChebyshevApproximation.cc | 6 +- .../HEPNumerics/src/G4DataInterpolation.cc | 9 +- .../HEPNumerics/src/G4GaussChebyshevQ.cc | 6 +- .../global/HEPNumerics/src/G4GaussHermiteQ.cc | 6 +- .../global/HEPNumerics/src/G4GaussJacobiQ.cc | 6 +- .../HEPNumerics/src/G4GaussLaguerreQ.cc | 6 +- .../HEPNumerics/src/G4GaussLegendreQ.cc | 6 +- .../HEPNumerics/src/G4SimpleIntegration.cc | 6 +- .../HEPNumerics/src/G4VGaussianQuadrature.cc | 6 +- source/global/HEPRandom/include/G4Poisson.hh | 17 +- source/global/HEPRandom/include/Randomize.hh | 6 +- .../HEPRandom/test/G4RandDistributionTest.cc | 233 + .../global/HEPRandom/test/G4RandGlobalTest.cc | 282 + .../global/HEPRandom/test/G4ShootBitTest.cc | 72 + source/global/HEPRandom/test/GNUmakefile | 24 + source/global/History | 150 +- source/global/STLInterface/History | 52 +- source/global/STLInterface/g4rw/cstring.h | 173 + source/global/STLInterface/g4rw/cstring.icc | 440 + source/global/STLInterface/g4rw/ctoken.h | 84 + source/global/STLInterface/g4rw/defs.h | 117 + source/global/STLInterface/g4rw/rstream.h | 30 + source/global/STLInterface/g4rw/rw2stl_algo.h | 39 + source/global/STLInterface/g4rw/tpordvec.h | 91 + source/global/STLInterface/g4rw/tpordvec.icc | 355 + source/global/STLInterface/g4rw/tpsrtvec.h | 84 + source/global/STLInterface/g4rw/tpsrtvec.icc | 240 + source/global/STLInterface/g4rw/tpvector.h | 64 + source/global/STLInterface/g4rw/tpvector.icc | 89 + source/global/STLInterface/g4rw/tvordvec.h | 90 + source/global/STLInterface/g4rw/tvordvec.icc | 281 + source/global/STLInterface/g4rw/tvvector.h | 71 + source/global/STLInterface/g4rw/tvvector.icc | 120 + source/global/STLInterface/rw/cstring.h | 443 - source/global/STLInterface/rw/ctoken.h | 61 - source/global/STLInterface/rw/defs.h | 115 - source/global/STLInterface/rw/rstream.h | 14 - source/global/STLInterface/rw/rw2stl_algo.h | 20 - source/global/STLInterface/rw/rwstlhash.h | 29 - source/global/STLInterface/rw/tphdict.h | 296 - source/global/STLInterface/rw/tpordvec.h | 378 - source/global/STLInterface/rw/tpsrtvec.h | 241 - source/global/STLInterface/rw/tpsrtvec.icc | 20 - source/global/STLInterface/rw/tpvector.h | 51 - source/global/STLInterface/rw/tpvector.icc | 16 - source/global/STLInterface/rw/tvhdict.h | 178 - source/global/STLInterface/rw/tvhdict.icc | 19 - source/global/STLInterface/rw/tvordvec.h | 297 - source/global/STLInterface/rw/tvvector.h | 101 - .../STLInterface/wrappers/AIX-xlC/hash_map | 28 - .../STLInterface/wrappers/DEC-cxx/cstdio | 2 +- .../STLInterface/wrappers/DEC-cxx/cstring | 2 +- .../STLInterface/wrappers/DEC-cxx/hash_map | 28 - .../STLInterface/wrappers/HP-aCC/hash_map | 28 - .../STLInterface/wrappers/HP-aCC/iomanip | 1 + .../STLInterface/wrappers/HP-aCC/iostream | 1 + .../STLInterface/wrappers/HP-aCC/strstream | 1 + .../STLInterface/wrappers/SGI-CC/iostream | 1 + .../STLInterface/wrappers/SUN-CC/hash_map | 28 - .../global/management/include/G4Allocator.hh | 19 +- .../management/include/G4AllocatorPage.hh | 9 +- .../management/include/G4AllocatorUnit.hh | 8 +- .../global/management/include/G4DataVector.hh | 15 +- .../global/management/include/G4FastVector.hh | 10 +- .../include/G4LPhysicsFreeVector.hh | 117 +- .../include/G4LPhysicsFreeVector.icc | 121 + .../management/include/G4OrderedTable.hh | 18 +- .../management/include/G4PhysicsFreeVector.hh | 33 +- .../include/G4PhysicsLinearVector.hh | 15 +- .../management/include/G4PhysicsLogVector.hh | 29 +- .../include/G4PhysicsOrderedFreeVector.hh | 66 +- .../include/G4PhysicsOrderedFreeVector.icc | 72 + .../management/include/G4PhysicsTable.hh | 10 +- .../management/include/G4PhysicsVector.hh | 119 +- .../management/include/G4PhysicsVector.icc | 106 + .../management/include/G4RotationMatrix.hh | 6 +- .../management/include/G4ThreeVector.hh | 6 +- source/global/management/include/G4Timer.hh | 20 +- source/global/management/include/G4Types.hh | 18 +- .../global/management/include/G4UnitsTable.hh | 66 +- .../global/management/include/G4UnitsTest.hh | 11 +- .../global/management/include/G4UserLimits.hh | 44 +- .../management/include/G4UserLimits.icc | 35 +- .../management/include/G4coutDestination.hh | 18 + source/global/management/include/G4ios.hh | 32 +- .../management/include/G4strstreambuf.hh | 82 +- .../management/include/PhysicalConstants.h | 20 +- .../global/management/include/SystemOfUnits.h | 14 +- .../global/management/include/g4std/algorithm | 23 + .../global/management/include/g4std/fstream | 22 + .../management/include/g4std/functional | 23 + .../global/management/include/g4std/iomanip | 23 + .../global/management/include/g4std/iostream | 22 + source/global/management/include/g4std/map | 22 + source/global/management/include/g4std/set | 23 + .../global/management/include/g4std/streambuf | 26 + .../global/management/include/g4std/strstream | 26 + source/global/management/include/g4std/vector | 24 + source/global/management/include/globals.hh | 23 +- source/global/management/include/templates.hh | 6 +- source/global/management/src/G4Exception.cc | 29 +- .../management/src/G4LPhysicsFreeVector.cc | 6 +- .../management/src/G4PhysicsFreeVector.cc | 13 +- .../management/src/G4PhysicsLinearVector.cc | 12 +- .../management/src/G4PhysicsLogVector.cc | 20 +- .../src/G4PhysicsOrderedFreeVector.cc | 6 +- .../global/management/src/G4PhysicsVector.cc | 14 +- source/global/management/src/G4Timer.cc | 8 +- source/global/management/src/G4UnitsTable.cc | 31 +- source/global/management/src/G4ios.cc | 26 +- source/graphics_reps/History | 14 +- source/graphics_reps/include/G4Circle.hh | 14 +- source/graphics_reps/include/G4Circle.icc | 6 +- source/graphics_reps/include/G4Color.hh | 11 +- source/graphics_reps/include/G4Colour.hh | 52 +- source/graphics_reps/include/G4NURBS.hh | 13 +- source/graphics_reps/include/G4NURBSbox.hh | 11 +- .../graphics_reps/include/G4NURBScylinder.hh | 12 +- .../include/G4NURBShexahedron.hh | 12 +- source/graphics_reps/include/G4NURBStube.hh | 11 +- .../include/G4NURBStubesector.hh | 13 +- .../include/G4PlacedPolyhedron.hh | 57 + source/graphics_reps/include/G4Point3DList.hh | 14 +- source/graphics_reps/include/G4Polyhedron.hh | 13 +- source/graphics_reps/include/G4Polyline.hh | 17 +- source/graphics_reps/include/G4Polymarker.hh | 15 +- source/graphics_reps/include/G4Polymarker.icc | 6 +- source/graphics_reps/include/G4Square.hh | 14 +- source/graphics_reps/include/G4Square.icc | 6 +- source/graphics_reps/include/G4Text.hh | 45 +- source/graphics_reps/include/G4Text.icc | 6 +- source/graphics_reps/include/G4VMarker.hh | 16 +- source/graphics_reps/include/G4VMarker.icc | 6 +- source/graphics_reps/include/G4VVisPrim.hh | 11 +- source/graphics_reps/include/G4VVisPrim.icc | 6 +- .../graphics_reps/include/G4VisAttributes.hh | 26 +- .../graphics_reps/include/G4VisAttributes.icc | 6 +- source/graphics_reps/include/G4VisExtent.hh | 14 +- source/graphics_reps/include/G4Visible.hh | 21 +- source/graphics_reps/include/G4Visible.icc | 6 +- source/graphics_reps/src/G4Circle.cc | 6 +- source/graphics_reps/src/G4Colour.cc | 6 +- source/graphics_reps/src/G4NURBS.cc | 6 +- source/graphics_reps/src/G4NURBSbox.cc | 6 +- source/graphics_reps/src/G4NURBScylinder.cc | 6 +- source/graphics_reps/src/G4NURBShexahedron.cc | 6 +- source/graphics_reps/src/G4NURBStube.cc | 6 +- source/graphics_reps/src/G4NURBStubesector.cc | 6 +- .../graphics_reps/src/G4PlacedPolyhedron.cc | 17 + source/graphics_reps/src/G4Point3DList.cc | 6 +- source/graphics_reps/src/G4Polyhedron.cc | 7 +- source/graphics_reps/src/G4Polyline.cc | 6 +- source/graphics_reps/src/G4Polymarker.cc | 6 +- source/graphics_reps/src/G4Square.cc | 6 +- source/graphics_reps/src/G4Text.cc | 6 +- source/graphics_reps/src/G4VMarker.cc | 6 +- source/graphics_reps/src/G4VVisPrim.cc | 6 +- source/graphics_reps/src/G4VisAttributes.cc | 6 +- source/graphics_reps/src/G4VisExtent.cc | 6 +- source/graphics_reps/src/G4Visible.cc | 6 +- source/intercoms/History | 18 +- .../intercoms/include/G4ApplicationState.hh | 8 +- source/intercoms/include/G4StateManager.hh | 50 +- source/intercoms/include/G4UIbatch.hh | 22 +- .../intercoms/include/G4UIcmdWith3Vector.hh | 33 +- .../include/G4UIcmdWith3VectorAndUnit.hh | 54 +- source/intercoms/include/G4UIcmdWithABool.hh | 34 +- .../intercoms/include/G4UIcmdWithADouble.hh | 30 +- .../include/G4UIcmdWithADoubleAndUnit.hh | 54 +- .../intercoms/include/G4UIcmdWithAString.hh | 30 +- .../intercoms/include/G4UIcmdWithAnInteger.hh | 30 +- .../include/G4UIcmdWithoutParameter.hh | 15 +- source/intercoms/include/G4UIcommand.hh | 56 +- source/intercoms/include/G4UIcommandStatus.hh | 6 +- source/intercoms/include/G4UIcommandTree.hh | 18 +- .../intercoms/include/G4UIcontrolMessenger.hh | 17 +- source/intercoms/include/G4UIdirectory.hh | 15 +- source/intercoms/include/G4UImanager.hh | 70 +- source/intercoms/include/G4UImessenger.hh | 34 +- source/intercoms/include/G4UIparameter.hh | 48 +- source/intercoms/include/G4UIsession.hh | 12 +- source/intercoms/include/G4UItokenNum.hh | 6 +- source/intercoms/include/G4UnitsMessenger.hh | 12 +- .../include/G4VFlavoredParallelWorld.hh | 6 +- .../include/G4VGlobalFastSimulationManager.hh | 6 +- source/intercoms/include/G4VGraphicsScene.hh | 82 +- source/intercoms/include/G4VStateDependent.hh | 21 +- source/intercoms/include/G4VVisManager.hh | 77 +- source/intercoms/src/G4StateManager.cc | 6 +- source/intercoms/src/G4UIbatch.cc | 6 +- source/intercoms/src/G4UIcmdWith3Vector.cc | 6 +- .../src/G4UIcmdWith3VectorAndUnit.cc | 6 +- source/intercoms/src/G4UIcmdWithABool.cc | 6 +- source/intercoms/src/G4UIcmdWithADouble.cc | 6 +- .../src/G4UIcmdWithADoubleAndUnit.cc | 6 +- source/intercoms/src/G4UIcmdWithAString.cc | 6 +- source/intercoms/src/G4UIcmdWithAnInteger.cc | 6 +- .../intercoms/src/G4UIcmdWithoutParameter.cc | 6 +- source/intercoms/src/G4UIcommand.cc | 12 +- source/intercoms/src/G4UIcommandTree.cc | 14 +- source/intercoms/src/G4UIcontrolMessenger.cc | 6 +- source/intercoms/src/G4UIdirectory.cc | 6 +- source/intercoms/src/G4UImanager.cc | 12 +- source/intercoms/src/G4UImessenger.cc | 6 +- source/intercoms/src/G4UIparameter.cc | 10 +- source/intercoms/src/G4UIsession.cc | 6 +- source/intercoms/src/G4UnitsMessenger.cc | 6 +- .../src/G4VGlobalFastSimulationManager.cc | 6 +- source/intercoms/src/G4VStateDependent.cc | 6 +- source/intercoms/src/G4VVisManager.cc | 6 +- source/interfaces/GAG/include/G4UIGAG.hh | 45 +- source/interfaces/GAG/src/G4UIGAG.cc | 40 +- source/interfaces/History | 42 +- source/interfaces/OPACS/include/G4UIWo.hh | 6 +- .../interfaces/OPACS/include/G4WoMessenger.hh | 6 +- source/interfaces/OPACS/include/G4oCommon.hh | 6 +- source/interfaces/OPACS/include/G4oCommon.icc | 6 +- source/interfaces/OPACS/src/G4UIWo.cc | 6 +- source/interfaces/OPACS/src/G4WoMessenger.cc | 6 +- source/interfaces/XVT/include/G4UIxvt.hh | 6 +- .../XVT/include/G4UIxvtMessenger.hh | 6 +- source/interfaces/XVT/src/G4UIxvt.cc | 6 +- source/interfaces/XVT/src/G4UIxvtMessenger.cc | 6 +- source/interfaces/basic/include/G4UIWin32.hh | 56 +- source/interfaces/basic/include/G4UIXaw.hh | 19 +- source/interfaces/basic/include/G4UIXm.hh | 50 +- .../interfaces/basic/include/G4UIterminal.hh | 24 +- source/interfaces/basic/src/G4UIWin32.cc | 20 +- source/interfaces/basic/src/G4UIXaw.cc | 6 +- source/interfaces/basic/src/G4UIXm.cc | 11 +- source/interfaces/basic/src/G4UIterminal.cc | 121 +- .../common/include/G4InteractorMessenger.hh | 2 +- .../common/include/G4VBasicShell.hh | 19 +- .../common/include/G4VInteractiveSession.hh | 17 +- .../common/include/G4VInteractorManager.hh | 26 +- source/interfaces/common/include/G4Win32.hh | 14 +- source/interfaces/common/include/G4Xt.hh | 29 +- .../common/src/G4InteractorMessenger.cc | 41 +- source/interfaces/common/src/G4VBasicShell.cc | 32 +- .../common/src/G4VInteractiveSession.cc | 12 +- .../common/src/G4VInteractorManager.cc | 36 +- source/interfaces/common/src/G4Win32.cc | 6 +- source/interfaces/common/src/G4Xt.cc | 18 +- source/materials/History | 17 +- source/materials/include/G4AtomicShells.hh | 6 +- source/materials/include/G4Element.hh | 14 +- source/materials/include/G4ElementTable.hh | 6 +- source/materials/include/G4ElementVector.hh | 6 +- source/materials/include/G4IonisParamElm.hh | 6 +- source/materials/include/G4IonisParamMat.hh | 6 +- source/materials/include/G4Isotope.hh | 10 +- source/materials/include/G4IsotopeVector.hh | 6 +- source/materials/include/G4MPVEntry.hh | 18 +- source/materials/include/G4Material.hh | 46 +- .../include/G4MaterialPropertiesTable.hh | 53 +- .../include/G4MaterialPropertyVector.hh | 43 +- source/materials/include/G4MaterialTable.hh | 6 +- source/materials/include/G4OpticalSurface.hh | 54 +- source/materials/include/G4SandiaTable.hh | 20 +- .../materials/include/G4StaticSandiaData.hh | 6 +- source/materials/src/G4AtomicShells.cc | 6 +- source/materials/src/G4Element.cc | 6 +- source/materials/src/G4IonisParamElm.cc | 6 +- source/materials/src/G4IonisParamMat.cc | 6 +- source/materials/src/G4Isotope.cc | 6 +- source/materials/src/G4MPVEntry.cc | 12 +- source/materials/src/G4Material.cc | 104 +- .../src/G4MaterialPropertiesTable.cc | 74 +- .../materials/src/G4MaterialPropertyVector.cc | 10 +- source/materials/src/G4OpticalSurface.cc | 6 +- source/materials/src/G4SandiaTable.cc | 43 +- source/particles/GNUmakefile | 4 +- source/particles/History | 55 +- .../bosons/include/G4BosonConstructor.hh | 6 +- .../bosons/include/G4ChargedGeantino.hh | 6 +- source/particles/bosons/include/G4Gamma.hh | 6 +- source/particles/bosons/include/G4Geantino.hh | 6 +- .../bosons/include/G4OpticalPhoton.hh | 6 +- source/particles/bosons/include/G4VBoson.hh | 6 +- .../bosons/src/G4BosonConstructor.cc | 6 +- .../particles/bosons/src/G4ChargedGeantino.cc | 6 +- source/particles/bosons/src/G4Gamma.cc | 6 +- source/particles/bosons/src/G4Geantino.cc | 6 +- .../particles/bosons/src/G4OpticalPhoton.cc | 6 +- source/particles/bosons/src/G4VBoson.cc | 6 +- source/particles/hadrons/barions/GNUmakefile | 4 +- .../hadrons/barions/include/G4AntiLambda.hh | 12 +- .../barions/include/G4AntiLambdacPlus.hh | 12 +- .../hadrons/barions/include/G4AntiNeutron.hh | 12 +- .../barions/include/G4AntiOmegaMinus.hh | 12 +- .../barions/include/G4AntiOmegacZero.hh | 12 +- .../hadrons/barions/include/G4AntiProton.hh | 12 +- .../barions/include/G4AntiSigmaMinus.hh | 12 +- .../barions/include/G4AntiSigmaPlus.hh | 12 +- .../barions/include/G4AntiSigmaZero.hh | 12 +- .../barions/include/G4AntiSigmacPlus.hh | 12 +- .../barions/include/G4AntiSigmacPlusPlus.hh | 12 +- .../barions/include/G4AntiSigmacZero.hh | 12 +- .../hadrons/barions/include/G4AntiXiMinus.hh | 12 +- .../hadrons/barions/include/G4AntiXiZero.hh | 12 +- .../hadrons/barions/include/G4AntiXicPlus.hh | 12 +- .../hadrons/barions/include/G4AntiXicZero.hh | 12 +- ...nConstructor.hh => G4BaryonConstructor.hh} | 22 +- .../hadrons/barions/include/G4Lambda.hh | 12 +- .../hadrons/barions/include/G4LambdacPlus.hh | 12 +- .../hadrons/barions/include/G4Neutron.hh | 12 +- .../hadrons/barions/include/G4OmegaMinus.hh | 12 +- .../hadrons/barions/include/G4OmegacZero.hh | 12 +- .../hadrons/barions/include/G4Proton.hh | 12 +- .../hadrons/barions/include/G4SigmaMinus.hh | 12 +- .../hadrons/barions/include/G4SigmaPlus.hh | 12 +- .../hadrons/barions/include/G4SigmaZero.hh | 12 +- .../hadrons/barions/include/G4SigmacPlus.hh | 12 +- .../barions/include/G4SigmacPlusPlus.hh | 12 +- .../hadrons/barions/include/G4SigmacZero.hh | 12 +- .../include/{G4VBarion.hh => G4VBaryon.hh} | 18 +- .../hadrons/barions/include/G4XiMinus.hh | 12 +- .../hadrons/barions/include/G4XiZero.hh | 12 +- .../hadrons/barions/include/G4XicPlus.hh | 12 +- .../hadrons/barions/include/G4XicZero.hh | 12 +- .../hadrons/barions/src/G4AntiLambda.cc | 8 +- .../hadrons/barions/src/G4AntiLambdacPlus.cc | 8 +- .../hadrons/barions/src/G4AntiNeutron.cc | 8 +- .../hadrons/barions/src/G4AntiOmegaMinus.cc | 8 +- .../hadrons/barions/src/G4AntiOmegacZero.cc | 8 +- .../hadrons/barions/src/G4AntiProton.cc | 8 +- .../hadrons/barions/src/G4AntiSigmaMinus.cc | 8 +- .../hadrons/barions/src/G4AntiSigmaPlus.cc | 8 +- .../hadrons/barions/src/G4AntiSigmaZero.cc | 8 +- .../hadrons/barions/src/G4AntiSigmacPlus.cc | 8 +- .../barions/src/G4AntiSigmacPlusPlus.cc | 8 +- .../hadrons/barions/src/G4AntiSigmacZero.cc | 8 +- .../hadrons/barions/src/G4AntiXiMinus.cc | 8 +- .../hadrons/barions/src/G4AntiXiZero.cc | 8 +- .../hadrons/barions/src/G4AntiXicPlus.cc | 8 +- .../hadrons/barions/src/G4AntiXicZero.cc | 8 +- ...nConstructor.cc => G4BaryonConstructor.cc} | 30 +- .../particles/hadrons/barions/src/G4Lambda.cc | 8 +- .../hadrons/barions/src/G4LambdacPlus.cc | 8 +- .../hadrons/barions/src/G4Neutron.cc | 8 +- .../hadrons/barions/src/G4OmegaMinus.cc | 8 +- .../hadrons/barions/src/G4OmegacZero.cc | 8 +- .../particles/hadrons/barions/src/G4Proton.cc | 8 +- .../hadrons/barions/src/G4SigmaMinus.cc | 8 +- .../hadrons/barions/src/G4SigmaPlus.cc | 8 +- .../hadrons/barions/src/G4SigmaZero.cc | 8 +- .../hadrons/barions/src/G4SigmacPlus.cc | 8 +- .../hadrons/barions/src/G4SigmacPlusPlus.cc | 8 +- .../hadrons/barions/src/G4SigmacZero.cc | 8 +- .../src/{G4VBarion.cc => G4VBaryon.cc} | 10 +- .../hadrons/barions/src/G4XiMinus.cc | 8 +- .../particles/hadrons/barions/src/G4XiZero.cc | 8 +- .../hadrons/barions/src/G4XicPlus.cc | 8 +- .../hadrons/barions/src/G4XicZero.cc | 8 +- .../particles/hadrons/ions/include/G4Alpha.hh | 6 +- .../hadrons/ions/include/G4Deuteron.hh | 6 +- .../hadrons/ions/include/G4GenericIon.hh | 6 +- .../particles/hadrons/ions/include/G4He3.hh | 6 +- .../hadrons/ions/include/G4IonConstructor.hh | 6 +- .../hadrons/ions/include/G4Triton.hh | 6 +- .../particles/hadrons/ions/include/G4VIon.hh | 6 +- source/particles/hadrons/ions/src/G4Alpha.cc | 6 +- .../particles/hadrons/ions/src/G4Deuteron.cc | 6 +- .../hadrons/ions/src/G4GenericIon.cc | 6 +- source/particles/hadrons/ions/src/G4He3.cc | 6 +- .../hadrons/ions/src/G4IonConstructor.cc | 6 +- source/particles/hadrons/ions/src/G4Triton.cc | 6 +- source/particles/hadrons/ions/src/G4VIon.cc | 6 +- .../mesons/include/G4AntiBMesonZero.hh | 6 +- .../mesons/include/G4AntiBsMesonZero.hh | 6 +- .../mesons/include/G4AntiDMesonZero.hh | 6 +- .../hadrons/mesons/include/G4AntiKaonZero.hh | 6 +- .../hadrons/mesons/include/G4BMesonMinus.hh | 6 +- .../hadrons/mesons/include/G4BMesonPlus.hh | 6 +- .../hadrons/mesons/include/G4BMesonZero.hh | 6 +- .../hadrons/mesons/include/G4BsMesonZero.hh | 6 +- .../hadrons/mesons/include/G4DMesonMinus.hh | 6 +- .../hadrons/mesons/include/G4DMesonPlus.hh | 6 +- .../hadrons/mesons/include/G4DMesonZero.hh | 6 +- .../hadrons/mesons/include/G4DsMesonMinus.hh | 6 +- .../hadrons/mesons/include/G4DsMesonPlus.hh | 6 +- .../particles/hadrons/mesons/include/G4Eta.hh | 6 +- .../hadrons/mesons/include/G4EtaPrime.hh | 6 +- .../hadrons/mesons/include/G4JPsi.hh | 6 +- .../hadrons/mesons/include/G4KaonMinus.hh | 6 +- .../hadrons/mesons/include/G4KaonPlus.hh | 6 +- .../hadrons/mesons/include/G4KaonZero.hh | 6 +- .../hadrons/mesons/include/G4KaonZeroLong.hh | 6 +- .../hadrons/mesons/include/G4KaonZeroShort.hh | 6 +- .../mesons/include/G4MesonConstructor.hh | 6 +- .../hadrons/mesons/include/G4PionMinus.hh | 6 +- .../hadrons/mesons/include/G4PionPlus.hh | 6 +- .../hadrons/mesons/include/G4PionZero.hh | 6 +- .../hadrons/mesons/include/G4RhoMinus.hh | 6 +- .../hadrons/mesons/include/G4RhoPlus.hh | 6 +- .../hadrons/mesons/include/G4RhoZero.hh | 6 +- .../hadrons/mesons/include/G4VMeson.hh | 6 +- .../hadrons/mesons/src/G4AntiBMesonZero.cc | 6 +- .../hadrons/mesons/src/G4AntiBsMesonZero.cc | 6 +- .../hadrons/mesons/src/G4AntiDMesonZero.cc | 6 +- .../hadrons/mesons/src/G4AntiKaonZero.cc | 6 +- .../hadrons/mesons/src/G4BMesonMinus.cc | 6 +- .../hadrons/mesons/src/G4BMesonPlus.cc | 6 +- .../hadrons/mesons/src/G4BMesonZero.cc | 6 +- .../hadrons/mesons/src/G4BsMesonZero.cc | 6 +- .../hadrons/mesons/src/G4DMesonMinus.cc | 6 +- .../hadrons/mesons/src/G4DMesonPlus.cc | 6 +- .../hadrons/mesons/src/G4DMesonZero.cc | 6 +- .../hadrons/mesons/src/G4DsMesonMinus.cc | 6 +- .../hadrons/mesons/src/G4DsMesonPlus.cc | 6 +- source/particles/hadrons/mesons/src/G4Eta.cc | 6 +- .../hadrons/mesons/src/G4EtaPrime.cc | 6 +- source/particles/hadrons/mesons/src/G4JPsi.cc | 6 +- .../hadrons/mesons/src/G4KaonMinus.cc | 6 +- .../hadrons/mesons/src/G4KaonPlus.cc | 6 +- .../hadrons/mesons/src/G4KaonZero.cc | 6 +- .../hadrons/mesons/src/G4KaonZeroLong.cc | 6 +- .../hadrons/mesons/src/G4KaonZeroShort.cc | 6 +- .../hadrons/mesons/src/G4MesonConstructor.cc | 6 +- .../hadrons/mesons/src/G4PionMinus.cc | 6 +- .../hadrons/mesons/src/G4PionPlus.cc | 6 +- .../hadrons/mesons/src/G4PionZero.cc | 6 +- .../hadrons/mesons/src/G4RhoMinus.cc | 6 +- .../particles/hadrons/mesons/src/G4RhoPlus.cc | 8 +- .../particles/hadrons/mesons/src/G4RhoZero.cc | 6 +- .../particles/hadrons/mesons/src/G4VMeson.cc | 6 +- .../leptons/include/G4AntiNeutrinoE.hh | 6 +- .../leptons/include/G4AntiNeutrinoMu.hh | 6 +- .../leptons/include/G4AntiNeutrinoTau.hh | 6 +- .../particles/leptons/include/G4Electron.hh | 6 +- .../leptons/include/G4LeptonConstructor.hh | 6 +- .../particles/leptons/include/G4MuonMinus.hh | 6 +- .../particles/leptons/include/G4MuonPlus.hh | 6 +- .../particles/leptons/include/G4NeutrinoE.hh | 6 +- .../particles/leptons/include/G4NeutrinoMu.hh | 6 +- .../leptons/include/G4NeutrinoTau.hh | 6 +- .../particles/leptons/include/G4Positron.hh | 6 +- .../particles/leptons/include/G4TauMinus.hh | 6 +- source/particles/leptons/include/G4TauPlus.hh | 6 +- source/particles/leptons/include/G4VLepton.hh | 6 +- .../particles/leptons/src/G4AntiNeutrinoE.cc | 6 +- .../particles/leptons/src/G4AntiNeutrinoMu.cc | 6 +- .../leptons/src/G4AntiNeutrinoTau.cc | 6 +- source/particles/leptons/src/G4Electron.cc | 6 +- .../leptons/src/G4LeptonConstructor.cc | 6 +- source/particles/leptons/src/G4MuonMinus.cc | 6 +- source/particles/leptons/src/G4MuonPlus.cc | 6 +- source/particles/leptons/src/G4NeutrinoE.cc | 6 +- source/particles/leptons/src/G4NeutrinoMu.cc | 6 +- source/particles/leptons/src/G4NeutrinoTau.cc | 6 +- source/particles/leptons/src/G4Positron.cc | 6 +- source/particles/leptons/src/G4TauMinus.cc | 6 +- source/particles/leptons/src/G4TauPlus.cc | 6 +- source/particles/leptons/src/G4VLepton.cc | 6 +- source/particles/management/GNUmakefile | 3 +- .../include/G4DalitzDecayChannel.hh | 15 +- .../management/include/G4DecayProducts.hh | 11 +- .../management/include/G4DecayTable.hh | 10 +- .../include/G4DecayTableMessenger.hh | 14 +- .../management/include/G4DynamicParticle.hh | 266 +- .../management/include/G4DynamicParticle.icc | 236 + .../include/G4DynamicParticleFastVector.hh | 6 +- .../management/include/G4ElectronOccupancy.hh | 157 + .../management/include/G4IonTable.hh | 137 +- source/particles/management/include/G4Ions.hh | 71 +- .../management/include/G4IsotopeProperty.hh | 166 + .../management/include/G4KL3DecayChannel.hh | 10 +- .../management/include/G4MuonDecayChannel.hh | 10 +- .../management/include/G4NucleiProperties.hh | 125 +- .../include/G4NucleiPropertiesTable.hh | 58 +- .../G4NucleiPropertiesTheoreticalTable.hh | 143 + .../management/include/G4PDGCodeChecker.hh | 173 + .../include/G4ParticleDefinition.hh | 101 +- .../management/include/G4ParticleMessenger.hh | 11 +- .../management/include/G4ParticleMomentum.hh | 8 +- .../include/G4ParticlePropertyMessenger.hh | 9 +- .../management/include/G4ParticleTable.hh | 221 +- .../management/include/G4ParticleTable.icc | 162 + .../include/G4ParticleTableIterator.hh | 61 + .../management/include/G4ParticleWithCuts.hh | 13 +- .../include/G4PhaseSpaceDecayChannel.hh | 15 +- .../management/include/G4ShortLivedTable.hh | 43 +- .../management/include/G4VDecayChannel.hh | 31 +- .../management/include/G4VIsotopeTable.hh | 100 + .../management/src/G4DalitzDecayChannel.cc | 6 +- .../management/src/G4DecayProducts.cc | 6 +- .../particles/management/src/G4DecayTable.cc | 6 +- .../management/src/G4DecayTableMessenger.cc | 6 +- .../management/src/G4DynamicParticle.cc | 122 +- .../management/src/G4ElectronOccupancy.cc | 120 + source/particles/management/src/G4IonTable.cc | 562 +- source/particles/management/src/G4Ions.cc | 17 +- .../management/src/G4IsotopeProperty.cc | 105 + .../management/src/G4KL3DecayChannel.cc | 6 +- .../management/src/G4MuonDecayChannel.cc | 6 +- .../management/src/G4NucleiProperties.cc | 162 +- .../src/G4NucleiPropertiesTableA.cc | 849 +- .../src/G4NucleiPropertiesTableB.cc | 1132 +- .../G4NucleiPropertiesTheoreticalTableA.cc | 50 + .../G4NucleiPropertiesTheoreticalTableB.cc | 2719 + .../management/src/G4PDGCodeChecker.cc | 349 + .../management/src/G4ParticleDefinition.cc | 321 +- .../management/src/G4ParticleMessenger.cc | 12 +- .../src/G4ParticlePropertyMessenger.cc | 6 +- .../management/src/G4ParticleTable.cc | 163 +- .../management/src/G4ParticleWithCuts.cc | 6 +- .../src/G4PhaseSpaceDecayChannel.cc | 6 +- .../management/src/G4ShortLivedTable.cc | 46 +- .../management/src/G4VDecayChannel.cc | 8 +- .../shortlived/include/G4DiQuarks.hh | 6 +- .../include/G4ExcitedBaryonConstructor.hh | 6 +- .../shortlived/include/G4ExcitedBaryons.hh | 6 +- .../include/G4ExcitedDeltaConstructor.hh | 8 +- .../include/G4ExcitedLambdaConstructor.hh | 8 +- .../include/G4ExcitedMesonConstructor.hh | 8 +- .../shortlived/include/G4ExcitedMesons.hh | 6 +- .../include/G4ExcitedNucleonConstructor.hh | 8 +- .../include/G4ExcitedSigmaConstructor.hh | 8 +- .../include/G4ExcitedXiConstructor.hh | 8 +- .../particles/shortlived/include/G4Gluons.hh | 6 +- .../particles/shortlived/include/G4Quarks.hh | 6 +- .../include/G4ShortLivedConstructor.hh | 8 +- .../include/G4VShortLivedParticle.hh | 6 +- source/particles/shortlived/src/G4DiQuarks.cc | 6 +- .../src/G4ExcitedBaryonConstructor.cc | 6 +- .../shortlived/src/G4ExcitedBaryons.cc | 6 +- .../src/G4ExcitedDeltaConstructor.cc | 8 +- .../src/G4ExcitedLambdaConstructor.cc | 8 +- .../src/G4ExcitedMesonConstructor.cc | 8 +- .../shortlived/src/G4ExcitedMesons.cc | 6 +- .../src/G4ExcitedNucleonConstructor.cc | 8 +- .../src/G4ExcitedSigmaConstructor.cc | 8 +- .../shortlived/src/G4ExcitedXiConstructor.cc | 8 +- source/particles/shortlived/src/G4Gluons.cc | 6 +- source/particles/shortlived/src/G4Quarks.cc | 6 +- .../shortlived/src/G4ShortLivedConstructor.cc | 10 +- .../shortlived/src/G4VShortLivedParticle.cc | 6 +- source/persistency/GNUmakefile | 40 +- source/persistency/History | 94 + .../digits+hits/digits/GNUmakefile | 34 + .../digits/include/G4PDCofThisEvent.ddl | 50 + .../digits+hits/digits/include/G4PVDigit.ddl | 34 + .../digits/include/G4PVDigitsCollection.ddl | 44 + .../digits/include/G4PersistentDigitMan.hh | 71 + .../digits/src/G4PDCofThisEvent.cc | 32 + .../digits+hits/digits/src/G4PVDigit.cc | 29 + .../digits/src/G4PVDigitsCollection.cc | 31 + .../digits/src/G4PersistentDigitMan.cc | 39 + .../persistency/digits+hits/hits/GNUmakefile | 15 +- .../hits/include/G4PHCofThisEvent.ddl | 60 +- .../digits+hits/hits/include/G4PVHit.ddl | 27 +- .../hits/include/G4PVHitsCollection.ddl | 38 +- .../hits/include/G4PersistentHitMan.hh | 71 + .../digits+hits/hits/src/G4PHCofThisEvent.cc | 31 + .../digits+hits/hits/src/G4PVHit.cc | 26 +- .../hits/src/G4PVHitsCollection.cc | 31 + .../hits/src/G4PersistentHitMan.cc | 39 + source/persistency/events/GNUmakefile | 36 +- .../persistency/events/include/G4PEvent.ddl | 98 +- .../events/include/G4PPrimaryParticle.ddl | 94 + .../events/include/G4PPrimaryVertex.ddl | 61 +- .../events/include/G4PersistentEventMan.hh | 76 + source/persistency/events/src/G4PEvent.cc | 111 +- .../events/src/G4PPrimaryParticle.cc | 68 + .../events/src/G4PPrimaryVertex.cc | 86 +- .../events/src/G4PersistentEventMan.cc | 103 + source/persistency/geometry/GNUmakefile | 4 +- .../persistency/geometry/global/GNUmakefile | 33 + .../global/include/G4PAffineTransform.ddl | 43 + .../include/G4PVSolid.ddl | 8 +- .../geometry/global/src/G4PAffineTransform.cc | 41 + .../{management => global}/src/G4PVSolid.cc | 12 +- .../geometry/management/GNUmakefile | 34 +- .../include/G4PGeometryObjectMap.ddl | 39 +- .../include/G4PLogicalVolume.ddl | 19 +- .../management/include/G4PPVParameterised.ddl | 14 +- .../management/include/G4PPVPlacement.ddl | 11 +- .../management/include/G4PPVReplica.ddl | 14 +- .../management/include/G4PVPhysicalVolume.ddl | 20 +- .../management/include/G4PersistentGeomMan.hh | 40 +- .../management/src/G4PGeometryObjectMap.cc | 25 +- .../src/G4PLogicalVolume.cc | 24 +- .../management/src/G4PPVParameterised.cc | 6 +- .../geometry/management/src/G4PPVPlacement.cc | 6 +- .../geometry/management/src/G4PPVReplica.cc | 6 +- .../management/src/G4PVPhysicalVolume.cc | 10 +- .../management/src/G4PersistentGeomMan.cc | 368 +- .../geometry/solids/Boolean/GNUmakefile | 39 + .../Boolean/include/G4PBooleanSolid.ddl | 42 + .../Boolean/include/G4PDisplacedSolid.ddl | 41 + .../Boolean/include/G4PIntersectionSolid.ddl | 38 + .../Boolean/include/G4PSubtractionSolid.ddl | 40 + .../solids/Boolean/include/G4PUnionSolid.ddl | 40 + .../solids/Boolean/src/G4PBooleanSolid.cc | 53 + .../solids/Boolean/src/G4PDisplacedSolid.cc | 39 + .../Boolean/src/G4PIntersectionSolid.cc | 30 + .../solids/Boolean/src/G4PSubtractionSolid.cc | 29 + .../solids/Boolean/src/G4PUnionSolid.cc | 28 + .../geometry/solids/CSG/GNUmakefile | 50 +- .../geometry/solids/CSG/include/G4PBox.ddl | 7 +- .../solids/CSG/include/G4PCSGSolid.ddl | 7 +- .../geometry/solids/CSG/include/G4PCons.ddl | 7 +- .../geometry/solids/CSG/include/G4PHype.ddl | 7 +- .../geometry/solids/CSG/include/G4PPara.ddl | 11 +- .../geometry/solids/CSG/include/G4PSphere.ddl | 11 +- .../geometry/solids/CSG/include/G4PTorus.ddl | 7 +- .../geometry/solids/CSG/include/G4PTrap.ddl | 11 +- .../geometry/solids/CSG/include/G4PTrd.ddl | 7 +- .../geometry/solids/CSG/include/G4PTubs.ddl | 7 +- .../geometry/solids/CSG/src/G4PBox.cc | 8 +- .../geometry/solids/CSG/src/G4PCSGSolid.cc | 12 +- .../geometry/solids/CSG/src/G4PCons.cc | 21 +- .../geometry/solids/CSG/src/G4PHype.cc | 15 +- .../geometry/solids/CSG/src/G4PPara.cc | 15 +- .../geometry/solids/CSG/src/G4PSphere.cc | 17 +- .../geometry/solids/CSG/src/G4PTorus.cc | 11 +- .../geometry/solids/CSG/src/G4PTrap.cc | 15 +- .../geometry/solids/CSG/src/G4PTrd.cc | 19 +- .../geometry/solids/CSG/src/G4PTubs.cc | 16 +- .../persistency/geometry/volumes/GNUmakefile | 35 - source/persistency/global/GNUmakefile | 32 + .../global/include/G4DatabaseTypes.hh | 33 + .../global/include/G4PersistentSchema.hh | 68 + .../include/G4PersistentTypes.hh | 6 +- .../global/include/G4VPersistentSubDbMan.hh | 95 + .../global/include/G4VPersistentSubMan.hh | 60 + .../global/src/G4VPersistentSubDbMan.cc | 24 + .../global/src/G4VPersistentSubMan.cc | 24 + source/persistency/management/GNUmakefile | 49 +- .../management/include/G4PLogVolRefVArray.hh | 20 - .../include/G4PVPhysVolRefVArray.hh | 20 - .../management/include/G4PVSolidRefVArray.hh | 20 - .../include/G4PersistencyManager.hh | 145 +- .../include/G4PersistencyMessenger.hh | 62 + .../include/G4PersistentEventMan.hh | 70 - .../management/include/G4PersistentRunMan.hh | 68 - .../include/G4TransactionManager.hh | 133 + .../management/src/G4PersistencyManager.cc | 271 +- .../management/src/G4PersistencyMessenger.cc | 94 + .../management/src/G4PersistentEventMan.cc | 117 - .../management/src/G4PersistentRunMan.cc | 113 - .../management/src/G4TransactionManager.cc | 438 + source/persistency/run/GNUmakefile | 30 +- source/persistency/run/include/G4PRun.ddl | 11 +- .../run/include/G4PersistentRunMan.hh | 77 + source/persistency/run/src/G4PRun.cc | 25 +- .../persistency/run/src/G4PersistentRunMan.cc | 79 + source/processes/GNUmakefile | 11 +- source/processes/decay/include/G4Decay.hh | 6 +- source/processes/decay/src/G4Decay.cc | 6 +- source/processes/electromagnetic/History | 5 +- .../lowenergy/include/G4Data.hh | 2 +- .../lowenergy/include/G4Epdl89File.hh | 2 +- .../lowenergy/include/G4Epdl97File.hh | 2 +- .../lowenergy/include/G4EpdlTables.hh | 2 +- .../lowenergy/include/G4FirstLevel.hh | 6 +- .../include/G4LowEnergyBremsstrahlung.hh | 6 +- .../include/G4LowEnergyBremsstrahlung.icc | 6 +- .../lowenergy/include/G4LowEnergyCompton.hh | 6 +- .../lowenergy/include/G4LowEnergyCompton.icc | 6 +- .../include/G4LowEnergyGammaConversion.hh | 6 +- .../include/G4LowEnergyGammaConversion.icc | 6 +- .../include/G4LowEnergyIonisation.hh | 22 +- .../include/G4LowEnergyIonisation.icc | 16 +- .../include/G4LowEnergyPhotoElectric.hh | 34 +- .../include/G4LowEnergyPhotoElectric.icc | 29 +- .../lowenergy/include/G4LowEnergyRayleigh.hh | 6 +- .../lowenergy/include/G4LowEnergyRayleigh.icc | 6 +- .../lowenergy/include/G4LowEnergyUtilities.hh | 6 +- .../lowenergy/include/G4SecondLevel.hh | 6 +- .../lowenergy/include/G4ThirdLevel.hh | 6 +- .../lowenergy/include/G4VDataFile.hh | 2 +- .../lowenergy/include/G4VTables.hh | 2 +- .../include/G4hLowEnergyIonisation.hh | 267 + .../include/G4hLowEnergyIonisation.icc | 71 + .../include/G4ionLowEnergyIonisation.hh | 91 + .../electromagnetic/lowenergy/src/G4Data.cc | 2 +- .../lowenergy/src/G4Epdl89File.cc | 2 +- .../lowenergy/src/G4Epdl97File.cc | 2 +- .../lowenergy/src/G4EpdlTables.cc | 2 +- .../lowenergy/src/G4FirstLevel.cc | 2 +- .../src/G4LowEnergyBremsstrahlung.cc | 145 +- .../lowenergy/src/G4LowEnergyCompton.cc | 43 +- .../src/G4LowEnergyGammaConversion.cc | 6 +- .../lowenergy/src/G4LowEnergyIonisation.cc | 695 +- .../lowenergy/src/G4LowEnergyPhotoElectric.cc | 171 +- .../lowenergy/src/G4LowEnergyRayleigh.cc | 68 +- .../lowenergy/src/G4LowEnergyUtilities.cc | 13 +- .../lowenergy/src/G4SecondLevel.cc | 2 +- .../lowenergy/src/G4ThirdLevel.cc | 2 +- .../lowenergy/src/G4VDataFile.cc | 2 +- .../lowenergy/src/G4VTables.cc | 2 +- .../lowenergy/src/G4hLowEnergyIonisation.cc | 2364 + .../lowenergy/src/G4ionLowEnergyIonisation.cc | 600 + .../muons/include/G4IMuBremsstrahlung.hh | 6 +- .../muons/include/G4IMuBremsstrahlung.icc | 6 +- .../muons/include/G4IMuEnergyLoss.hh | 6 +- .../muons/include/G4IMuEnergyLoss.icc | 6 +- .../muons/include/G4IMuIonisation.hh | 6 +- .../muons/include/G4IMuIonisation.icc | 6 +- .../muons/include/G4IMuPairProduction.hh | 6 +- .../muons/include/G4IMuPairProduction.icc | 6 +- .../muons/include/G4MuBremsstrahlung.hh | 6 +- .../muons/include/G4MuBremsstrahlung.icc | 6 +- .../muons/include/G4MuEnergyLoss.hh | 31 +- .../muons/include/G4MuEnergyLoss.icc | 6 +- .../muons/include/G4MuIonisation.hh | 6 +- .../muons/include/G4MuIonisation.icc | 6 +- .../muons/include/G4MuPairProduction.hh | 6 +- .../muons/include/G4MuPairProduction.icc | 6 +- .../muons/src/G4IMuBremsstrahlung.cc | 6 +- .../muons/src/G4IMuEnergyLoss.cc | 20 +- .../muons/src/G4IMuIonisation.cc | 6 +- .../muons/src/G4IMuPairProduction.cc | 6 +- .../muons/src/G4MuBremsstrahlung.cc | 6 +- .../muons/src/G4MuEnergyLoss.cc | 19 +- .../muons/src/G4MuIonisation.cc | 30 +- .../muons/src/G4MuPairProduction.cc | 6 +- .../standard/include/G4ComptonScattering.hh | 6 +- .../standard/include/G4ComptonScattering.icc | 6 +- .../standard/include/G4EnergyLossMessenger.hh | 6 +- .../standard/include/G4GammaConversion.hh | 6 +- .../standard/include/G4GammaConversion.icc | 6 +- .../standard/include/G4IMultipleScattering.hh | 6 +- .../include/G4IMultipleScattering.icc | 6 +- .../standard/include/G4IeBremsstrahlung.hh | 6 +- .../standard/include/G4IeBremsstrahlung.icc | 6 +- .../standard/include/G4IeEnergyLoss.hh | 6 +- .../standard/include/G4IeEnergyLoss.icc | 6 +- .../standard/include/G4IeIonisation.hh | 6 +- .../standard/include/G4IeIonisation.icc | 6 +- .../standard/include/G4IeplusAnnihilation.hh | 6 +- .../standard/include/G4IeplusAnnihilation.icc | 6 +- .../standard/include/G4IhEnergyLoss.hh | 15 +- .../standard/include/G4IhEnergyLoss.icc | 6 +- .../standard/include/G4IhIonisation.hh | 10 +- .../standard/include/G4IhIonisation.icc | 6 +- .../standard/include/G4MultipleScattering.hh | 22 +- .../standard/include/G4MultipleScattering.icc | 33 +- .../standard/include/G4PAIenergyLoss.hh | 8 +- .../standard/include/G4PAIenergyLoss.icc | 6 +- .../standard/include/G4PAIonisation.hh | 6 +- .../standard/include/G4PAIonisation.icc | 6 +- .../standard/include/G4PAIxSection.hh | 29 +- .../standard/include/G4PhotoElectricEffect.hh | 6 +- .../include/G4PhotoElectricEffect.icc | 6 +- .../include/G4PolarizedComptonScattering.hh | 6 +- .../include/G4SynchrotronRadiation.hh | 6 +- .../standard/include/G4eBremsstrahlung.hh | 6 +- .../standard/include/G4eBremsstrahlung.icc | 6 +- .../standard/include/G4eBremsstrahlungPlus.hh | 6 +- .../include/G4eBremsstrahlungPlus.icc | 6 +- .../standard/include/G4eEnergyLoss.hh | 74 +- .../standard/include/G4eEnergyLoss.icc | 6 +- .../standard/include/G4eEnergyLossPlus.hh | 82 +- .../standard/include/G4eEnergyLossPlus.icc | 6 +- .../standard/include/G4eIonisation.hh | 6 +- .../standard/include/G4eIonisation.icc | 6 +- .../standard/include/G4eIonisationPlus.hh | 6 +- .../standard/include/G4eIonisationPlus.icc | 6 +- .../standard/include/G4eplusAnnihilation.hh | 6 +- .../standard/include/G4eplusAnnihilation.icc | 6 +- .../standard/include/G4hEnergyLoss.hh | 64 +- .../standard/include/G4hEnergyLoss.icc | 6 +- .../standard/include/G4hEnergyLossPlus.hh | 25 +- .../standard/include/G4hEnergyLossPlus.icc | 6 +- .../standard/include/G4hIonisation.hh | 18 +- .../standard/include/G4hIonisation.icc | 6 +- .../standard/include/G4hIonisationPlus.hh | 14 +- .../standard/include/G4hIonisationPlus.icc | 6 +- .../standard/include/G4ionIonisation.hh | 6 +- .../standard/include/G4ionIonisation.icc | 6 +- .../standard/src/G4ComptonScattering.cc | 6 +- .../standard/src/G4EnergyLossMessenger.cc | 24 +- .../standard/src/G4GammaConversion.cc | 6 +- .../standard/src/G4IMultipleScattering.cc | 6 +- .../standard/src/G4IeBremsstrahlung.cc | 6 +- .../standard/src/G4IeEnergyLoss.cc | 19 +- .../standard/src/G4IeIonisation.cc | 6 +- .../standard/src/G4IeplusAnnihilation.cc | 6 +- .../standard/src/G4IhEnergyLoss.cc | 24 +- .../standard/src/G4IhIonisation.cc | 42 +- .../standard/src/G4MultipleScattering.cc | 74 +- .../standard/src/G4PAIenergyLoss.cc | 6 +- .../standard/src/G4PAIonisation.cc | 6 +- .../standard/src/G4PAIxSection.cc | 192 +- .../standard/src/G4PhotoElectricEffect.cc | 10 +- .../src/G4PolarizedComptonScattering.cc | 6 +- .../standard/src/G4SynchrotronRadiation.cc | 6 +- .../standard/src/G4eBremsstrahlung.cc | 6 +- .../standard/src/G4eBremsstrahlungPlus.cc | 6 +- .../standard/src/G4eEnergyLoss.cc | 20 +- .../standard/src/G4eEnergyLossPlus.cc | 66 +- .../standard/src/G4eIonisation.cc | 6 +- .../standard/src/G4eIonisationPlus.cc | 6 +- .../standard/src/G4eplusAnnihilation.cc | 6 +- .../standard/src/G4hEnergyLoss.cc | 29 +- .../standard/src/G4hEnergyLossPlus.cc | 84 +- .../standard/src/G4hIonisation.cc | 43 +- .../standard/src/G4hIonisationPlus.cc | 42 +- .../standard/src/G4ionIonisation.cc | 6 +- .../utils/include/G4EnergyLossTables.hh | 29 +- .../utils/include/G4EnergyLossTables.icc | 79 +- .../utils/src/G4EnergyLossTables.cc | 23 +- .../xrays/include/G4Cerenkov.hh | 36 +- .../xrays/include/G4ForwardXrayTR.hh | 6 +- .../xrays/include/G4Scintillation.hh | 40 +- .../xrays/include/G4TransitionRadiation.hh | 6 +- .../electromagnetic/xrays/src/G4Cerenkov.cc | 25 +- .../xrays/src/G4ForwardXrayTR.cc | 6 +- .../xrays/src/G4Scintillation.cc | 6 +- .../xrays/src/G4TransitionRadiation.cc | 6 +- source/processes/hadronic/GNUmakefile | 5 +- .../include/G4CrossSectionDataStore.hh | 6 +- .../include/G4HadronCaptureDataSet.hh | 6 +- .../include/G4HadronCrossSections.hh | 8 +- .../include/G4HadronElasticDataSet.hh | 6 +- .../include/G4HadronFissionDataSet.hh | 6 +- .../include/G4HadronInelasticDataSet.hh | 6 +- .../include/G4NeutronInelasticCrossSection.hh | 40 + .../include/G4VCrossSectionDataSet.hh | 6 +- .../src/G4CrossSectionDataStore.cc | 6 +- .../src/G4HadronCaptureDataSet.cc | 6 +- .../src/G4HadronCrossSections.cc | 6 +- .../src/G4HadronElasticDataSet.cc | 6 +- .../src/G4HadronFissionDataSet.cc | 6 +- .../src/G4HadronInelasticDataSet.cc | 6 +- .../src/G4NeutronInelasticCrossSection.cc | 40 + .../src/G4VCrossSectionDataSet.cc | 6 +- .../include/G4EnergyRangeManager.hh | 6 +- .../include/G4HadronInelasticProcess.hh | 6 +- .../include/G4HadronicInteraction.hh | 6 +- .../include/G4HadronicInteractionRegistry.hh | 4 +- .../management/include/G4HadronicProcess.hh | 54 +- .../include/G4InelasticInteraction.hh | 6 +- .../management/include/G4IsoParticleChange.hh | 34 + .../include/G4VIsotopeProduction.hh | 22 + .../management/src/G4EnergyRangeManager.cc | 6 +- .../src/G4HadronInelasticProcess.cc | 8 +- .../management/src/G4HadronicInteraction.cc | 6 +- .../management/src/G4HadronicProcess.cc | 111 +- .../management/src/G4InelasticInteraction.cc | 2 +- source/processes/hadronic/models/GNUmakefile | 5 +- .../include/G4B9FermiFragment.hh | 2 +- .../include/G4Be8FermiFragment.hh | 2 +- .../include/G4CompetitiveFission.hh | 2 +- .../G4ConstantLevelDensityParameter.hh | 2 +- .../include/G4ContinuumGammaDeexcitation.hh | 2 +- .../include/G4ContinuumGammaTransition.hh | 2 +- .../include/G4DiscreteGammaDeexcitation.hh | 2 +- .../include/G4DiscreteGammaTransition.hh | 2 +- .../de_excitation/include/G4DummyMF.hh | 36 - .../de_excitation/include/G4Evaporation.hh | 134 +- .../include/G4EvaporationChannel.hh | 12 +- .../G4EvaporationLevelDensityParameter.hh | 2 +- .../include/G4EvaporationProbability.hh | 2 +- .../include/G4ExcitationHandler.hh | 18 +- .../de_excitation/include/G4FermiBreakUp.hh | 2 +- .../include/G4FermiConfiguration.hh | 12 +- .../include/G4FermiConfigurationList.hh | 10 +- .../de_excitation/include/G4FissionBarrier.hh | 6 +- .../include/G4FissionLevelDensityParameter.hh | 2 +- .../include/G4FissionParameters.hh | 2 +- .../include/G4FissionProbability.hh | 2 +- .../include/G4He5FermiFragment.hh | 2 +- .../include/G4Li5FermiFragment.hh | 2 +- .../include/G4MultiFragmentation.hh | 40 - .../de_excitation/include/G4NuclearLevel.hh | 2 +- .../include/G4NuclearLevelManager.hh | 2 +- .../include/G4PhotonEvaporation.hh | 2 +- .../de_excitation/include/G4PtrLevelVector.hh | 6 +- .../de_excitation/include/G4Solver.hh | 77 + .../include/G4Solver.templates.cc | 199 + .../include/G4StableFermiFragment.hh | 2 +- .../de_excitation/include/G4StatMF.hh | 100 +- .../de_excitation/include/G4StatMFChannel.hh | 92 + .../de_excitation/include/G4StatMFFragment.hh | 154 +- .../include/G4StatMFMacroBiNucleon.hh | 42 + .../include/G4StatMFMacroChemicalPotential.hh | 85 + .../include/G4StatMFMacroMultiNucleon.hh | 44 + .../include/G4StatMFMacroMultiplicity.hh | 78 + .../include/G4StatMFMacroNucleon.hh | 54 + .../include/G4StatMFMacroTemperature.hh | 97 + .../include/G4StatMFMacroTetraNucleon.hh | 41 + .../include/G4StatMFMacroTriNucleon.hh | 42 + .../include/G4StatMFMacrocanonical.hh | 102 +- .../include/G4StatMFMicroManager.hh | 90 + .../include/G4StatMFMicroPartition.hh | 112 + .../include/G4StatMFMicrocanonical.hh | 118 +- .../include/G4StatMFParameters.hh | 52 +- .../include/G4UnstableFermiFragment.hh | 4 +- .../include/G4VEmissionProbability.hh | 2 +- .../de_excitation/include/G4VEvaporation.hh | 2 +- .../include/G4VEvaporationChannel.hh | 2 +- .../de_excitation/include/G4VFermiBreakUp.hh | 2 +- .../de_excitation/include/G4VFermiFragment.hh | 2 +- .../include/G4VFissionBarrier.hh | 6 +- .../include/G4VGammaDeexcitation.hh | 2 +- .../include/G4VGammaTransition.hh | 2 +- .../include/G4VLevelDensityParameter.hh | 2 +- .../include/G4VMultiFragmentation.hh | 37 + .../include/G4VPhotonEvaporation.hh | 2 +- .../include/G4VStatMFCanonical.hh | 137 - .../include/G4VStatMFEnsemble.hh | 56 + .../include/G4VStatMFMacroCluster.hh | 109 + .../de_excitation/src/G4B9FermiFragment.cc | 4 +- .../de_excitation/src/G4Be8FermiFragment.cc | 4 +- .../de_excitation/src/G4CompetitiveFission.cc | 2 +- .../src/G4ConstantLevelDensityParameter.cc | 2 +- .../src/G4ContinuumGammaDeexcitation.cc | 2 +- .../src/G4ContinuumGammaTransition.cc | 2 +- .../src/G4DiscreteGammaDeexcitation.cc | 2 +- .../src/G4DiscreteGammaTransition.cc | 2 +- .../generator/de_excitation/src/G4DummyMF.cc | 51 - .../de_excitation/src/G4Evaporation.cc | 2 +- .../de_excitation/src/G4EvaporationChannel.cc | 6 +- .../src/G4EvaporationLevelDensityParameter.cc | 2 +- .../src/G4EvaporationProbability.cc | 2 +- .../de_excitation/src/G4ExcitationHandler.cc | 6 +- .../de_excitation/src/G4FermiBreakUp.cc | 2 +- .../de_excitation/src/G4FermiConfiguration.cc | 10 +- .../src/G4FermiConfigurationList.cc | 4 +- .../de_excitation/src/G4FissionBarrier.cc | 6 +- .../src/G4FissionLevelDensityParameter.cc | 2 +- .../de_excitation/src/G4FissionParameters.cc | 2 +- .../de_excitation/src/G4FissionProbability.cc | 2 +- .../de_excitation/src/G4He5FermiFragment.cc | 4 +- .../de_excitation/src/G4Li5FermiFragment.cc | 4 +- .../de_excitation/src/G4MultiFragmentation.cc | 46 - .../de_excitation/src/G4NuclearLevel.cc | 2 +- .../src/G4NuclearLevelManager.cc | 2 +- .../de_excitation/src/G4PhotonEvaporation.cc | 2 +- .../generator/de_excitation/src/G4Solver.cc | 41 + .../src/G4StableFermiFragment.cc | 2 +- .../generator/de_excitation/src/G4StatMF.cc | 817 +- .../de_excitation/src/G4StatMFChannel.cc | 408 + .../de_excitation/src/G4StatMFFragment.cc | 109 +- .../src/G4StatMFMacroBiNucleon.cc | 77 + .../src/G4StatMFMacroChemicalPotential.cc | 105 + .../src/G4StatMFMacroMultiNucleon.cc | 133 + .../src/G4StatMFMacroMultiplicity.cc | 101 + .../de_excitation/src/G4StatMFMacroNucleon.cc | 79 + .../src/G4StatMFMacroTemperature.cc | 128 + .../src/G4StatMFMacroTetraNucleon.cc | 84 + .../src/G4StatMFMacroTriNucleon.cc | 76 + .../src/G4StatMFMacrocanonical.cc | 761 +- .../de_excitation/src/G4StatMFMicroManager.cc | 166 + .../src/G4StatMFMicroPartition.cc | 299 + .../src/G4StatMFMicrocanonical.cc | 896 +- .../de_excitation/src/G4StatMFParameters.cc | 53 +- .../src/G4UnstableFermiFragment.cc | 8 +- .../src/G4VEmissionProbability.cc | 2 +- .../de_excitation/src/G4VEvaporation.cc | 2 +- .../src/G4VEvaporationChannel.cc | 2 +- .../de_excitation/src/G4VFermiBreakUp.cc | 2 +- .../de_excitation/src/G4VFermiFragment.cc | 2 +- .../de_excitation/src/G4VFissionBarrier.cc | 6 +- .../de_excitation/src/G4VGammaDeexcitation.cc | 2 +- .../src/G4VLevelDensityParameter.cc | 2 +- .../src/G4VMultiFragmentation.cc | 49 + .../de_excitation/src/G4VPhotonEvaporation.cc | 2 +- .../de_excitation/src/G4VStatMFCanonical.cc | 76 - .../de_excitation/src/G4VStatMFEnsemble.cc | 33 + .../src/G4VStatMFMacroCluster.cc | 43 + .../include/G4DiffractiveHHScatterer.hh | 4 +- .../include/G4DiffractiveSplitableHadron.hh | 6 +- .../diffractive_string/include/G4FTFModel.hh | 7 +- .../include/G4FTFParticipants.hh | 10 +- .../src/G4DiffractiveSplitableHadron.cc | 6 +- .../diffractive_string/src/G4FTFModel.cc | 17 +- .../src/G4FTFParticipants.cc | 6 +- .../high_energy/include/G4TheoFSGenerator.hh | 2 +- .../high_energy/src/G4TheoFSGenerator.cc | 2 +- .../management/include/G4V3DNucleus.hh | 6 +- .../include/G4VHighEnergyGenerator.hh | 6 +- .../include/G4VIntraNuclearTransportModel.hh | 6 +- .../management/include/G4VKineticNucleon.hh | 6 +- .../management/include/G4VNuclearDensity.hh | 6 +- .../management/include/G4VPreCompoundModel.hh | 6 +- .../generator/management/src/G4V3DNucleus.cc | 6 +- .../management/src/G4VHighEnergyGenerator.cc | 6 +- .../src/G4VIntraNuclearTransportModel.cc | 6 +- .../management/src/G4VKineticNucleon.cc | 6 +- .../management/src/G4VNuclearDensity.cc | 6 +- .../management/src/G4VPreCompoundModel.cc | 6 +- .../include/G4PreCompoundAlpha.hh | 2 +- .../include/G4PreCompoundDeuteron.hh | 2 +- .../include/G4PreCompoundHe3.hh | 2 +- .../include/G4PreCompoundModel.hh | 8 +- .../include/G4PreCompoundNeutron.hh | 2 +- .../include/G4PreCompoundParameters.hh | 2 +- .../include/G4PreCompoundProton.hh | 2 +- .../include/G4PreCompoundTransitions.hh | 2 +- .../include/G4PreCompoundTriton.hh | 2 +- .../include/G4VPreCompoundFragment.hh | 2 +- .../include/G4VPreCompoundIon.hh | 2 +- .../include/G4VPreCompoundNucleon.hh | 2 +- .../pre_equilibrium/src/G4PreCompoundModel.cc | 34 +- .../src/G4PreCompoundNeutron.cc | 2 +- .../src/G4PreCompoundParameters.cc | 2 +- .../src/G4PreCompoundProton.cc | 2 +- .../src/G4PreCompoundTransitions.cc | 2 +- .../src/G4VPreCompoundFragment.cc | 2 +- .../pre_equilibrium/src/G4VPreCompoundIon.cc | 2 +- .../generator/quark_gluon_string/GNUmakefile | 41 + .../include/G4BaryonSplitter.hh | 24 + .../include/G4DiffractiveStringBuilder.hh | 34 + .../include/G4InelasticSplitableHadron.hh | 53 + .../include/G4MesonSplitter.hh | 20 + .../include/G4PartonPair.hh | 89 + .../include/G4PartonStringAnnihilator.hh | 71 + .../include/G4QGSMParameters.hh | 28 + .../include/G4QGSMSplitableHadron.hh | 75 + .../quark_gluon_string/include/G4QGSModel.hh | 54 + .../include/G4QGSParticipants.hh | 84 + .../quark_gluon_string/include/G4SPBaryon.hh | 63 + .../include/G4SPBaryonTable.hh | 35 + .../include/G4SoftStringBuilder.hh | 35 + .../src/G4BaryonSplitter.cc | 75 + .../src/G4DiffractiveStringBuilder.cc | 22 + .../src/G4InelasticSplitableHadron.cc | 144 + .../quark_gluon_string/src/G4MesonSplitter.cc | 19 + .../quark_gluon_string/src/G4PartonPair.cc | 21 + .../src/G4QGSMParameters.cc | 13 + .../src/G4QGSMSplitableHadron.cc | 306 + .../quark_gluon_string/src/G4QGSModel.cc | 77 + .../src/G4QGSParticipants.cc | 205 + .../quark_gluon_string/src/G4SPBaryon.cc | 196 + .../src/G4SoftStringBuilder.cc | 24 + .../include/G4DiffractiveExcitation.hh | 10 +- .../string_common/include/G4EventGenerator.hh | 6 +- .../include/G4InteractionCode.hh | 6 +- .../include/G4InteractionContent.hh | 6 +- .../include/G4PomeronCrossSection.hh | 6 +- .../include/G4SingleDiffractiveExcitation.hh | 63 + .../string_common/include/G4StringModel.hh | 6 +- .../string_common/include/G4VParticipants.hh | 6 +- .../include/G4VPartonStringModel.hh | 6 +- .../include/G4VSplitableHadron.hh | 8 +- .../include/G4VStringFragmentation.hh | 6 +- .../string_common/include/G4VertexCode.hh | 6 +- .../src/G4DiffractiveExcitation.cc | 10 +- .../string_common/src/G4EventGenerator.cc | 6 +- .../string_common/src/G4InteractionContent.cc | 6 +- .../src/G4PomeronCrossSection.cc | 6 +- .../src/G4SingleDiffractiveExcitation.cc | 261 + .../string_common/src/G4StringModel.cc | 6 +- .../string_common/src/G4VParticipants.cc | 6 +- .../string_common/src/G4VPartonStringModel.cc | 17 +- .../string_common/src/G4VSplitableHadron.cc | 6 +- .../src/G4VStringFragmentation.cc | 6 +- .../include/G4ExcitedStringDecay.hh | 6 +- .../include/G4LundStringFragmentation.hh | 6 +- .../include/G4QGSMFragmentation.hh | 6 +- .../include/G4VKinkyStringDecay.hh | 6 +- .../include/G4VLongitudinalStringDecay.hh | 6 +- .../src/G4ExcitedStringDecay.cc | 6 +- .../src/G4LundStringFragmentation.cc | 6 +- .../src/G4QGSMFragmentation.cc | 6 +- .../src/G4VKinkyStringDecay.cc | 6 +- .../src/G4VLongitudinalStringDecay.cc | 10 +- .../generator/util/include/G4ExcitedString.hh | 31 +- .../util/include/G4ExcitedStringVector.hh | 10 +- .../util/include/G4Fancy3DNucleus.hh | 12 +- .../generator/util/include/G4FermiMomentum.hh | 6 +- .../generator/util/include/G4Fragment.hh | 10 +- .../util/include/G4FragmentVector.hh | 6 +- .../util/include/G4GeneralPhaseSpaceDecay.hh | 8 +- .../generator/util/include/G4KineticTrack.hh | 6 +- .../util/include/G4KineticTrackVector.hh | 10 +- .../util/include/G4NuclearFermiDensity.hh | 6 +- .../include/G4NuclearShellModelDensity.hh | 6 +- .../generator/util/include/G4Nucleon.hh | 6 +- .../models/generator/util/include/G4Parton.hh | 6 +- .../generator/util/include/G4PartonVector.hh | 10 +- .../generator/util/src/G4ExcitedString.cc | 16 +- .../generator/util/src/G4Fancy3DNucleus.cc | 12 +- .../generator/util/src/G4FermiMomentum.cc | 6 +- .../models/generator/util/src/G4Fragment.cc | 6 +- .../util/src/G4GeneralPhaseSpaceDecay.cc | 6 +- .../generator/util/src/G4KineticTrack.cc | 6 +- .../util/src/G4NuclearFermiDensity.cc | 6 +- .../util/src/G4NuclearShellModelDensity.cc | 6 +- .../models/generator/util/src/G4Nucleon.cc | 6 +- .../models/generator/util/src/G4Parton.cc | 6 +- .../include/G4HEAntiKaonZeroInelastic.hh | 6 +- .../include/G4HEAntiLambdaInelastic.hh | 6 +- .../include/G4HEAntiNeutronInelastic.hh | 6 +- .../include/G4HEAntiOmegaMinusInelastic.hh | 6 +- .../include/G4HEAntiProtonInelastic.hh | 6 +- .../include/G4HEAntiSigmaMinusInelastic.hh | 6 +- .../include/G4HEAntiSigmaPlusInelastic.hh | 6 +- .../include/G4HEAntiSigmaZeroInelastic.hh | 6 +- .../include/G4HEAntiXiMinusInelastic.hh | 6 +- .../include/G4HEAntiXiZeroInelastic.hh | 6 +- .../high_energy/include/G4HEInelastic.hh | 6 +- .../include/G4HEKaonMinusInelastic.hh | 6 +- .../include/G4HEKaonPlusInelastic.hh | 6 +- .../include/G4HEKaonZeroInelastic.hh | 6 +- .../include/G4HEKaonZeroLongInelastic.hh | 6 +- .../include/G4HEKaonZeroShortInelastic.hh | 6 +- .../include/G4HELambdaInelastic.hh | 6 +- .../include/G4HENeutronInelastic.hh | 6 +- .../include/G4HEOmegaMinusInelastic.hh | 6 +- .../include/G4HEPionMinusInelastic.hh | 6 +- .../include/G4HEPionPlusInelastic.hh | 6 +- .../models/high_energy/include/G4HEPlot.hh | 6 +- .../include/G4HEProtonInelastic.hh | 6 +- .../include/G4HESigmaMinusInelastic.hh | 6 +- .../include/G4HESigmaPlusInelastic.hh | 6 +- .../include/G4HESigmaZeroInelastic.hh | 6 +- .../models/high_energy/include/G4HEVector.hh | 6 +- .../include/G4HEXiMinusInelastic.hh | 6 +- .../include/G4HEXiZeroInelastic.hh | 6 +- .../src/G4HEAntiKaonZeroInelastic.cc | 6 +- .../src/G4HEAntiLambdaInelastic.cc | 6 +- .../src/G4HEAntiNeutronInelastic.cc | 6 +- .../src/G4HEAntiOmegaMinusInelastic.cc | 6 +- .../src/G4HEAntiProtonInelastic.cc | 6 +- .../src/G4HEAntiSigmaMinusInelastic.cc | 6 +- .../src/G4HEAntiSigmaPlusInelastic.cc | 6 +- .../src/G4HEAntiSigmaZeroInelastic.cc | 6 +- .../src/G4HEAntiXiMinusInelastic.cc | 6 +- .../src/G4HEAntiXiZeroInelastic.cc | 6 +- .../models/high_energy/src/G4HEInelastic.cc | 6 +- .../high_energy/src/G4HEKaonMinusInelastic.cc | 6 +- .../high_energy/src/G4HEKaonPlusInelastic.cc | 6 +- .../high_energy/src/G4HEKaonZeroInelastic.cc | 6 +- .../src/G4HEKaonZeroLongInelastic.cc | 6 +- .../src/G4HEKaonZeroShortInelastic.cc | 6 +- .../high_energy/src/G4HELambdaInelastic.cc | 6 +- .../high_energy/src/G4HENeutronInelastic.cc | 6 +- .../src/G4HEOmegaMinusInelastic.cc | 6 +- .../high_energy/src/G4HEPionMinusInelastic.cc | 6 +- .../high_energy/src/G4HEPionPlusInelastic.cc | 6 +- .../models/high_energy/src/G4HEPlot.cc | 6 +- .../high_energy/src/G4HEProtonInelastic.cc | 6 +- .../src/G4HESigmaMinusInelastic.cc | 6 +- .../high_energy/src/G4HESigmaPlusInelastic.cc | 6 +- .../high_energy/src/G4HESigmaZeroInelastic.cc | 6 +- .../models/high_energy/src/G4HEVector.cc | 6 +- .../high_energy/src/G4HEXiMinusInelastic.cc | 6 +- .../high_energy/src/G4HEXiZeroInelastic.cc | 6 +- .../models/isotope_production/GNUmakefile | 37 + .../include/G4NeutronElementCrossSections.hh | 12 + .../G4NeutronElementIsoCrossSections.hh | 30 + .../include/G4NeutronIsoIsoCrossSections.hh | 33 + .../include/G4NeutronIsoProdCrossSections.hh | 22 + .../include/G4NeutronIsotopeProduction.hh | 24 + .../src/G4NeutronElementIsoCrossSections.cc | 85 + .../src/G4NeutronIsoIsoCrossSections.cc | 222 + .../src/G4NeutronIsoProdCrossSections.cc | 23 + .../src/G4NeutronIsotopeProduction.cc | 68 + .../models/low_energy/include/G4LCapture.hh | 7 +- .../low_energy/include/G4LEAlphaInelastic.hh | 6 +- .../include/G4LEAntiLambdaInelastic.hh | 6 +- .../include/G4LEAntiNeutronInelastic.hh | 6 +- .../include/G4LEAntiOmegaMinusInelastic.hh | 6 +- .../include/G4LEAntiProtonInelastic.hh | 6 +- .../include/G4LEAntiSigmaMinusInelastic.hh | 6 +- .../include/G4LEAntiSigmaPlusInelastic.hh | 6 +- .../include/G4LEAntiXiMinusInelastic.hh | 6 +- .../include/G4LEAntiXiZeroInelastic.hh | 6 +- .../include/G4LEDeuteronInelastic.hh | 6 +- .../include/G4LEKaonMinusInelastic.hh | 6 +- .../include/G4LEKaonPlusInelastic.hh | 6 +- .../include/G4LEKaonZeroLInelastic.hh | 6 +- .../include/G4LEKaonZeroSInelastic.hh | 6 +- .../low_energy/include/G4LELambdaInelastic.hh | 6 +- .../include/G4LEOmegaMinusInelastic.hh | 6 +- .../include/G4LEPionMinusInelastic.hh | 6 +- .../include/G4LEPionPlusInelastic.hh | 6 +- .../low_energy/include/G4LEProtonInelastic.hh | 6 +- .../include/G4LESigmaMinusInelastic.hh | 6 +- .../include/G4LESigmaPlusInelastic.hh | 6 +- .../low_energy/include/G4LETritonInelastic.hh | 6 +- .../include/G4LEXiMinusInelastic.hh | 6 +- .../low_energy/include/G4LEXiZeroInelastic.hh | 6 +- .../models/low_energy/include/G4LElastic.hh | 7 +- .../models/low_energy/include/G4LFission.hh | 7 +- .../models/low_energy/src/G4LCapture.cc | 8 +- .../low_energy/src/G4LEAlphaInelastic.cc | 6 +- .../low_energy/src/G4LEAntiLambdaInelastic.cc | 6 +- .../src/G4LEAntiNeutronInelastic.cc | 6 +- .../src/G4LEAntiOmegaMinusInelastic.cc | 6 +- .../low_energy/src/G4LEAntiProtonInelastic.cc | 6 +- .../src/G4LEAntiSigmaMinusInelastic.cc | 6 +- .../src/G4LEAntiSigmaPlusInelastic.cc | 6 +- .../src/G4LEAntiXiMinusInelastic.cc | 6 +- .../low_energy/src/G4LEAntiXiZeroInelastic.cc | 6 +- .../low_energy/src/G4LEDeuteronInelastic.cc | 6 +- .../low_energy/src/G4LEKaonMinusInelastic.cc | 6 +- .../low_energy/src/G4LEKaonPlusInelastic.cc | 6 +- .../low_energy/src/G4LEKaonZeroLInelastic.cc | 6 +- .../low_energy/src/G4LEKaonZeroSInelastic.cc | 6 +- .../low_energy/src/G4LELambdaInelastic.cc | 6 +- .../low_energy/src/G4LENeutronInelastic.cc | 6 +- .../low_energy/src/G4LEOmegaMinusInelastic.cc | 6 +- .../low_energy/src/G4LEPionMinusInelastic.cc | 6 +- .../low_energy/src/G4LEPionPlusInelastic.cc | 6 +- .../low_energy/src/G4LEProtonInelastic.cc | 6 +- .../low_energy/src/G4LESigmaMinusInelastic.cc | 6 +- .../low_energy/src/G4LESigmaPlusInelastic.cc | 6 +- .../low_energy/src/G4LETritonInelastic.cc | 6 +- .../low_energy/src/G4LEXiMinusInelastic.cc | 6 +- .../low_energy/src/G4LEXiZeroInelastic.cc | 6 +- .../models/low_energy/src/G4LElastic.cc | 8 +- .../models/low_energy/src/G4LFission.cc | 8 +- .../hadronic/models/neutron_hp/README | 9 - .../include/G4InterpolationIterator.hh | 2 +- .../include/G4InterpolationManager.hh | 6 +- .../include/G4InterpolationScheme.hh | 2 +- .../include/G4NeutronHP2AInelasticFS.hh | 2 +- .../include/G4NeutronHP2N2AInelasticFS.hh | 2 +- .../include/G4NeutronHP2NAInelasticFS.hh | 2 +- .../include/G4NeutronHP2NDInelasticFS.hh | 2 +- .../include/G4NeutronHP2NInelasticFS.hh | 2 +- .../include/G4NeutronHP2NPInelasticFS.hh | 2 +- .../include/G4NeutronHP2PInelasticFS.hh | 2 +- .../include/G4NeutronHP3AInelasticFS.hh | 2 +- .../include/G4NeutronHP3NAInelasticFS.hh | 2 +- .../include/G4NeutronHP3NInelasticFS.hh | 2 +- .../include/G4NeutronHP3NPInelasticFS.hh | 2 +- .../include/G4NeutronHP4NInelasticFS.hh | 2 +- .../include/G4NeutronHPAInelasticFS.hh | 2 +- .../neutron_hp/include/G4NeutronHPAngular.hh | 2 +- .../neutron_hp/include/G4NeutronHPAngularP.hh | 2 +- .../include/G4NeutronHPArbitaryTab.hh | 2 +- .../neutron_hp/include/G4NeutronHPCapture.hh | 2 +- .../include/G4NeutronHPCaptureData.hh | 2 +- .../include/G4NeutronHPCaptureFS.hh | 2 +- .../neutron_hp/include/G4NeutronHPChannel.hh | 2 +- .../include/G4NeutronHPChannelList.hh | 2 +- .../include/G4NeutronHPContAngularPar.hh | 2 +- .../include/G4NeutronHPContEnergyAngular.hh | 2 +- .../include/G4NeutronHPD2AInelasticFS.hh | 2 +- .../include/G4NeutronHPDAInelasticFS.hh | 2 +- .../include/G4NeutronHPDInelasticFS.hh | 2 +- .../neutron_hp/include/G4NeutronHPData.hh | 2 +- .../include/G4NeutronHPDataPoint.hh | 2 +- .../include/G4NeutronHPDeExGammas.hh | 2 +- .../include/G4NeutronHPDiscreteTwoBody.hh | 2 +- .../neutron_hp/include/G4NeutronHPElastic.hh | 2 +- .../include/G4NeutronHPElasticData.hh | 2 +- .../include/G4NeutronHPElasticFS.hh | 2 +- .../include/G4NeutronHPElementData.hh | 5 +- .../include/G4NeutronHPEnAngCorrelation.hh | 2 +- .../include/G4NeutronHPEnergyDistribution.hh | 2 +- .../include/G4NeutronHPEvapSpectrum.hh | 2 +- .../include/G4NeutronHPFCFissionFS.hh | 2 +- .../include/G4NeutronHPFSFissionFS.hh | 2 +- .../include/G4NeutronHPFastLegendre.hh | 6 +- .../neutron_hp/include/G4NeutronHPField.hh | 2 +- .../include/G4NeutronHPFieldPoint.hh | 2 +- .../include/G4NeutronHPFinalState.hh | 2 +- .../neutron_hp/include/G4NeutronHPFission.hh | 2 +- .../include/G4NeutronHPFissionBaseFS.hh | 2 +- .../include/G4NeutronHPFissionData.hh | 2 +- .../include/G4NeutronHPFissionERelease.hh | 2 +- .../include/G4NeutronHPFissionFS.hh | 2 +- .../include/G4NeutronHPFissionSpectrum.hh | 2 +- .../neutron_hp/include/G4NeutronHPGamma.hh | 2 +- .../include/G4NeutronHPHe3InelasticFS.hh | 2 +- .../include/G4NeutronHPInelastic.hh | 2 +- .../include/G4NeutronHPInelasticBaseFS.hh | 2 +- .../include/G4NeutronHPInelasticCompFS.hh | 2 +- .../include/G4NeutronHPInelasticData.hh | 2 +- .../include/G4NeutronHPInterpolator.hh | 32 +- .../neutron_hp/include/G4NeutronHPIsoData.hh | 21 +- .../include/G4NeutronHPIsotropic.hh | 2 +- .../include/G4NeutronHPKallbachMannSyst.hh | 2 +- .../include/G4NeutronHPLCFissionFS.hh | 2 +- .../include/G4NeutronHPLabAngularEnergy.hh | 2 +- .../include/G4NeutronHPLegendreStore.hh | 2 +- .../include/G4NeutronHPLegendreTable.hh | 2 +- .../neutron_hp/include/G4NeutronHPLevel.hh | 2 +- .../neutron_hp/include/G4NeutronHPList.hh | 2 +- .../include/G4NeutronHPMadlandNixSpectrum.hh | 2 +- .../include/G4NeutronHPN2AInelasticFS.hh | 2 +- .../include/G4NeutronHPN2PInelasticFS.hh | 2 +- .../include/G4NeutronHPN3AInelasticFS.hh | 2 +- .../include/G4NeutronHPNAInelasticFS.hh | 2 +- .../include/G4NeutronHPNBodyPhaseSpace.hh | 2 +- .../include/G4NeutronHPND2AInelasticFS.hh | 2 +- .../include/G4NeutronHPNDInelasticFS.hh | 2 +- .../include/G4NeutronHPNHe3InelasticFS.hh | 2 +- .../include/G4NeutronHPNInelasticFS.hh | 2 +- .../include/G4NeutronHPNPAInelasticFS.hh | 2 +- .../include/G4NeutronHPNPInelasticFS.hh | 2 +- .../include/G4NeutronHPNT2AInelasticFS.hh | 2 +- .../include/G4NeutronHPNTInelasticFS.hh | 2 +- .../include/G4NeutronHPNXInelasticFS.hh | 2 +- .../neutron_hp/include/G4NeutronHPNames.hh | 6 +- .../include/G4NeutronHPNeutronYield.hh | 2 +- .../include/G4NeutronHPPAInelasticFS.hh | 2 +- .../include/G4NeutronHPPDInelasticFS.hh | 2 +- .../include/G4NeutronHPPInelasticFS.hh | 2 +- .../include/G4NeutronHPPTInelasticFS.hh | 2 +- .../neutron_hp/include/G4NeutronHPPartial.hh | 2 +- .../include/G4NeutronHPPhotonDist.hh | 2 +- .../include/G4NeutronHPPhotonXSection.hh | 2 +- .../include/G4NeutronHPPolynomExpansion.hh | 2 +- .../neutron_hp/include/G4NeutronHPProduct.hh | 2 +- .../include/G4NeutronHPSCFissionFS.hh | 2 +- .../include/G4NeutronHPSimpleEvapSpectrum.hh | 2 +- .../include/G4NeutronHPT2AInelasticFS.hh | 2 +- .../include/G4NeutronHPTCFissionFS.hh | 2 +- .../include/G4NeutronHPTInelasticFS.hh | 2 +- .../neutron_hp/include/G4NeutronHPVector.hh | 30 +- .../include/G4NeutronHPWattSpectrum.hh | 2 +- .../neutron_hp/include/G4VNeutronHPEDis.hh | 2 +- .../include/G4VNeutronHPEnergyAngular.hh | 2 +- .../neutron_hp/src/G4NeutronHPElementData.cc | 5 + .../neutron_hp/src/G4NeutronHPFSFissionFS.cc | 4 + .../src/G4NeutronHPFissionBaseFS.cc | 4 + .../neutron_hp/src/G4NeutronHPInelastic.cc | 2 +- .../src/G4NeutronHPInelasticBaseFS.cc | 8 + .../src/G4NeutronHPInelasticCompFS.cc | 8 + .../neutron_hp/src/G4NeutronHPIsoData.cc | 5 + .../src/G4NeutronHPNBodyPhaseSpace.cc | 2 +- .../models/neutron_hp/src/G4NeutronHPNames.cc | 10 + .../neutron_hp/src/G4NeutronHPVector.cc | 99 +- .../include/G4AlphaInelasticProcess.hh | 6 +- .../include/G4AntiLambdaInelasticProcess.hh | 6 +- .../include/G4AntiNeutronInelasticProcess.hh | 6 +- .../G4AntiOmegaMinusInelasticProcess.hh | 6 +- .../include/G4AntiProtonInelasticProcess.hh | 6 +- .../G4AntiSigmaMinusInelasticProcess.hh | 6 +- .../G4AntiSigmaPlusInelasticProcess.hh | 6 +- .../include/G4AntiXiMinusInelasticProcess.hh | 6 +- .../include/G4AntiXiZeroInelasticProcess.hh | 6 +- .../include/G4DeuteronInelasticProcess.hh | 6 +- .../include/G4HadronCaptureProcess.hh | 8 +- .../include/G4HadronElasticProcess.hh | 8 +- .../include/G4HadronFissionProcess.hh | 8 +- .../include/G4KaonMinusInelasticProcess.hh | 6 +- .../include/G4KaonPlusInelasticProcess.hh | 6 +- .../include/G4KaonZeroLInelasticProcess.hh | 6 +- .../include/G4KaonZeroSInelasticProcess.hh | 6 +- .../include/G4LambdaInelasticProcess.hh | 6 +- .../include/G4NeutronInelasticProcess.hh | 6 +- .../include/G4OmegaMinusInelasticProcess.hh | 6 +- .../include/G4PionMinusInelasticProcess.hh | 6 +- .../include/G4PionPlusInelasticProcess.hh | 6 +- .../include/G4ProtonInelasticProcess.hh | 6 +- .../include/G4SigmaMinusInelasticProcess.hh | 6 +- .../include/G4SigmaPlusInelasticProcess.hh | 6 +- .../include/G4TritonInelasticProcess.hh | 6 +- .../include/G4XiMinusInelasticProcess.hh | 6 +- .../include/G4XiZeroInelasticProcess.hh | 6 +- .../processes/src/G4HadronCaptureProcess.cc | 6 +- .../processes/src/G4HadronElasticProcess.cc | 6 +- .../processes/src/G4HadronFissionProcess.cc | 6 +- .../G4AntiNeutronAnnihilationAtRest.hh | 6 +- .../include/G4AntiProtonAnnihilationAtRest.hh | 6 +- .../include/G4DistributionGenerator.hh | 16 +- .../stopping/include/G4KaonMinusAbsorption.hh | 6 +- .../include/G4KaonMinusAbsorptionAtRest.hh | 8 +- .../include/G4MuonMinusCaptureAtRest.hh | 6 +- .../include/G4NeutronCaptureAtRest.hh | 6 +- .../include/G4PiMinusAbsorptionAtRest.hh | 6 +- .../include/G4PiMinusStopAbsorption.hh | 8 +- .../stopping/include/G4PiMinusStopAl.hh | 16 +- .../stopping/include/G4PiMinusStopC.hh | 12 +- .../stopping/include/G4PiMinusStopCo.hh | 16 +- .../stopping/include/G4PiMinusStopCu.hh | 16 +- .../stopping/include/G4PiMinusStopLi.hh | 16 +- .../stopping/include/G4PiMinusStopMaterial.hh | 20 +- .../stopping/include/G4PiMinusStopN.hh | 16 +- .../stopping/include/G4PiMinusStopO.hh | 16 +- .../stopping/include/G4PiMinusStopPb.hh | 16 +- .../stopping/include/G4PiMinusStopTa.hh | 16 +- .../include/G4PionMinusAbsorptionAtRest.hh | 6 +- .../stopping/include/G4StopDeexcitation.hh | 6 +- .../include/G4StopDeexcitationAlgorithm.hh | 6 +- .../include/G4StopDummyDeexcitation.hh | 6 +- .../include/G4StopTheoDeexcitation.hh | 6 +- .../src/G4AntiNeutronAnnihilationAtRest.cc | 6 +- .../src/G4AntiProtonAnnihilationAtRest.cc | 6 +- .../stopping/src/G4DistributionGenerator.cc | 10 +- .../stopping/src/G4KaonMinusAbsorption.cc | 6 +- .../src/G4KaonMinusAbsorptionAtRest.cc | 2 +- .../stopping/src/G4MuonMinusCaptureAtRest.cc | 6 +- .../stopping/src/G4NeutronCaptureAtRest.cc | 6 +- .../stopping/src/G4PiMinusAbsorptionAtRest.cc | 6 +- .../stopping/src/G4PiMinusStopAbsorption.cc | 16 +- .../hadronic/stopping/src/G4PiMinusStopAl.cc | 24 +- .../hadronic/stopping/src/G4PiMinusStopC.cc | 24 +- .../hadronic/stopping/src/G4PiMinusStopCo.cc | 24 +- .../hadronic/stopping/src/G4PiMinusStopCu.cc | 24 +- .../hadronic/stopping/src/G4PiMinusStopLi.cc | 24 +- .../stopping/src/G4PiMinusStopMaterial.cc | 20 +- .../hadronic/stopping/src/G4PiMinusStopN.cc | 24 +- .../hadronic/stopping/src/G4PiMinusStopO.cc | 24 +- .../hadronic/stopping/src/G4PiMinusStopPb.cc | 24 +- .../hadronic/stopping/src/G4PiMinusStopTa.cc | 24 +- .../src/G4PionMinusAbsorptionAtRest.cc | 6 +- .../stopping/src/G4StopDeexcitation.cc | 12 +- .../stopping/src/G4StopDummyDeexcitation.cc | 10 +- .../stopping/src/G4StopTheoDeexcitation.cc | 10 +- source/processes/hadronic/util/GNUmakefile | 4 +- .../hadronic/util/include/DumpFrame.hh | 30 + .../util/include/G4DynamicParticleVector.hh | 10 +- .../util/include/G4GHEKinematicsVector.hh | 6 +- .../hadronic/util/include/G4IsoResult.hh | 31 + .../hadronic/util/include/G4LightMedia.hh | 6 +- .../hadronic/util/include/G4Nucleus.hh | 6 +- .../hadronic/util/include/G4ParticleVector.hh | 10 +- .../util/include/G4ReactionDynamics.hh | 6 +- .../util/include/G4ReactionKinematics.hh | 6 +- .../util/include/G4ReactionProduct.hh | 6 +- .../util/include/G4ReactionProductVector.hh | 10 +- .../hadronic/util/include/G4StableIsotopes.hh | 6 +- .../hadronic/util/src/G4LightMedia.cc | 6 +- .../processes/hadronic/util/src/G4Nucleus.cc | 6 +- .../hadronic/util/src/G4ReactionDynamics.cc | 19 +- .../hadronic/util/src/G4ReactionKinematics.cc | 6 +- .../hadronic/util/src/G4ReactionProduct.cc | 6 +- .../hadronic/util/src/G4StableIsotopes.cc | 6 +- source/processes/management/History | 8 +- .../include/G4IVContinuousDiscreteProcess.hh | 18 +- .../include/G4IVRestDiscreteProcess.hh | 20 +- .../management/include/G4ParticleTypes.hh | 10 +- .../management/include/G4ProcTblElement.hh | 13 +- .../management/include/G4ProcessAttribute.hh | 9 +- .../management/include/G4ProcessManager.hh | 259 +- .../management/include/G4ProcessManager.icc | 160 + .../include/G4ProcessManagerMessenger.hh | 25 +- .../management/include/G4ProcessTable.hh | 55 +- .../include/G4ProcessTableMessenger.hh | 11 +- .../management/include/G4ProcessType.hh | 8 +- .../management/include/G4ProcessVector.hh | 20 +- .../include/G4VContinuousDiscreteProcess.hh | 19 +- .../include/G4VContinuousProcess.hh | 19 +- .../management/include/G4VDiscreteProcess.hh | 14 +- .../management/include/G4VProcess.hh | 47 +- .../G4VRestContinuousDiscreteProcess.hh | 22 +- .../include/G4VRestContinuousProcess.hh | 23 +- .../include/G4VRestDiscreteProcess.hh | 14 +- .../management/include/G4VRestProcess.hh | 14 +- .../src/G4IVContinuousDiscreteProcess.cc | 6 +- .../management/src/G4IVRestDiscreteProcess.cc | 6 +- .../management/src/G4ProcTblElement.cc | 6 +- .../management/src/G4ProcessAttribute.cc | 6 +- .../management/src/G4ProcessManager.cc | 18 +- .../src/G4ProcessManagerMessenger.cc | 6 +- .../management/src/G4ProcessTable.cc | 6 +- .../management/src/G4ProcessTableMessenger.cc | 12 +- .../src/G4VContinuousDiscreteProcess.cc | 6 +- .../management/src/G4VContinuousProcess.cc | 6 +- .../management/src/G4VDiscreteProcess.cc | 6 +- source/processes/management/src/G4VProcess.cc | 6 +- .../src/G4VRestContinuousDiscreteProcess.cc | 6 +- .../src/G4VRestContinuousProcess.cc | 6 +- .../management/src/G4VRestDiscreteProcess.cc | 6 +- .../management/src/G4VRestProcess.cc | 6 +- source/processes/optical/History | 23 + .../optical/include/G4OpAbsorption.hh | 25 +- .../optical/include/G4OpBoundaryProcess.hh | 38 +- .../processes/optical/include/G4OpRayleigh.hh | 25 +- .../processes/optical/src/G4OpAbsorption.cc | 6 +- .../optical/src/G4OpBoundaryProcess.cc | 9 +- source/processes/optical/src/G4OpRayleigh.cc | 6 +- source/processes/parameterisation/History | 8 +- .../include/G4FastSimulationManager.hh | 56 +- .../include/G4FastSimulationManagerProcess.hh | 15 +- .../include/G4FastSimulationMessenger.hh | 6 +- .../parameterisation/include/G4FastStep.hh | 128 +- .../parameterisation/include/G4FastStep.icc | 6 +- .../parameterisation/include/G4FastTrack.hh | 40 +- .../include/G4FlavoredParallelWorld.hh | 6 +- .../include/G4GlobalFastSimulationManager.hh | 51 +- .../include/G4VFastSimulationModel.hh | 97 +- .../src/G4FastSimulationManager.cc | 6 +- .../src/G4FastSimulationManagerProcess.cc | 6 +- .../src/G4FastSimulationMessenger.cc | 6 +- .../parameterisation/src/G4FastStep.cc | 16 +- .../parameterisation/src/G4FastTrack.cc | 6 +- .../src/G4GlobalFastSimulationManager.cc | 6 +- .../src/G4VFastSimulationModel.cc | 6 +- .../processes/photolepton_hadron/GNUmakefile | 3 +- source/processes/photolepton_hadron/History | 25 + .../include/G4MuNuclearInteraction.hh | 6 +- .../include/G4MuNuclearInteraction.icc | 6 +- .../include/G4ParametrizedHadronicVertex.hh | 2 +- .../src/G4MuNuclearInteraction.cc | 6 +- .../src/G4MuonNucleusInteractionModel.cc | 8 +- .../src/G4ParametrizedHadronicVertex.cc | 2 +- source/processes/transportation/History | 14 +- .../include/G4Transportation.hh | 6 +- .../include/G4Transportation.icc | 6 +- .../include/G4UserSpecialCuts.hh | 28 +- .../transportation/src/G4Transportation.cc | 31 +- .../transportation/src/G4UserSpecialCuts.cc | 55 +- source/readout/History | 6 +- source/readout/include/G4DCtable.hh | 24 +- source/readout/include/G4DMmessenger.hh | 18 +- source/readout/include/G4DigiManager.hh | 49 +- source/readout/include/G4VDigitizerModule.hh | 31 +- source/readout/src/G4DCtable.cc | 8 +- source/readout/src/G4DMmessenger.cc | 6 +- source/readout/src/G4DigiManager.cc | 8 +- source/readout/src/G4VDigitizerModule.cc | 6 +- source/run/GNUmakefile | 3 +- source/run/History | 25 +- source/run/include/G4Run.hh | 35 +- source/run/include/G4RunManager.hh | 189 +- source/run/include/G4RunMessenger.hh | 19 +- .../run/include/G4UserPhysicsListMessenger.hh | 16 +- source/run/include/G4UserRunAction.hh | 18 +- source/run/include/G4VPersistencyManager.hh | 27 +- .../include/G4VUserDetectorConstruction.hh | 15 +- source/run/include/G4VUserPhysicsList.hh | 49 +- .../include/G4VUserPrimaryGeneratorAction.hh | 19 +- source/run/src/G4Run.cc | 6 +- source/run/src/G4RunManager.cc | 63 +- source/run/src/G4RunMessenger.cc | 45 +- source/run/src/G4UserPhysicsListMessenger.cc | 6 +- source/run/src/G4UserRunAction.cc | 6 +- source/run/src/G4VPersistencyManager.cc | 6 +- source/run/src/G4VUserDetectorConstruction.cc | 6 +- source/run/src/G4VUserPhysicsList.cc | 6 +- .../run/src/G4VUserPrimaryGeneratorAction.cc | 6 +- source/track/History | 13 +- source/track/include/G4EvtBiasMechanism.hh | 13 +- source/track/include/G4ForceCondition.hh | 8 +- source/track/include/G4GPILSelection.hh | 8 +- source/track/include/G4Mars5GeVMechanism.hh | 15 +- source/track/include/G4ParticleChange.hh | 40 +- source/track/include/G4ParticleChange.icc | 33 +- .../track/include/G4ParticleChangeForDecay.hh | 9 +- .../track/include/G4ParticleChangeForLoss.hh | 9 +- .../track/include/G4ParticleChangeForMSC.hh | 9 +- .../track/include/G4ParticleChangeForMSC.icc | 6 +- .../include/G4ParticleChangeForTransport.hh | 9 +- .../include/G4ParticleChangeForTransport.icc | 6 +- source/track/include/G4Step.hh | 174 +- source/track/include/G4Step.icc | 212 + source/track/include/G4StepPoint.hh | 63 +- source/track/include/G4StepStatus.hh | 8 +- source/track/include/G4SteppingControl.hh | 8 +- source/track/include/G4Track.hh | 319 +- source/track/include/G4Track.icc | 258 + source/track/include/G4TrackFastVector.hh | 6 +- source/track/include/G4TrackStatus.hh | 8 +- source/track/include/G4VEvtBiasMechanism.hh | 21 +- source/track/include/G4VParticleChange.hh | 31 +- source/track/include/G4VParticleChange.icc | 6 +- source/track/src/G4EvtBiasMechanism.cc | 6 +- source/track/src/G4Mars5GeVMechanism.cc | 10 +- source/track/src/G4ParticleChange.cc | 44 +- source/track/src/G4ParticleChangeForDecay.cc | 6 +- source/track/src/G4ParticleChangeForLoss.cc | 6 +- source/track/src/G4ParticleChangeForMSC.cc | 6 +- .../track/src/G4ParticleChangeForTransport.cc | 6 +- source/track/src/G4Step.cc | 6 +- source/track/src/G4StepPoint.cc | 6 +- source/track/src/G4Track.cc | 42 +- source/track/src/G4VEvtBiasMechanism.cc | 6 +- source/track/src/G4VParticleChange.cc | 6 +- source/tracking/History | 4 +- source/tracking/include/G4SteppingManager.hh | 20 +- source/tracking/include/G4SteppingManager.icc | 6 +- source/tracking/include/G4SteppingVerbose.hh | 119 +- source/tracking/include/G4TrackVector.hh | 10 +- source/tracking/include/G4TrackingManager.hh | 6 +- .../tracking/include/G4TrackingMessenger.hh | 6 +- source/tracking/include/G4Trajectory.hh | 10 +- source/tracking/include/G4TrajectoryPoint.hh | 6 +- .../tracking/include/G4UserSteppingAction.hh | 6 +- .../tracking/include/G4UserTrackingAction.hh | 6 +- source/tracking/include/G4VSteppingVerbose.hh | 168 +- source/tracking/include/G4VTrajectory.hh | 6 +- source/tracking/include/G4VTrajectoryPoint.hh | 6 +- source/tracking/src/G4SteppingManager.cc | 24 +- source/tracking/src/G4SteppingVerbose.cc | 101 +- source/tracking/src/G4TrackingManager.cc | 6 +- source/tracking/src/G4TrackingMessenger.cc | 6 +- source/tracking/src/G4Trajectory.cc | 10 +- source/tracking/src/G4TrajectoryPoint.cc | 6 +- source/tracking/src/G4UserSteppingAction.cc | 6 +- source/tracking/src/G4UserTrackingAction.cc | 6 +- source/tracking/src/G4VSteppingVerbose.cc | 94 +- source/visualization/FukuiRenderer/History | 26 + source/visualization/FukuiRenderer/README | 11 +- .../FukuiRenderer/include/G4DAWNFILE.hh | 6 +- .../include/G4DAWNFILESceneHandler.hh | 28 +- .../FukuiRenderer/include/G4DAWNFILEViewer.hh | 7 +- .../FukuiRenderer/include/G4FRClientServer.hh | 6 +- .../FukuiRenderer/include/G4FRConst.hh | 8 +- .../FukuiRenderer/include/G4FRFeatures.hh | 6 +- .../FukuiRenderer/include/G4FRSocketConfig.hh | 6 +- .../FukuiRenderer/include/G4FRSocketMacro.hh | 6 +- .../FukuiRenderer/include/G4FRofstream.hh | 6 +- .../FukuiRenderer/include/G4FukuiRenderer.hh | 6 +- .../include/G4FukuiRendererSceneHandler.hh | 94 +- .../include/G4FukuiRendererViewer.hh | 15 +- .../FukuiRenderer/src/G4DAWNFILE.cc | 8 +- .../src/G4DAWNFILESceneHandler.cc | 65 +- .../FukuiRenderer/src/G4DAWNFILEViewer.cc | 106 +- .../FukuiRenderer/src/G4FRClientServer.cc | 6 +- .../FukuiRenderer/src/G4FRSceneFunc.icc | 195 +- .../FukuiRenderer/src/G4FukuiRenderer.cc | 6 +- .../src/G4FukuiRendererSceneHandler.cc | 77 +- .../src/G4FukuiRendererViewer.cc | 147 +- source/visualization/GNUmakefile | 12 +- source/visualization/History | 128 +- .../OPACS/include/G4GoSceneHandler.hh | 6 +- source/visualization/OPACS/include/G4Wo.hh | 6 +- .../visualization/OPACS/include/G4WoViewer.hh | 6 +- source/visualization/OPACS/include/G4Xo.hh | 6 +- .../visualization/OPACS/include/G4XoViewer.hh | 6 +- .../OPACS/src/G4GoSceneHandler.cc | 52 +- source/visualization/OPACS/src/G4Wo.cc | 6 +- source/visualization/OPACS/src/G4WoViewer.cc | 6 +- source/visualization/OPACS/src/G4Xo.cc | 8 +- source/visualization/OPACS/src/G4XoViewer.cc | 6 +- .../include/G4OpenGLImmediateSceneHandler.hh | 6 +- .../OpenGL/include/G4OpenGLImmediateViewer.hh | 8 +- .../OpenGL/include/G4OpenGLImmediateWin32.hh | 6 +- .../include/G4OpenGLImmediateWin32Viewer.hh | 8 +- .../OpenGL/include/G4OpenGLImmediateX.hh | 6 +- .../include/G4OpenGLImmediateXViewer.hh | 8 +- .../OpenGL/include/G4OpenGLImmediateXm.hh | 6 +- .../include/G4OpenGLImmediateXmViewer.hh | 8 +- .../OpenGL/include/G4OpenGLSceneHandler.hh | 6 +- .../OpenGL/include/G4OpenGLSceneHandler.icc | 6 +- .../include/G4OpenGLStoredSceneHandler.hh | 19 +- .../OpenGL/include/G4OpenGLStoredViewer.hh | 8 +- .../OpenGL/include/G4OpenGLStoredWin32.hh | 6 +- .../include/G4OpenGLStoredWin32Viewer.hh | 6 +- .../OpenGL/include/G4OpenGLStoredX.hh | 6 +- .../OpenGL/include/G4OpenGLStoredXViewer.hh | 6 +- .../OpenGL/include/G4OpenGLStoredXm.hh | 6 +- .../OpenGL/include/G4OpenGLStoredXmViewer.hh | 6 +- .../OpenGL/include/G4OpenGLTransform3D.hh | 6 +- .../OpenGL/include/G4OpenGLViewer.hh | 8 +- .../OpenGL/include/G4OpenGLWin32Viewer.hh | 8 +- .../OpenGL/include/G4OpenGLXViewer.hh | 8 +- .../OpenGL/include/G4OpenGLXmBox.hh | 6 +- .../include/G4OpenGLXmConvenienceRoutines.hh | 6 +- .../include/G4OpenGLXmFourArrowButtons.hh | 6 +- .../OpenGL/include/G4OpenGLXmFramedBox.hh | 6 +- .../include/G4OpenGLXmMainMenubarCallbacks.hh | 6 +- .../include/G4OpenGLXmPanningCallbacks.hh | 6 +- .../OpenGL/include/G4OpenGLXmPushButton.hh | 6 +- .../OpenGL/include/G4OpenGLXmRadioButton.hh | 6 +- .../OpenGL/include/G4OpenGLXmResources.hh | 6 +- .../include/G4OpenGLXmRotationCallbacks.hh | 6 +- .../OpenGL/include/G4OpenGLXmSeparator.hh | 6 +- .../OpenGL/include/G4OpenGLXmSliderBar.hh | 6 +- .../include/G4OpenGLXmStyleCallbacks.hh | 6 +- .../OpenGL/include/G4OpenGLXmTextField.hh | 6 +- .../OpenGL/include/G4OpenGLXmTopLevelShell.hh | 6 +- .../include/G4OpenGLXmVWidgetComponent.hh | 6 +- .../include/G4OpenGLXmVWidgetContainer.hh | 6 +- .../OpenGL/include/G4OpenGLXmVWidgetObject.hh | 6 +- .../OpenGL/include/G4OpenGLXmVWidgetShell.hh | 6 +- .../OpenGL/include/G4OpenGLXmViewer.hh | 8 +- .../G4OpenGLXmWindowHandlingCallbacks.hh | 6 +- .../src/G4OpenGLImmediateSceneHandler.cc | 6 +- .../OpenGL/src/G4OpenGLImmediateViewer.cc | 6 +- .../OpenGL/src/G4OpenGLImmediateWin32.cc | 6 +- .../src/G4OpenGLImmediateWin32Viewer.cc | 6 +- .../OpenGL/src/G4OpenGLImmediateX.cc | 6 +- .../OpenGL/src/G4OpenGLImmediateXViewer.cc | 6 +- .../OpenGL/src/G4OpenGLImmediateXm.cc | 6 +- .../OpenGL/src/G4OpenGLImmediateXmViewer.cc | 6 +- .../OpenGL/src/G4OpenGLSceneHandler.cc | 6 +- .../OpenGL/src/G4OpenGLStoredSceneHandler.cc | 26 +- .../OpenGL/src/G4OpenGLStoredViewer.cc | 6 +- .../OpenGL/src/G4OpenGLStoredWin32.cc | 6 +- .../OpenGL/src/G4OpenGLStoredWin32Viewer.cc | 6 +- .../OpenGL/src/G4OpenGLStoredX.cc | 6 +- .../OpenGL/src/G4OpenGLStoredXViewer.cc | 6 +- .../OpenGL/src/G4OpenGLStoredXm.cc | 6 +- .../OpenGL/src/G4OpenGLStoredXmViewer.cc | 6 +- .../OpenGL/src/G4OpenGLTransform3D.cc | 6 +- .../OpenGL/src/G4OpenGLViewer.cc | 6 +- .../OpenGL/src/G4OpenGLWin32Viewer.cc | 6 +- .../OpenGL/src/G4OpenGLXViewer.cc | 6 +- .../visualization/OpenGL/src/G4OpenGLXmBox.cc | 6 +- .../src/G4OpenGLXmConvenienceRoutines.cc | 6 +- .../OpenGL/src/G4OpenGLXmFourArrowButtons.cc | 6 +- .../OpenGL/src/G4OpenGLXmFramedBox.cc | 6 +- .../src/G4OpenGLXmMainMenubarCallbacks.cc | 6 +- .../OpenGL/src/G4OpenGLXmPanningCallbacks.cc | 6 +- .../OpenGL/src/G4OpenGLXmPushButton.cc | 6 +- .../OpenGL/src/G4OpenGLXmRadioButton.cc | 6 +- .../OpenGL/src/G4OpenGLXmRotationCallbacks.cc | 6 +- .../OpenGL/src/G4OpenGLXmSeparator.cc | 6 +- .../OpenGL/src/G4OpenGLXmSliderBar.cc | 6 +- .../OpenGL/src/G4OpenGLXmStyleCallbacks.cc | 6 +- .../OpenGL/src/G4OpenGLXmTextField.cc | 6 +- .../OpenGL/src/G4OpenGLXmTopLevelShell.cc | 6 +- .../OpenGL/src/G4OpenGLXmVWidgetComponent.cc | 6 +- .../OpenGL/src/G4OpenGLXmVWidgetContainer.cc | 6 +- .../OpenGL/src/G4OpenGLXmVWidgetObject.cc | 6 +- .../OpenGL/src/G4OpenGLXmVWidgetShell.cc | 6 +- .../OpenGL/src/G4OpenGLXmViewer.cc | 6 +- .../src/G4OpenGLXmWindowHandlingCallbacks.cc | 6 +- .../OpenInventor/include/G4OpenInventor.hh | 6 +- .../include/G4OpenInventorSceneHandler.hh | 17 +- .../include/G4OpenInventorSceneHandler.icc | 6 +- .../include/G4OpenInventorTransform3D.hh | 6 +- .../include/G4OpenInventorViewer.hh | 8 +- .../include/G4OpenInventorWin32.hh | 6 +- .../OpenInventor/include/G4OpenInventorX.hh | 6 +- .../OpenInventor/src/G4OpenInventor.cc | 6 +- .../src/G4OpenInventorSceneHandler.cc | 29 +- .../src/G4OpenInventorTransform3D.cc | 6 +- .../OpenInventor/src/G4OpenInventorViewer.cc | 6 +- .../OpenInventor/src/G4OpenInventorWin32.cc | 6 +- .../OpenInventor/src/G4OpenInventorX.cc | 6 +- source/visualization/README | 12 +- source/visualization/VRML/History | 3 + source/visualization/VRML/g4vrmlview/README | 222 + .../visualization/VRML/g4vrmlview/g4mini.java | 6 +- .../VRML/g4vrmlview/g4vrmlview.java | 6 +- source/visualization/VRML/include/FRClient.h | 6 +- .../visualization/VRML/include/G4FRClient.hh | 6 +- source/visualization/VRML/include/G4VRML1.hh | 6 +- .../visualization/VRML/include/G4VRML1File.hh | 6 +- .../VRML/include/G4VRML1FileSceneHandler.hh | 11 +- .../VRML/include/G4VRML1FileViewer.hh | 6 +- .../VRML/include/G4VRML1SceneHandler.hh | 11 +- .../VRML/include/G4VRML1Viewer.hh | 6 +- source/visualization/VRML/include/G4VRML2.hh | 6 +- .../visualization/VRML/include/G4VRML2File.hh | 6 +- .../VRML/include/G4VRML2FileSceneHandler.hh | 11 +- .../VRML/include/G4VRML2FileViewer.hh | 6 +- .../VRML/include/G4VRML2SceneHandler.hh | 11 +- .../VRML/include/G4VRML2Viewer.hh | 6 +- .../VRML/include/G4VRMLNetConfig.hh | 6 +- source/visualization/VRML/src/FRClient.cc | 6 +- source/visualization/VRML/src/G4FRClient.cc | 6 +- source/visualization/VRML/src/G4VRML1.cc | 6 +- source/visualization/VRML/src/G4VRML1File.cc | 6 +- .../VRML/src/G4VRML1FileSceneHandler.cc | 6 +- .../VRML/src/G4VRML1FileViewer.cc | 21 +- .../VRML/src/G4VRML1SceneHandler.cc | 6 +- .../VRML/src/G4VRML1SceneHandlerFunc.icc | 104 +- .../visualization/VRML/src/G4VRML1Viewer.cc | 23 +- source/visualization/VRML/src/G4VRML2.cc | 6 +- source/visualization/VRML/src/G4VRML2File.cc | 6 +- .../VRML/src/G4VRML2FileSceneHandler.cc | 6 +- .../VRML/src/G4VRML2FileViewer.cc | 21 +- .../VRML/src/G4VRML2SceneHandler.cc | 6 +- .../VRML/src/G4VRML2SceneHandlerFunc.icc | 93 +- .../visualization/VRML/src/G4VRML2Viewer.cc | 23 +- .../include/G4GraphicsSystemList.hh | 10 +- .../management/include/G4Scene.hh | 33 +- .../management/include/G4Scene.icc | 18 +- .../management/include/G4SceneHandlerList.hh | 10 +- .../management/include/G4SceneList.hh | 10 +- .../management/include/G4VGraphicsSystem.hh | 13 +- .../management/include/G4VGraphicsSystem.icc | 6 +- .../management/include/G4VSceneHandler.hh | 70 +- .../management/include/G4VSceneHandler.icc | 30 +- .../management/include/G4VViewer.hh | 15 +- .../management/include/G4VViewer.icc | 6 +- .../management/include/G4VVisCommand.hh | 8 +- .../management/include/G4VVisCommand.icc | 6 +- .../management/include/G4ViewParameters.hh | 105 +- .../management/include/G4ViewParameters.icc | 6 +- .../management/include/G4ViewerList.hh | 10 +- .../include/G4VisCommandTemplates.hh | 6 +- .../include/G4VisCommandTemplates.icc | 6 +- .../management/include/G4VisCommandsCamera.hh | 6 +- .../include/G4VisCommandsCameraMessengers.hh | 6 +- .../management/include/G4VisCommandsClear.hh | 6 +- .../management/include/G4VisCommandsCopy.hh | 6 +- .../include/G4VisCommandsCreateScene.hh | 6 +- .../include/G4VisCommandsCreateView.hh | 6 +- .../management/include/G4VisCommandsDelete.hh | 6 +- .../management/include/G4VisCommandsDraw.hh | 6 +- .../management/include/G4VisCommandsLights.hh | 6 +- .../management/include/G4VisCommandsPrint.hh | 6 +- .../include/G4VisCommandsRefresh.hh | 6 +- .../management/include/G4VisCommandsScene.hh | 20 +- .../include/G4VisCommandsSceneAdd.hh | 17 +- .../include/G4VisCommandsSceneHandler.hh | 6 +- .../include/G4VisCommandsSceneInclude.hh | 6 +- .../management/include/G4VisCommandsSet.hh | 6 +- .../management/include/G4VisCommandsShow.hh | 6 +- .../management/include/G4VisCommandsViewer.hh | 17 +- .../include/G4VisFeaturesOfDAWNFILE.hh | 6 +- .../include/G4VisFeaturesOfFukuiRenderer.hh | 6 +- .../include/G4VisFeaturesOfOpenGL.hh | 6 +- .../include/G4VisFeaturesOfOpenInventor.hh | 6 +- .../management/include/G4VisFeaturesOfRay.hh | 20 - .../management/include/G4VisManMessenger.hh | 10 +- .../management/include/G4VisManager.hh | 92 +- .../management/include/G4VisManager.icc | 6 +- .../management/include/G4VisStateDependent.hh | 34 + .../include/G4VisToOldVisCommands.hh | 8 +- .../management/include/MyVisManager.cc | 14 +- .../management/include/MyVisManager.hh | 19 +- .../visualization/management/src/G4Scene.cc | 72 +- .../management/src/G4VGraphicsSystem.cc | 6 +- .../management/src/G4VSceneHandler.cc | 32 +- .../visualization/management/src/G4VViewer.cc | 8 +- .../management/src/G4VVisCommand.cc | 10 +- .../management/src/G4ViewParameters.cc | 6 +- .../management/src/G4VisCommandTemplates.cc | 14 +- .../management/src/G4VisCommandsCamera.cc | 6 +- .../src/G4VisCommandsCameraMessengers.cc | 6 +- .../management/src/G4VisCommandsScene.cc | 151 +- .../management/src/G4VisCommandsSceneAdd.cc | 124 +- .../src/G4VisCommandsSceneHandler.cc | 10 +- .../src/G4VisCommandsSceneInclude.cc | 6 +- .../management/src/G4VisCommandsViewer.cc | 86 +- .../management/src/G4VisFeaturesOfDAWNFILE.cc | 6 +- .../src/G4VisFeaturesOfFukuiRenderer.cc | 6 +- .../management/src/G4VisFeaturesOfOpenGL.cc | 6 +- .../src/G4VisFeaturesOfOpenInventor.cc | 6 +- .../management/src/G4VisFeaturesOfRay.cc | 21 - .../management/src/G4VisManMessCamera.cc | 6 +- .../management/src/G4VisManMessCreateView.cc | 16 +- .../management/src/G4VisManMessDraw.cc | 6 +- .../management/src/G4VisManMessExpert.cc | 6 +- .../management/src/G4VisManMessLights.cc | 6 +- .../management/src/G4VisManMessSet.cc | 16 +- .../management/src/G4VisManMessenger.cc | 6 +- .../management/src/G4VisManager.cc | 156 +- .../src/G4VisManagerRegisterMessengers.cc | 21 +- .../management/src/G4VisStateDependent.cc | 26 + .../management/src/G4VisToOldVisCommands.cc | 6 +- source/visualization/modeling/GNUmakefile | 3 +- source/visualization/modeling/History | 7 +- .../modeling/include/G4BoundingSphereScene.hh | 20 +- .../include/G4FlavoredParallelWorldModel.hh | 15 +- .../modeling/include/G4HitsModel.hh | 21 +- .../modeling/include/G4HitsModel.icc | 6 +- .../modeling/include/G4LogicalVolumeModel.hh | 59 + .../modeling/include/G4ModelingParameters.hh | 19 +- .../modeling/include/G4ModelingParameters.icc | 6 +- .../modeling/include/G4NullModel.hh | 6 +- .../modeling/include/G4PhysicalVolumeModel.hh | 94 +- .../include/G4PhysicalVolumeModel.icc | 15 - .../include/G4PhysicalVolumeSearchScene.hh | 19 +- .../include/G4PhysicalVolumeSearchScene.icc | 6 +- .../modeling/include/G4TrajectoriesModel.hh | 21 +- .../modeling/include/G4TrajectoriesModel.icc | 6 +- .../modeling/include/G4VModel.hh | 47 +- .../modeling/include/G4VModel.icc | 10 +- .../modeling/src/G4BoundingSphereScene.cc | 6 +- .../src/G4FlavoredParallelWorldModel.cc | 6 +- .../visualization/modeling/src/G4HitsModel.cc | 6 +- .../modeling/src/G4LogicalVolumeModel.cc | 85 + .../modeling/src/G4ModelingParameters.cc | 6 +- .../visualization/modeling/src/G4NullModel.cc | 6 +- .../modeling/src/G4PhysicalVolumeModel.cc | 138 +- .../src/G4PhysicalVolumeSearchScene.cc | 6 +- .../modeling/src/G4TrajectoriesModel.cc | 6 +- source/visualization/modeling/src/G4VModel.cc | 8 +- 2995 files changed, 106830 insertions(+), 299600 deletions(-) create mode 100644 ReleaseNotes/ReleaseNotes4.1.0.txt delete mode 100644 examples/extended/E01/GNUmakefile delete mode 100644 examples/extended/E01/History delete mode 100644 examples/extended/E01/README delete mode 100644 examples/extended/E01/exampleE01.cc delete mode 100644 examples/extended/E01/exampleE01.out delete mode 100644 examples/extended/E01/include/ExE01DetectorConstruction.hh delete mode 100644 examples/extended/E01/include/ExE01PhysicsList.hh delete mode 100644 examples/extended/E01/include/ExE01PrimaryGeneratorAction.hh delete mode 100644 examples/extended/E01/include/ExE01RunAction.hh delete mode 100644 examples/extended/E01/include/ExE01SteppingAction.hh delete mode 100644 examples/extended/E01/src/ExE01DetectorConstruction.cc delete mode 100644 examples/extended/E01/src/ExE01PhysicsList.cc delete mode 100644 examples/extended/E01/src/ExE01PrimaryGeneratorAction.cc delete mode 100644 examples/extended/E01/src/ExE01RunAction.cc delete mode 100644 examples/extended/E01/src/ExE01SteppingAction.cc delete mode 100644 examples/extended/E02/GNUmakefile delete mode 100644 examples/extended/E02/README delete mode 100644 examples/extended/E02/exampleE02.cc delete mode 100644 examples/extended/E02/exampleE02.in delete mode 100644 examples/extended/E02/exampleE02.out delete mode 100644 examples/extended/E02/exampleE02run delete mode 100644 examples/extended/E02/include/ExE02DetectorConstruction.hh delete mode 100644 examples/extended/E02/include/ExE02PrimaryGeneratorAction.hh delete mode 100644 examples/extended/E02/include/ExE02TrackerHit.hh delete mode 100644 examples/extended/E02/include/ExE02TrackerSD.hh delete mode 100644 examples/extended/E02/src/ExE02EventAction.cc delete mode 100644 examples/extended/E02/src/ExE02TrackerHit.cc delete mode 100644 examples/extended/E03/GNUmakefile delete mode 100644 examples/extended/E03/History delete mode 100644 examples/extended/E03/README delete mode 100644 examples/extended/E03/exampleE03.cc delete mode 100644 examples/extended/E03/exampleE03.err delete mode 100644 examples/extended/E03/exampleE03.in delete mode 100644 examples/extended/E03/exampleE03.out delete mode 100644 examples/extended/E03/include/ExE03DetectorConstruction.hh delete mode 100755 examples/extended/E03/include/ExE03PrimaryGeneratorAction.hh delete mode 100755 examples/extended/E03/include/ExE03RunAction.hh delete mode 100644 examples/extended/E03/src/ExE03DetectorConstruction.cc delete mode 100644 examples/extended/E03/src/ExE03PrimaryGeneratorAction.cc delete mode 100755 examples/extended/E03/src/ExE03RunAction.cc delete mode 100644 examples/extended/E03/stepfiles/CMS2.step delete mode 100644 examples/extended/E03/stepfiles/CMSTracker.step delete mode 100644 examples/extended/E03/stepfiles/G4rod_place_asm.stp delete mode 100644 examples/extended/E03/stepfiles/G4rod_solid.stp delete mode 100755 examples/extended/E03/stepfiles/correct.pl create mode 100644 examples/extended/electromagnetic/TestEm1/GNUmakefile create mode 100644 examples/extended/electromagnetic/TestEm1/History create mode 100644 examples/extended/electromagnetic/TestEm1/README create mode 100644 examples/extended/electromagnetic/TestEm1/TestEm1.cc create mode 100644 examples/extended/electromagnetic/TestEm1/geant3/README create mode 100755 examples/extended/electromagnetic/TestEm1/geant3/gmakeB create mode 100755 examples/extended/electromagnetic/TestEm1/geant3/gmakeT create mode 100644 examples/extended/electromagnetic/TestEm1/geant3/run00.dat create mode 100644 examples/extended/electromagnetic/TestEm1/geant3/run01.dat create mode 100644 examples/extended/electromagnetic/TestEm1/geant3/run02.dat create mode 100644 examples/extended/electromagnetic/TestEm1/geant3/run03.dat create mode 100644 examples/extended/electromagnetic/TestEm1/geant3/run04.dat create mode 100644 examples/extended/electromagnetic/TestEm1/geant3/run05.dat create mode 100644 examples/extended/electromagnetic/TestEm1/geant3/run06.dat create mode 100644 examples/extended/electromagnetic/TestEm1/geant3/run07.dat create mode 100644 examples/extended/electromagnetic/TestEm1/geant3/run08.dat create mode 100644 examples/extended/electromagnetic/TestEm1/geant3/run09.dat create mode 100644 examples/extended/electromagnetic/TestEm1/geant3/run11.dat create mode 100644 examples/extended/electromagnetic/TestEm1/geant3/testem1.cra create mode 100644 examples/extended/electromagnetic/TestEm1/include/Em1DetectorConstruction.hh create mode 100644 examples/extended/electromagnetic/TestEm1/include/Em1DetectorMessenger.hh create mode 100644 examples/extended/electromagnetic/TestEm1/include/Em1EventAction.hh create mode 100644 examples/extended/electromagnetic/TestEm1/include/Em1EventActionMessenger.hh create mode 100644 examples/extended/electromagnetic/TestEm1/include/Em1PhysicsList.hh create mode 100644 examples/extended/electromagnetic/TestEm1/include/Em1PhysicsListMessenger.hh create mode 100644 examples/extended/electromagnetic/TestEm1/include/Em1PrimaryGeneratorAction.hh create mode 100644 examples/extended/electromagnetic/TestEm1/include/Em1RunAction.hh create mode 100644 examples/extended/electromagnetic/TestEm1/include/Em1RunActionMessenger.hh create mode 100644 examples/extended/electromagnetic/TestEm1/include/Em1SteppingAction.hh create mode 100644 examples/extended/electromagnetic/TestEm1/include/Em1TrackingAction.hh create mode 100644 examples/extended/electromagnetic/TestEm1/include/Em1VisManager.hh create mode 100644 examples/extended/electromagnetic/TestEm1/include/ProcessesCount.hh create mode 100644 examples/extended/electromagnetic/TestEm1/init.mac create mode 100644 examples/extended/electromagnetic/TestEm1/run00.mac create mode 100644 examples/extended/electromagnetic/TestEm1/run01.mac create mode 100644 examples/extended/electromagnetic/TestEm1/run02.mac create mode 100644 examples/extended/electromagnetic/TestEm1/run03.mac create mode 100644 examples/extended/electromagnetic/TestEm1/run04.mac create mode 100644 examples/extended/electromagnetic/TestEm1/run05.mac create mode 100644 examples/extended/electromagnetic/TestEm1/run06.mac create mode 100644 examples/extended/electromagnetic/TestEm1/run07.mac create mode 100644 examples/extended/electromagnetic/TestEm1/run08.mac create mode 100644 examples/extended/electromagnetic/TestEm1/run09.mac create mode 100644 examples/extended/electromagnetic/TestEm1/run11.mac create mode 100644 examples/extended/electromagnetic/TestEm1/src/Em1DetectorConstruction.cc create mode 100644 examples/extended/electromagnetic/TestEm1/src/Em1DetectorMessenger.cc create mode 100644 examples/extended/electromagnetic/TestEm1/src/Em1EventAction.cc create mode 100644 examples/extended/electromagnetic/TestEm1/src/Em1EventActionMessenger.cc create mode 100644 examples/extended/electromagnetic/TestEm1/src/Em1PhysicsList.cc create mode 100644 examples/extended/electromagnetic/TestEm1/src/Em1PhysicsListMessenger.cc create mode 100644 examples/extended/electromagnetic/TestEm1/src/Em1PrimaryGeneratorAction.cc create mode 100644 examples/extended/electromagnetic/TestEm1/src/Em1RunAction.cc create mode 100644 examples/extended/electromagnetic/TestEm1/src/Em1RunActionMessenger.cc create mode 100644 examples/extended/electromagnetic/TestEm1/src/Em1SteppingAction.cc create mode 100644 examples/extended/electromagnetic/TestEm1/src/Em1TrackingAction.cc create mode 100644 examples/extended/electromagnetic/TestEm1/src/Em1VisManager.cc create mode 100644 examples/extended/electromagnetic/TestEm2/GNUmakefile create mode 100644 examples/extended/electromagnetic/TestEm2/README create mode 100644 examples/extended/electromagnetic/TestEm2/TestEm2.cc create mode 100644 examples/extended/electromagnetic/TestEm2/geant3/README create mode 100755 examples/extended/electromagnetic/TestEm2/geant3/gmakeB create mode 100755 examples/extended/electromagnetic/TestEm2/geant3/gmakeT create mode 100644 examples/extended/electromagnetic/TestEm2/geant3/run01.dat create mode 100644 examples/extended/electromagnetic/TestEm2/geant3/run02.dat create mode 100644 examples/extended/electromagnetic/TestEm2/geant3/run03.dat create mode 100644 examples/extended/electromagnetic/TestEm2/geant3/run04.dat create mode 100644 examples/extended/electromagnetic/TestEm2/geant3/testem2.cra create mode 100644 examples/extended/electromagnetic/TestEm2/include/Em2DetectorConstruction.hh create mode 100644 examples/extended/electromagnetic/TestEm2/include/Em2DetectorMessenger.hh create mode 100644 examples/extended/electromagnetic/TestEm2/include/Em2EventAction.hh create mode 100644 examples/extended/electromagnetic/TestEm2/include/Em2EventActionMessenger.hh create mode 100644 examples/extended/electromagnetic/TestEm2/include/Em2PhysicsList.hh create mode 100644 examples/extended/electromagnetic/TestEm2/include/Em2PrimaryGeneratorAction.hh create mode 100644 examples/extended/electromagnetic/TestEm2/include/Em2RunAction.hh create mode 100644 examples/extended/electromagnetic/TestEm2/include/Em2RunActionMessenger.hh create mode 100644 examples/extended/electromagnetic/TestEm2/include/Em2SteppingAction.hh create mode 100644 examples/extended/electromagnetic/TestEm2/include/Em2TrackingAction.hh create mode 100644 examples/extended/electromagnetic/TestEm2/include/Em2VisManager.hh create mode 100644 examples/extended/electromagnetic/TestEm2/init.mac create mode 100644 examples/extended/electromagnetic/TestEm2/run01.mac create mode 100644 examples/extended/electromagnetic/TestEm2/run02.mac create mode 100644 examples/extended/electromagnetic/TestEm2/run03.mac create mode 100644 examples/extended/electromagnetic/TestEm2/run04.mac create mode 100644 examples/extended/electromagnetic/TestEm2/src/Em2DetectorConstruction.cc create mode 100644 examples/extended/electromagnetic/TestEm2/src/Em2DetectorMessenger.cc create mode 100644 examples/extended/electromagnetic/TestEm2/src/Em2EventAction.cc create mode 100644 examples/extended/electromagnetic/TestEm2/src/Em2EventActionMessenger.cc create mode 100644 examples/extended/electromagnetic/TestEm2/src/Em2PhysicsList.cc create mode 100644 examples/extended/electromagnetic/TestEm2/src/Em2PrimaryGeneratorAction.cc create mode 100644 examples/extended/electromagnetic/TestEm2/src/Em2RunAction.cc create mode 100644 examples/extended/electromagnetic/TestEm2/src/Em2RunActionMessenger.cc create mode 100644 examples/extended/electromagnetic/TestEm2/src/Em2SteppingAction.cc create mode 100644 examples/extended/electromagnetic/TestEm2/src/Em2TrackingAction.cc create mode 100644 examples/extended/electromagnetic/TestEm2/src/Em2VisManager.cc create mode 100644 examples/extended/electromagnetic/TestEm3/GNUmakefile create mode 100644 examples/extended/electromagnetic/TestEm3/README create mode 100644 examples/extended/electromagnetic/TestEm3/TestEm3.cc create mode 100644 examples/extended/electromagnetic/TestEm3/geant3/README create mode 100755 examples/extended/electromagnetic/TestEm3/geant3/gmakeB create mode 100755 examples/extended/electromagnetic/TestEm3/geant3/gmakeT create mode 100644 examples/extended/electromagnetic/TestEm3/geant3/run01.dat create mode 100644 examples/extended/electromagnetic/TestEm3/geant3/run02.dat create mode 100644 examples/extended/electromagnetic/TestEm3/geant3/run03.dat create mode 100644 examples/extended/electromagnetic/TestEm3/geant3/run04.dat create mode 100644 examples/extended/electromagnetic/TestEm3/geant3/run05.dat create mode 100644 examples/extended/electromagnetic/TestEm3/geant3/run06.dat create mode 100644 examples/extended/electromagnetic/TestEm3/geant3/run07.dat create mode 100644 examples/extended/electromagnetic/TestEm3/geant3/testem3.cra create mode 100644 examples/extended/electromagnetic/TestEm3/include/Em3CalorHit.hh create mode 100644 examples/extended/electromagnetic/TestEm3/include/Em3CalorimeterSD.hh create mode 100644 examples/extended/electromagnetic/TestEm3/include/Em3DetectorConstruction.hh create mode 100644 examples/extended/electromagnetic/TestEm3/include/Em3DetectorMessenger.hh create mode 100644 examples/extended/electromagnetic/TestEm3/include/Em3EventAction.hh create mode 100644 examples/extended/electromagnetic/TestEm3/include/Em3EventActionMessenger.hh create mode 100644 examples/extended/electromagnetic/TestEm3/include/Em3PhysicsList.hh create mode 100644 examples/extended/electromagnetic/TestEm3/include/Em3PrimaryGeneratorAction.hh create mode 100644 examples/extended/electromagnetic/TestEm3/include/Em3PrimaryGeneratorMessenger.hh create mode 100644 examples/extended/electromagnetic/TestEm3/include/Em3RunAction.hh create mode 100644 examples/extended/electromagnetic/TestEm3/include/Em3RunActionMessenger.hh create mode 100644 examples/extended/electromagnetic/TestEm3/include/Em3SteppingAction.hh create mode 100644 examples/extended/electromagnetic/TestEm3/include/Em3VisManager.hh create mode 100644 examples/extended/electromagnetic/TestEm3/init.mac create mode 100644 examples/extended/electromagnetic/TestEm3/run01.mac create mode 100644 examples/extended/electromagnetic/TestEm3/run02.mac create mode 100644 examples/extended/electromagnetic/TestEm3/run03.mac create mode 100644 examples/extended/electromagnetic/TestEm3/run04.mac create mode 100644 examples/extended/electromagnetic/TestEm3/run05.mac create mode 100644 examples/extended/electromagnetic/TestEm3/run06.mac create mode 100644 examples/extended/electromagnetic/TestEm3/run07.mac create mode 100644 examples/extended/electromagnetic/TestEm3/src/Em3CalorHit.cc create mode 100644 examples/extended/electromagnetic/TestEm3/src/Em3CalorimeterSD.cc create mode 100644 examples/extended/electromagnetic/TestEm3/src/Em3DetectorConstruction.cc create mode 100644 examples/extended/electromagnetic/TestEm3/src/Em3DetectorMessenger.cc create mode 100644 examples/extended/electromagnetic/TestEm3/src/Em3EventAction.cc create mode 100644 examples/extended/electromagnetic/TestEm3/src/Em3EventActionMessenger.cc create mode 100644 examples/extended/electromagnetic/TestEm3/src/Em3PhysicsList.cc create mode 100644 examples/extended/electromagnetic/TestEm3/src/Em3PrimaryGeneratorAction.cc create mode 100644 examples/extended/electromagnetic/TestEm3/src/Em3PrimaryGeneratorMessenger.cc create mode 100644 examples/extended/electromagnetic/TestEm3/src/Em3RunAction.cc create mode 100644 examples/extended/electromagnetic/TestEm3/src/Em3RunActionMessenger.cc create mode 100644 examples/extended/electromagnetic/TestEm3/src/Em3SteppingAction.cc create mode 100644 examples/extended/electromagnetic/TestEm3/src/Em3VisManager.cc create mode 100644 examples/extended/electromagnetic/TestEm4/GNUmakefile create mode 100644 examples/extended/electromagnetic/TestEm4/History create mode 100644 examples/extended/electromagnetic/TestEm4/README create mode 100644 examples/extended/electromagnetic/TestEm4/TestEm4.cc create mode 100755 examples/extended/electromagnetic/TestEm4/geant3/gmakeB create mode 100755 examples/extended/electromagnetic/TestEm4/geant3/gmakeT create mode 100644 examples/extended/electromagnetic/TestEm4/geant3/run01.dat create mode 100644 examples/extended/electromagnetic/TestEm4/geant3/testem4.cra create mode 100644 examples/extended/electromagnetic/TestEm4/include/Em4DetectorConstruction.hh create mode 100644 examples/extended/electromagnetic/TestEm4/include/Em4EventAction.hh create mode 100644 examples/extended/electromagnetic/TestEm4/include/Em4EventActionMessenger.hh create mode 100644 examples/extended/electromagnetic/TestEm4/include/Em4PhysicsList.hh create mode 100644 examples/extended/electromagnetic/TestEm4/include/Em4PrimaryGeneratorAction.hh create mode 100644 examples/extended/electromagnetic/TestEm4/include/Em4RunAction.hh create mode 100644 examples/extended/electromagnetic/TestEm4/include/Em4RunActionMessenger.hh create mode 100644 examples/extended/electromagnetic/TestEm4/include/Em4SteppingAction.hh create mode 100644 examples/extended/electromagnetic/TestEm4/include/Em4SteppingVerbose.hh create mode 100644 examples/extended/electromagnetic/TestEm4/include/Em4VisManager.hh create mode 100644 examples/extended/electromagnetic/TestEm4/init.mac create mode 100644 examples/extended/electromagnetic/TestEm4/run01.mac create mode 100644 examples/extended/electromagnetic/TestEm4/src/Em4DetectorConstruction.cc create mode 100644 examples/extended/electromagnetic/TestEm4/src/Em4EventAction.cc create mode 100644 examples/extended/electromagnetic/TestEm4/src/Em4EventActionMessenger.cc create mode 100644 examples/extended/electromagnetic/TestEm4/src/Em4PhysicsList.cc create mode 100644 examples/extended/electromagnetic/TestEm4/src/Em4PrimaryGeneratorAction.cc create mode 100644 examples/extended/electromagnetic/TestEm4/src/Em4RunAction.cc create mode 100644 examples/extended/electromagnetic/TestEm4/src/Em4RunActionMessenger.cc create mode 100644 examples/extended/electromagnetic/TestEm4/src/Em4SteppingAction.cc create mode 100644 examples/extended/electromagnetic/TestEm4/src/Em4SteppingVerbose.cc create mode 100644 examples/extended/electromagnetic/TestEm4/src/Em4VisManager.cc create mode 100644 examples/extended/electromagnetic/TestEm5/GNUmakefile create mode 100644 examples/extended/electromagnetic/TestEm5/History create mode 100644 examples/extended/electromagnetic/TestEm5/README create mode 100644 examples/extended/electromagnetic/TestEm5/TestEm5.cc create mode 100644 examples/extended/electromagnetic/TestEm5/geant3/README create mode 100755 examples/extended/electromagnetic/TestEm5/geant3/gmakeB create mode 100755 examples/extended/electromagnetic/TestEm5/geant3/gmakeT create mode 100644 examples/extended/electromagnetic/TestEm5/geant3/run01.dat create mode 100644 examples/extended/electromagnetic/TestEm5/geant3/run01a.dat create mode 100644 examples/extended/electromagnetic/TestEm5/geant3/run02.dat create mode 100644 examples/extended/electromagnetic/TestEm5/geant3/run02a.dat create mode 100644 examples/extended/electromagnetic/TestEm5/geant3/run03.dat create mode 100644 examples/extended/electromagnetic/TestEm5/geant3/run04.dat create mode 100644 examples/extended/electromagnetic/TestEm5/geant3/run05.dat create mode 100644 examples/extended/electromagnetic/TestEm5/geant3/run11.dat create mode 100644 examples/extended/electromagnetic/TestEm5/geant3/run12.dat create mode 100644 examples/extended/electromagnetic/TestEm5/geant3/run13.dat create mode 100644 examples/extended/electromagnetic/TestEm5/geant3/run14.dat create mode 100644 examples/extended/electromagnetic/TestEm5/geant3/run15.dat create mode 100644 examples/extended/electromagnetic/TestEm5/geant3/run16.dat create mode 100644 examples/extended/electromagnetic/TestEm5/geant3/run21.dat create mode 100644 examples/extended/electromagnetic/TestEm5/geant3/run22.dat create mode 100644 examples/extended/electromagnetic/TestEm5/geant3/testem5.cra create mode 100644 examples/extended/electromagnetic/TestEm5/include/Em5CalorHit.hh create mode 100644 examples/extended/electromagnetic/TestEm5/include/Em5CalorimeterSD.hh create mode 100644 examples/extended/electromagnetic/TestEm5/include/Em5DetectorConstruction.hh create mode 100644 examples/extended/electromagnetic/TestEm5/include/Em5DetectorMessenger.hh create mode 100644 examples/extended/electromagnetic/TestEm5/include/Em5EventAction.hh create mode 100644 examples/extended/electromagnetic/TestEm5/include/Em5EventActionMessenger.hh create mode 100644 examples/extended/electromagnetic/TestEm5/include/Em5PhysicsList.hh create mode 100644 examples/extended/electromagnetic/TestEm5/include/Em5PhysicsListMessenger.hh create mode 100644 examples/extended/electromagnetic/TestEm5/include/Em5PrimaryGeneratorAction.hh create mode 100644 examples/extended/electromagnetic/TestEm5/include/Em5PrimaryGeneratorMessenger.hh create mode 100644 examples/extended/electromagnetic/TestEm5/include/Em5RunAction.hh create mode 100644 examples/extended/electromagnetic/TestEm5/include/Em5RunMessenger.hh create mode 100644 examples/extended/electromagnetic/TestEm5/include/Em5StepCut.hh create mode 100644 examples/extended/electromagnetic/TestEm5/include/Em5SteppingAction.hh create mode 100644 examples/extended/electromagnetic/TestEm5/include/Em5SteppingMessenger.hh create mode 100644 examples/extended/electromagnetic/TestEm5/include/Em5VisManager.hh create mode 100644 examples/extended/electromagnetic/TestEm5/init.mac create mode 100644 examples/extended/electromagnetic/TestEm5/run01.mac create mode 100644 examples/extended/electromagnetic/TestEm5/run01a.mac create mode 100644 examples/extended/electromagnetic/TestEm5/run02.mac create mode 100644 examples/extended/electromagnetic/TestEm5/run02a.mac create mode 100644 examples/extended/electromagnetic/TestEm5/run03.mac create mode 100644 examples/extended/electromagnetic/TestEm5/run04.mac create mode 100644 examples/extended/electromagnetic/TestEm5/run05.mac create mode 100644 examples/extended/electromagnetic/TestEm5/run11.mac create mode 100644 examples/extended/electromagnetic/TestEm5/run12.mac create mode 100644 examples/extended/electromagnetic/TestEm5/run13.mac create mode 100644 examples/extended/electromagnetic/TestEm5/run14.mac create mode 100644 examples/extended/electromagnetic/TestEm5/run15.mac create mode 100644 examples/extended/electromagnetic/TestEm5/run16.mac create mode 100644 examples/extended/electromagnetic/TestEm5/run21.mac create mode 100644 examples/extended/electromagnetic/TestEm5/run22.mac create mode 100644 examples/extended/electromagnetic/TestEm5/src/Em5CalorHit.cc create mode 100644 examples/extended/electromagnetic/TestEm5/src/Em5CalorimeterSD.cc create mode 100644 examples/extended/electromagnetic/TestEm5/src/Em5DetectorConstruction.cc create mode 100644 examples/extended/electromagnetic/TestEm5/src/Em5DetectorMessenger.cc create mode 100644 examples/extended/electromagnetic/TestEm5/src/Em5EventAction.cc create mode 100644 examples/extended/electromagnetic/TestEm5/src/Em5EventActionMessenger.cc create mode 100644 examples/extended/electromagnetic/TestEm5/src/Em5PhysicsList.cc create mode 100644 examples/extended/electromagnetic/TestEm5/src/Em5PhysicsListMessenger.cc create mode 100644 examples/extended/electromagnetic/TestEm5/src/Em5PrimaryGeneratorAction.cc create mode 100644 examples/extended/electromagnetic/TestEm5/src/Em5PrimaryGeneratorMessenger.cc create mode 100644 examples/extended/electromagnetic/TestEm5/src/Em5RunAction.cc create mode 100644 examples/extended/electromagnetic/TestEm5/src/Em5RunMessenger.cc create mode 100644 examples/extended/electromagnetic/TestEm5/src/Em5StepCut.cc create mode 100644 examples/extended/electromagnetic/TestEm5/src/Em5SteppingAction.cc create mode 100644 examples/extended/electromagnetic/TestEm5/src/Em5SteppingMessenger.cc create mode 100644 examples/extended/electromagnetic/TestEm5/src/Em5VisManager.cc create mode 100644 examples/extended/electromagnetic/TestEm6/GNUmakefile create mode 100644 examples/extended/electromagnetic/TestEm6/TestEm6.cc create mode 100644 examples/extended/electromagnetic/TestEm6/batch.mac create mode 100644 examples/extended/electromagnetic/TestEm6/include/Em6CalorHit.hh create mode 100644 examples/extended/electromagnetic/TestEm6/include/Em6CalorimeterSD.hh create mode 100644 examples/extended/electromagnetic/TestEm6/include/Em6DetectorConstruction.hh create mode 100644 examples/extended/electromagnetic/TestEm6/include/Em6DetectorMessenger.hh create mode 100644 examples/extended/electromagnetic/TestEm6/include/Em6EventAction.hh create mode 100644 examples/extended/electromagnetic/TestEm6/include/Em6EventActionMessenger.hh create mode 100644 examples/extended/electromagnetic/TestEm6/include/Em6PhysicsList.hh create mode 100644 examples/extended/electromagnetic/TestEm6/include/Em6PhysicsListMessenger.hh create mode 100644 examples/extended/electromagnetic/TestEm6/include/Em6PrimaryGeneratorAction.hh create mode 100644 examples/extended/electromagnetic/TestEm6/include/Em6RunAction.hh create mode 100644 examples/extended/electromagnetic/TestEm6/include/Em6RunMessenger.hh create mode 100644 examples/extended/electromagnetic/TestEm6/include/Em6StepCut.hh create mode 100644 examples/extended/electromagnetic/TestEm6/include/Em6SteppingAction.hh create mode 100644 examples/extended/electromagnetic/TestEm6/include/Em6SteppingMessenger.hh create mode 100644 examples/extended/electromagnetic/TestEm6/include/Em6VisManager.hh create mode 100644 examples/extended/electromagnetic/TestEm6/include/G4IonAr40.hh create mode 100644 examples/extended/electromagnetic/TestEm6/include/G4IonC12.hh create mode 100644 examples/extended/electromagnetic/TestEm6/include/G4IonFe56.hh create mode 100644 examples/extended/electromagnetic/TestEm6/src/Em6CalorHit.cc create mode 100644 examples/extended/electromagnetic/TestEm6/src/Em6DetectorConstruction.cc create mode 100644 examples/extended/electromagnetic/TestEm6/src/Em6DetectorMessenger.cc create mode 100644 examples/extended/electromagnetic/TestEm6/src/Em6DetectorSD.cc create mode 100644 examples/extended/electromagnetic/TestEm6/src/Em6EventAction.cc create mode 100644 examples/extended/electromagnetic/TestEm6/src/Em6EventActionMessenger.cc create mode 100644 examples/extended/electromagnetic/TestEm6/src/Em6PhysicsList.cc create mode 100644 examples/extended/electromagnetic/TestEm6/src/Em6PhysicsList.cc.ions create mode 100644 examples/extended/electromagnetic/TestEm6/src/Em6PhysicsList.cc.protons create mode 100644 examples/extended/electromagnetic/TestEm6/src/Em6PhysicsListMessenger.cc create mode 100644 examples/extended/electromagnetic/TestEm6/src/Em6PrimaryGeneratorAction.cc create mode 100644 examples/extended/electromagnetic/TestEm6/src/Em6RunAction.cc create mode 100644 examples/extended/electromagnetic/TestEm6/src/Em6RunAction.cc.ions create mode 100644 examples/extended/electromagnetic/TestEm6/src/Em6RunAction.cc.protons create mode 100644 examples/extended/electromagnetic/TestEm6/src/Em6RunMessenger.cc create mode 100644 examples/extended/electromagnetic/TestEm6/src/Em6StepCut.cc create mode 100644 examples/extended/electromagnetic/TestEm6/src/Em6SteppingAction.cc create mode 100644 examples/extended/electromagnetic/TestEm6/src/Em6SteppingMessenger.cc create mode 100644 examples/extended/electromagnetic/TestEm6/src/Em6VisManager.cc create mode 100644 examples/extended/electromagnetic/TestEm6/src/G4IonAr40.cc create mode 100644 examples/extended/electromagnetic/TestEm6/src/G4IonC12.cc create mode 100644 examples/extended/electromagnetic/TestEm6/src/G4IonFe56.cc create mode 100644 examples/extended/persistency/PersistentEx01/GNUmakefile rename examples/extended/{E02 => persistency/PersistentEx01}/History (55%) create mode 100644 examples/extended/persistency/PersistentEx01/PersistentEx01.cc create mode 100644 examples/extended/persistency/PersistentEx01/PersistentEx01.in create mode 100644 examples/extended/persistency/PersistentEx01/PersistentEx01.out create mode 100755 examples/extended/persistency/PersistentEx01/PersistentEx01run create mode 100644 examples/extended/persistency/PersistentEx01/README create mode 100644 examples/extended/persistency/PersistentEx01/createTag/GNUmakefile create mode 100644 examples/extended/persistency/PersistentEx01/createTag/README create mode 100644 examples/extended/persistency/PersistentEx01/createTag/createTag.cpp create mode 100755 examples/extended/persistency/PersistentEx01/createTag/setup.csh create mode 100755 examples/extended/persistency/PersistentEx01/createTag/setup.sh rename examples/extended/{E02 => persistency/PersistentEx01}/g4odbms_setup.csh (71%) create mode 100644 examples/extended/persistency/PersistentEx01/g4odbms_setup.sh create mode 100644 examples/extended/persistency/PersistentEx01/include/PersEx01DetectorConstruction.hh rename examples/extended/{E02/include/ExE02EventAction.hh => persistency/PersistentEx01/include/PersEx01EventAction.hh} (58%) rename examples/extended/{E02/include/ExE02PhysicsList.hh => persistency/PersistentEx01/include/PersEx01PhysicsList.hh} (78%) create mode 100644 examples/extended/persistency/PersistentEx01/include/PersEx01PrimaryGeneratorAction.hh rename examples/extended/{E02/include/ExE02RunAction.hh => persistency/PersistentEx01/include/PersEx01RunAction.hh} (57%) rename examples/extended/{E02/include/ExE02StackingAction.hh => persistency/PersistentEx01/include/PersEx01StackingAction.hh} (57%) create mode 100644 examples/extended/persistency/PersistentEx01/include/PersEx01TrackerHit.hh create mode 100644 examples/extended/persistency/PersistentEx01/include/PersEx01TrackerSD.hh create mode 100644 examples/extended/persistency/PersistentEx01/prerunPEx01.mac create mode 100644 examples/extended/persistency/PersistentEx01/readDB/GNUmakefile create mode 100644 examples/extended/persistency/PersistentEx01/readDB/README create mode 100644 examples/extended/persistency/PersistentEx01/readDB/readDB.cpp create mode 100644 examples/extended/persistency/PersistentEx01/readDB/setup.csh create mode 100644 examples/extended/persistency/PersistentEx01/readDB/setup.sh create mode 100644 examples/extended/persistency/PersistentEx01/readTag/GNUmakefile create mode 100644 examples/extended/persistency/PersistentEx01/readTag/README create mode 100644 examples/extended/persistency/PersistentEx01/readTag/readTag.cpp create mode 100755 examples/extended/persistency/PersistentEx01/readTag/setup.csh create mode 100755 examples/extended/persistency/PersistentEx01/readTag/setup.sh create mode 100644 examples/extended/persistency/PersistentEx01/setup_lhcxx.csh create mode 100644 examples/extended/persistency/PersistentEx01/setup_lhcxx.sh rename examples/extended/{E02/src/ExE02DetectorConstruction.cc => persistency/PersistentEx01/src/PersEx01DetectorConstruction.cc} (90%) create mode 100644 examples/extended/persistency/PersistentEx01/src/PersEx01EventAction.cc rename examples/extended/{E02/src/ExE02PhysicsList.cc => persistency/PersistentEx01/src/PersEx01PhysicsList.cc} (83%) rename examples/extended/{E02/src/ExE02PrimaryGeneratorAction.cc => persistency/PersistentEx01/src/PersEx01PrimaryGeneratorAction.cc} (74%) rename examples/extended/{E02/src/ExE02RunAction.cc => persistency/PersistentEx01/src/PersEx01RunAction.cc} (68%) rename examples/extended/{E02/src/ExE02StackingAction.cc => persistency/PersistentEx01/src/PersEx01StackingAction.cc} (53%) create mode 100644 examples/extended/persistency/PersistentEx01/src/PersEx01TrackerHit.cc rename examples/extended/{E02/src/ExE02TrackerSD.cc => persistency/PersistentEx01/src/PersEx01TrackerSD.cc} (62%) create mode 100644 examples/extended/persistency/PersistentEx02/GNUmakefile create mode 100644 examples/extended/persistency/PersistentEx02/History create mode 100644 examples/extended/persistency/PersistentEx02/PersistentEx02.cc create mode 100644 examples/extended/persistency/PersistentEx02/PersistentEx02.in create mode 100644 examples/extended/persistency/PersistentEx02/PersistentEx02.out create mode 100755 examples/extended/persistency/PersistentEx02/PersistentEx02run create mode 100644 examples/extended/persistency/PersistentEx02/README create mode 100644 examples/extended/persistency/PersistentEx02/include/PersEx02DetectorConstruction.hh create mode 100644 examples/extended/persistency/PersistentEx02/include/PersEx02EventAction.hh rename examples/extended/{E03/include/ExE03PhysicsList.hh => persistency/PersistentEx02/include/PersEx02PhysicsList.hh} (53%) create mode 100644 examples/extended/persistency/PersistentEx02/include/PersEx02PrimaryGeneratorAction.hh create mode 100644 examples/extended/persistency/PersistentEx02/include/PersEx02RunAction.hh create mode 100644 examples/extended/persistency/PersistentEx02/include/PersEx02StackingAction.hh create mode 100644 examples/extended/persistency/PersistentEx02/include/PersEx02TrackerHit.ddl create mode 100644 examples/extended/persistency/PersistentEx02/include/PersEx02TrackerHitsCollection.ddl create mode 100644 examples/extended/persistency/PersistentEx02/include/PersEx02TrackerSD.hh create mode 100644 examples/extended/persistency/PersistentEx02/prerunPEx02.mac create mode 100644 examples/extended/persistency/PersistentEx02/readDB/GNUmakefile create mode 100644 examples/extended/persistency/PersistentEx02/readDB/README create mode 100644 examples/extended/persistency/PersistentEx02/readDB/readDB.cpp create mode 100644 examples/extended/persistency/PersistentEx02/readDB/setup.csh create mode 100644 examples/extended/persistency/PersistentEx02/readDB/setup.sh create mode 100644 examples/extended/persistency/PersistentEx02/src/PersEx02DetectorConstruction.cc create mode 100644 examples/extended/persistency/PersistentEx02/src/PersEx02EventAction.cc rename examples/extended/{E03/src/ExE03PhysicsList.cc => persistency/PersistentEx02/src/PersEx02PhysicsList.cc} (77%) create mode 100644 examples/extended/persistency/PersistentEx02/src/PersEx02PrimaryGeneratorAction.cc create mode 100644 examples/extended/persistency/PersistentEx02/src/PersEx02RunAction.cc create mode 100644 examples/extended/persistency/PersistentEx02/src/PersEx02StackingAction.cc create mode 100644 examples/extended/persistency/PersistentEx02/src/PersEx02TrackerHit.cc create mode 100644 examples/extended/persistency/PersistentEx02/src/PersEx02TrackerHitsCollection.cc create mode 100644 examples/extended/persistency/PersistentEx02/src/PersEx02TrackerSD.cc create mode 100644 examples/novice/N03/exN03Vis0.mac create mode 100644 examples/novice/N03/exN03Vis1.mac create mode 100644 examples/novice/N03/exN03Vis2.mac create mode 100644 examples/novice/N03/exN03Vis3.mac create mode 100644 source/g3tog4/include/G3DetTableEntry.hh create mode 100644 source/g3tog4/include/G3Division.hh create mode 100644 source/g3tog4/include/G3MatTableEntry.hh create mode 100644 source/g3tog4/include/G3MedTableEntry.hh create mode 100644 source/g3tog4/include/G3RotTableEntry.hh create mode 100644 source/g3tog4/include/G3SensVolVector.hh create mode 100644 source/g3tog4/include/G3VolTableEntry.hh delete mode 100644 source/g3tog4/include/G4makevol.hh delete mode 100644 source/g3tog4/include/VolTableEntry.hh create mode 100644 source/g3tog4/src/G3DetTableEntry.cc create mode 100644 source/g3tog4/src/G3Division.cc create mode 100644 source/g3tog4/src/G3MatTableEntry.cc create mode 100644 source/g3tog4/src/G3MedTableEntry.cc create mode 100644 source/g3tog4/src/G3NegVolPars.cc create mode 100644 source/g3tog4/src/G3RotTableEntry.cc create mode 100644 source/g3tog4/src/G3VolTableEntry.cc create mode 100644 source/g3tog4/src/G3fillParams.cc delete mode 100644 source/g3tog4/src/G4makevol.cc delete mode 100644 source/g3tog4/src/VolTableEntry.cc rename source/g3tog4/src/{g3test.F => g3test.F.main} (94%) create mode 100644 source/g3tog4/test/GNUmakefile create mode 100644 source/g3tog4/test/README create mode 100644 source/g3tog4/test/clGeometry.cc create mode 100644 source/g3tog4/test/clGeometry.x create mode 100644 source/g3tog4/test/cltog4.cc create mode 100644 source/g3tog4/test/cltog4.x create mode 100644 source/g3tog4/test/include/G3toG4DetectorConstruction.hh create mode 100644 source/g3tog4/test/include/G3toG4EventAction.hh create mode 100644 source/g3tog4/test/include/G3toG4EventActionMessenger.hh create mode 100644 source/g3tog4/test/include/G3toG4PhysicsList.hh create mode 100644 source/g3tog4/test/include/G3toG4PrimaryGeneratorAction.hh create mode 100644 source/g3tog4/test/include/G3toG4RunAction.hh create mode 100644 source/g3tog4/test/include/G3toG4VisManager.hh create mode 100644 source/g3tog4/test/parity.dat create mode 100644 source/g3tog4/test/src/G3toG4DetectorConstruction.cc create mode 100644 source/g3tog4/test/src/G3toG4EventAction.cc create mode 100644 source/g3tog4/test/src/G3toG4EventActionMessenger.cc create mode 100644 source/g3tog4/test/src/G3toG4PhysicsList.cc create mode 100644 source/g3tog4/test/src/G3toG4PrimaryGeneratorAction.cc create mode 100644 source/g3tog4/test/src/G3toG4RunAction.cc create mode 100644 source/g3tog4/test/src/G3toG4VisManager.cc create mode 100644 source/g3tog4/test/svtwaf.dat create mode 100644 source/g3tog4/test/testmodel.dat create mode 100644 source/geometry/management/include/G4DrawVoxels.hh create mode 100644 source/geometry/management/src/G4DrawVoxels.cc create mode 100644 source/geometry/solids/BREPS/include/G4BREPSolidOpenPCone.hh create mode 100644 source/geometry/solids/BREPS/src/G4BREPSolidOpenPCone.cc rename source/geometry/solids/{BREPS => STEPinterface}/include/G4NISTStepReader.hh (94%) rename source/geometry/solids/{BREPS => STEPinterface}/include/G4StepFileReader.hh (79%) rename source/geometry/solids/{BREPS => STEPinterface}/src/G4NISTStepReader.cc (94%) create mode 100644 source/global/HEPNumerics/include/G4Integrator.hh create mode 100644 source/global/HEPNumerics/include/G4Integrator.icc create mode 100644 source/global/HEPRandom/test/G4RandDistributionTest.cc create mode 100644 source/global/HEPRandom/test/G4RandGlobalTest.cc create mode 100644 source/global/HEPRandom/test/G4ShootBitTest.cc create mode 100644 source/global/HEPRandom/test/GNUmakefile create mode 100644 source/global/STLInterface/g4rw/cstring.h create mode 100644 source/global/STLInterface/g4rw/cstring.icc create mode 100644 source/global/STLInterface/g4rw/ctoken.h create mode 100644 source/global/STLInterface/g4rw/defs.h create mode 100644 source/global/STLInterface/g4rw/rstream.h create mode 100644 source/global/STLInterface/g4rw/rw2stl_algo.h create mode 100644 source/global/STLInterface/g4rw/tpordvec.h create mode 100644 source/global/STLInterface/g4rw/tpordvec.icc create mode 100644 source/global/STLInterface/g4rw/tpsrtvec.h create mode 100644 source/global/STLInterface/g4rw/tpsrtvec.icc create mode 100644 source/global/STLInterface/g4rw/tpvector.h create mode 100644 source/global/STLInterface/g4rw/tpvector.icc create mode 100644 source/global/STLInterface/g4rw/tvordvec.h create mode 100644 source/global/STLInterface/g4rw/tvordvec.icc create mode 100644 source/global/STLInterface/g4rw/tvvector.h create mode 100644 source/global/STLInterface/g4rw/tvvector.icc delete mode 100644 source/global/STLInterface/rw/cstring.h delete mode 100644 source/global/STLInterface/rw/ctoken.h delete mode 100644 source/global/STLInterface/rw/defs.h delete mode 100644 source/global/STLInterface/rw/rstream.h delete mode 100644 source/global/STLInterface/rw/rw2stl_algo.h delete mode 100644 source/global/STLInterface/rw/rwstlhash.h delete mode 100644 source/global/STLInterface/rw/tphdict.h delete mode 100644 source/global/STLInterface/rw/tpordvec.h delete mode 100644 source/global/STLInterface/rw/tpsrtvec.h delete mode 100644 source/global/STLInterface/rw/tpsrtvec.icc delete mode 100644 source/global/STLInterface/rw/tpvector.h delete mode 100644 source/global/STLInterface/rw/tpvector.icc delete mode 100644 source/global/STLInterface/rw/tvhdict.h delete mode 100644 source/global/STLInterface/rw/tvhdict.icc delete mode 100644 source/global/STLInterface/rw/tvordvec.h delete mode 100644 source/global/STLInterface/rw/tvvector.h delete mode 100644 source/global/STLInterface/wrappers/AIX-xlC/hash_map delete mode 100644 source/global/STLInterface/wrappers/DEC-cxx/hash_map delete mode 100644 source/global/STLInterface/wrappers/HP-aCC/hash_map create mode 100644 source/global/STLInterface/wrappers/HP-aCC/iomanip create mode 100644 source/global/STLInterface/wrappers/HP-aCC/iostream create mode 100644 source/global/STLInterface/wrappers/HP-aCC/strstream create mode 100644 source/global/STLInterface/wrappers/SGI-CC/iostream delete mode 100644 source/global/STLInterface/wrappers/SUN-CC/hash_map create mode 100644 source/global/management/include/G4LPhysicsFreeVector.icc create mode 100644 source/global/management/include/G4PhysicsOrderedFreeVector.icc create mode 100644 source/global/management/include/G4PhysicsVector.icc create mode 100644 source/global/management/include/g4std/algorithm create mode 100644 source/global/management/include/g4std/fstream create mode 100644 source/global/management/include/g4std/functional create mode 100644 source/global/management/include/g4std/iomanip create mode 100644 source/global/management/include/g4std/iostream create mode 100644 source/global/management/include/g4std/map create mode 100644 source/global/management/include/g4std/set create mode 100644 source/global/management/include/g4std/streambuf create mode 100644 source/global/management/include/g4std/strstream create mode 100644 source/global/management/include/g4std/vector create mode 100644 source/graphics_reps/include/G4PlacedPolyhedron.hh create mode 100644 source/graphics_reps/src/G4PlacedPolyhedron.cc rename source/particles/hadrons/barions/include/{G4BarionConstructor.hh => G4BaryonConstructor.hh} (59%) rename source/particles/hadrons/barions/include/{G4VBarion.hh => G4VBaryon.hh} (85%) rename source/particles/hadrons/barions/src/{G4BarionConstructor.cc => G4BaryonConstructor.cc} (81%) rename source/particles/hadrons/barions/src/{G4VBarion.cc => G4VBaryon.cc} (74%) create mode 100644 source/particles/management/include/G4DynamicParticle.icc create mode 100644 source/particles/management/include/G4ElectronOccupancy.hh create mode 100644 source/particles/management/include/G4IsotopeProperty.hh create mode 100644 source/particles/management/include/G4NucleiPropertiesTheoreticalTable.hh create mode 100644 source/particles/management/include/G4PDGCodeChecker.hh create mode 100644 source/particles/management/include/G4ParticleTable.icc create mode 100644 source/particles/management/include/G4ParticleTableIterator.hh create mode 100644 source/particles/management/include/G4VIsotopeTable.hh create mode 100644 source/particles/management/src/G4ElectronOccupancy.cc create mode 100644 source/particles/management/src/G4IsotopeProperty.cc create mode 100644 source/particles/management/src/G4NucleiPropertiesTheoreticalTableA.cc create mode 100644 source/particles/management/src/G4NucleiPropertiesTheoreticalTableB.cc create mode 100644 source/particles/management/src/G4PDGCodeChecker.cc create mode 100644 source/persistency/digits+hits/digits/GNUmakefile create mode 100644 source/persistency/digits+hits/digits/include/G4PDCofThisEvent.ddl create mode 100644 source/persistency/digits+hits/digits/include/G4PVDigit.ddl create mode 100644 source/persistency/digits+hits/digits/include/G4PVDigitsCollection.ddl create mode 100644 source/persistency/digits+hits/digits/include/G4PersistentDigitMan.hh create mode 100644 source/persistency/digits+hits/digits/src/G4PDCofThisEvent.cc create mode 100644 source/persistency/digits+hits/digits/src/G4PVDigit.cc create mode 100644 source/persistency/digits+hits/digits/src/G4PVDigitsCollection.cc create mode 100644 source/persistency/digits+hits/digits/src/G4PersistentDigitMan.cc create mode 100644 source/persistency/digits+hits/hits/include/G4PersistentHitMan.hh create mode 100644 source/persistency/digits+hits/hits/src/G4PHCofThisEvent.cc create mode 100644 source/persistency/digits+hits/hits/src/G4PVHitsCollection.cc create mode 100644 source/persistency/digits+hits/hits/src/G4PersistentHitMan.cc create mode 100644 source/persistency/events/include/G4PPrimaryParticle.ddl create mode 100644 source/persistency/events/include/G4PersistentEventMan.hh create mode 100644 source/persistency/events/src/G4PPrimaryParticle.cc create mode 100644 source/persistency/events/src/G4PersistentEventMan.cc create mode 100644 source/persistency/geometry/global/GNUmakefile create mode 100644 source/persistency/geometry/global/include/G4PAffineTransform.ddl rename source/persistency/geometry/{management => global}/include/G4PVSolid.ddl (85%) create mode 100644 source/persistency/geometry/global/src/G4PAffineTransform.cc rename source/persistency/geometry/{management => global}/src/G4PVSolid.cc (76%) rename source/persistency/{ => geometry}/management/include/G4PGeometryObjectMap.ddl (80%) rename source/persistency/geometry/{volumes => management}/include/G4PLogicalVolume.ddl (78%) rename source/persistency/{ => geometry}/management/include/G4PersistentGeomMan.hh (81%) rename source/persistency/{ => geometry}/management/src/G4PGeometryObjectMap.cc (93%) rename source/persistency/geometry/{volumes => management}/src/G4PLogicalVolume.cc (90%) rename source/persistency/{ => geometry}/management/src/G4PersistentGeomMan.cc (57%) create mode 100644 source/persistency/geometry/solids/Boolean/GNUmakefile create mode 100644 source/persistency/geometry/solids/Boolean/include/G4PBooleanSolid.ddl create mode 100644 source/persistency/geometry/solids/Boolean/include/G4PDisplacedSolid.ddl create mode 100644 source/persistency/geometry/solids/Boolean/include/G4PIntersectionSolid.ddl create mode 100644 source/persistency/geometry/solids/Boolean/include/G4PSubtractionSolid.ddl create mode 100644 source/persistency/geometry/solids/Boolean/include/G4PUnionSolid.ddl create mode 100644 source/persistency/geometry/solids/Boolean/src/G4PBooleanSolid.cc create mode 100644 source/persistency/geometry/solids/Boolean/src/G4PDisplacedSolid.cc create mode 100644 source/persistency/geometry/solids/Boolean/src/G4PIntersectionSolid.cc create mode 100644 source/persistency/geometry/solids/Boolean/src/G4PSubtractionSolid.cc create mode 100644 source/persistency/geometry/solids/Boolean/src/G4PUnionSolid.cc delete mode 100644 source/persistency/geometry/volumes/GNUmakefile create mode 100644 source/persistency/global/GNUmakefile create mode 100644 source/persistency/global/include/G4DatabaseTypes.hh create mode 100644 source/persistency/global/include/G4PersistentSchema.hh rename source/persistency/{management => global}/include/G4PersistentTypes.hh (82%) create mode 100644 source/persistency/global/include/G4VPersistentSubDbMan.hh create mode 100644 source/persistency/global/include/G4VPersistentSubMan.hh create mode 100644 source/persistency/global/src/G4VPersistentSubDbMan.cc create mode 100644 source/persistency/global/src/G4VPersistentSubMan.cc delete mode 100644 source/persistency/management/include/G4PLogVolRefVArray.hh delete mode 100644 source/persistency/management/include/G4PVPhysVolRefVArray.hh delete mode 100644 source/persistency/management/include/G4PVSolidRefVArray.hh create mode 100644 source/persistency/management/include/G4PersistencyMessenger.hh delete mode 100644 source/persistency/management/include/G4PersistentEventMan.hh delete mode 100644 source/persistency/management/include/G4PersistentRunMan.hh create mode 100644 source/persistency/management/include/G4TransactionManager.hh create mode 100644 source/persistency/management/src/G4PersistencyMessenger.cc delete mode 100644 source/persistency/management/src/G4PersistentEventMan.cc delete mode 100644 source/persistency/management/src/G4PersistentRunMan.cc create mode 100644 source/persistency/management/src/G4TransactionManager.cc create mode 100644 source/persistency/run/include/G4PersistentRunMan.hh create mode 100644 source/persistency/run/src/G4PersistentRunMan.cc create mode 100644 source/processes/electromagnetic/lowenergy/include/G4hLowEnergyIonisation.hh create mode 100644 source/processes/electromagnetic/lowenergy/include/G4hLowEnergyIonisation.icc create mode 100644 source/processes/electromagnetic/lowenergy/include/G4ionLowEnergyIonisation.hh create mode 100644 source/processes/electromagnetic/lowenergy/src/G4hLowEnergyIonisation.cc create mode 100644 source/processes/electromagnetic/lowenergy/src/G4ionLowEnergyIonisation.cc create mode 100644 source/processes/hadronic/cross_sections/include/G4NeutronInelasticCrossSection.hh create mode 100644 source/processes/hadronic/cross_sections/src/G4NeutronInelasticCrossSection.cc create mode 100644 source/processes/hadronic/management/include/G4IsoParticleChange.hh create mode 100644 source/processes/hadronic/management/include/G4VIsotopeProduction.hh delete mode 100644 source/processes/hadronic/models/generator/de_excitation/include/G4DummyMF.hh delete mode 100644 source/processes/hadronic/models/generator/de_excitation/include/G4MultiFragmentation.hh create mode 100644 source/processes/hadronic/models/generator/de_excitation/include/G4Solver.hh create mode 100644 source/processes/hadronic/models/generator/de_excitation/include/G4Solver.templates.cc create mode 100644 source/processes/hadronic/models/generator/de_excitation/include/G4StatMFChannel.hh create mode 100644 source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroBiNucleon.hh create mode 100644 source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroChemicalPotential.hh create mode 100644 source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroMultiNucleon.hh create mode 100644 source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroMultiplicity.hh create mode 100644 source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroNucleon.hh create mode 100644 source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroTemperature.hh create mode 100644 source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroTetraNucleon.hh create mode 100644 source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroTriNucleon.hh create mode 100644 source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMicroManager.hh create mode 100644 source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMicroPartition.hh create mode 100644 source/processes/hadronic/models/generator/de_excitation/include/G4VMultiFragmentation.hh delete mode 100644 source/processes/hadronic/models/generator/de_excitation/include/G4VStatMFCanonical.hh create mode 100644 source/processes/hadronic/models/generator/de_excitation/include/G4VStatMFEnsemble.hh create mode 100644 source/processes/hadronic/models/generator/de_excitation/include/G4VStatMFMacroCluster.hh delete mode 100644 source/processes/hadronic/models/generator/de_excitation/src/G4DummyMF.cc delete mode 100644 source/processes/hadronic/models/generator/de_excitation/src/G4MultiFragmentation.cc create mode 100644 source/processes/hadronic/models/generator/de_excitation/src/G4Solver.cc create mode 100644 source/processes/hadronic/models/generator/de_excitation/src/G4StatMFChannel.cc create mode 100644 source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroBiNucleon.cc create mode 100644 source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroChemicalPotential.cc create mode 100644 source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroMultiNucleon.cc create mode 100644 source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroMultiplicity.cc create mode 100644 source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroNucleon.cc create mode 100644 source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroTemperature.cc create mode 100644 source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroTetraNucleon.cc create mode 100644 source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroTriNucleon.cc create mode 100644 source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMicroManager.cc create mode 100644 source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMicroPartition.cc create mode 100644 source/processes/hadronic/models/generator/de_excitation/src/G4VMultiFragmentation.cc delete mode 100644 source/processes/hadronic/models/generator/de_excitation/src/G4VStatMFCanonical.cc create mode 100644 source/processes/hadronic/models/generator/de_excitation/src/G4VStatMFEnsemble.cc create mode 100644 source/processes/hadronic/models/generator/de_excitation/src/G4VStatMFMacroCluster.cc create mode 100644 source/processes/hadronic/models/generator/quark_gluon_string/GNUmakefile create mode 100644 source/processes/hadronic/models/generator/quark_gluon_string/include/G4BaryonSplitter.hh create mode 100644 source/processes/hadronic/models/generator/quark_gluon_string/include/G4DiffractiveStringBuilder.hh create mode 100644 source/processes/hadronic/models/generator/quark_gluon_string/include/G4InelasticSplitableHadron.hh create mode 100644 source/processes/hadronic/models/generator/quark_gluon_string/include/G4MesonSplitter.hh create mode 100644 source/processes/hadronic/models/generator/quark_gluon_string/include/G4PartonPair.hh create mode 100644 source/processes/hadronic/models/generator/quark_gluon_string/include/G4PartonStringAnnihilator.hh create mode 100644 source/processes/hadronic/models/generator/quark_gluon_string/include/G4QGSMParameters.hh create mode 100644 source/processes/hadronic/models/generator/quark_gluon_string/include/G4QGSMSplitableHadron.hh create mode 100644 source/processes/hadronic/models/generator/quark_gluon_string/include/G4QGSModel.hh create mode 100644 source/processes/hadronic/models/generator/quark_gluon_string/include/G4QGSParticipants.hh create mode 100644 source/processes/hadronic/models/generator/quark_gluon_string/include/G4SPBaryon.hh create mode 100644 source/processes/hadronic/models/generator/quark_gluon_string/include/G4SPBaryonTable.hh create mode 100644 source/processes/hadronic/models/generator/quark_gluon_string/include/G4SoftStringBuilder.hh create mode 100644 source/processes/hadronic/models/generator/quark_gluon_string/src/G4BaryonSplitter.cc create mode 100644 source/processes/hadronic/models/generator/quark_gluon_string/src/G4DiffractiveStringBuilder.cc create mode 100644 source/processes/hadronic/models/generator/quark_gluon_string/src/G4InelasticSplitableHadron.cc create mode 100644 source/processes/hadronic/models/generator/quark_gluon_string/src/G4MesonSplitter.cc create mode 100644 source/processes/hadronic/models/generator/quark_gluon_string/src/G4PartonPair.cc create mode 100644 source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSMParameters.cc create mode 100644 source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSMSplitableHadron.cc create mode 100644 source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSModel.cc create mode 100644 source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSParticipants.cc create mode 100644 source/processes/hadronic/models/generator/quark_gluon_string/src/G4SPBaryon.cc create mode 100644 source/processes/hadronic/models/generator/quark_gluon_string/src/G4SoftStringBuilder.cc create mode 100644 source/processes/hadronic/models/generator/string_common/include/G4SingleDiffractiveExcitation.hh create mode 100644 source/processes/hadronic/models/generator/string_common/src/G4SingleDiffractiveExcitation.cc create mode 100644 source/processes/hadronic/models/isotope_production/GNUmakefile create mode 100644 source/processes/hadronic/models/isotope_production/include/G4NeutronElementCrossSections.hh create mode 100644 source/processes/hadronic/models/isotope_production/include/G4NeutronElementIsoCrossSections.hh create mode 100644 source/processes/hadronic/models/isotope_production/include/G4NeutronIsoIsoCrossSections.hh create mode 100644 source/processes/hadronic/models/isotope_production/include/G4NeutronIsoProdCrossSections.hh create mode 100644 source/processes/hadronic/models/isotope_production/include/G4NeutronIsotopeProduction.hh create mode 100644 source/processes/hadronic/models/isotope_production/src/G4NeutronElementIsoCrossSections.cc create mode 100644 source/processes/hadronic/models/isotope_production/src/G4NeutronIsoIsoCrossSections.cc create mode 100644 source/processes/hadronic/models/isotope_production/src/G4NeutronIsoProdCrossSections.cc create mode 100644 source/processes/hadronic/models/isotope_production/src/G4NeutronIsotopeProduction.cc delete mode 100644 source/processes/hadronic/models/neutron_hp/README create mode 100644 source/processes/hadronic/util/include/DumpFrame.hh create mode 100644 source/processes/hadronic/util/include/G4IsoResult.hh create mode 100644 source/processes/management/include/G4ProcessManager.icc create mode 100644 source/processes/optical/History create mode 100644 source/processes/photolepton_hadron/History create mode 100644 source/track/include/G4Step.icc create mode 100644 source/track/include/G4Track.icc create mode 100644 source/visualization/VRML/g4vrmlview/README delete mode 100644 source/visualization/management/include/G4VisFeaturesOfRay.hh create mode 100644 source/visualization/management/include/G4VisStateDependent.hh delete mode 100644 source/visualization/management/src/G4VisFeaturesOfRay.cc create mode 100644 source/visualization/management/src/G4VisStateDependent.cc create mode 100644 source/visualization/modeling/include/G4LogicalVolumeModel.hh delete mode 100644 source/visualization/modeling/include/G4PhysicalVolumeModel.icc create mode 100644 source/visualization/modeling/src/G4LogicalVolumeModel.cc diff --git a/ReleaseNotes/ReleaseNotes4.1.0.txt b/ReleaseNotes/ReleaseNotes4.1.0.txt new file mode 100644 index 0000000000..e3bfbcd761 --- /dev/null +++ b/ReleaseNotes/ReleaseNotes4.1.0.txt @@ -0,0 +1,357 @@ + + Geant4 1.0 Release Notes + ------------------------ + + 7th December 1999 + +These are the main new features/fixes included in this release (for the +detailed list of fixes/additions, please refer to the related History files): + + o Electromagnetic Processes: + - Multiple scattering: fine tuning and fixes for low energy e-; + inclusion of nuclear size effect for high energy (e+,e- > 100 MeV, + hadrons > 1 GeV); + - IonisationPlus: improved code and testing, for electrons and hadrons. + - LowEnergy: implemented hadron and ion ionisation; minor fixes in + photo electric process. + - Xrays: fixes in Cerenkov process. + - Created new examples in examples/extended/electromagnetic. + + o Geometry: + - Field: minor fixes, more access to user parameters and clearer warnings; + - CSG/Booleans: fixes and more detailed unit tests; + - BREPS/STEP: fix to the NIST STEP reader for complex surfaces; + - Volumes: first implementation for visualization of voxels; + - Transportation: added protection for zero step in field. + + o Globals: + - STLInterface: + major modifications for removing all references to Rogue Wave classes; + removed wrappers for hash dictionaries; reorganised classes/files. + - management: + introduced 'g4std' wrappers and keywords for migration to the ISO/ANSI + C++ standard and usage of the std namespace; fixed minor bug in + G4PhysicsVector. + + o Hadronic Processes: + - new isotope-production models for neutron induced production and + corresponding design updates in hadronic/management; + - additional string model for proton induced reactions; + - design iteration on multi-fragmentation; + - memory usage optimization in the neutron transport. + NOTE: an updated set of neutron data files is now required. + + o Particles: + - introduced dynamical electric charge in G4DynamicParticle to allow + change of charge for ions; + - introduced new G4IsotopeTable to manage excitation energy, lifetime, + and decay modes for isotopes; + - corrected identifier for isotopes Promethium and Prasceodym; + - corrected spelling for file-names and keyword "barion" to "baryon". + + o Persistency: + - added association of HitsCollection and PrimaryVertex to G4PEvent; + added persistency of Boolean solid types; fixes for ODMG compliance; + added G4PPRimaryParticle; + - added new examples in examples/extended/persistency. + + o Visualization: + - introduced visualization of *components* of a boolean solid. + Visualisation of the *result* of the boolean operation will be + available in a future release; + - introduced new commands (use help for more information): + /vis/scene/add/logicalVolume + /vis/viewer/update + - improvements to FukuiRenderer (DAWN): + made destination directory of g4.prim and g4.eps customizable + with the environmental variable G4DAWNFILE_DEST_DIR; auto + incrementation of output file names is now supported; + - removed ray tracing, pending re-implementation. + +Notes: + + o Geant4 1.0 is based on STL. All direct references to Rogue Wave have + been removed from the code. See notes below. + + o The code released in Geant4 1.0 is not ISO/ANSI C++ compliant. + A future minor release or patch will be provided that + will include the ability to choose between using namespaces in + ISO/ANSI mode or using traditional style "includes". + +This code and some binary libraries are available through our "Source +Code" Web page: +- see our Geant4 + Home Page. + +Please refer to Geant4 +User Documentation for further information about using Geant4. +Updates to the documentation for Geant4 1.0 are still in preparation and are +expected to be published within three weeks. + + +Contents +-------- + + 1. Supported and Tested Platforms + 2. CLHEP 1.4 + 3. The Standard Template Library (STL) + 4. Persistency + 5. Compiler Specific Problems + 6. Known Run-Time Problems + 7. Compilation Warnings + 8. Known Run-Time Warnings + + +1. Supported and Tested Platforms +--------------------------------- + + o SUN Solaris 5.6, C++ 4.2 patch 104631-04. + o HP 10.20, aCC C++ B3910B A.01.18 or A.01.21 + o Linux 2.0.35, gcc C++ egcs-2.91.66 (egcs 1.1.2). + This configuration was tested in the RedHat 5.1 distribution, but + versions of Geant4 have also been compiled successfully on RedHat 6.1, + Debian and Suse distributions. + +Platforms also tested but giving rise to some problems - see below: + + o DEC V4.0, cxx C++ V6.1-027. + o NT 4.0 with Service Pack 4 and Cygnus Tools b20 with: + Visual C++ 6.0 Service Pack 2 + +Platforms configured but not tested and not supported: + o SGI V6.5.5, CC 7.2.1 with ObjectSpace + o AIX 4.3.2, xlC compiler with ObjectSpace + +2. CLHEP 1.4 +------------ + +Geant4 1.0 requires the installation of CLHEP 1.4. + +See +CLHEP 1.4. + +The following platform specific instructions apply: + + DEC: Do *not* use the compiler option "-std strict_ansi". + + NT: After configure, edit the file config/CLHEP-x86-cygnus-win32 + and comment out "#define HEP-USE-STD 1". + + + +3. The Standard Template Library +-------------------------------- + +The following versions of STL have been tested: + + ObjectSpace STL on + DEC, HP, NT and SUN. + + See ObjectSpace. + + "Native" STL on: Linux, HP. + +This is selected at installation/compile time by the environment variable +G4USE_OSPACE in the case of the former - see documentation. + +NOTES: +- Be aware that by default, the installation scripts will expect to use + the native STL implementation. You must set the G4USE_OSPACE variable + in the environment in order to select the ObjectSpace implementation. + +- Platform specific setup: + o DEC: ObjectSpace is required. + o HP: either ObjectSpace or native STL can be used. In order to use + native STL you must also set the environment variable + G4NO_STD_NAMESPACE. + o SUN: ObjectSpace is required. + o Linux: native STL is required. + o NT: ObjectSpace is required. + Support for native STL and ISO/ANSI installation will be added + soon (future patch or minor release). + +- A future minor release or patch will allow ISO/ANSI compliant installations. + Their characteristics will be: + o DEC: Native STL will be used + o HP: The setup for native STL will trigger by default the ISO/ANSI + installation (set G4NO_STD_NAMESPACE in the environment to avoid it.) + o SUN: Support for CC 5.0 compiler and native STL (ISO/ANSI installation) + o NT: Support for native STL and ISO/ANSI installation + The modifications to support these installations will be tested soon. + They will be made available in a patch or minor release. + +Geant4 1.0 is the first release requiring the Standard Template Library. +In the interest of stability, a significant part of the code still makes use +of the "STL Interface" wrapper classes. For these the emphasis has remained +on correct behaviour, rather than performance. The size of libraries and +executables can appear considerably larger than the previous Rogue-Wave based +versions. + +4. Persistency +-------------- + +- Platforms + + Persistency in Geant4 1.0 release has been tested on the following + platforms/software versions: + + G4SYSTEM OS C++ compiler HepODBMS Objectivity + --------- ----------- ------------ --------- ----------- + SUN-CC SunOS 5.6 CC 4.2 0.3.1.0 5.2 + HP-aCC HP-UX 10.20 aCC A.01.18 0.3.0.1 5.1.2 + Linux-g++ Linux RH5.1 egcs 1.1.2 0.3.0.1 5.1.2 + + A patch to run persistency examples on DEC-cxx will be released + later, pending a fix to HepODBMS library. + +- Known Problems + + 1) The following warning messages appear on some platforms during the + installation of the libraries and the compilation of the example + files. The message comes from the parser of the Objectivity + preprocessor. It can be ignored. + + ------------------------------------------------------------------------- + "/opt/SUNWspro/SC4.2/include/CC/generic.h", line 29: warning: omission of + explicit type is nonstandard ("int" assumed) + extern genericerror(int, char*); + ^ + "/opt/SUNWspro/SC4.2/include/CC/iostream.h", line 781: warning: integer + conversion resulted in a change of sign + unsafe_istream& wignore(int=1, wchar_t=WEOF); + ^ + "/opt/SUNWspro/SC4.2/include/CC/iostream.h", line 962: warning: integer + conversion resulted in a change of sign + istream& wignore(int=1, wchar_t=WEOF); + ------------------------------------------------------------------------- + + 2) The following warning messages appear during the installation of the + library. This is due to a design choice of the persitent object + and it can be safely ignored. + + ------------------------------------------------------------------------- + warning: persistent-capable class member type is a problem + The type of base class vector is a problem + The type of member vector::start_ is pointer + The type of member vector::finish_ is pointer + The type of member vector::end_of_storage_ + is pointer + The type of member vector::alloc_ is a + problem + The type of member allocator::impl_ is + pointer + G4VPhysVolRefVArray transPhysVolPtrs; + ^ + ------------------------------------------------------------------------- + + 3) The following warning messages appears during the installation of the + libraries and the compilation of the example files. Dependency + file is used to solve the GNUmake dependencies inside the Geant4 + categories and it can be safely ignored. + + ------------------------------------------------------------------------- + In file included from /afs/cern.ch/sw/lhcxx/specific/@sys/HepODBMS/0.3.1.0/ + include/HepODBMS/odbms/HepODBMS.h:75, + from include/G4PersistentTypes.hh:21, + from include/G4VPersistentSubMan.hh:34, + from src/G4VPersistentSubMan.cc:16: + /afs/cern.ch/sw/lhcxx/specific/sun/Objectivity/5.2/include/oo.h:57: + warning: No include path in which to find generic.h + ------------------------------------------------------------------------- + + 4) The following error messages appear at the end of the library + installation, and it can be safely ignored. + + ------------------------------------------------------------------------- + installing schema header files ... + cp: cannot access /afs/cern.ch/sw/geant4/stt/ref+/AIX-xlC/debug/persistency/ + STL/tmp/SUN-CC/G4pglobal/*.hh + schema header file does not exist, so ignore the error message... + ------------------------------------------------------------------------- + + 5) The following warning message appears at the runtime of the persistency + examples, which is generated by HepDbApplication in HepODBMS. + It can be ignored. + + ------------------------------------------------------------------------- + Opening federated database OO_FD_BOOT. + WARNING: g4example: Could not find naming root directory: + Naming will be disabled. + ------------------------------------------------------------------------- + + +5. Compiler Specific Problems +----------------------------- + + o DEC V4.0, cxx C++ V6.1-027. + + We have found cases of mis-compilation of min and max templates + on DEC. We have traced those which cause serious malfunction + but there is no guarantee that there are no other cases. + Detailed inspection of assembler output suggests that this + problem might not be confined to min and max. This has been + reported to DEC/Compaq. We understand a new version 6.2 of the + compiler is now available. However we cannot guarantee correct + execution of Geant4 on DEC with the current version of the + compiler. + + o NT + + - Due to limitations of the VC++ optimiser, testing was done using + the debuggable version only. + - g3tog4 has not been ported to NT. + - During the making of dependency files during compilation there + are repeated warnings ("Strstrea.h not found") - this is an + artifact of using g++ for this purpose. + - Ignore linker warnings: "conflicts with use of other libs". + - Ignore linker errors: "unresolved external symbol + __imp__MessageBoxA@16". + + +6. Known Run-Time Problems +-------------------------- + + o Reading STEP files on DEC with optimised libraries causes a Memory + fault - but see notes on DEC above. + o In rare cases heavy ions appear not to be properly stopped and killed + in tracking, therefore Geant4 sticks making many small steps. This + behaviour has been observed on SUN and is under investigation. + o On WindowsNT, a problem can occur reading the data files associated with + the environment variable G4LEVELGAMMADATA. (Usually the value + for this variable is $G4INSTALL/geant4/data/PhotonEvaporation .) + A correction that resolves this anomalous behaviour will be issued + soon, in a patch. + + +7. Compilation Warnings +----------------------- + +There are compilation warnings on some platforms. We do not believe +that any will lead to incorrect run-time behaviour, but we are working +on reducing them. + + +8. Known Run-Time Warnings +-------------------------- + +The following messages can be written to error output while tracking. We +believe none give rise to incorrect behaviour. + + o G4PropagatorInField::LocateIntersectionPoint: Warning: Integration + inaccuracy requires an adjustment in the step's endpoint Two + mid-points are further apart than their curve length difference: + Dist = xxx curve length = yyy + o Warning in G4Navigator::ComputeStep: The Step's starting point has + moved... + o G4PropagateInField: Warning: Particle is looping + - tracking in field will be stopped. + It has performed 10000 steps in Field while a maximum of 10000 + are allowed. + +For very high energy muons (ex. 1 TeV) warnings of this kind might be +generated: + + o G4ParticleChange::CheckIt : the Momentum Change is not unit vector !! + Difference: 1e-09 + G4ParticleChange::CheckIt diff --git a/config/G4ODBMS_BUILD.gmk b/config/G4ODBMS_BUILD.gmk index 44bf7fb042..b1d240e567 100644 --- a/config/G4ODBMS_BUILD.gmk +++ b/config/G4ODBMS_BUILD.gmk @@ -1,4 +1,4 @@ -# $Id: G4ODBMS_BUILD.gmk,v 1.1 1999/01/07 15:58:31 gunter Exp $ +# $Id: G4ODBMS_BUILD.gmk,v 1.2 1999/09/17 13:15:29 morita Exp $ # ---------------------------------------------------------------- # GNUmakefile for CPPFLAGS for HepODBMS and Objectivity/DB. # Youhei Morita, 9th July 1998. @@ -11,6 +11,7 @@ endif ifdef HEP_ODBMS_DIR CPPFLAGS += -I$(HEP_ODBMS_DIR)/include \ + -DHEP_ODBMS_EXPORT="" \ -DHep_HAS_BUILDIN_BOOL_CONSTANTS endif #-------------------------------------------------------------------- diff --git a/config/History b/config/History index e98befc05e..8bca936119 100644 --- a/config/History +++ b/config/History @@ -1,5 +1,5 @@ -$Id: History,v 1.50 1999/07/06 17:54:47 johna Exp $ -$Name: geant4-00-01 $ +$Id: History,v 1.92 1999/12/07 08:51:38 gcosmo Exp $ +$Name: geant4-01-00 $ ------------------------------------------------------------------- ========================================================= @@ -17,6 +17,170 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +7th December 1999 Gabriele Cosmo (config-V00-01-19) +- architecture.gmk: minor fix on OSPACELIBS path for Win/NT. + +5th December 1999 Youhei Morita (config-V00-01-18) +- architecture.gmk: defined G4OODDLX_FLAGS +- common.gmk: use G4OODDLX_FLAGS + +5th December 1999 Gabriele Cosmo (config-V00-01-17) +- architecture.gmk: fixes for Win/NT. + o fixed path for OSPACELIBS + o removed -DG4NOT_ISO_DELETES flag + +3rd December 1999 Gabriele Cosmo (config-V00-01-16) +- architecture.gmk: set G4_HAVE_BOOL for SUN-CC5. + +3rd December 1999 Youhei Morita +- common.gmk: fixed minor typo in G4OODDLX_SCHEMA_NAME + +1st December 1999 Gabriele Cosmo (config-V00-01-15) +- architecture.gmk: + o added new G4SYSTEM flavor SUN-CC5, used for testing on the new C++ + compiler v5.0 on SunOS. Requires ISO/ANSI-C++ installation and native + STL by default. Compatibility with old no ISO/ANSI code is assured + through the -compat compiler option and the usage of ObjectSpace STL + (i.e. G4USE_OSPACE set). + o added new flag G4NO_STD_NAMESPACE. + HP-aCC setup with native STL assumes the ISO-ANSI installation by default, + the new flag should be explicitly set in the environment to avoid this. + o upgraded SGI-CC setup to IRIX 6.5.5, CC 7.2.1 and ObjectSpace STL. + Tests on this configuration has NOT been tested though. + +1st December 1999 Youhei Morita +- architecture.gmk: added G4EXAMPLE_BOOT and G4EXAMPLE_FD +- common.gmk: copy only the .hh files +- binmake.gmk: added persistent include paths + added new targed cleandb, newboot, newfd + added G4SKIP_DEPEND for dependencies + +29th November 1999 Youhei Morita +- architecture.gmk: added G4SYSTEM to G4SCHEMA_DIR, G4TMPSCHEMA_DIR +- common.gmk: changed G4SCHEMA_HEADER_DIR from G4TMPSCHEMA_INCLUDE to G4TMPDIR + added target install_schema for schema copying +- globlib.gmk: create schema header files at G4TMPDIR, then install + +29th November 1999 John Allison +- Introduced LDLIBS2EXTRA so that granular libraries are not + expanded too soon. + +25th November 1999 Gabriele Cosmo (config-V00-01-14) +- architecture.gmk: redefined OSPACEDIR as OSPACE_BASE_DIR to conform to + an omogeneous format. Added existence check for OSPACE and CLHEP paths. + +23rd November 1999 Gabriele Cosmo (config-V00-01-13) +- architecture.gmk: added setup for ISO/ANSI installation on DEC-cxx. + If using native STL (i.e. G4USE_OSPACE not set), G4USE_STD_NAMESPACE is + implicitly defined and a strict-ANSI installation is assumed. Note that + in this case, also CLHEP must have been installed in strict-ANSI mode. + +20th November 1999 Youhei Morita (config-V00-01-12) +- common.gmk: added G4OODDLX_SCHEMA_NAME to use Geant4 named schema + +19th November 1999 Youhei Morita +- liblist.c: avoid coredumps when it was given non-existing directly. + +18th November 1999 Gabriele Cosmo (config-V00-01-11) +- architecture.gmk: added -e option to $ECHO for Linux-g++ setup. + +17th November 1999 John Allison (config-V00-01-10) +- binmake.gnk: added isotope_production/include to -I list (Hans-Peter). + +17th November 1999 Youhei Morita (config-V00-01-09) +- moved schema header files to G4INSTALL/schema/include + architecture.gmk: introduced G4SCHEMA_INCLUDE and G4TMPSCHEMA_INCLUDE + common.gmk: introduced G4SCHEMA_HEADER_DIR and G4SCHEMA_SRC_DIR + globlib.gmk: added tmp schema header copying + +15th November 1999 Gabriele Cosmo (config-V00-01-08) +- Tagged. + +14th November 1999 Youhei Morita +- globlib.gmk: moved contruction of libmap for G4ODBMS to + source/GNUmakefile + +12th November 1999 Youhei Morita +- common.gmk: introduced G4ODBMS_DEPEND and G4SKIP_DEPEND for + better handling of dependencies +- globlib.gmk: use G4ODBMS_DEPEND, automatic rebuilding of libmap + +11th November 1999 Gabriele Cosmo (config-V00-01-07) +- Migration RWT->G4RWT performed: + o Removed every occurence of Rogue-Wave from configuration, replaced + RWBASE with G4STLBASE. Modified scripts: architecture.gmk, common.gmk + and binmake.gmk. + o Made setup for Native-STL the default, removed test on conditional + flag G4USE_STL. + o Removed setup for Win/NT-g++, no longer supported. + +10th November 1999 Youhei Morita (config-V00-01-06) +- binmake.gmk: added path to persistency/global/include. +- common.gmk: Change G4ODBMS_DEPEND to G4ODBMS_NODDL +- globlib.gmk: removed G4ODBMS_DEPEND, modified target "global" + +10th November 1999 Gabriele Cosmo (config-V00-01-05) +- binmake.gmk: added path to HEPNumerics/include which was missing. + +29th October 1999 Guy Barrand +- architecture.gmk, interactivity.gmk: introduced + "G4_OPACS_WIDGET_SET lesstif" logic to handle the case + of using, on Linux, the bugged lesstif with the non bugged OPACS. + +29th October 1999 Gabriele Cosmo +- Introduced fixes for shared library setup (courtesy of F.Carminati). + Modified files: architecture.gmk, common.gmk, globlib.gmk, makeshlib.sh. + +28th October 1999 Gabriele Cosmo (config-V00-01-04) +- architecture.gmk: removed G4STREAM and G4STREAM_STREAMBUF_IMPLEMENTATION + flags, now no longer needed. Streambuf implementation is the default for + every platform. (by H.Yoshida) + +26th October 1999 John Allison +- Augmented liblist to look for dependencies on auto-generated + headers in $G4TMP. + +26th October 1999 Gabriele Cosmo (config-V00-01-03) +- Removed AIX-xlC as default platform for G4SYSTEM in architecture.gmk. + Configuration is still kept but no longer supported. + +26th October 1999 Youhei Morita +- architecture.gmk: include $(HEP_ODBMS_DIR)/etc/$(OS).mk instead of + defininig load module separately. Defined G4ODBMS_LIBS. +- binmake.gmk: Use G4ODBMS_LIBS. + +20th October 1999 Gabriele Cosmo (config-V00-01-02) +- architecture.gmk: removed option -DOS_NO_TYPEDEF_5 from HP-aCC + OSpace setup. Not anymore needed. + +20th October 1999 John Allison +- architecture.gmk: removed G4USE_EXPLICIT_TYPES_IN_TEMPLATES (was needed + only for HP aCC; now not needed at all). + +19th Octobre 1999 Youhei Morita +- common.gmk: Surpress verbose output for G4ODBMS if CPPVERBOSE + is not defined. + +7th October 1999 John Allison (config-V00-01-01) +- Removed WARNINGs about granular libraries. Now standard usage. Simple + using messages printed. + +17th Sep 1999 Youhei Morita +- architecture.gmk: Defined G4TMPSCHEMA_DIR, G4TMPSCHEMA_BOOT + Added OBJY_LDLIB definition for Objectivity 5.1 +- binmake.gmk: LDLIBS1 += -lG4persistency +- common.gmk: Changed ooddlx boot file option to G4OODDLX_BOOT +- globlib.gmk: Changed G4EXAMPLE_BOOT to G4TMPSCHEMA_BOOT +- G4ODBMS_BUILD.gmk: Defined HEP_ODBMS_EXPORT for HepODBMS 0.3.0.x + +27th July 1999 Gonzalo Gracia Abril +- Changed OSPACELIBS := '-libpath:c:\dev\ospace\lib std-2.1-vc5.0-mt.lib' + to OSPACELIBS := '-libpath:$(OSPACEDIR)\lib std-2.1-vc5.0-mt.lib' + in architecture.gmk for NT + +20th July 1999 John Allison (config-V00-01-00) +- Added EXTRA_LINK_DEPENDENCIES to binmake.gmk. + 6th July 1999 John Allison (config-01-00-10) - Changed -L/usr/X11/lib to -L/usr/X11R6/lib for Linux. diff --git a/config/architecture.gmk b/config/architecture.gmk index db6b726b64..f0bdc063e8 100644 --- a/config/architecture.gmk +++ b/config/architecture.gmk @@ -1,4 +1,4 @@ -# $Id: architecture.gmk,v 1.36 1999/07/06 17:54:49 johna Exp $ +# $Id: architecture.gmk,v 1.59 1999/12/07 08:37:13 gracia Exp $ # ------------------------------------------------------------------------ # GEANT 4 - Architecture configuration script for GNU Make # @@ -13,44 +13,39 @@ # List of the supported architectures/compilers and related flavors for # the environment variable G4SYSTEM: # -# AIX-xlC AIX 4.3, (xlC) C Set ++ for AIX (default) +# SUN-CC SunOS 5.6, CC 4.2 compiler (default) # -# SUN-CC SunOS 5.6, CC 4.2 compiler -# -# HP-aCC HP-UX 10.20, aCC A.01.09 compiler -# -# SGI-CC SGI-IRIX 6.2, C++ 7.2 compiler +# HP-aCC HP-UX 10.20, aCC A.01.21 compiler # # DEC-cxx DEC-OSF/1 4.0, DEC C++ 6.1 # -# Linux-g++ Linux (Red Hat 5.1), egcs 1.1 +# Linux-g++ Linux (Red Hat 5.1/6.1), egcs 1.1.2 # -# WIN32-VC NT and Microsoft Visual C++ 5.0 or Microsoft Visual C++ 6.0 -# and using CYGWIN32 tools ( make, g++ as "makedepend", sh...) -# ( Note: you will need to set your environment, see installation -# guide.) -# -# WIN32-VC-NICE alias for the above, although NICE is not used anymore. -# -# WIN32-G++-NICE NiceNT and CYGWIN32 with g++ as base compiler -# ex. NiceNT at CERN (but CYGWIN32 and RogueWave -# for g++ installed locally, because not full -# installation on NICE) +# WIN32-VC Windows/NT and Microsoft Visual C++ 6.0 +# Adding CYGWIN32 tools (make, g++ as "makedepend", sh...) +# Note: you will need to set your environment, see the +# installation guide. +# ------------------------------------------------------------------------- + +# Definition of HEP_ODBMS_LIBS, OBJY_LIBS and OSPACE_LIBS by HepODBMS. +# Note: If G4ODBMS is defined, it calls for HEP_ODBMS setup files in +# $(HEP_ODBMS_DIR)/etc/. # +ifdef G4ODBMS + # variables LHCXXTOP and PLATF are used in HepODBMS setup + include $(HEP_ODBMS_DIR)/etc/$(OS).mk + G4ODBMS_LIBS := $(HEP_ODBMS_LIBS) $(OBJY_LIBS) $(OSPACE_LIBS) +endif MAKEFLAGS= --no-print-directory -# Specify G4USE_STL when using STL, even for using our "temporary" -# STLinterface to RogueWave. -# -ifdef G4USE_STL - CPPFLAGS += -DG4USE_STL -endif - -# If not specified, the default platform for G4SYSTEM is IBM-AIX ... +# If not specified, the default platform for G4SYSTEM is SUN-CC ... # ifndef G4SYSTEM - G4SYSTEM := AIX-xlC + G4SYSTEM := SUN-CC +endif +ifeq ($(G4SYSTEM),WIN32-VC-NICE) + G4SYSTEM := WIN32-VC endif # If not specified, the default path for G4 installation G4INSTALL is @@ -99,159 +94,144 @@ ifndef G4BIN endif G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4BIN) ] && mkdir -p $(G4BIN) ) +#################### schema directories & setup for G4ODBMS ################### +# +ifdef G4ODBMS # If not specified, the default path for G4 schema G4SCHEMA_DIR is -# set to $G4WORKDIR/schema ... +# set to $G4LIB/$G4SYSTEM/schema ... # ifndef G4SCHEMA_DIR - G4SCHEMA_DIR := $(G4WORKDIR)/schema + G4SCHEMA_DIR := $(G4LIB)/$(G4SYSTEM)/schema + G4SCHEMA_INCLUDE := $(G4SCHEMA_DIR)/include +endif +ifndef G4SCHEMA_FDID G4SCHEMA_FDID := 207 endif -ifdef G4ODBMS - G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4SCHEMA_DIR) ] && mkdir -p $(G4SCHEMA_DIR) ) + +G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4SCHEMA_DIR) ] && mkdir -p $(G4SCHEMA_DIR) ) +G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4SCHEMA_INCLUDE) ] && mkdir -p $(G4SCHEMA_INCLUDE) ) + +# If not specified, the default path for G4 temporary schema G4TMPSCHEMA_DIR is +# set to $G4TMP/$G4SYSTEM/schema (for building persistency library)... +# +ifndef G4TMPSCHEMA_DIR + G4TMPSCHEMA_DIR := $(G4TMP)/$(G4SYSTEM)/schema + G4TMPSCHEMA_BOOT := $(G4TMPSCHEMA_DIR)/G4SCHEMA endif -# If not specified, the default path for G4 example federated database is -# set to $HOME/G4EXAMPLE ... +G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4TMPSCHEMA_DIR) ] && mkdir -p $(G4TMPSCHEMA_DIR) ) + +# If not specified, the default path for G4 example schema G4EXAMPLE_BOOT_DIR is +# set to $G4WORKDIR/exampleSchema (for persistency examples)... # ifndef G4EXAMPLE_BOOT_DIR - G4EXAMPLE_BOOT_DIR := $(HOME)/G4EXAMPLE - G4EXAMPLE_BOOT := $(G4EXAMPLE_BOOT_DIR)/G4EXAMPLE + G4EXAMPLE_BOOT_DIR := $(G4WORKDIR)/exampleSchema/$(G4SYSTEM) endif -ifdef G4ODBMS - G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4EXAMPLE_BOOT_DIR) ] && mkdir -p $(G4EXAMPLE_BOOT_DIR) ) + +G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4EXAMPLE_BOOT_DIR) ] && mkdir -p $(G4EXAMPLE_BOOT_DIR) ) + +ifndef G4EXAMPLE_BOOT + G4EXAMPLE_BOOT = $(G4EXAMPLE_BOOT_DIR)/$(name) endif +# If not specified, the default path for G4 example runtime federated +# database directory G4EXAMPLE_FD_DIR is set to $G4WORKDIR/exampleFD +# (for persistency examples)... +# +ifndef G4EXAMPLE_FD_DIR + G4EXAMPLE_FD_DIR := $(G4WORKDIR)/exampleFD/$(G4SYSTEM) +endif + +G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4EXAMPLE_FD_DIR) ] && mkdir -p $(G4EXAMPLE_FD_DIR) ) +G4OODDLX_FLAGS := -DTEMPLATEP_HIDES_FNCD + +ifndef G4EXAMPLE_FD + G4EXAMPLE_FD = $(G4EXAMPLE_FD_DIR)/$(name) +endif + +endif +# +########################### end setup for G4ODBMS ############################# + # If G4DEBUG not specified, the default compilation is optimised ... # ifndef G4DEBUG G4OPTIMISE := 1 endif -# # CLHEP path, etc. # - ifndef CLHEP_BASE_DIR CLHEP_BASE_DIR := /afs/cern.ch/sw/geant4/dev/CLHEP/$(G4SYSTEM)/pro endif -CLHEP_INCLUDE_DIR := $(CLHEP_BASE_DIR)/include -CLHEP_LIB_DIR := $(CLHEP_BASE_DIR)/lib -ifndef CLHEP_LIB - CLHEP_LIB := CLHEP -endif - -ifeq ($(G4SYSTEM),WIN32-VC-NICE) -G4SYSTEM:=WIN32-VC -endif - -ifeq ($(G4SYSTEM),WIN32-VC) -# CLHEP_BASE_DIR must be defined in the environment +ifndef CLHEP_INCLUDE_DIR CLHEP_INCLUDE_DIR := $(CLHEP_BASE_DIR)/include +endif +ifndef CLHEP_LIB_DIR CLHEP_LIB_DIR := $(CLHEP_BASE_DIR)/lib - CLHEP_LIB := CLHEP.lib +endif +ifndef CLHEP_LIB + ifeq ($(G4SYSTEM),WIN32-VC) + CLHEP_LIB := CLHEP.lib + else + CLHEP_LIB := CLHEP + endif endif +# Native STL is the default # -# Rogue Wave Tools.h++ path & ObjectSpace STL -# +CPPFLAGS += -DG4USE_STL +G4STLINC := $(G4BASE)/global/STLInterface +# Path to ObjectSpace STL (or STLport <- only test for Win/NT) +# ifdef G4USE_OSPACE -#Object Space STL implementation - - RWINC := $(G4BASE)/global/STLInterface - OSPACEDIR := /afs/cern.ch/sw/geant4/dev/ObjectSpace/$(G4SYSTEM)/pro/ToolKit - OSPACEINC := -I$(OSPACEDIR)/ospace/std -I$(OSPACEDIR)/ospace/stl - OSPACELIBS := -L$(OSPACEDIR)/lib -lospace - CPPFLAGS += -DG4USE_STL + # ObjectSpace STL implementation + # + ifndef OSPACE_BASE_DIR + OSPACE_BASE_DIR := /afs/cern.ch/sw/geant4/dev/ObjectSpace/$(G4SYSTEM)/pro/ToolKit + endif + OSPACEINC := -I$(OSPACE_BASE_DIR)/ospace/std -I$(OSPACE_BASE_DIR)/ospace/stl + OSPACELIBS := -L$(OSPACE_BASE_DIR)/lib -lospace ifeq ($(G4SYSTEM),WIN32-VC) - OSPACEDIR := $(OBJECT_SPACE_BASE) - OSPACEINC := -I$(OSPACEDIR)/ospace/std -I$(OSPACEDIR)/ospace/stl -I$(OSPACEDIR) - OSPACELIBS := '-libpath:c:\dev\ospace\lib std-2.1-vc5.0-mt.lib' - CPPFLAGS += -DG4USE_STL -DG4USE_OLDSTL + OSPACE_BASE_DIR := $(OBJECT_SPACE_BASE) + OSPACEINC := -I$(OSPACE_BASE_DIR)/ospace/std -I$(OSPACE_BASE_DIR)/ospace/stl -I$(OSPACE_BASE_DIR) + OSPACELIBS := '-libpath':$(OSPACE_BASE_DIR)/lib std-2.1-vc5.0-mt.lib + CPPFLAGS += -DG4USE_OLDSTL CPPFLAGS += -DOS_WIN_NT_4_0 -DOS_MULTI_THREADED -D_WIN32_WINNT $(OSPACEINC) endif -else -ifdef G4USE_STL - -# Native STL implemetation - - RWINC := $(G4BASE)/global/STLInterface else ifdef G4USE_STLPORT -# STLport STL implementation (free) ( derived from SGI implementaion) - ifeq ($(G4SYSTEM),WIN32-VC) - - RWINC := $(G4BASE)/global/STLInterface - STLPORTDIR := $(STLPORT_BASE) - OSPACEINC := -I$(STLPORTDIR)/stl - CPPFLAGS += -DG4USE_STL -DG4USE_OLDSTL - CPPFLAGS += -D_NOTHREADS -D__STL_NO_NEW_IOSTREAMS -D__STL_NO_NAMESPACES -D__STL_NO_NEW_STYLE_HEADERS - - endif + # STLport STL implementation + # (derived from SGI implementation) - TEST on WIN32 + # + ifeq ($(G4SYSTEM),WIN32-VC) + STLPORT_BASE_DIR := $(STLPORT_BASE) + OSPACEINC := -I$(STLPORT_BASE_DIR)/stl + CPPFLAGS += -DG4USE_OLDSTL + CPPFLAGS += -D_NOTHREADS -D__STL_NO_NEW_IOSTREAMS -D__STL_NO_NAMESPACES + CPPFLAGS += -D__STL_NO_NEW_STYLE_HEADERS + endif endif #STLport -endif #STL endif #OPSPACE -# default to RW if RWINC is not set... -ifndef RWINC - ifndef RWBASE - RWBASE := /afs/cern.ch/sw/geant4/dev/rogue/$(G4SYSTEM) - endif - RWINC := $(RWBASE) - RWLIBDIR := $(RWBASE)/lib - RWLIB := rwtool - - ifeq ($(G4SYSTEM),HP-aCC) - RWBASE := /opt/aCC - RWINC := $(RWBASE)/include - RWLIBDIR := /usr/lib - endif - - ifeq ($(G4SYSTEM),WIN32-VC) -# RWBASE must be defined in the environment - - RWINC := $(RWBASE) - RWLIBDIR := $(RWBASE)"\lib" - RWLIB := mtlmt.lib - endif - - ifeq ($(G4SYSTEM),WIN32-G++-NICE) - # - # locally installed RogueWave for g++ (mount mapping) - # - RWBASE := /rogue - RWINC := $(RWBASE) - RWLIBDIR := $(RWBASE)/lib - RWLIB := rwtool - endif - - # - # Make dependencies files by g++ then need right RW include - # - ifdef RWINCGPP - RWINCGPP := -I$(RWINCGPP) - endif -endif # ifndef RWINC - -# # Paths for G4 data # - ifndef G4DATA G4DATA := $(G4INSTALL)/data endif # Photon evaporation data +# ifndef G4LEVELGAMMADATA G4LEVELGAMMADATA := $(G4DATA)/PhotonEvaporation endif -# # Toggle variables (positional qualifiers) between WIN32-VC and UNIX... # ifeq ($(G4SYSTEM),WIN32-VC) @@ -262,9 +242,9 @@ ifeq ($(G4SYSTEM),WIN32-VC) LIB_PATH := '-libpath:' CERNLIB_PATH := "z:\p32\cern\new\df\lib" PATH_DEL := \\ -# -# pattern for next substitution -# + # + # pattern for next substitution + # LIB_PATT := lib(LibName).a FLIB_PATT := (LibName).lib else @@ -275,47 +255,31 @@ else LIB_PATH := -L CERNLIB_PATH := /cern/pro/lib PATH_DEL := / -# -# pattern for next substitution -# + # + # pattern for next substitution + # LIB_PATT := -l(LibName) FLIB_PATT := $(LIB_PATT) endif -# # Variables for implicit rules, etc., as suggested in GNU Make manual... # - -CPPFLAGS += -Iinclude -I$(RWINC) +CPPFLAGS += -Iinclude -I$(G4STLINC) CPPFLAGS += -I$(CLHEP_INCLUDE_DIR) -# # Positional qualifiers in action... # ifeq ($(G4SYSTEM),WIN32-VC) LDFLAGS := -link $(LIB_PATH)$(CLHEP_LIB_DIR) - ifdef RWLIBDIR - LDFLAGS += $(LIB_PATH)$(RWLIBDIR) - endif LOADLIBS := $(CLHEP_LIB) - ifdef RWLIB - LOADLIBS += $(RWLIB) - endif else ## LDFLAGS := -L$(CLHEP_LIB_DIR) LDFLAGS := - ifdef RWLIBDIR - LDFLAGS += -L$(RWLIBDIR) - endif ## LOADLIBS := -l$(CLHEP_LIB) LOADLIBS := $(CLHEP_LIB_DIR)/lib$(CLHEP_LIB).a - ifdef RWLIB - LOADLIBS += -l$(RWLIB) - endif LOADLIBS += -lm endif -# # Graphic variables... # ifndef VISLIBS @@ -355,35 +319,225 @@ ifndef OIVLIBS OIVLIBS := -L${HEPVISLIB} -lHEPVis -lInventorXt -lInventor -lGLU -lGL endif # ----------------- OPACS -------------------- +# lesstiff is bugged for popups ; then OPACS/Xo uses +# the Xaw widgets for handling popups. The OPACS distrib +# for Linux assumes that lesstif is used by default. To be +# coherent we set in Geant4 the default toolkit to lesstif +# on Linux in order to link with -lXaw, etc... ifndef G4_OPACS_WIDGET_SET - G4_OPACS_WIDGET_SET := Xm + ifeq ($(G4SYSTEM),Linux-g++) + G4_OPACS_WIDGET_SET := lesstif + else + G4_OPACS_WIDGET_SET := Xm + endif endif -# # For cfront compilers the repository location is set to # $G4TMP/$G4SYSTEM/g4.ptrepository. # - G4TEMPLATE_REPOSITORY := $(G4SYSTEM)/g4.ptrepository G4TEMPEXEC_REPOSITORY := $(G4TEMPLATE_REPOSITORY)/exec G4TREP := $(G4TMP)/$(G4TEMPLATE_REPOSITORY) # Default archive call. Changed for: SUN-CC. +# AR := ar r # Default echo used with makedepend. Changed for SUN-CC, Linux-g++. +# ECHO:= echo # Default grep used with source/GNUmakfile. Changed for SUN-CC. +# GREP := grep - # -# Architecture dependent variables... +# Architecture dependent setups... # -# -------- AIX ---------- +# -------- SUN --------- # +ifeq ($(G4SYSTEM),SUN-CC) + CXX := CC + ifdef G4OPTIMISE + CXXFLAGS := -O + else + CXXFLAGS := -g + FCFLAGS := -g + CCFLAGS := -g + endif +# CXXFLAGS += -fnonstd + CFRONT_G4TEMPLATE_REPOSITORY := true + FC := f77 + SHEXT := so + AR := $(CXX) -xar -ptr$(G4TREP) -o + ECHO := /bin/echo + GREP := /usr/xpg4/bin/grep + FCLIBS := -lM77 -lF77 -lsunmath + X11FLAGS := -I/usr/openwin/include/X11/extensions -I/usr/openwin/include/X11 + X11FLAGS += -I/usr/openwin/include + X11LIBS := -L/usr/openwin/lib -L/usr/dt/lib -L/usr/ucblib + X11LIBS += -R/usr/openwin/lib -lXmu -lX11 -lXext + XMLIBS := -L/usr/openwin/lib -L/usr/dt/lib -L/usr/ucblib + XMLIBS += -R/usr/openwin/lib -lXt -lXm -lX11 + XAWFLAGS := -I/usr/openwin/include/X11 + XAWLIBS := -L/usr/openwin/lib -L/usr/dt/lib -L/usr/ucblib + XAWLIBS += -R/usr/openwin/lib -lXaw -lXmu -lXt -lX11 -lXext + ifndef OGLFLAGS + OGLFLAGS := -I$(OGLHOME)/include + endif + ifndef OGLLIBS + OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL + endif + CPPFLAGS += -DSOCKET_IRIX_SOLARIS + LOADLIBS += -L/usr/lib -lsocket -lnsl + CPPFLAGS += -DG4NOT_ISO_DELETES + CPPFLAGS += -I$(G4STLINC)/wrappers/$(G4SYSTEM) + ifdef G4USE_OSPACE + CPPFLAGS += -DOS_SOLARIS_2_5 -DOS_NEW_CHECK -DOS_STL_ASSERT + CPPFLAGS += -DOS_NO_WSTRING -DOS_NO_ALLOCATORS + CPPFLAGS += $(OSPACEINC) -I$(OSPACE_BASE_DIR) + endif +endif + +# -------- SUN/CC5 --------- !!! under testing !!! +# SunOS-2.6 CC-5.0 +ifeq ($(G4SYSTEM),SUN-CC5) + CXX := CC + ifdef G4OPTIMISE + CXXFLAGS := -O + else + CXXFLAGS := -g + FCFLAGS := -g + CCFLAGS := -g + endif +# CXXFLAGS += -fnonstd + G4_HAVE_BOOL := yes + CFRONT_G4TEMPLATE_REPOSITORY := true + FC := f77 + SHEXT := so + AR := $(CXX) -xar -ptr$(G4TREP) -o + ECHO := /bin/echo + GREP := /usr/xpg4/bin/grep + FCLIBS := -lM77 -lF77 -lsunmath + X11FLAGS := -I/usr/openwin/include/X11/extensions -I/usr/openwin/include/X11 + X11FLAGS += -I/usr/openwin/include + X11LIBS := -L/usr/openwin/lib -L/usr/dt/lib -L/usr/ucblib + X11LIBS += -R/usr/openwin/lib -lXmu -lX11 -lXext + XMLIBS := -L/usr/openwin/lib -L/usr/dt/lib -L/usr/ucblib + XMLIBS += -R/usr/openwin/lib -lXt -lXm -lX11 + XAWFLAGS := -I/usr/openwin/include/X11 + XAWLIBS := -L/usr/openwin/lib -L/usr/dt/lib -L/usr/ucblib + XAWLIBS += -R/usr/openwin/lib -lXaw -lXmu -lXt -lX11 -lXext + ifndef OGLFLAGS + OGLFLAGS := -I$(OGLHOME)/include + endif + ifndef OGLLIBS + OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL + endif + CPPFLAGS += -DSOCKET_IRIX_SOLARIS + LOADLIBS += -L/usr/lib -lsocket -lnsl + CPPFLAGS += -DG4NOT_ISO_DELETES + CPPFLAGS += -I$(G4STLINC)/wrappers/$(G4SYSTEM) + ifdef G4USE_OSPACE + CPPFLAGS += -DOS_SOLARIS_2_5 -DOS_NEW_CHECK -DOS_STL_ASSERT + CPPFLAGS += -DOS_NO_WSTRING -DOS_NO_ALLOCATORS + CPPFLAGS += $(OSPACEINC) -I$(OSPACE_BASE_DIR) + CXXFLAGS += -compat + else + ifndef G4NO_STD_NAMESPACE + G4USE_STD_NAMESPACE := yes + CPPFLAGS += -DG4USE_STD_NAMESPACE + else + CXXFLAGS += -compat + endif + endif +endif + +# -------- HP --------- +# +ifeq ($(G4SYSTEM),HP-aCC) + CXX := aCC + ifdef G4OPTIMISE + CXXFLAGS := +O2 +Onolimit + else + CXXFLAGS := -g + FCFLAGS := -g + CCFLAGS := -g + endif + CXXFLAGS += +DAportable + CPPFLAGS += -I/usr + ifdef G4MAKESHLIB + CXXFLAGS += +Z + endif + G4_HAVE_BOOL := yes + FC := f77 + FCFLAGS += +E6 +ppu + CCFLAGS += -Ae +DAportable + X11FLAGS := -I/usr/include/X11/extensions -I/usr/contrib/X11R6/include + X11FLAGS += -I/usr/contrib/X11R6/include/X11 + X11LIBS := -L/usr/contrib/X11R6/lib -lXmu -L/usr/lib -lXt -lXext -lX11 + XMFLAGS := -I/usr/include/Motif1.2 + XMLIBS := -L/usr/lib/Motif1.2_R6 -lXm + XAWFLAGS := -I/usr/contrib/X11R6/include -I/usr/contrib/X11R6/include/X11 + XAWLIBS := -L/usr/contrib/X11R6/lib -lXaw + ifndef OGLFLAGS + OGLFLAGS := -I$(OGLHOME)/include + endif + ifndef OGLLIBS + OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL + OGLLIBS += -L/opt/graphics/common/lib -lXwindow -lhpgfx -lXhp11 -ldld + endif + CPPFLAGS += -DG4NOT_ISO_DELETES + CPPFLAGS += -I$(G4STLINC)/wrappers/$(G4SYSTEM) + ifdef G4USE_OSPACE + CPPFLAGS += -DOS_HPUX_10_20 -DOS_NEW_CHECK -DOS_STL_ASSERT + CPPFLAGS += -DOS_NO_WSTRING -DOS_NO_ALLOCATORS -D__HPACC_NOEH + CPPFLAGS += $(OSPACEINC) -I$(OSPACE_BASE_DIR) + else + ifndef G4NO_STD_NAMESPACE + G4USE_STD_NAMESPACE := yes + CPPFLAGS += -DG4USE_STD_NAMESPACE + endif + endif +endif + +# -------- SGI --------- !!! not supported !!! +# Irix-6.5.5 CC-7.2.1 +ifeq ($(G4SYSTEM),SGI-CC) + CXX := CC + ifdef G4OPTIMISE + CXXFLAGS := -O -OPT:Olimit=5000 + else + CXXFLAGS := -g + FCFLAGS := -g + CCFLAGS := -g + endif + G4_HAVE_BOOL := yes + CXXFLAGS += -ptused + FC := f77 + FCLIBS := -lftn + SHEXT := so + X11FLAGS := -I/usr/include/X11/extensions -I/usr/include/X11 + X11LIBS := -L/usr/lib -lXmu -lXt -lXext -lX11 + XMLIBS := -L/usr/lib -lXm + ifndef OGLFLAGS + OGLFLAGS := + endif + ifndef OGLLIBS + OGLLIBS := -L/usr/lib -lGLU -lGL + endif + CPPFLAGS += -DSOCKET_IRIX_SOLARIS + CPPFLAGS += -I$(G4STLINC)/wrappers/$(G4SYSTEM) + ifdef G4USE_OSPACE + CPPFLAGS += -DOS_IRIX_6_5 -DOS_NEW_CHECK -DOS_STL_ASSERT + CPPFLAGS += -DOS_NO_WSTRING -DOS_NO_ALLOCATORS + CPPFLAGS += $(OSPACEINC) -I$(OSPACE_BASE_DIR) + endif +endif + +# -------- AIX ---------- !!! not supported !!! +# AIX-4.3.2 xlC ifeq ($(G4SYSTEM),AIX-xlC) CXX := xlC ifdef G4OPTIMISE @@ -408,145 +562,12 @@ ifeq ($(G4SYSTEM),AIX-xlC) ifndef OGLLIBS OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL endif - ifdef G4ODBMS - ifeq ($(OBJY_VERS),4.0.2) - OBJY_LDLIB := oo_shar.4.02 - endif - endif CPPFLAGS += -DG4NOT_ISO_DELETES - ifdef G4USE_STL - CPPFLAGS += -I$(RWINC)/wrappers/$(G4SYSTEM) - endif + CPPFLAGS += -I$(G4STLINC)/wrappers/$(G4SYSTEM) ifdef G4USE_OSPACE - CPPFLAGS += -DOS_AIX_4 -DOS_NEW_CHECK -DOS_STL_ASSERT -DOS_NO_WSTRING -DOS_NO_ALLOCATORS - CPPFLAGS += -I$(RWINC)/wrappers/$(G4SYSTEM) $(OSPACEINC) -I$(OSPACEDIR) - endif -endif - -# -------- SUN --------- -# -ifeq ($(G4SYSTEM),SUN-CC) - CXX := CC - ifdef G4OPTIMISE - CXXFLAGS := -O - else - CXXFLAGS := -g - FCFLAGS := -g - CCFLAGS := -g - endif -# CXXFLAGS += -fnonstd - CFRONT_G4TEMPLATE_REPOSITORY := true - FC := f77 - SHEXT := so - AR := $(CXX) -xar -ptr$(G4TREP) -o - ECHO := /bin/echo - GREP := /usr/xpg4/bin/grep - FCLIBS := -lM77 -lF77 -lsunmath - X11FLAGS := -I/usr/openwin/include/X11/extensions -I/usr/openwin/include/X11 -I/usr/openwin/include - X11LIBS := -L/usr/openwin/lib -L/usr/dt/lib -L/usr/ucblib -R/usr/openwin/lib -lXmu -lX11 -lXext - XMLIBS := -L/usr/openwin/lib -L/usr/dt/lib -L/usr/ucblib -R/usr/openwin/lib -lXt -lXm -lX11 - XAWFLAGS := -I/usr/openwin/include/X11 - XAWLIBS := -L/usr/openwin/lib -L/usr/dt/lib -L/usr/ucblib -R/usr/openwin/lib -lXaw -lXmu -lXt -lX11 -lXext - ifndef OGLFLAGS - OGLFLAGS := -I$(OGLHOME)/include - endif - ifndef OGLLIBS - OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL - endif - ifdef G4ODBMS - ifeq ($(OBJY_VERS),4.0.2) - OBJY_LDLIB := oo - endif - endif - CPPFLAGS += -DSOCKET_IRIX_SOLARIS - LOADLIBS += -L/usr/lib -lsocket -lnsl - CPPFLAGS += -DG4NOT_ISO_DELETES - ifdef G4USE_STL - CPPFLAGS += -I$(RWINC)/wrappers/$(G4SYSTEM) - endif - ifdef G4USE_OSPACE - CPPFLAGS += -DOS_SOLARIS_2_5 -DOS_NEW_CHECK -DOS_STL_ASSERT -DOS_NO_WSTRING -DOS_NO_ALLOCATORS - CPPFLAGS += -I$(RWINC)/wrappers/$(G4SYSTEM) $(OSPACEINC) -I$(OSPACEDIR) - endif -endif - -# -------- HP --------- -# -ifeq ($(G4SYSTEM),HP-aCC) - CXX := aCC - ifdef G4OPTIMISE - CXXFLAGS := +O2 +Onolimit - else - CXXFLAGS := -g - FCFLAGS := -g - CCFLAGS := -g - endif - CXXFLAGS += +DAportable - CPPFLAGS += -I/usr - ifdef G4MAKESHLIB - CXXFLAGS += +Z - endif - G4_HAVE_BOOL := yes - FC := f77 - FCFLAGS += +E6 +ppu - CCFLAGS += -Ae +DAportable - X11FLAGS := -I/usr/include/X11/extensions -I/usr/contrib/X11R6/include -I/usr/contrib/X11R6/include/X11 - X11LIBS := -L/usr/contrib/X11R6/lib -lXmu -L/usr/lib -lXt -lXext -lX11 - XMFLAGS := -I/usr/include/Motif1.2 - XMLIBS := -L/usr/lib/Motif1.2_R6 -lXm - XAWFLAGS := -I/usr/contrib/X11R6/include -I/usr/contrib/X11R6/include/X11 - XAWLIBS := -L/usr/contrib/X11R6/lib -lXaw - ifndef OGLFLAGS - OGLFLAGS := -I$(OGLHOME)/include - endif - ifndef OGLLIBS - OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL - OGLLIBS += -L/opt/graphics/common/lib -lXwindow -lhpgfx -lXhp11 -ldld - endif - ifdef G4ODBMS - ifeq ($(OBJY_VERS),4.0.2) - OBJY_LDLIB := oo - endif - endif - CPPFLAGS += -DG4NOT_ISO_DELETES - ifdef G4USE_STL - CPPFLAGS += -I$(RWINC)/wrappers/$(G4SYSTEM) -DG4USE_EXPLICIT_TYPES_IN_TEMPLATES - endif - ifdef G4USE_OSPACE - CPPFLAGS += -DOS_HPUX_10_20 -DOS_NEW_CHECK -DOS_STL_ASSERT -DOS_NO_WSTRING -DOS_NO_ALLOCATORS - CPPFLAGS += -DOS_NO_TYPEDEF_5 -D__HPACC_NOEH -DG4USE_EXPLICIT_TYPES_IN_TEMPLATES - CPPFLAGS += -I$(RWINC)/wrappers/$(G4SYSTEM) $(OSPACEINC) -I$(OSPACEDIR) - endif -endif - -# -------- SGI --------- -# -ifeq ($(G4SYSTEM),SGI-CC) - CXX := CC - ifdef G4OPTIMISE - CXXFLAGS := -O -Olimit 5000 - else - CXXFLAGS := -g - FCFLAGS := -g - CCFLAGS := -g - endif - CXXFLAGS += -ptused - FC := f77 - FCLIBS := -lftn - SHEXT := so - X11FLAGS := -I/usr/include/X11/extensions -I/usr/include/X11 - X11LIBS := -L/usr/lib -lXmu -lXt -lXext -lX11 - XMLIBS := -L/usr/lib -lXm - ifndef OGLFLAGS - OGLFLAGS := - endif - ifndef OGLLIBS - OGLLIBS := -L/usr/lib -lGLU -lGL - endif - CPPFLAGS += -DSOCKET_IRIX_SOLARIS - ifdef G4USE_OSPACE - CPPFLAGS += -DOS_IRIX_6_2 -DOS_NEW_CHECK -DOS_STL_ASSERT -DOS_NO_WSTRING -DOS_NO_ALLOCATORS - CPPFLAGS += $(OSPACEINC) -I$(OSPACEDIR) + CPPFLAGS += -DOS_AIX_4 -DOS_NEW_CHECK -DOS_STL_ASSERT + CPPFLAGS += -DOS_NO_WSTRING -DOS_NO_ALLOCATORS + CPPFLAGS += $(OSPACEINC) -I$(OSPACE_BASE_DIR) endif endif @@ -561,9 +582,7 @@ ifeq ($(G4SYSTEM),DEC-cxx) FCFLAGS := -g CCFLAGS := -g endif - CFRONT_G4TEMPLATE_REPOSITORY := true G4_HAVE_BOOL := yes - LDFLAGS += -taso CXXFLAGS += -ieee -timplicit_local FC := f77 FCLIBS := -lUfor -lfor -lFutil -lots @@ -576,14 +595,18 @@ ifeq ($(G4SYSTEM),DEC-cxx) OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL # OGLLIBS := -lMesaGLU -lMesaGL endif - ifdef G4USE_STL - CPPFLAGS += -I$(RWINC)/wrappers/$(G4SYSTEM) - CXXFLAGS += -nostdnew - endif + CPPFLAGS += -I$(G4STLINC)/wrappers/$(G4SYSTEM) ifdef G4USE_OSPACE - CPPFLAGS += -DOS_OSF1_4 -DOS_NEW_CHECK -DOS_STL_ASSERT -DOS_NO_WSTRING -DOS_NO_ALLOCATORS -D__NO_EDG_EXCEPTION_CLASSES - CPPFLAGS += -I$(RWINC)/wrappers/$(G4SYSTEM) $(OSPACEINC) -I$(OSPACEDIR) + CPPFLAGS += -DOS_OSF1_4 -DOS_NEW_CHECK -DOS_STL_ASSERT -DOS_NO_WSTRING + CPPFLAGS += -DOS_NO_ALLOCATORS -D__NO_EDG_EXCEPTION_CLASSES + CPPFLAGS += $(OSPACEINC) -I$(OSPACE_BASE_DIR) CXXFLAGS += -nostdnew + else + ifndef G4NO_STD_NAMESPACE + G4USE_STD_NAMESPACE := yes + CXXFLAGS += -std strict_ansi + CPPFLAGS += -DG4USE_STD_NAMESPACE + endif endif endif @@ -595,15 +618,22 @@ ifeq ($(G4SYSTEM),Linux-g++) CXXFLAGS := -pipe -fno-for-scope -DGNU_GCC ifdef G4OPTIMISE CXXFLAGS += -O + FCFLAGS := -O + CCFLAGS := -O else CXXFLAGS += -g FCFLAGS := -g CCFLAGS := -g endif + ifdef G4MAKESHLIB + CXXFLAGS += -fPIC + FCFLAGS += -fPIC + CCFLAGS += -fPIC + endif FC := g77 FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore FCLIBS := -lf2c - ECHO := /bin/echo + ECHO := /bin/echo -e X11FLAGS := -I/usr/include/X11/extensions -I/usr/include/X11 X11LIBS := -L/usr/X11R6/lib -lXmu -lXt -lXext -lX11 -lSM -lICE XMFLAGS := -I/usr/X11R6/include @@ -616,8 +646,12 @@ ifeq ($(G4SYSTEM),Linux-g++) endif OIVFLAGS += -I$(OIHOME)/include ifdef G4USE_OSPACE - CPPFLAGS += -DOS_LINUX_2 -DOS_NEW_CHECK -DOS_STL_ASSERT -DOS_NO_WSTRING -DOS_NO_ALLOCATORS - CPPFLAGS += -I$(OSPACEDIR)/ospace/std -I$(OSPACEDIR) + CPPFLAGS += -DOS_LINUX_2 -DOS_NEW_CHECK -DOS_STL_ASSERT + CPPFLAGS += -DOS_NO_WSTRING -DOS_NO_ALLOCATORS + CPPFLAGS += -I$(OSPACE_BASE_DIR)/ospace/std -I$(OSPACE_BASE_DIR) + endif + ifdef G4ODBMS + G4OODDLX_FLAGS += -D__STL_CLASS_PARTIAL_SPECIALIZATION -Dstd="" endif endif @@ -632,29 +666,29 @@ ifeq ($(G4SYSTEM),WIN32-VC) else CXXFLAGS += -Od -Zi -Fd$(G4LIBDIR)/lib$(name) endif - CXXFLAGS += -MD -GX -Zm200 -nologo -DWIN32 -D_CONSOLE - CXXFLAGS += -D_WIN32 -DOS -DG4NOT_ISO_DELETES - CPPFLAGS += -DWIN32 -DRW_NO_XMSG -# -# Should set $INCLUDE environment, if not set as below -# -ifdef G4USE_OSPACE - CXXFLAGS += $(OSPACEINC) -else -ifdef G4USE_STLPORT - CXXFLAGS += $(OSPACEINC) -endif #stlport -endif #ospace + CXXFLAGS += -MD -GX -Zm200 -nologo -DWIN32 -D_CONSOLE + CXXFLAGS += -D_WIN32 -DOS + CPPFLAGS += -DWIN32 + # + # Should set $INCLUDE environment, if not set as below + # + ifdef G4USE_OSPACE + CXXFLAGS += $(OSPACEINC) + else + ifdef G4USE_STLPORT + CXXFLAGS += $(OSPACEINC) + endif #stlport + endif #ospace LDFLAGS += -FORCE /NODEFAULTLIB:MSVCRT.dll -# -# Should set $LIB environment to include VC++ Studio lib directories, e.g. -# -# $(LIB_PATH)"c:\ProgramFiles\DevStudio\vc\lib" \ -# $(LIB_PATH)'\\srv1_info\v2\vc50pro1\DEVSTUDIO\VC\LIB' \ -# $(LIB_PATH)'\\srv1_info\v2\DecFtn5\x86\df\lib' - + # + # Should set $LIB environment to include VC++ Studio lib directories, e.g. + # + # $(LIB_PATH)"c:\ProgramFiles\DevStudio\vc\lib" \ + # $(LIB_PATH)'\\srv1_info\v2\vc50pro1\DEVSTUDIO\VC\LIB' \ + # $(LIB_PATH)'\\srv1_info\v2\DecFtn5\x86\df\lib' + AR := LIB ECHO := echo -e FC := f77 @@ -667,87 +701,32 @@ endif #ospace endif endif -# ------ WIN32/G++/NICE ------ -# -ifeq ($(G4SYSTEM),WIN32-G++-NICE) - CXX := g++ - CXXFLAGS := -fno-for-scope - G4_HAVE_BOOL := yes - ifdef G4OPTIMISE - CXXFLAGS += -O - else - CXXFLAGS += -g - endif - CXXFLAGS += -DCYGWIN32 - ECHO := echo -e - FC := g77 - FCLIBS := -lf2c - ifndef OGLFLAGS - OGLFLAGS := - endif - ifndef OGLLIBS - OGLLIBS := -lGLU -lGL - endif -endif - # If compiler recognises implicit C++ type bool... +# ifdef G4_HAVE_BOOL CPPFLAGS += -DG4_HAVE_BOOL endif # If there is no cbrt() function... +# ifdef G4_NO_CBRT CPPFLAGS += -DG4_NO_CBRT endif -# Standard Template Library (STL) not installed -ifndef G4USE_STL - ifndef G4USE_OSPACE - CPPFLAGS += -DRW_NO_STL - endif -endif - # Verbosity code can be left out (for better performance) # by defining G4_NO_VERBOSE. - +# ifndef G4_NO_VERBOSE CPPFLAGS += -DG4VERBOSE endif # Trajectory related classes can be left out (for better performance) # by defining G4_NO_STORE_TRAJECTORY. - +# ifndef G4_NO_STORE_TRAJECTORY CPPFLAGS += -DG4_STORE_TRAJECTORY endif -# -# Enable/disable G4cout/G4cerr -# - -# Set G4STREAM for all platforms. - -G4STREAM = 1 - -# Set G4STREAM_STREAMBUF_IMPLEMENTATION for selected platforms. - -ifeq ($(findstring AIX,$(G4SYSTEM)),AIX) - G4STREAM_STREAMBUF_IMPLEMENTATION = 1 -endif - -ifeq ($(findstring WIN32,$(G4SYSTEM)),WIN32) - G4STREAM_STREAMBUF_IMPLEMENTATION = 1 -endif - -ifdef G4STREAM - CPPFLAGS += -DG4STREAM -endif - -ifdef G4STREAM_STREAMBUF_IMPLEMENTATION - CPPFLAGS += -DG4STREAM_STREAMBUF_IMPLEMENTATION -endif - -# # Template setup - repositories, special options etc # ifdef CFRONT_G4TEMPLATE_REPOSITORY diff --git a/config/binmake.gmk b/config/binmake.gmk index c88cb22b89..a9d5307dcd 100644 --- a/config/binmake.gmk +++ b/config/binmake.gmk @@ -1,4 +1,4 @@ -# $Id: binmake.gmk,v 1.29 1999/07/06 15:19:42 gunter Exp $ +# $Id: binmake.gmk,v 1.39 1999/12/01 14:40:43 morita Exp $ # ---------------------------------------------------------- # Script defining rules and paths for making binaries. # Gabriele Cosmo, 25/06/1998. @@ -19,6 +19,7 @@ ifndef INCFLAGS -I$(G4BASE)/global/management/include \ -I$(G4BASE)/global/HEPRandom/include \ -I$(G4BASE)/global/HEPGeometry/include \ + -I$(G4BASE)/global/HEPNumerics/include \ -I$(G4BASE)/run/include \ -I$(G4BASE)/materials/include \ -I$(G4BASE)/particles/management/include \ @@ -56,6 +57,7 @@ ifndef INCFLAGS -I$(G4BASE)/processes/hadronic/models/high_energy/include \ -I$(G4BASE)/processes/hadronic/models/low_energy/include \ -I$(G4BASE)/processes/hadronic/models/neutron_hp/include \ + -I$(G4BASE)/processes/hadronic/models/isotope_production/include \ -I$(G4BASE)/processes/hadronic/stopping/include \ -I$(G4BASE)/geometry/management/include \ -I$(G4BASE)/geometry/solids/CSG/include \ @@ -78,18 +80,16 @@ endif ifdef G4ODBMS INCFLAGS += \ - -I$(G4BASE)/persistency/management/include \ - -I$(G4BASE)/persistency/events/include \ + -I$(G4BASE)/persistency/global/include \ -I$(G4BASE)/persistency/digits+hits/hits/include \ - -I$(G4BASE)/persistency/geometry/management/include \ - -I$(G4BASE)/persistency/geometry/volumes/include \ + -I$(G4BASE)/persistency/digits+hits/digits/include \ + -I$(G4BASE)/persistency/events/include \ + -I$(G4BASE)/persistency/geometry/global/include \ -I$(G4BASE)/persistency/geometry/solids/CSG/include \ - -I$(G4TMP)/$(G4SYSTEM)/G4pmanagement \ - -I$(G4TMP)/$(G4SYSTEM)/G4pevents \ - -I$(G4TMP)/$(G4SYSTEM)/G4phits \ - -I$(G4TMP)/$(G4SYSTEM)/G4pgeomn \ - -I$(G4TMP)/$(G4SYSTEM)/G4pvol \ - -I$(G4TMP)/$(G4SYSTEM)/G4pcsg \ + -I$(G4BASE)/persistency/geometry/solids/Boolean/include \ + -I$(G4BASE)/persistency/geometry/management/include \ + -I$(G4BASE)/persistency/management/include \ + -I$(G4SCHEMA_INCLUDE) \ -I$(OBJY_DIR)/include \ -I$(HEP_ODBMS_DIR)/include \ -DHep_HAS_BUILDIN_BOOL_CONSTANTS @@ -131,11 +131,12 @@ ifdef GLOBALLIBS LDLIBS1 += $(VISLIBS) $(UILIBS) endif -ifdef G4ODBMS - LDLIBS1 += -lG4persistency -endif - ifdef GLOBALLIBS + + ifdef G4ODBMS + LDLIBS1 += -lG4persistency + endif + LDLIBS2 := -lG4readout \ -lG4run \ -lG4event \ @@ -159,8 +160,10 @@ else $(G4LIB)/$(G4SYSTEM)/liblist \ -d $(G4TMPDIR) \ < $(G4LIB)/$(G4SYSTEM)/libname.map; fi) +# Warning: do not add to LDLIBS2 with += becuase this causes it to be +# expanded too soon. Hence extra libraries must have a different name... # Extra libraries to resolve remaining circular dependencies... -# LDLIBS2 += +# LDLIBS2EXTRA = endif # LDLIBS3 contains the first set of low level libraries... @@ -176,10 +179,10 @@ ifdef G4ODBMS LDFLAGS += -L$(OBJY_DIR)/lib \ -L$(HEP_ODBMS_DIR)/lib -# Note: -l$(OBJY_LDLIB) and -lHepODBMS should be placed -# _before_ -l$(CLHEP_LIB) -l$(RWLIB) +# Note: $(G4ODBMS_LIBS) should be placed +# _before_ -l$(CLHEP_LIB) - LDLIBS4 += -l$(OBJY_LDLIB) -lHepODBMS + LDLIBS4 += $(G4ODBMS_LIBS) endif ifdef G4USE_OSPACE LDLIBS4 += $(OSPACELIBS) @@ -193,7 +196,8 @@ LDLIBS4 += $(LOADLIBS) ifdef USER_DEFINED_LDLIBS LDLIBS_PREFINAL := $(LDLIBS) else - LDLIBS_PREFINAL = $(LDLIBS1) $(LDLIBS2) $(LDLIBS3) +# Again, do not use := or +=. See note on LDLIBS2 above. + LDLIBS_PREFINAL = $(LDLIBS1) $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3) endif LDLIBS_PREFINAL += $(LDLIBS4) @@ -210,9 +214,13 @@ sources := $(wildcard $(G4TARGET).cc) objects := $(patsubst %.cc,$(G4TMPDIR)/exe/%.o,$(sources)) dependencies := $(patsubst %.cc,$(G4TMPDIR)/exe/%.d,$(sources)) -LINK_DEPENDENCIES := $(G4TMPDIR)/exe/obj.last +LINK_DEPENDENCIES := $(G4TMPDIR)/exe/obj.last $(EXTRA_LINK_DEPENDENCIES) +ifndef G4ODBMS .PHONY: bin clean clean_bin debug +else +.PHONY: bin clean clean_bin debug cleandb newboot newfd +endif # Make $(G4TARGET) executable. bin: $(G4BINDIR)/$(G4TARGET) @@ -220,14 +228,7 @@ bin: $(G4BINDIR)/$(G4TARGET) $(G4BINDIR)/$(G4TARGET): $(LINK_DEPENDENCIES) ifndef USER_DEFINED_LDLIBS ifndef GLOBALLIBS - @echo "WARNING: This assumes you are using granular libraries!" - @echo "WARNING: It looked for your global library G4global and," - @echo " not finding it, assumes you are using granular" - @echo " libraries." - @echo "WARNING: If you did not intend this, interrupt now (CTRL-C)," - @echo " and go back and make global libraries, i.e.," - @echo ' cd $$G4INSTALL/source' - @echo " gmake global" + @echo "Using granular libraries." @if [ ! \( -f $(G4LIB)/$(G4SYSTEM)/liblist \ -a -f $(G4LIB)/$(G4SYSTEM)/libname.map \) ]; then \ echo "ERROR: No liblist program or library map file."; \ @@ -239,6 +240,8 @@ ifndef USER_DEFINED_LDLIBS echo " granular libraries:"; \ echo " gmake libmap"; \ exit 1; fi + else + @echo "Using global libraries." endif endif @if [ ! -d $(G4BINDIR) ] ; then mkdir $(G4BINDIR) ;fi @@ -273,14 +276,19 @@ else endif # Make the $(G4TARGET).d file and include it. +ifdef G4SKIP_DEPEND +$(G4TMPDIR)/exe/$(G4TARGET).d: $(G4TARGET).cc + @echo Skip dependency file creation for file $< ... +else $(G4TMPDIR)/exe/$(G4TARGET).d: $(G4TARGET).cc @if [ ! -d $(G4TMP)/$(G4SYSTEM) ] ; then mkdir $(G4TMP)/$(G4SYSTEM) ;fi @if [ ! -d $(G4TMPDIR) ] ; then mkdir $(G4TMPDIR) ;fi @if [ ! -d $(G4TMPDIR)/exe ] ; then mkdir $(G4TMPDIR)/exe ;fi @echo Making dependency for file $<... @($(ECHO) $(G4TMPDIR)/exe/\\c ; \ - g++ -MM $(RWINCGPP) $(CPPFLAGS) $< ) | sed 's!$(G4TMPDIR)/exe/$*.o!& $@!' >$@ + g++ -MM $(CPPFLAGS) $< ) | sed 's!$(G4TMPDIR)/exe/$*.o!& $@!' >$@ -include $(dependencies) +endif clean: @echo Cleaning up ... @@ -296,3 +304,31 @@ clean_bin: @echo Removing application $(G4TARGET) ... @rm -f ./core @rm -f $(G4BINDIR)/$(G4TARGET) + +############################+ targets for G4ODBMS +############################ +ifdef G4ODBMS + +cleandb: clean newboot + +newboot: + @echo Copying schema file to $(G4EXAMPLE_BOOT) for FDID $(G4EXAMPLE_FDID) + @rm -f $(G4EXAMPLE_BOOT_DIR)/$(name) + @rm -f $(G4EXAMPLE_BOOT_DIR)/$(name).FDDB + @rm -f $(G4EXAMPLE_BOOT_DIR)/*.$(name).DB + @$(HEP_ODBMS_DIR)/etc/getdb $(G4SCHEMA_DIR)/G4SCHEMA \ + $(G4EXAMPLE_BOOT) $(G4SCHEMA_FDID) + +newfd: +ifndef G4EXAMPLE_FDID + @echo G4EXAMPLE_FDID is not defined. Stop. + exit 1 +endif + @echo Creating new runtime federated database $(G4EXAMPLE_BOOT) for FDID $(G4EXAMPLE_FDID) + @rm -f $(G4EXAMPLE_FD_DIR)/$(name) + @rm -f $(G4EXAMPLE_FD_DIR)/$(name).FDDB + @rm -f $(G4EXAMPLE_FD_DIR)/*.$(name).DB + @$(HEP_ODBMS_DIR)/etc/getdb $(G4EXAMPLE_BOOT) \ + $(G4EXAMPLE_FD) $(G4EXAMPLE_FDID) +endif +############################- targets for G4ODBMS -############################ + diff --git a/config/common.gmk b/config/common.gmk index b291703031..5def054826 100644 --- a/config/common.gmk +++ b/config/common.gmk @@ -1,32 +1,42 @@ -# $Id: common.gmk,v 1.1 1999/01/07 15:58:32 gunter Exp $ +# $Id: common.gmk,v 1.14 1999/12/05 22:41:38 morita Exp $ # ---------------------------------------------------------------- # Common part of GNUmakefile for libraries. John Allison, 5/7/95. # ---------------------------------------------------------------- # Libraries are created according to G4SYSTEM. G.Cosmo, 11/6/96. # Introduced G4LIBDIR and G4TMPDIR. G.Cosmo, 23/6/98. +# Introduced G4SCHEMA_HEADER_DIR and G4SCHEMA_SRC_DIR. Y.Morita, 16/11/99. ifndef G4LIBDIR G4LIBDIR := $(G4LIB)/$(G4SYSTEM) endif G4TMPDIR := $(G4TMP)/$(G4SYSTEM)/$(name) +ifdef G4ODBMS_INSTALLATION + G4OODDLX_SCHEMA_NAME := -schema Geant4 +else + G4OODDLX_SCHEMA_NAME := +endif +G4SCHEMA_HEADER_DIR := $(G4TMPDIR) +G4SCHEMA_SRC_DIR := $(G4TMPDIR) + sources := $(wildcard src/*.cc) schema_ddl := $(wildcard include/*.ddl) -schema_hh := $(patsubst include/%.ddl,$(G4TMPDIR)/%.hh,$(schema_ddl)) +schema_hh := $(patsubst include/%.ddl,$(G4SCHEMA_HEADER_DIR)/%.hh,$(schema_ddl)) +schema_ref_hh := $(patsubst include/%.ddl,$(G4SCHEMA_HEADER_DIR)/%_ref.hh,$(schema_ddl)) objects := $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources)) dependencies := $(patsubst src/%.cc,$(G4TMPDIR)/%.d,$(sources)) # output of ooddlx in G4TMPDIR (.hh, _ref.hh, _ddl.cc) # -temporaries := $(patsubst include/%.ddl,$(G4TMPDIR)/%.hh,$(schema_ddl)) +temporaries := $(patsubst include/%.ddl,$(G4SCHEMA_HEADER_DIR)/%.hh,$(schema_ddl)) # output of ooddlx in the current directory (if the process does not finish) # temporaries2 := $(patsubst include/%.ddl,%.hh,$(schema_ddl)) ifdef G4ODBMS - temporaries += $(patsubst include/%.ddl,$(G4TMPDIR)/%_ddl.cc,$(schema_ddl)) \ - $(patsubst include/%.ddl,$(G4TMPDIR)/%_ref.hh,$(schema_ddl)) + temporaries += $(patsubst include/%.ddl,$(G4SCHEMA_SRC_DIR)/%_ddl.cc,$(schema_ddl)) \ + $(patsubst include/%.ddl,$(G4SCHEMA_HEADER_DIR)/%_ref.hh,$(schema_ddl)) temporaries2 += $(patsubst include/%.ddl,%_ddl.cc,$(schema_ddl)) \ $(patsubst include/%.ddl,%_ref.hh,$(schema_ddl)) objects += $(patsubst include/%.ddl,$(G4TMPDIR)/%_ddl.o,$(schema_ddl)) @@ -35,9 +45,13 @@ endif ifneq ($(G4MAKESHLIB),) # Make shared library. $(G4LIBDIR)/lib$(name).$(SHEXT): $(G4LIBDIR)/lib$(name).a - @cp $(objects) $(G4LIBDIR)/. - sh $(G4MAKESHLIB) $(G4LIBDIR) $(name) - $(RM) $(G4LIBDIR)/*.o +ifneq ($(G4TMPDIR),$(G4LIBDIR)) + @cp $(G4TMPDIR)/*.o $(G4LIBDIR)/. + @sh $(G4MAKESHLIB) $(G4LIBDIR) $(name) + @$(RM) $(G4LIBDIR)/*.o +else + @sh $(G4MAKESHLIB) $(G4LIBDIR) $(name) +endif endif # Make library. @@ -65,54 +79,73 @@ else @$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(OUT_OBJ)$(G4TMPDIR)/$(*F).o src/$*.cc endif ifdef G4ODBMS -$(G4TMPDIR)/%.o: $(G4TMPDIR)/%.cc - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $(G4TMPDIR)/$(*F).o $(G4TMPDIR)/$*.cc +$(G4TMPDIR)/%.o: $(G4SCHEMA_SRC_DIR)/%.cc +ifdef CPPVERBOSE + $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $(G4TMPDIR)/$(*F).o $(G4SCHEMA_SRC_DIR)/$*.cc +else + @echo Compiling $*.cc ... + @$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $(G4TMPDIR)/$(*F).o $(G4SCHEMA_SRC_DIR)/$*.cc +endif endif # Make the temporary files. -.PRECIOUS: $(G4TMPDIR)/%_ddl.cc ddl/%.hh $(G4TMPDIR)/%_ref.hh +.PRECIOUS: $(G4SCHEMA_SRC_DIR)/%_ddl.cc $(G4SCHEMA_HEADER_DIR)/%.hh $(G4SCHEMA_HEADER_DIR)/%_ref.hh ifdef G4ODBMS -$(G4TMPDIR)/%_ddl.cc $(G4TMPDIR)/%.hh $(G4TMPDIR)/%_ref.hh: include/%.ddl +$(G4SCHEMA_SRC_DIR)/%_ddl.cc $(G4SCHEMA_HEADER_DIR)/%.hh $(G4SCHEMA_HEADER_DIR)/%_ref.hh: include/%.ddl +ifndef G4OODDLX_BOOT + @echo G4OODDLX_BOOT is not defined. Stop. + exit 1 +endif @if [ ! -d $(G4TMP)/$(G4SYSTEM) ] ; then mkdir $(G4TMP)/$(G4SYSTEM) ;fi @if [ ! -d $(G4TMPDIR) ] ; then mkdir $(G4TMPDIR) ;fi - ooddlx -notitle -header_suffix .hh -ref_suffix _ref.hh -c++_suffix _ddl.cc \ - -DRW_NO_CONST_OVERLOAD -DRW_NO_STL -DTEMPLATEP_HIDES_FNCD \ - $(CPPFLAGS) $< $(G4EXAMPLE_BOOT) - mv -f $*.hh $(G4TMPDIR)/ - mv -f $*_ref.hh $(G4TMPDIR)/ - mv -f $*_ddl.cc $(G4TMPDIR)/ + @if [ ! -d $(G4SCHEMA_HEADER_DIR) ] ; then mkdir $(G4SCHEMA_HEADER_DIR) ;fi + @if [ ! -d $(G4SCHEMA_SRC_DIR) ] ; then mkdir $(G4SCHEMA_SRC_DIR) ;fi +ifdef CPPVERBOSE + ooddlx -notitle $(G4OODDLX_SCHEMA_NAME) \ + -header_suffix .hh -ref_suffix _ref.hh -c++_suffix _ddl.cc \ + $(G4OODDLX_FLAGS) $(CPPFLAGS) $< $(G4OODDLX_BOOT) else -$(G4TMPDIR)/%.hh: include/%.ddl - @if [ ! -d $(G4TMP)/$(G4SYSTEM) ] ; then mkdir $(G4TMP)/$(G4SYSTEM) ;fi - @if [ ! -d $(G4TMPDIR) ] ; then mkdir $(G4TMPDIR) ;fi - ln -s -f ../$< $(G4TMPDIR)/$*.hh + @echo Preprocessing $< ... + @ooddlx -notitle $(G4OODDLX_SCHEMA_NAME) \ + -header_suffix .hh -ref_suffix _ref.hh -c++_suffix _ddl.cc \ + $(G4OODDLX_FLAGS) $(CPPFLAGS) $< $(G4OODDLX_BOOT) +endif + @mv -f $*.hh $(G4SCHEMA_HEADER_DIR)/ + @mv -f $*_ref.hh $(G4SCHEMA_HEADER_DIR)/ + @mv -f $*_ddl.cc $(G4SCHEMA_SRC_DIR)/ endif # Make the .d file(s) and include it(them). # g++ -MM is good at this, except it forgets the subdirectory # (hence the use of $G4TMP/). +# define G4SKIP_DEPEND for simplicity +ifndef G4ODBMS_DEPEND ifdef G4ODBMS -$(G4TMPDIR)/%.d: src/%.cc $(schema_hh) + G4SKIP_DEPEND := 1 +endif +endif + +ifdef G4SKIP_DEPEND +$(G4TMPDIR)/%.d: + @echo Skip dependency file creation for file $< ... else $(G4TMPDIR)/%.d: src/%.cc -endif @if [ ! -d $(G4TMP)/$(G4SYSTEM) ] ; then mkdir $(G4TMP)/$(G4SYSTEM) ;fi @if [ ! -d $(G4TMPDIR) ] ; then mkdir $(G4TMPDIR) ;fi @echo Making dependency for file $< ... @($(ECHO) $(G4TMPDIR)/\\c ; \ - g++ -MM $(RWINCGPP) $(CPPFLAGS) $< ) | sed 's!$(G4TMPDIR)/$*.o!& $@!' >$@ -ifdef G4ODBMS -ifdef G4ODBMS_DEPEND --include $(dependencies) -endif -else + g++ -MM $(CPPFLAGS) $< ) | sed 's!$(G4TMPDIR)/$*.o!& $@!' >$@ -include $(dependencies) endif # .PHONY targets are executed regardless of time-stamp of any file of # same name. +ifdef G4ODBMS_DEPEND +.PHONY: all obj lib clean clean_libs d_files install_schema +else .PHONY: all obj lib clean clean_libs +endif obj: $(G4TMPDIR)/obj.last @@ -122,6 +155,11 @@ headers: $(schema_hh) d_files: $(dependencies) $(schema_hh): $(schema_ddl) + +install_schema: + @echo installing schema header files ... + -@(cp -f $(G4TMPDIR)/*.hh $(G4SCHEMA_INCLUDE)/ || \ + echo " schema header file does not exist, so ignore the error message...") endif ifneq ($(G4MAKESHLIB),) @@ -134,6 +172,7 @@ ifndef G4EXLIB clean: @echo Cleaning up ... @rm -f $(G4LIBDIR)/lib$(name).a + @rm -f $(schema_hh) $(schema_ref_hh) @rm -rf $(G4TMPDIR) endif @@ -141,3 +180,4 @@ clean_libs: @if [ -f $(G4LIBDIR)/lib$(name).a ] ; then \ $(ECHO) Removing library lib$(name).a ... ; \ $(RM) -f $(G4LIBDIR)/lib$(name).a ; fi + diff --git a/config/globlib.gmk b/config/globlib.gmk index 2bd8055f84..d043326676 100644 --- a/config/globlib.gmk +++ b/config/globlib.gmk @@ -1,4 +1,4 @@ -# $Id: globlib.gmk,v 1.2 1999/07/06 15:19:44 gunter Exp $ +# $Id: globlib.gmk,v 1.10 1999/11/30 19:41:08 morita Exp $ # -------------------------------------------------------------- # Script for compound libraries. Gabriele Cosmo, 25/6/98. # -------------------------------------------------------------- @@ -18,14 +18,22 @@ ifndef G4ODBMS @for dir in $(SUBDIRS); do (cd $$dir; $(MAKE)); done else @for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) headers); done - @for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) d_files); done - @for dir in $(SUBDIRS); do (cd $$dir; G4ODBMS_DEPEND=1; export G4ODBMS_DEPEND; $(MAKE)); done + @for dir in $(SUBDIRS); do (cd $$dir; G4ODBMS_DEPEND=1; \ + export G4ODBMS_DEPEND; $(MAKE)); done + @echo Copying tmp schema header from G4TMPDIR to $(G4SCHEMA_INCLUDE) + @rm -f $(G4SCHEMA_INCLUDE)/*.hh + @for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) install_schema); done + @echo Copying tmp schema to $(G4SCHEMA_DIR) for FDID $(G4SCHEMA_FDID) + @rm -f $(G4SCHEMA_DIR)/G4SCHEMA + @rm -f $(G4SCHEMA_DIR)/G4SCHEMA.FDDB + @$(HEP_ODBMS_DIR)/etc/getdb $(G4TMPSCHEMA_BOOT) \ + $(G4SCHEMA_DIR)/G4SCHEMA $(G4SCHEMA_FDID) endif ifndef G4ODBMS glob global: objs wipe_libs $(G4LIBDIR)/lib$(name).a else -glob global: all $(G4LIBDIR)/lib$(name).a $(G4SCHEMA_DIR)/G4SCHEMA.FDDB +glob global: headers d_files objs wipe_libs $(G4LIBDIR)/lib$(name).a $(G4SCHEMA_DIR)/G4SCHEMA.FDDB endif $(G4LIBDIR)/lib$(name).a: \ @@ -67,7 +75,7 @@ $(G4LIBDIR)/lib$(name).a: \ ifneq ($(G4MAKESHLIB),) @for lib in $(SUBLIBS); do (cp $(G4TMP)/$(G4SYSTEM)/$$lib/*.o $(G4LIBDIR)/.); done @sh $(G4MAKESHLIB) $(G4LIBDIR) $(name) - $(RM) $(G4LIBDIR)/*.o + @$(RM) $(G4LIBDIR)/*.o endif ifdef G4ODBMS @@ -77,15 +85,13 @@ headers: d_files: @for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) d_files); done -$(G4SCHEMA_DIR)/G4SCHEMA.FDDB: $(G4EXAMPLE_BOOT_DIR)/G4EXAMPLE.FDDB -ifdef G4SCHEMA_DIR +$(G4SCHEMA_DIR)/G4SCHEMA.FDDB: $(G4TMPSCHEMA_DIR)/G4SCHEMA.FDDB @rm -f $(G4SCHEMA_DIR)/G4SCHEMA @rm -f $(G4SCHEMA_DIR)/G4SCHEMA.FDDB @echo Copying schema file to $(G4SCHEMA_DIR) for FDID $(G4SCHEMA_FDID) - @$(HEP_ODBMS_DIR)/etc/getdb $(G4EXAMPLE_BOOT) \ + @$(HEP_ODBMS_DIR)/etc/getdb $(G4TMPSCHEMA_BOOT) \ $(G4SCHEMA_DIR)/G4SCHEMA $(G4SCHEMA_FDID) endif -endif objs: @for dir in $(SUBDIRS); \ diff --git a/config/interactivity.gmk b/config/interactivity.gmk index 39fc6d38a5..9851b2c561 100644 --- a/config/interactivity.gmk +++ b/config/interactivity.gmk @@ -32,7 +32,12 @@ ifdef INC_OPACS ifeq ($(G4_OPACS_WIDGET_SET),Xm) INC_XM = 1 CPPFLAGS += -DHAS_XM - else + endif + ifeq ($(G4_OPACS_WIDGET_SET),lesstif) + INC_XM = 1 + CPPFLAGS += -DHAS_XM + endif + ifeq ($(G4_OPACS_WIDGET_SET),Xaw) INC_XAW = 1 CPPFLAGS += -DHAS_XAW endif @@ -44,7 +49,15 @@ ifeq ($(G4_OPACS_WIDGET_SET),Xm) INC_XM = 1 LOAD_XM = 1 INTYLIBS += -L$(WOROOT)/$(OCONFIG) -lWoXm -else +endif +ifeq ($(G4_OPACS_WIDGET_SET),lesstif) + INC_XM = 1 + LOAD_XM = 1 + INTYLIBS += -L$(WOROOT)/$(OCONFIG) -lWoXm +# lesstif is bugged on popup ; then OPACS/Xo uses Xaw for popup. + LOAD_XAW = 1 +endif +ifeq ($(G4_OPACS_WIDGET_SET),Xaw) INC_XAW = 1 LOAD_XAW = 1 INTYLIBS += -L$(WOROOT)/$(OCONFIG) -lWoXaw diff --git a/config/liblist.c b/config/liblist.c index d6591c115a..19b6cbe800 100644 --- a/config/liblist.c +++ b/config/liblist.c @@ -1,4 +1,4 @@ -/* $Id: liblist.c,v 1.7 1999/07/02 12:27:38 stesting Exp $ */ +/* $Id: liblist.c,v 1.9 1999/11/19 18:01:40 morita Exp $ */ /* Given a "libname.map" file on standard input and a list or directory @@ -53,6 +53,8 @@ char** parsedir(char *directory,int *argc) /*Open the actual directory*/ actualdir=opendir(directory); + if(!actualdir) return targv; + /*Loop over all entries */ for(entry=readdir(actualdir);entry!=NULL;entry=readdir(actualdir)) { @@ -126,10 +128,10 @@ int main (int argc, char** argv) { struct libmap_ { - char *lib; - char *trigger; - int used; - char **uses; + char *lib; /* Library name, e.g., G4run. */ + char *trigger; /* Source directory, e.g., source/run/. */ + int used; /* True if used by these dependency files. */ + char **uses; /* List of library names which this library uses. */ struct libmap_ *next; }; @@ -307,41 +309,71 @@ int main (int argc, char** argv) { { userLibmapPtr=0; } - + /* Look for a "used" library and add it to the "user" uses list... */ - do + bufferPtr=strtok(NULL,"\n"); /* Start *after* ":". */ + if (!bufferPtr) { - for(libmapPtr=libmap;libmapPtr;libmapPtr=libmapPtr->next) - { - strcpy(workbuf,libmapPtr->trigger); - strcat(workbuf,"/include"); - ptr=strstr(buffer,workbuf); - if(ptr) - { - libmapPtr->used=1; - if(userLibmapPtr) - { - for(pp=userLibmapPtr->uses;*pp;pp++) - { - if(strcmp(*pp,libmapPtr->lib)==0)break; - } - if(!*pp)*pp=libmapPtr->lib; - } - } - } - fgets(buffer,BUFSIZE,fp); + fprintf(stderr," WARNING: It seems there is nothing after \':\' in dependency file %s.\n", rargv[i]); + } + else { + do + { + for(libmapPtr=libmap;libmapPtr;libmapPtr=libmapPtr->next) + { + /* Look for trigger string. */ + strcpy(workbuf,libmapPtr->trigger); + strcat(workbuf,"/include"); + ptr=strstr(bufferPtr,workbuf); + if(ptr && (userLibmapPtr != libmapPtr)) + { + libmapPtr->used=1; + if(userLibmapPtr) + { + for(pp=userLibmapPtr->uses;*pp;pp++) + { + if(strcmp(*pp,libmapPtr->lib)==0)break; + } + if(!*pp)*pp=libmapPtr->lib; + } + } + /* Also look for library name in case header files are + placed in temporary directories under a subdirectory + with the same name as the library name. This can + happen with Objectivity which makes header files + from .ddl files and places them in a temporary + directory. */ + strcpy(workbuf,libmapPtr->lib); + strcat(workbuf,"/"); + ptr=strstr(bufferPtr,workbuf); + if(ptr && (userLibmapPtr != libmapPtr)) + { + libmapPtr->used=1; + if(userLibmapPtr) + { + for(pp=userLibmapPtr->uses;*pp;pp++) + { + if(strcmp(*pp,libmapPtr->lib)==0)break; + } + if(!*pp)*pp=libmapPtr->lib; + } + } + } + fgets(buffer,BUFSIZE,fp); + bufferPtr=buffer; #ifdef _WIN32 - while ( ptr=strchr(buffer,'\\') ) *ptr='/'; + while ( ptr=strchr(buffer,'\\') ) *ptr='/'; - while (ntg4tmp1 && (ptr=strstr(buffer,ntg4tmp1)) ) - { - for(nti=0;nti lib$name.exp echo "noentry" >> lib$name.exp diff --git a/environments/History b/environments/History index a114858804..324f0e94c6 100644 --- a/environments/History +++ b/environments/History @@ -1,4 +1,4 @@ -$Id: History,v 1.3 1999/05/20 10:13:46 johna Exp $ +$Id: History,v 1.4 1999/11/10 16:27:22 johna Exp $ ------------------------------------------------------------------- ========================================================= @@ -18,6 +18,10 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +envs-V00-01-00 10th November 1999 John Allison +- Only OPACS and History tagged. + +01-00-02 20th May 1999 John Allison envs-01-00-02 20th May 1999 John Allison - Only OPACS and History tagged. - Archived Momo (cvs remove) which puts it in the Attic. Can be retrieved diff --git a/environments/OPACS/History b/environments/OPACS/History index 58f373aa3a..46de704308 100644 --- a/environments/OPACS/History +++ b/environments/OPACS/History @@ -1,4 +1,4 @@ -$Id: History,v 1.1 1999/01/07 16:04:49 gunter Exp $ +$Id: History,v 1.2 1999/09/15 12:28:18 barrand Exp $ ------------------------------------------------------------------- ========================================================= @@ -18,6 +18,10 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +15 Sep 1999 Guy Barrand +- Modification to compile on Linux-g++ with STL. + + envs-00-01-02 15th July 1998 John Allison - Removed ATLAS files. Retrieve with: cvs update -r pre-beta01-08 ./app/ATLAS.cc ./usr/ATLAS.odb \ diff --git a/environments/OPACS/app/EXPO.cc b/environments/OPACS/app/EXPO.cc index c3371b93e6..e6f0228853 100644 --- a/environments/OPACS/app/EXPO.cc +++ b/environments/OPACS/app/EXPO.cc @@ -1,15 +1,19 @@ // This code implementation is the intellectual property of -// the RD44 GEANT4 collaboration. +// the GEANT4 collaboration. // // By copying, distributing or modifying the Program (or any work // based on the Program) you indicate your acceptance of this statement, // and all its terms. // -// $Id: EXPO.cc,v 1.4 1999/05/18 13:27:23 barrand Exp $ -// GEANT4 tag $Name: geant4-00-01 $ +// $Id: EXPO.cc,v 1.5.2.1.2.1 1999/12/07 20:46:48 gunter Exp $ +// GEANT4 tag $Name: geant4-01-00 $ // #include +// GB : put this include before the GL ones. +// It avoid a clash with STL includes on Linux. +#include "g4rw/tvhdict.h" + /*Geant4*/ #include @@ -17,10 +21,10 @@ #include "EXPO_Templates.hh" // This : /* -template class RWTValOrderedVector; -template class RWTValOrderedVector; -template class RWTValVector; -template class RWTValVector; +template class G4RWTValOrderedVector; +template class G4RWTValOrderedVector; +template class G4RWTValVector; +template class G4RWTValVector; template class G4Allocator; template class G4Allocator; */ @@ -195,8 +199,8 @@ int main ( WoProcessEvents (); WoClearClass (); - delete runManager; delete state; + delete runManager; return EXIT_SUCCESS; } diff --git a/environments/OPACS/app/TEST.cc b/environments/OPACS/app/TEST.cc index a29d7d4b79..0d2a454adb 100644 --- a/environments/OPACS/app/TEST.cc +++ b/environments/OPACS/app/TEST.cc @@ -1,12 +1,12 @@ // This code implementation is the intellectual property of -// the RD44 GEANT4 collaboration. +// the GEANT4 collaboration. // // By copying, distributing or modifying the Program (or any work // based on the Program) you indicate your acceptance of this statement, // and all its terms. // -// $Id: TEST.cc,v 1.2 1999/04/16 10:03:17 barrand Exp $ -// GEANT4 tag $Name: geant4-00-01 $ +// $Id: TEST.cc,v 1.2.6.1 1999/12/07 20:46:49 gunter Exp $ +// GEANT4 tag $Name: geant4-01-00 $ // #include diff --git a/environments/OPACS/include/EXPO_Detector.icc b/environments/OPACS/include/EXPO_Detector.icc index f110e696d7..33bd22d744 100644 --- a/environments/OPACS/include/EXPO_Detector.icc +++ b/environments/OPACS/include/EXPO_Detector.icc @@ -1,12 +1,12 @@ // This code implementation is the intellectual property of -// the RD44 GEANT4 collaboration. +// the GEANT4 collaboration. // // By copying, distributing or modifying the Program (or any work // based on the Program) you indicate your acceptance of this statement, // and all its terms. // -// $Id: EXPO_Detector.icc,v 1.2 1999/04/16 10:03:19 barrand Exp $ -// GEANT4 tag $Name: geant4-00-01 $ +// $Id: EXPO_Detector.icc,v 1.2.6.1 1999/12/07 20:46:49 gunter Exp $ +// GEANT4 tag $Name: geant4-01-00 $ // // See also G4/run/example/MyDetectorConstruction.cc. diff --git a/environments/OPACS/include/EXPO_PhysicsList.hh b/environments/OPACS/include/EXPO_PhysicsList.hh index d5a9976f9c..0ff9a4b174 100644 --- a/environments/OPACS/include/EXPO_PhysicsList.hh +++ b/environments/OPACS/include/EXPO_PhysicsList.hh @@ -1,12 +1,12 @@ // This code implementation is the intellectual property of -// the RD44 GEANT4 collaboration. +// the GEANT4 collaboration. // // By copying, distributing or modifying the Program (or any work // based on the Program) you indicate your acceptance of this statement, // and all its terms. // -// $Id: EXPO_PhysicsList.hh,v 1.3 1999/05/18 10:57:12 barrand Exp $ -// GEANT4 tag $Name: geant4-00-01 $ +// $Id: EXPO_PhysicsList.hh,v 1.3.6.1 1999/12/07 20:46:49 gunter Exp $ +// GEANT4 tag $Name: geant4-01-00 $ // // // ------------------------------------------------------------ diff --git a/environments/OPACS/include/EXPO_PhysicsList.icc b/environments/OPACS/include/EXPO_PhysicsList.icc index 0440a21a02..9ede675e20 100644 --- a/environments/OPACS/include/EXPO_PhysicsList.icc +++ b/environments/OPACS/include/EXPO_PhysicsList.icc @@ -1,12 +1,12 @@ // This code implementation is the intellectual property of -// the RD44 GEANT4 collaboration. +// the GEANT4 collaboration. // // By copying, distributing or modifying the Program (or any work // based on the Program) you indicate your acceptance of this statement, // and all its terms. // -// $Id: EXPO_PhysicsList.icc,v 1.3 1999/05/18 10:57:13 barrand Exp $ -// GEANT4 tag $Name: geant4-00-01 $ +// $Id: EXPO_PhysicsList.icc,v 1.3.6.1 1999/12/07 20:46:50 gunter Exp $ +// GEANT4 tag $Name: geant4-01-00 $ // // // ------------------------------------------------------------ diff --git a/environments/OPACS/include/EXPO_Primary.icc b/environments/OPACS/include/EXPO_Primary.icc index 6cde12563c..51641fb2e2 100644 --- a/environments/OPACS/include/EXPO_Primary.icc +++ b/environments/OPACS/include/EXPO_Primary.icc @@ -1,12 +1,12 @@ // This code implementation is the intellectual property of -// the RD44 GEANT4 collaboration. +// the GEANT4 collaboration. // // By copying, distributing or modifying the Program (or any work // based on the Program) you indicate your acceptance of this statement, // and all its terms. // -// $Id: EXPO_Primary.icc,v 1.2 1999/04/16 10:03:21 barrand Exp $ -// GEANT4 tag $Name: geant4-00-01 $ +// $Id: EXPO_Primary.icc,v 1.2.6.1 1999/12/07 20:46:50 gunter Exp $ +// GEANT4 tag $Name: geant4-01-00 $ // // See also G4/run/example/EXPO_PrimaryGeneratorAction.cc. diff --git a/environments/OPACS/include/EXPO_Templates.hh b/environments/OPACS/include/EXPO_Templates.hh index f27f9f4da2..eb6a8454e8 100644 --- a/environments/OPACS/include/EXPO_Templates.hh +++ b/environments/OPACS/include/EXPO_Templates.hh @@ -39,83 +39,83 @@ #include "G4UItokenNum.hh" #include "G4Trajectory.hh" -template class RWTPtrSlistDictionary; -template class RWTPtrSlistDictionary; +template class RWTPtrSlistDictionary; +template class RWTPtrSlistDictionary; template class RWTPtrSlistDictionary; -template class RWTPtrSlistDictionaryIterator; -template class RWTPtrSlistDictionaryIterator; +template class RWTPtrSlistDictionaryIterator; +template class RWTPtrSlistDictionaryIterator; template class RWTPtrSlistDictionaryIterator; -template class RWTValSlistDictionary; +template class RWTValSlistDictionary; template class RWTValSlistDictionary; template class RWTValSlistDictionary; -template class RWTValVector; +template class G4RWTValVector; -template class RWTPtrHashDictionary; -template class RWTPtrHashDictionary; -template class RWTPtrHashDictionary; -template class RWTPtrHashDictionaryIterator; -template class RWTPtrHashDictionaryIterator; -template class RWTPtrHashDictionaryIterator; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrOrderedVector; -template class RWTPtrSortedVector; -template class RWTPtrSortedVector; -template class RWTValHashDictionary; -template class RWTValHashDictionary; -template class RWTValHashDictionary; -template class RWTValOrderedVector; -template class RWTValOrderedVector; -//template class RWTValOrderedVector; -template class RWTValOrderedVector; -template class RWTValOrderedVector; -template class RWTValOrderedVector; -template class RWTValOrderedVector; -template class RWTValOrderedVector; -template class RWTValOrderedVector; -template class RWTValOrderedVector; -template class RWTValOrderedVector; -template class RWTValVector; -template class RWTValVector; -template class RWTValVector; -//template class RWTValVector; -template class RWTValVector; -template class RWTValVector; -template class RWTValVector; -template class RWTValVector; -template class RWTValVector; -template class RWTValVector; -template class RWTValVector; -template class RWTPtrOrderedVector; +template class G4RWTPtrHashDictionary; +template class G4RWTPtrHashDictionary; +template class G4RWTPtrHashDictionary; +template class G4RWTPtrHashDictionaryIterator; +template class G4RWTPtrHashDictionaryIterator; +template class G4RWTPtrHashDictionaryIterator; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrOrderedVector; +template class G4RWTPtrSortedVector; +template class G4RWTPtrSortedVector; +template class G4RWTValHashDictionary; +template class G4RWTValHashDictionary; +template class G4RWTValHashDictionary; +template class G4RWTValOrderedVector; +template class G4RWTValOrderedVector; +//template class G4RWTValOrderedVector; +template class G4RWTValOrderedVector; +template class G4RWTValOrderedVector; +template class G4RWTValOrderedVector; +template class G4RWTValOrderedVector; +template class G4RWTValOrderedVector; +template class G4RWTValOrderedVector; +template class G4RWTValOrderedVector; +template class G4RWTValOrderedVector; +template class G4RWTValVector; +template class G4RWTValVector; +template class G4RWTValVector; +//template class G4RWTValVector; +template class G4RWTValVector; +template class G4RWTValVector; +template class G4RWTValVector; +template class G4RWTValVector; +template class G4RWTValVector; +template class G4RWTValVector; +template class G4RWTValVector; +template class G4RWTPtrOrderedVector; // // G4 : diff --git a/environments/OPACS/include/G4o.h b/environments/OPACS/include/G4o.h index ed1a90fda3..34fffeb5d3 100644 --- a/environments/OPACS/include/G4o.h +++ b/environments/OPACS/include/G4o.h @@ -1,12 +1,12 @@ // This code implementation is the intellectual property of -// the RD44 GEANT4 collaboration. +// the GEANT4 collaboration. // // By copying, distributing or modifying the Program (or any work // based on the Program) you indicate your acceptance of this statement, // and all its terms. // -// $Id: G4o.h,v 1.2 1999/04/16 10:03:22 barrand Exp $ -// GEANT4 tag $Name: geant4-00-01 $ +// $Id: G4o.h,v 1.2.6.1 1999/12/07 20:46:50 gunter Exp $ +// GEANT4 tag $Name: geant4-01-00 $ // /* +---------------------- Copyright notice -------------------------------+ */ /* | Copyright (C) 1995, Guy Barrand, LAL Orsay, (barrand@lal.in2p3.fr) | */ diff --git a/environments/OPACS/include/G4oCommon.hh b/environments/OPACS/include/G4oCommon.hh index 805fd892c3..06103cc6b2 100644 --- a/environments/OPACS/include/G4oCommon.hh +++ b/environments/OPACS/include/G4oCommon.hh @@ -1,12 +1,12 @@ // This code implementation is the intellectual property of -// the RD44 GEANT4 collaboration. +// the GEANT4 collaboration. // // By copying, distributing or modifying the Program (or any work // based on the Program) you indicate your acceptance of this statement, // and all its terms. // -// $Id: G4oCommon.hh,v 1.2 1999/04/16 10:03:23 barrand Exp $ -// GEANT4 tag $Name: geant4-00-01 $ +// $Id: G4oCommon.hh,v 1.2.6.1 1999/12/07 20:46:50 gunter Exp $ +// GEANT4 tag $Name: geant4-01-00 $ // /* Included by G4o.h. diff --git a/environments/OPACS/include/G4oCommon.icc b/environments/OPACS/include/G4oCommon.icc index 72a90fb8d0..2821351f6b 100644 --- a/environments/OPACS/include/G4oCommon.icc +++ b/environments/OPACS/include/G4oCommon.icc @@ -1,12 +1,12 @@ // This code implementation is the intellectual property of -// the RD44 GEANT4 collaboration. +// the GEANT4 collaboration. // // By copying, distributing or modifying the Program (or any work // based on the Program) you indicate your acceptance of this statement, // and all its terms. // -// $Id: G4oCommon.icc,v 1.2 1999/04/16 10:03:24 barrand Exp $ -// GEANT4 tag $Name: geant4-00-01 $ +// $Id: G4oCommon.icc,v 1.2.6.1 1999/12/07 20:46:50 gunter Exp $ +// GEANT4 tag $Name: geant4-01-00 $ // /* Included by G4o.cc. diff --git a/environments/OPACS/include/G4oDrawer.hh b/environments/OPACS/include/G4oDrawer.hh index 0b5972aa73..a539c796cc 100644 --- a/environments/OPACS/include/G4oDrawer.hh +++ b/environments/OPACS/include/G4oDrawer.hh @@ -1,12 +1,12 @@ // This code implementation is the intellectual property of -// the RD44 GEANT4 collaboration. +// the GEANT4 collaboration. // // By copying, distributing or modifying the Program (or any work // based on the Program) you indicate your acceptance of this statement, // and all its terms. // -// $Id: G4oDrawer.hh,v 1.2 1999/04/16 10:03:25 barrand Exp $ -// GEANT4 tag $Name: geant4-00-01 $ +// $Id: G4oDrawer.hh,v 1.2.6.1 1999/12/07 20:46:51 gunter Exp $ +// GEANT4 tag $Name: geant4-01-00 $ // /* +---------------------- Copyright notice -------------------------------+ */ /* | Copyright (C) 1995, Guy Barrand, LAL Orsay, (barrand@lal.in2p3.fr) | */ diff --git a/environments/OPACS/include/G4oEXPO.h b/environments/OPACS/include/G4oEXPO.h index 2f26a5239e..594e15fb05 100644 --- a/environments/OPACS/include/G4oEXPO.h +++ b/environments/OPACS/include/G4oEXPO.h @@ -1,12 +1,12 @@ // This code implementation is the intellectual property of -// the RD44 GEANT4 collaboration. +// the GEANT4 collaboration. // // By copying, distributing or modifying the Program (or any work // based on the Program) you indicate your acceptance of this statement, // and all its terms. // -// $Id: G4oEXPO.h,v 1.2 1999/04/16 10:03:26 barrand Exp $ -// GEANT4 tag $Name: geant4-00-01 $ +// $Id: G4oEXPO.h,v 1.2.6.1 1999/12/07 20:46:51 gunter Exp $ +// GEANT4 tag $Name: geant4-01-00 $ // /* +---------------------- Copyright notice -------------------------------+ */ /* | Copyright (C) 1995, Guy Barrand, LAL Orsay, (barrand@lal.in2p3.fr) | */ diff --git a/environments/OPACS/include/G4oScene.hh b/environments/OPACS/include/G4oScene.hh index 4ca92e5ad2..b88d91930f 100644 --- a/environments/OPACS/include/G4oScene.hh +++ b/environments/OPACS/include/G4oScene.hh @@ -1,12 +1,12 @@ // This code implementation is the intellectual property of -// the RD44 GEANT4 collaboration. +// the GEANT4 collaboration. // // By copying, distributing or modifying the Program (or any work // based on the Program) you indicate your acceptance of this statement, // and all its terms. // -// $Id: G4oScene.hh,v 1.2 1999/04/16 10:03:27 barrand Exp $ -// GEANT4 tag $Name: geant4-00-01 $ +// $Id: G4oScene.hh,v 1.2.6.1 1999/12/07 20:46:51 gunter Exp $ +// GEANT4 tag $Name: geant4-01-00 $ // /* +---------------------- Copyright notice -------------------------------+ */ /* | Copyright (C) 1995, Guy Barrand, LAL Orsay, (barrand@lal.in2p3.fr) | */ diff --git a/environments/OPACS/include/G4oState.hh b/environments/OPACS/include/G4oState.hh index 9669c01515..372c4c22f8 100644 --- a/environments/OPACS/include/G4oState.hh +++ b/environments/OPACS/include/G4oState.hh @@ -1,12 +1,12 @@ // This code implementation is the intellectual property of -// the RD44 GEANT4 collaboration. +// the GEANT4 collaboration. // // By copying, distributing or modifying the Program (or any work // based on the Program) you indicate your acceptance of this statement, // and all its terms. // -// $Id: G4oState.hh,v 1.2 1999/04/16 10:03:28 barrand Exp $ -// GEANT4 tag $Name: geant4-00-01 $ +// $Id: G4oState.hh,v 1.3.4.1 1999/12/07 20:46:51 gunter Exp $ +// GEANT4 tag $Name: geant4-01-00 $ // #ifndef G4oState_h #define G4oState_h @@ -16,9 +16,10 @@ class G4oState : public G4VStateDependent, public G4UIsession { public: - G4oState (G4String); - G4bool Notify (G4ApplicationState); - void PauseSessionStart (G4String); + G4oState(G4String); + ~G4oState(); + G4bool Notify(G4ApplicationState); + void PauseSessionStart(G4String); private: G4String name; }; diff --git a/environments/OPACS/include/WoG4o.h b/environments/OPACS/include/WoG4o.h index ea130abaff..2918f3f94c 100644 --- a/environments/OPACS/include/WoG4o.h +++ b/environments/OPACS/include/WoG4o.h @@ -1,12 +1,12 @@ // This code implementation is the intellectual property of -// the RD44 GEANT4 collaboration. +// the GEANT4 collaboration. // // By copying, distributing or modifying the Program (or any work // based on the Program) you indicate your acceptance of this statement, // and all its terms. // -// $Id: WoG4o.h,v 1.2 1999/04/16 10:03:29 barrand Exp $ -// GEANT4 tag $Name: geant4-00-01 $ +// $Id: WoG4o.h,v 1.2.6.1 1999/12/07 20:46:51 gunter Exp $ +// GEANT4 tag $Name: geant4-01-00 $ // /* +---------------------- Copyright notice -------------------------------+ */ /* | Copyright (C) 1995, Guy Barrand, LAL Orsay, (barrand@lal.in2p3.fr) | */ diff --git a/environments/OPACS/mgr/Makefile b/environments/OPACS/mgr/Makefile index aa6ed835dd..350f2c1847 100644 --- a/environments/OPACS/mgr/Makefile +++ b/environments/OPACS/mgr/Makefile @@ -24,8 +24,6 @@ This_macros = \ "libGL = -L${GLOROOT}/${OCONFIG} -lGLo" \ "libGLU = -L${GLOROOT}/${OCONFIG} -lGLUo" \ "libGLX = -L${GLOROOT}/${OCONFIG} -lGLXo" \ -"G4_CPPFLAGS = -I${G4INSTALL}/source/global/management/include -I${G4INSTALL}/source/global/HEPRandom/include -I${G4INSTALL}/source/global/HEPGeometry/include -I${G4INSTALL}/source/run/include -I${G4INSTALL}/source/materials/include -I${G4INSTALL}/source/particles/management/include -I${G4INSTALL}/source/particles/bosons/include -I${G4INSTALL}/source/particles/leptons/include -I${G4INSTALL}/source/particles/hadrons/barions/include -I${G4INSTALL}/source/particles/hadrons/ions/include -I${G4INSTALL}/source/particles/hadrons/mesons/include -I${G4INSTALL}/source/processes/management/include -I${G4INSTALL}/source/processes/general/include -I${G4INSTALL}/source/processes/decay/include -I${G4INSTALL}/source/processes/optical/include -I${G4INSTALL}/source/processes/transportation/include -I${G4INSTALL}/source/processes/parameterisation/include -I${G4INSTALL}/source/processes/electromagnetic/standard/include -I${G4INSTALL}/source/processes/electromagnetic/muons/include -I${G4INSTALL}/source/processes/electromagnetic/utils/include -I${G4INSTALL}/source/processes/electromagnetic/xrays/include -I${G4INSTALL}/source/processes/hadronic/management/include -I${G4INSTALL}/source/processes/hadronic/processes/include -I${G4INSTALL}/source/processes/hadronic/util/include -I${G4INSTALL}/source/processes/hadronic/cross_sections/include -I${G4INSTALL}/source/processes/hadronic/models/generator/include -I${G4INSTALL}/source/processes/hadronic/models/high_energy/include -I${G4INSTALL}/source/processes/hadronic/models/low_energy/include -I${G4INSTALL}/source/processes/hadronic/stopping/include -I${G4INSTALL}/source/geometry/management/include -I${G4INSTALL}/source/geometry/solids/CSG/include -I${G4INSTALL}/source/geometry/solids/BREPS/include -I${G4INSTALL}/source/geometry/solids/STEP/include -I${G4INSTALL}/source/geometry/volumes/include -I${G4INSTALL}/source/geometry/magneticfield/include -I${G4INSTALL}/source/track/include -I${G4INSTALL}/source/tracking/include -I${G4INSTALL}/source/digits+hits/detector/include -I${G4INSTALL}/source/digits+hits/hits/include -I${G4INSTALL}/source/digits+hits/digits/include -I${G4INSTALL}/source/readout/include -I${G4INSTALL}/source/event/include -I${G4INSTALL}/source/graphics_reps/include -I${G4INSTALL}/source/persistency/include -I${G4INSTALL}/source/intercoms/include -I${G4INSTALL}/source/visualization/modeling/include" \ -"libg4 = -L${G4LIB}/$${G4SYSTEM} -lG4modeling -lG4run -lG4event -lG4tracking -lG4processes -lG4particles -lG4digits+hits -lG4track -lG4materials -lG4geometry -lG4graphics_reps -lG4intercoms -lG4global" \ "Wo_CPPFLAGS = -I${COROOT}/include -I${XXROOT}/include -I${WOROOT}/include" \ "libCo = -L${COROOT}/${OCONFIG} -lCo" \ "libXx = -L${XXROOT}/${OCONFIG} -lXx" \ @@ -38,11 +36,15 @@ This_macros = \ "libHo = -L${HOROOT}/${OCONFIG} -lHo" \ "libGo = -L${GOROOT}/${OCONFIG} -lGo" \ "libwww = -L${W3OROOT}/${OCONFIG} -lW3o" \ -"libhtmlw = -L${HTMLOROOT}/${OCONFIG} -lHTMLo" +"libhtmlw = -L${HTMLOROOT}/${OCONFIG} -lHTMLo" \ +"G4_CPPFLAGS = -I${G4INSTALL}/source/global/management/include -I${G4INSTALL}/source/global/HEPRandom/include -I${G4INSTALL}/source/global/HEPGeometry/include -I${G4INSTALL}/source/run/include -I${G4INSTALL}/source/materials/include -I${G4INSTALL}/source/particles/management/include -I${G4INSTALL}/source/particles/bosons/include -I${G4INSTALL}/source/particles/leptons/include -I${G4INSTALL}/source/particles/hadrons/barions/include -I${G4INSTALL}/source/particles/hadrons/ions/include -I${G4INSTALL}/source/particles/hadrons/mesons/include -I${G4INSTALL}/source/processes/management/include -I${G4INSTALL}/source/processes/general/include -I${G4INSTALL}/source/processes/decay/include -I${G4INSTALL}/source/processes/optical/include -I${G4INSTALL}/source/processes/transportation/include -I${G4INSTALL}/source/processes/parameterisation/include -I${G4INSTALL}/source/processes/electromagnetic/standard/include -I${G4INSTALL}/source/processes/electromagnetic/muons/include -I${G4INSTALL}/source/processes/electromagnetic/utils/include -I${G4INSTALL}/source/processes/electromagnetic/xrays/include -I${G4INSTALL}/source/processes/hadronic/management/include -I${G4INSTALL}/source/processes/hadronic/processes/include -I${G4INSTALL}/source/processes/hadronic/util/include -I${G4INSTALL}/source/processes/hadronic/cross_sections/include -I${G4INSTALL}/source/processes/hadronic/models/generator/include -I${G4INSTALL}/source/processes/hadronic/models/high_energy/include -I${G4INSTALL}/source/processes/hadronic/models/low_energy/include -I${G4INSTALL}/source/processes/hadronic/stopping/include -I${G4INSTALL}/source/geometry/management/include -I${G4INSTALL}/source/geometry/solids/CSG/include -I${G4INSTALL}/source/geometry/solids/BREPS/include -I${G4INSTALL}/source/geometry/solids/STEP/include -I${G4INSTALL}/source/geometry/volumes/include -I${G4INSTALL}/source/geometry/magneticfield/include -I${G4INSTALL}/source/track/include -I${G4INSTALL}/source/tracking/include -I${G4INSTALL}/source/digits+hits/detector/include -I${G4INSTALL}/source/digits+hits/hits/include -I${G4INSTALL}/source/digits+hits/digits/include -I${G4INSTALL}/source/readout/include -I${G4INSTALL}/source/event/include -I${G4INSTALL}/source/graphics_reps/include -I${G4INSTALL}/source/persistency/include -I${G4INSTALL}/source/intercoms/include -I${G4INSTALL}/source/visualization/modeling/include" \ +"libg4 = -L${G4LIB}/$${G4SYSTEM} -lG4modeling -lG4emstandard -lG4decay -lG4UIbasic -lG4muons -lG4ions -lG4mesons -lG4leptons -lG4barions -lG4run -lG4event -lG4bosons -lG4tracking -lG4transportation -lG4detector -lG4emutils -lG4hits -lG4procman -lG4digits -lG4track -lG4UIcommon -lG4partman -lG4volumes -lG4magneticfield -lG4csg -lG4geometrymng -lG4materials -lG4intercoms -lG4graphics_reps -lG4globman" + +# With Geant4 global libs use : +#"libg4 = -L${G4LIB}/$${G4SYSTEM} -lG4modeling -lG4run -lG4event -lG4tracking -lG4processes -lG4particles -lG4digits+hits -lG4track -lG4materials -lG4geometry -lG4graphics_reps -lG4intercoms -lG4global" include Config.mk - This_needed : @if test "${COROOT}" = "" ; then echo "COROOT not set" ; exit 1 ; else exit 0 ; fi @if test "${GOROOT}" = "" ; then echo "GOROOT not set"; exit 1 ; else exit 0 ; fi diff --git a/environments/OPACS/mgr/setup.csh b/environments/OPACS/mgr/setup.csh index f63da2f1bb..83a8095fc9 100644 --- a/environments/OPACS/mgr/setup.csh +++ b/environments/OPACS/mgr/setup.csh @@ -12,18 +12,6 @@ # -------------------------- source /lal/OPACS/v3/setup.csh # -# Geant4 global path : -# ------------------ -#setenv G4INSTALL /geant4/dev/geant4 -# -# If you have one, execute your Geant4 setup script : -# ------------------------------------------------- -# Mainly it should define G4INSTALL, G4SYSTEM, G4LIB, G4WORKDIR -# needed by the mgr/Makefile, Config.mk make files : -#source $G4INSTALL/mgr/setup.csh -#source $G4INSTALL/mgr/setsf.csh -#source $G4INSTALL/mgr/setiv.csh -# # CLHEP, Rogue Wave path : # ---------------------- if ( `uname -n` == "aleph" ) then @@ -38,9 +26,13 @@ setenv RWLIBS "-L${RWROOT}/lib -lrwtool" endif if ( `uname -n` == "lx1.lal.in2p3.fr" ) then setenv CLHEPROOT /lal/CLHEP/1.4/Linux-gxx -setenv RWROOT /lal/rogue/6.1/Linux-gxx -setenv RWFLAGS "-I${RWROOT}" -setenv RWLIBS "-L${RWROOT}/lib -lrwtool" +# With RogueWave : +#setenv RWROOT /lal/rogue/6.1/Linux-gxx +#setenv RWFLAGS "-I${RWROOT}" +#setenv RWLIBS "-L${RWROOT}/lib -lrwtool" +# With STL : +setenv RWFLAGS "-I$G4INSTALL/source/global/STLInterface" +setenv RWLIBS "" endif if ( `uname -n` == "papou1" ) then setenv G4WORKDIR /geant4/dev diff --git a/environments/OPACS/src/G4o.cc b/environments/OPACS/src/G4o.cc index 2029b4a528..3afb1834cb 100644 --- a/environments/OPACS/src/G4o.cc +++ b/environments/OPACS/src/G4o.cc @@ -1,12 +1,12 @@ // This code implementation is the intellectual property of -// the RD44 GEANT4 collaboration. +// the GEANT4 collaboration. // // By copying, distributing or modifying the Program (or any work // based on the Program) you indicate your acceptance of this statement, // and all its terms. // -// $Id: G4o.cc,v 1.3 1999/05/18 10:56:53 barrand Exp $ -// GEANT4 tag $Name: geant4-00-01 $ +// $Id: G4o.cc,v 1.4.2.1.2.1 1999/12/07 20:46:52 gunter Exp $ +// GEANT4 tag $Name: geant4-01-00 $ // /* #define DEBUG @@ -15,6 +15,10 @@ #include #include +// GB : put this include before the GL ones. +// It avoid a clash with STL includes on Linux. +#include "g4rw/tvhdict.h" + // Geant4 : #include #include diff --git a/environments/OPACS/src/G4oDrawer.cc b/environments/OPACS/src/G4oDrawer.cc index 733cc992a3..7695229ccc 100644 --- a/environments/OPACS/src/G4oDrawer.cc +++ b/environments/OPACS/src/G4oDrawer.cc @@ -1,18 +1,22 @@ // This code implementation is the intellectual property of -// the RD44 GEANT4 collaboration. +// the GEANT4 collaboration. // // By copying, distributing or modifying the Program (or any work // based on the Program) you indicate your acceptance of this statement, // and all its terms. // -// $Id: G4oDrawer.cc,v 1.2 1999/04/16 10:03:36 barrand Exp $ -// GEANT4 tag $Name: geant4-00-01 $ +// $Id: G4oDrawer.cc,v 1.3.2.1.2.1 1999/12/07 20:46:52 gunter Exp $ +// GEANT4 tag $Name: geant4-01-00 $ // /* From geant4/visualization/management/src/G4VisManager.cc. */ #include +// GB : put this include before the GL ones. +// It avoid a clash with STL includes on Linux. +#include "g4rw/tvhdict.h" + #include /*G4*/ diff --git a/environments/OPACS/src/G4oScene.cc b/environments/OPACS/src/G4oScene.cc index e39b3da28c..2372989166 100644 --- a/environments/OPACS/src/G4oScene.cc +++ b/environments/OPACS/src/G4oScene.cc @@ -1,12 +1,12 @@ // This code implementation is the intellectual property of -// the RD44 GEANT4 collaboration. +// the GEANT4 collaboration. // // By copying, distributing or modifying the Program (or any work // based on the Program) you indicate your acceptance of this statement, // and all its terms. // -// $Id: G4oScene.cc,v 1.2 1999/04/16 10:03:38 barrand Exp $ -// GEANT4 tag $Name: geant4-00-01 $ +// $Id: G4oScene.cc,v 1.3.2.1.2.1 1999/12/07 20:46:52 gunter Exp $ +// GEANT4 tag $Name: geant4-01-00 $ // /* +---------------------- Copyright notice -------------------------------+ */ /* | Copyright (C) 1995, Guy Barrand, LAL Orsay, (barrand@lal.in2p3.fr) | */ @@ -25,6 +25,10 @@ #include #endif +// GB : put this include before the GL ones. +// It avoid a clash with STL includes on Linux. +#include "g4rw/tvhdict.h" + /*Co*/ #include #include diff --git a/environments/OPACS/src/G4oState.cc b/environments/OPACS/src/G4oState.cc index e6b2805e2b..70ceead330 100644 --- a/environments/OPACS/src/G4oState.cc +++ b/environments/OPACS/src/G4oState.cc @@ -1,16 +1,18 @@ // This code implementation is the intellectual property of -// the RD44 GEANT4 collaboration. +// the GEANT4 collaboration. // // By copying, distributing or modifying the Program (or any work // based on the Program) you indicate your acceptance of this statement, // and all its terms. // -// $Id: G4oState.cc,v 1.2 1999/04/16 10:03:39 barrand Exp $ -// GEANT4 tag $Name: geant4-00-01 $ +// $Id: G4oState.cc,v 1.3.2.1.2.1 1999/12/07 20:46:52 gunter Exp $ +// GEANT4 tag $Name: geant4-01-00 $ // //#define DEBUG -//#include "G4ios.hh" +// GB : put this include before the GL ones. +// It avoid a clash with STL includes on Linux. +#include "g4rw/tvhdict.h" //G4 #include @@ -35,27 +37,42 @@ G4oState::G4oState( G4UImanager::GetUIpointer()->SetSession(this); //So that Pause works.. } /***************************************************************************/ +G4oState::~G4oState( +) +/***************************************************************************/ +/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/ +{ +} +/***************************************************************************/ G4bool G4oState::Notify ( G4ApplicationState requestedState ) /***************************************************************************/ /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/ { - G4StateManager* statM = G4StateManager::GetStateManager(); + G4StateManager* statM = G4StateManager::GetStateManager(); G4ApplicationState previousState = statM->GetPreviousState(); - if(previousState==Idle && requestedState==GeomClosed) { //beginOfRun - G4String string = "RunBegin.osh"; - OShellExecuteFile (G4oGetShell(),(char*)(name + string).data()); - } else if(previousState==GeomClosed && requestedState==Idle) { //endOfRun - G4String string = "RunEnd.osh"; - OShellExecuteFile (G4oGetShell(),(char*)(name + string).data()); - } else if(previousState==GeomClosed && requestedState==EventProc) { //beginOfEvent - G4String string = "EventBegin.osh"; - OShellExecuteFile (G4oGetShell(),(char*)(name + string).data()); - } else if(previousState==EventProc && requestedState==GeomClosed) { // EndOfEvent - G4String string = "EventEnd.osh"; - OShellExecuteFile (G4oGetShell(),(char*)(name + string).data()); + if(previousState==Idle && requestedState==GeomClosed) { + //beginOfRun + G4String string = name; + string += "RunBegin.osh"; + OShellExecuteFile (G4oGetShell(),(char*)string.data()); + } else if(previousState==GeomClosed && requestedState==Idle) { + //endOfRun + G4String string = name; + string += "RunEnd.osh"; + OShellExecuteFile (G4oGetShell(),(char*)string.data()); + } else if(previousState==GeomClosed && requestedState==EventProc) { + //beginOfEvent + G4String string = name; + string += "EventBegin.osh"; + OShellExecuteFile (G4oGetShell(),(char*)string.data()); + } else if(previousState==EventProc && requestedState==GeomClosed) { + // EndOfEvent + G4String string = name; + string += "EventEnd.osh"; + OShellExecuteFile (G4oGetShell(),(char*)string.data()); } return true; diff --git a/examples/History b/examples/History index afd5119eb7..f8db368b0a 100644 --- a/examples/History +++ b/examples/History @@ -1,4 +1,4 @@ -$Id: History,v 1.16 1999/07/06 18:15:39 johna Exp $ +$Id: History,v 1.37 1999/12/07 11:33:51 stesting Exp $ ------------------------------------------------------------------- ========================================================= @@ -17,6 +17,78 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +7th December 1999 John Allison (examples-V00-01-19) +- Updated novice .out files to geant4-01-00. + +6th December 1999 John Allison (examples-V00-01-18) +- Temporarily backed muon out of exampleN02. +- Included PersistentEx01-V00-01-05, PersistentEx02-V00-01-03. + +3rd December 1999 Gabriele Cosmo (examples-V00-01-17) +- Fixed definition of vacuum in exampleN02 and updated reference + output as for Linux-g++ (J.Apostolakis) +- Included PersistentEx01-V00-01-04, PersistentEx02-V00-01-02. + +1st December 1999 John Allison (examples-V00-01-16) +- Added 1 Tev muon to exampleN02 (J.Apostolakis). +- Included PersistentEx01-V00-01-03, PersistentEx02-V00-01-01. + +29th November 1999 John Allison (examples-V00-01-15) +- Delete VisManager before RunManager in exampleN05.cc + +17th November 1999 John Allison (examples-V00-01-14) +- Updated exampleN03.out and exampleN06.out for geant4-00-01-ref-09 and + Sun debug. + +10th November 1999 John Allison (examples-V00-01-13) +- Archived (cvs remove) E01, E02 and E03. +- Added extended/electromagnetic and extended/persistency. + +10th November 1999 Satoshi Tanaka (examples-V00-01-12) +- novice/N03 is updated +- Vis macros for N03 are updated for the latest updation of vis commands + (Introduction of /vis/viewer/update etc) + +09th November 1999 Satoshi Tanaka (examples-V00-01-11) +- novice/N03 is updated +- prerunN03.mac : /vis/viewer/update is appended +- src/ExN03RunAction.cc: /vis/scene/notifyHandlers is in BeginOfRunAction() + /vis/viewer/update is in EndOfRunAction() + +29th September 1999 John Allison (examples-V00-01-09) +- Updated .out files for geant4-00-01-ref-05, tags 11. + +29th September 1999 John Allison (examples-V00-01-08) +- Updated exampleN04 .out files for geant4-00-01-ref-05. + +26th October 1999 John Allison (examples-V00-01-07) +- Tagged Y.Morita's changes to extended/E02 - see extended/E02/History. + +20th October 1999 John Allison (examples-V00-01-06) +- Define G4OODDLX_BOOT in E02/GNUmakefile. +- Updated .out files for geant4-00-01-ref-04. + +29th September 1999 John Allison (examples-V00-01-05) +- Updated .out files for geant4-00-01-ref-03. + +3rd October 1999 Hisaya Kurashige (examples-V00-01-04) +- Updated all PhysicsList for renaming 'Barion' to 'Baryon' + +29th September 1999 John Allison (examples-V00-01-03) +- Updated .out files for geant4-00-01-ref-02. + +14th September 1999 Satoshi Tanaka (examples-V00-01-02) +- Included new macro files and other changes for visualization. + +5th August 1999 John Allison (examples-V00-01-01) +- Updated exampleN02.out for geant4-00-01-ref-01. + +5th August 1999 John Allison (examples-V00-01-00) +- Updated exampleN04.EMtest.out and exampleN04.out for geant4-00-01. + +4th August 1999 John Allison + - Eliminated references to G4Ray in ExN02VisManager.cc and N03. + 6th July 1999 John Allison (examples-01-00-13) - Relaxed non-optimised compiling for ExN04PhysicsList.cc for Linux. diff --git a/examples/extended/E01/GNUmakefile b/examples/extended/E01/GNUmakefile deleted file mode 100644 index 4edbffeb84..0000000000 --- a/examples/extended/E01/GNUmakefile +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: GNUmakefile,v 1.1 1999/01/07 16:05:17 gunter Exp $ -# -------------------------------------------------------------- -# GNUmakefile for tests module. Gabriele Cosmo, 27/06/98. -# -------------------------------------------------------------- - -name := exampleE01 -G4TARGET := $(name) -G4EXLIB := true - -ifndef G4INSTALL - G4INSTALL = ../../.. -endif - -.PHONY: all -all: lib bin - -include $(G4INSTALL)/config/architecture.gmk - -# Override some variables for binmake.gmk. -# -# INCFLAGS := -# LDLIBS := - -CPPFLAGS += \ - -I$(OBJY_DIR)/include \ - -I$(HEP_ODBMS_DIR)/include \ - -I$(HISTOODIR)/code -LDFLAGS += \ - -L$(OBJY_DIR)/lib \ - -L$(HEP_ODBMS_DIR)/lib \ - -L$(HISTOODIR)/lib -LOADLIBS += -lHistoxx -lHepODBMS -loo -lm - -include $(G4INSTALL)/config/binmake.gmk - diff --git a/examples/extended/E01/History b/examples/extended/E01/History deleted file mode 100644 index 7289e55d01..0000000000 --- a/examples/extended/E01/History +++ /dev/null @@ -1,46 +0,0 @@ -$Id: History,v 1.2 1999/04/17 04:06:40 kurasige Exp $ -------------------------------------------------------------------- - - ========================================================= - Geant4 - an Object-Oriented Toolkit for Simulation in HEP - ========================================================= - - Novice Example 07 History file - ------------------------------ -This file should be used by the test developer to briefly -summarize all major modifications introduced in the code and keep -track of all tags. - - ---------------------------------------------------------- - * Reverse chronological order (last date on top), please * - ---------------------------------------------------------- -17 Apr., 1999 H.Kurashige -- Modify SetCuts() and ConstructParticle() in ExE0101PhysicsList -- Modify BeginOfRunAction() and EndOfRunAction() in ExE0101RunAction -- Modify UserSteppingAction() in ExE0101SteppingAction - -14th October 1998 John Allison -- Moved from N07. - -25th August 1998 Evgueni.Tcherniaev@cern.ch -- CPPFLAGS += ... -I$(HISTOODIR)/code - LDFLAGS += ... -L$(HISTOODIR)/lib - -- Changed p.Print(); to p.print(); - -21st August 1998 John Allison -- Changed file names from N07* to ExN07*. - -August 7th,1998 John Allison -- Moved from test03 to exampleN07. - -July 10, 1998, Evgueni.Tcherniaev@cern.ch -- in test03.cc added: - runManager->initialize(); - -- GNUmakefile now points to $(HISTOODIR)/../dev/code - should be changed to $(HISTOODIR) for official release - -June 27, 98 G. Cosmo -- Created. - diff --git a/examples/extended/E01/README b/examples/extended/E01/README deleted file mode 100644 index 6b7380e8d4..0000000000 --- a/examples/extended/E01/README +++ /dev/null @@ -1,47 +0,0 @@ -$Id: README,v 1.1 1999/01/07 16:05:17 gunter Exp $ -------------------------------------------------------------------- - - ========================================================= - Geant4 - an Object-Oriented Toolkit for Simulation in HEP - ========================================================= - - ExampleN07 - --------- - -This directory contains a GEANT4 example on how to create, fill, -print and save histograms in a OODBMS. - -The main program "exampleN07.cc" is a standard G4 main (no initialization -of OODBMS or histos). - -The run actions are overloaded: - -- in BeginOfRunAction the federated data base and the data bases sessions - are initialized and a transaction is opened; - 1d and 2d histograms are constructed; - The name of the base name is "ExN07DB". - -- in EndOfRunAction contents of the histograms are printed and - the transaction is closed; - -The stepping action is overloaded: - -- in SteppingAction two histograms are accessed and filled. - -The followings are the instruction to execute it for the case of HP-AFS. - -0) Setting up the environment - - http://wwwinfo.cern.ch/asdoc/lhcpp/SetUpUserEnvironment.html - -1) Compilation/linking - - % gmake - -2) Execution - - % ../../../bin/HP-AFS/exampleN07 > exampleN07.newout - % diff exampleN07.out exampleN07.newout - - Evgueni.Tcherniaev@cern.ch, 25.08.98 - diff --git a/examples/extended/E01/exampleE01.cc b/examples/extended/E01/exampleE01.cc deleted file mode 100644 index dd1d2adb66..0000000000 --- a/examples/extended/E01/exampleE01.cc +++ /dev/null @@ -1,31 +0,0 @@ -// $Id: exampleE01.cc,v 1.1 1999/01/07 16:05:17 gunter Exp $ - -#include "ExE01DetectorConstruction.hh" -#include "ExE01RunAction.hh" -#include "ExE01PrimaryGeneratorAction.hh" -#include "ExE01PhysicsList.hh" -#include "ExE01SteppingAction.hh" - -#include "G4RunManager.hh" - -int main(int ,char** ) { - // Run manager - G4RunManager * runManager = new G4RunManager; - - // UserInitialization classes - runManager->SetUserInitialization(new ExE01DetectorConstruction); - runManager->SetUserInitialization(new ExE01PhysicsList); - - // UserAction classes. - runManager->SetUserAction(new ExE01RunAction); - runManager->SetUserAction(new ExE01PrimaryGeneratorAction); - runManager->SetUserAction(new ExE01SteppingAction); - - // Event loop - G4int n_event = 1000; - runManager->Initialize(); - runManager->BeamOn(n_event); - - delete runManager; - return 0; -} diff --git a/examples/extended/E01/exampleE01.out b/examples/extended/E01/exampleE01.out deleted file mode 100644 index 7db6ad44c5..0000000000 --- a/examples/extended/E01/exampleE01.out +++ /dev/null @@ -1,175 +0,0 @@ -ExE01PhysicsList::setCuts:CutLength : 1 (mm) -TYPE : Histo1D -TITLE : HepJamesRandom1 -BIN NUMBER : 100 -BIN WIDTH : 0.01 - - 0.00e+00 3.88e+00 Y -X POSITION BIN VALUE|---------------------------------------------------> - 0.000e+00 0 6.000e-02| - 1.000e-02 1 4.000e-02| - 2.000e-02 2 1.800e-01|XX - 3.000e-02 3 9.000e-02|X - 4.000e-02 4 1.500e-01|X - 5.000e-02 5 2.600e-01|XXX - 6.000e-02 6 2.500e-01|XXX - 7.000e-02 7 3.600e-01|XXXX - 8.000e-02 8 3.000e-01|XXX - 9.000e-02 9 4.900e-01|XXXXXX - 1.000e-01 10 6.000e-01|XXXXXXX - 1.100e-01 11 5.600e-01|XXXXXXX - 1.200e-01 12 6.400e-01|XXXXXXXX - 1.300e-01 13 1.110e+00|XXXXXXXXXXXXXX - 1.400e-01 14 1.140e+00|XXXXXXXXXXXXXX - 1.500e-01 15 1.500e+00|XXXXXXXXXXXXXXXXXXX - 1.600e-01 16 1.520e+00|XXXXXXXXXXXXXXXXXXX - 1.700e-01 17 1.750e+00|XXXXXXXXXXXXXXXXXXXXXXX - 1.800e-01 18 1.700e+00|XXXXXXXXXXXXXXXXXXXXXX - 1.900e-01 19 1.860e+00|XXXXXXXXXXXXXXXXXXXXXXXX - 2.000e-01 20 2.360e+00|XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - 2.100e-01 21 2.530e+00|XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - 2.200e-01 22 2.580e+00|XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - 2.300e-01 23 2.670e+00|XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - 2.400e-01 24 2.900e+00|XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - 2.500e-01 25 3.100e+00|XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - 2.600e-01 26 3.250e+00|XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - 2.700e-01 27 3.230e+00|XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - 2.800e-01 28 3.530e+00|XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - 2.900e-01 29 3.540e+00|XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - 3.000e-01 30 3.470e+00|XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - 3.100e-01 31 3.880e+00|XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - 3.200e-01 32 3.340e+00|XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - 3.300e-01 33 3.430e+00|XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - 3.400e-01 34 3.070e+00|XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - 3.500e-01 35 3.490e+00|XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - 3.600e-01 36 2.950e+00|XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - 3.700e-01 37 2.560e+00|XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - 3.800e-01 38 2.740e+00|XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - 3.900e-01 39 2.250e+00|XXXXXXXXXXXXXXXXXXXXXXXXXXXXX - 4.000e-01 40 2.110e+00|XXXXXXXXXXXXXXXXXXXXXXXXXXX - 4.100e-01 41 1.900e+00|XXXXXXXXXXXXXXXXXXXXXXXX - 4.200e-01 42 1.740e+00|XXXXXXXXXXXXXXXXXXXXXX - 4.300e-01 43 1.420e+00|XXXXXXXXXXXXXXXXXX - 4.400e-01 44 1.160e+00|XXXXXXXXXXXXXXX - 4.500e-01 45 1.040e+00|XXXXXXXXXXXXX - 4.600e-01 46 9.200e-01|XXXXXXXXXXXX - 4.700e-01 47 7.900e-01|XXXXXXXXXX - 4.800e-01 48 7.500e-01|XXXXXXXXX - 4.900e-01 49 6.200e-01|XXXXXXXX - 5.000e-01 50 5.400e-01|XXXXXXX - 5.100e-01 51 3.800e-01|XXXX - 5.200e-01 52 2.900e-01|XXX - 5.300e-01 53 2.000e-01|XX - 5.400e-01 54 2.000e-01|XX - 5.500e-01 55 1.200e-01|X - 5.600e-01 56 6.000e-02| - 5.700e-01 57 5.000e-02| - 5.800e-01 58 4.000e-02| - 5.900e-01 59 8.000e-02|X - 6.000e-01 60 2.000e-02| - 6.100e-01 61 0.000e+00| - 6.200e-01 62 1.000e-02| - 6.300e-01 63 1.000e-02| - 6.400e-01 64 0.000e+00| - 6.500e-01 65 0.000e+00| - 6.600e-01 66 0.000e+00| - 6.700e-01 67 0.000e+00| - 6.800e-01 68 0.000e+00| - 6.900e-01 69 0.000e+00| - 7.000e-01 70 0.000e+00| - 7.100e-01 71 0.000e+00| - 7.200e-01 72 0.000e+00| - 7.300e-01 73 0.000e+00| - 7.400e-01 74 0.000e+00| - 7.500e-01 75 0.000e+00| - 7.600e-01 76 0.000e+00| - 7.700e-01 77 0.000e+00| - 7.800e-01 78 0.000e+00| - 7.900e-01 79 0.000e+00| - 8.000e-01 80 0.000e+00| - 8.100e-01 81 0.000e+00| - 8.200e-01 82 0.000e+00| - 8.300e-01 83 0.000e+00| - 8.400e-01 84 0.000e+00| - 8.500e-01 85 0.000e+00| - 8.600e-01 86 0.000e+00| - 8.700e-01 87 0.000e+00| - 8.800e-01 88 0.000e+00| - 8.900e-01 89 0.000e+00| - 9.000e-01 90 0.000e+00| - 9.100e-01 91 0.000e+00| - 9.200e-01 92 0.000e+00| - 9.300e-01 93 0.000e+00| - 9.400e-01 94 0.000e+00| - 9.500e-01 95 0.000e+00| - 9.600e-01 96 0.000e+00| - 9.700e-01 97 0.000e+00| - 9.800e-01 98 0.000e+00| - 9.900e-01 99 0.000e+00| - X | - V - ENTRIES : 9000 TOTAL C. : 8.988e+01 NEQUIVAL : 8.988e+03 - MEAN F.T.: 3.003e-01 MEAN B.C.: 3.003e-01 UNDERFLOW: 1.200e-01 - RMS F.T. : 1.003e-01 RMS B.C. : 1.003e-01 OVERFLOW : 0.000e+00 -TYPE : Histo2D -TITLE : HepJamesVsDRand48 -X: BINS : 40 WIDTH : 2.500e-02 MIN : 0.000e+00 MAX : 1.000e+00 -Y: BINS : 40 WIDTH : 2.500e-02 MIN : 0.000e+00 MAX : 1.000e+00 - - - 0 1 2 3 - 0123456789012345678901234567890123456789 - ****************************************** - * * - 0 * ........................................ * - 1 * ........................................ * - 2 * ........................................ * - 3 * ........................................ * - 4 * ........................................ * - 5 * ........................................ * - 6 * ........................................ * - 7 * ........................................ * - 8 * ........................................ * - 9 * ........................................ * - 10 * ........................................ * - 11 * ........................................ * - 12 * ........................................ * - 13 * ........................................ * - 14 * ........................................ * - 15 * ........................................ * - 16 * ........................................ * - 17 * ........................................ * - 18 * ............++.......................... * - 19 * ..........++++.++....................... * - 20 * .......+22++22++++...................... * - 21 * ...++.2+2+233323+2...................... * - 22 * .....+224334444222..+................... * - 23 * ..+.+223447786642322.................... * - 24 * .....+3466997984633..................... * - 25 * ..++22457A9ACAA85332+................... * - 26 * ..+++45779DBFA778523+................... * - 27 * ....+37688DCBCA96422+................... * - 28 * ...+2467AAADE9DA6443++.................. * - 29 * ...+2454999ACB985332+................... * - 30 * ...++2445AAB9B9863+2+................... * - 31 * ...++2245568878553+++................... * - 32 * .....2235556765332+2.................... * - 33 * .....++23345343422+..................... * - 34 * .....++.+23322232++..................... * - 35 * .......+.2+2+2+++....................... * - 36 * .........++++.+..+...................... * - 37 * ...........++++......................... * - 38 * ........................................ * - 39 * ........................................ * - * * - ****************************************** - -ENTRIES : 9000 Z MIN : 0 -TOTAL C. : 89.8 Z STEP : 0.068 -NEQUIVAL : 8.98e+03 Z SCALE : .+23456789ABCDE - - 0 | 0.05 | 0 - -----------|------------|----------- - 0.12 | 89.7 | 0 - -----------|------------|----------- - 0 | 0 | 0 diff --git a/examples/extended/E01/include/ExE01DetectorConstruction.hh b/examples/extended/E01/include/ExE01DetectorConstruction.hh deleted file mode 100644 index 99609324f4..0000000000 --- a/examples/extended/E01/include/ExE01DetectorConstruction.hh +++ /dev/null @@ -1,34 +0,0 @@ - -#ifndef ExE01DetectorConstruction_h -#define ExE01DetectorConstruction_h 1 - -#include "G4VUserDetectorConstruction.hh" -#include "globals.hh" - -class ExE01DetectorConstruction : public G4VUserDetectorConstruction -{ - public: - ExE01DetectorConstruction(); - ~ExE01DetectorConstruction(); - - public: - G4VPhysicalVolume* Construct(); - - private: - G4double expHall_x; - G4double expHall_y; - G4double expHall_z; - - G4double calBox_x; - G4double calBox_y; - G4double calBox_z; - G4double rotAngle; - G4double calPos; - - G4double trackerRadius; - G4double trackerHight; - G4double trackerPos; -}; - -#endif - diff --git a/examples/extended/E01/include/ExE01PhysicsList.hh b/examples/extended/E01/include/ExE01PhysicsList.hh deleted file mode 100644 index 89727a39d8..0000000000 --- a/examples/extended/E01/include/ExE01PhysicsList.hh +++ /dev/null @@ -1,37 +0,0 @@ -// $Id: ExE01PhysicsList.hh,v 1.2 1999/04/17 04:06:41 kurasige Exp $ -// ------------------------------------------------------------ -#ifndef ExE01PhysicsList_h -#define ExE01PhysicsList_h 1 - -#include "G4VUserPhysicsList.hh" -#include "globals.hh" - -class ExE01PhysicsList: public G4VUserPhysicsList -{ - public: - ExE01PhysicsList(); - virtual ~ExE01PhysicsList(); - - protected: - // Construct particle and physics - virtual void ConstructParticle(); - virtual void ConstructProcess(); - - // - virtual void SetCuts(); - - protected: - // these methods Construct particles - virtual void ConstructBosons(); - virtual void ConstructLeptons(); - - protected: - // these methods Construct physics processes and register them - virtual void ConstructEM(); - -}; - -#endif - - - diff --git a/examples/extended/E01/include/ExE01PrimaryGeneratorAction.hh b/examples/extended/E01/include/ExE01PrimaryGeneratorAction.hh deleted file mode 100644 index 86f5ec2fcb..0000000000 --- a/examples/extended/E01/include/ExE01PrimaryGeneratorAction.hh +++ /dev/null @@ -1,25 +0,0 @@ - -#ifndef ExE01PrimaryGeneratorAction_h -#define ExE01PrimaryGeneratorAction_h 1 - -#include "G4VUserPrimaryGeneratorAction.hh" - -class G4ParticleGun; -class G4Event; - -class ExE01PrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction -{ - public: - ExE01PrimaryGeneratorAction(); - ~ExE01PrimaryGeneratorAction(); - - public: - void GeneratePrimaries(G4Event* anEvent); - - private: - G4ParticleGun* particleGun; -}; - -#endif - - diff --git a/examples/extended/E01/include/ExE01RunAction.hh b/examples/extended/E01/include/ExE01RunAction.hh deleted file mode 100644 index 92dcba7ce6..0000000000 --- a/examples/extended/E01/include/ExE01RunAction.hh +++ /dev/null @@ -1,33 +0,0 @@ -// $Id: ExE01RunAction.hh,v 1.3 1999/04/22 21:49:17 asaim Exp $ - -#ifndef ExE01RunAction_h -#define ExE01RunAction_h 1 - -#include "G4UserRunAction.hh" -#include "globals.hh" - -#include "HepODBMS/clustering/HepDbApplication.h" -#include "histograms.h" -class G4Run; - -class ExE01RunAction : public G4UserRunAction -{ - public: - ExE01RunAction() { } - virtual ~ExE01RunAction() {} - - virtual void BeginOfRunAction(const G4Run* aRun); - virtual void EndOfRunAction(const G4Run* aRun); - - static HepRef(Histo1D) get_1d() { return myHisto1D; } - static HepRef(Histo2D) Get2d() { return myHisto2D; } - - private: - static HepRef(Histo1D) myHisto1D; - static HepRef(Histo2D) myHisto2D; - - HepDbApplication dbApp; -}; - -#endif - diff --git a/examples/extended/E01/include/ExE01SteppingAction.hh b/examples/extended/E01/include/ExE01SteppingAction.hh deleted file mode 100644 index cc1f903d5d..0000000000 --- a/examples/extended/E01/include/ExE01SteppingAction.hh +++ /dev/null @@ -1,24 +0,0 @@ -// $Id: ExE01SteppingAction.hh,v 1.2 1999/04/17 04:06:43 kurasige Exp $ - -#ifndef ExE01SteppingAction_h -#define ExE01SteppingAction_h 1 - -#include "G4UserSteppingAction.hh" -#include "globals.hh" -#include "Randomize.hh" - -#include "histograms.h" - -class ExE01SteppingAction : public G4UserSteppingAction { - private: - HepJamesRandom theJamesEngine; - DRand48Engine theDRand48Engine; - - public: - ExE01SteppingAction(){}; - virtual ~ExE01SteppingAction(){}; - - virtual void UserSteppingAction(const G4Step*); -}; - -#endif diff --git a/examples/extended/E01/src/ExE01DetectorConstruction.cc b/examples/extended/E01/src/ExE01DetectorConstruction.cc deleted file mode 100644 index 93851c0b28..0000000000 --- a/examples/extended/E01/src/ExE01DetectorConstruction.cc +++ /dev/null @@ -1,102 +0,0 @@ - -#include "ExE01DetectorConstruction.hh" - -#include "G4Material.hh" -#include "G4MaterialTable.hh" -#include "G4Element.hh" -#include "G4ElementTable.hh" -#include "G4Box.hh" -#include "G4Tubs.hh" -#include "G4LogicalVolume.hh" -#include "G4RotationMatrix.hh" -#include "G4ThreeVector.hh" -#include "G4Transform3D.hh" -#include "G4PVPlacement.hh" - -ExE01DetectorConstruction::ExE01DetectorConstruction() -{ - expHall_x = 600.*cm; - expHall_y = 600.*cm; - expHall_z = 600.*cm; - - calBox_x = 50.*cm; - calBox_y = 50.*cm; - calBox_z = 50.*cm; - rotAngle = 30.*deg; - calPos = 200.*cm; - - trackerRadius = 50.*cm; - trackerHight = 100.*cm; - trackerPos = -200.*cm; -} - -ExE01DetectorConstruction::~ExE01DetectorConstruction() -{;} - -G4VPhysicalVolume* ExE01DetectorConstruction::Construct() -{ - - //------------------------------------------------------ materials - - G4double a, iz, z, density; - G4String name, symbol; - G4int nel; - - a = 14.01*g/mole; - G4Element* elN = new G4Element(name="Nitrogen", symbol="N", iz=7., a); - a = 16.00*g/mole; - G4Element* elO = new G4Element(name="Oxygen", symbol="O", iz=8., a); - - density = 1.29e-03*g/cm3; - G4Material* Air = new G4Material(name="Air", density, nel=2); - Air->AddElement(elN, .7); - Air->AddElement(elO, .3); - - a = 207.19*g/mole; - density = 11.35*g/cm3; - G4Material* Lead = new G4Material(name="Lead", z=82., a, density); - - a = 39.95*g/mole; - density = 1.782e-03*g/cm3; - G4Material* Ar = new G4Material(name="ArgonGas", z=18., a, density); - - //------------------------------------------------------ volumes - - //------------------------------ experimental hall - G4Box * experimantalHall_box - = new G4Box("expHall_b",expHall_x,expHall_y,expHall_z); - G4LogicalVolume * experimantalHall_log - = new G4LogicalVolume(experimantalHall_box,Air,"expHall_L",0,0,0); - G4VPhysicalVolume * experimantalHall_phys - = new G4PVPlacement(0,G4ThreeVector(),"expHall_P", - experimantalHall_log,0,false,0); - - //------------------------------ calorimeter boxes - G4Box * calorimeter_box - = new G4Box("calorimeter_b",calBox_x,calBox_y,calBox_z); - G4LogicalVolume * calorimeter_log - = new G4LogicalVolume(calorimeter_box,Lead,"calo_L",0,0,0); - for(G4int i=0;i<3;i++) - { - G4RotationMatrix rm; - rm.rotateZ(i*rotAngle); - new G4PVPlacement(G4Transform3D(rm,G4ThreeVector(0.*cm,i*calPos,0.*cm)), - "calo_phys",calorimeter_log,experimantalHall_phys, - false,i); - } - - //------------------------------ tracker tube - G4Tubs * tracker_tube - = new G4Tubs("tracker_tube",0.*cm,trackerRadius,trackerHight, - 0.*deg,360.*deg); - G4LogicalVolume * tracker_log - = new G4LogicalVolume(tracker_tube,Ar,"tracker_L",0,0,0); - new G4PVPlacement(0,G4ThreeVector(0.*cm,trackerPos,0.*cm), - "tracker_phys",tracker_log,experimantalHall_phys, - false,0); - - //------------------------------------------------------------------ - - return experimantalHall_phys; -} - diff --git a/examples/extended/E01/src/ExE01PhysicsList.cc b/examples/extended/E01/src/ExE01PhysicsList.cc deleted file mode 100644 index 69a9dacca0..0000000000 --- a/examples/extended/E01/src/ExE01PhysicsList.cc +++ /dev/null @@ -1,130 +0,0 @@ -// $Id: ExE01PhysicsList.cc,v 1.2 1999/04/17 04:06:46 kurasige Exp $ - -#include "globals.hh" -#include "ExE01PhysicsList.hh" -#include "G4ParticleDefinition.hh" -#include "G4ParticleWithCuts.hh" -#include "G4ProcessManager.hh" -#include "G4ProcessVector.hh" -#include "G4ParticleTypes.hh" -#include "G4ParticleTable.hh" -#include "G4Material.hh" -#include "G4MaterialTable.hh" -#include "G4ios.hh" -#include - - -ExE01PhysicsList::ExE01PhysicsList(): G4VUserPhysicsList() -{ - SetVerboseLevel(1); -} - -ExE01PhysicsList::~ExE01PhysicsList() -{ -} - -void ExE01PhysicsList::ConstructParticle() -{ - // In this method, static member functions should be called - // for all particles which you want to use. - // This ensures that objects of these particle types will be - // created in the program. - - ConstructBosons(); - ConstructLeptons(); - -} - -void ExE01PhysicsList::ConstructBosons() -{ - // pseudo-particles - G4Geantino::GeantinoDefinition(); - G4ChargedGeantino::ChargedGeantinoDefinition(); - - // gamma - G4Gamma::GammaDefinition(); - - // optical photon - G4OpticalPhoton::OpticalPhotonDefinition(); -} - -void ExE01PhysicsList::ConstructLeptons() -{ - // leptons - G4Electron::ElectronDefinition(); - G4Positron::PositronDefinition(); - G4NeutrinoE::NeutrinoEDefinition(); - G4AntiNeutrinoE::AntiNeutrinoEDefinition(); -} - -void ExE01PhysicsList::ConstructProcess() -{ - AddTransportation(); - ConstructEM(); -} - -#include "G4ComptonScattering.hh" -#include "G4GammaConversion.hh" -#include "G4PhotoElectricEffect.hh" - -#include "G4MultipleScattering.hh" - -#include "G4eIonisation.hh" -#include "G4eBremsstrahlung.hh" -#include "G4eplusAnnihilation.hh" - -void ExE01PhysicsList::ConstructEM() -{ - theParticleIterator->reset(); - while( (*theParticleIterator)() ){ - G4ParticleDefinition* particle = theParticleIterator->value(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - G4String particleName = particle->GetParticleName(); - - if (particleName == "gamma") { - // gamma - // Construct processes for gamma - pmanager->AddDiscreteProcess(new G4GammaConversion()); - pmanager->AddDiscreteProcess(new G4ComptonScattering()); - pmanager->AddDiscreteProcess(new G4PhotoElectricEffect()); - - } else if (particleName == "e-") { - //electron - // Construct processes for electron - pmanager->AddProcess(new G4MultipleScattering(),-1,1,1); - pmanager->AddProcess(new G4eIonisation(),-1,2,2); - pmanager->AddProcess(new G4eBremsstrahlung(),-1,-1,3); - - } else if (particleName == "e+") { - //positron - // Construct processes for positron - pmanager->AddProcess(new G4MultipleScattering(),-1,1,1); - - pmanager->AddProcess(new G4eIonisation(),-1,2,2); - pmanager->AddProcess(new G4eBremsstrahlung(),-1,-1,3); - pmanager->AddProcess(new G4eplusAnnihilation(),0,-1,4); - - } - } -} - -void ExE01PhysicsList::SetCuts() -{ - G4double cut = defaultCutValue; - if (verboseLevel >0){ - G4cout << "ExE01PhysicsList::SetCuts:"; - G4cout << "CutLength : " << cut/mm << " (mm)" << endl; - } - - // set cut values for gamma at first and for e- second and next for e+, - // because some processes for e+/e- need cut values for gamma - SetCutValue(cut, "gamma"); - SetCutValue(cut, "e-"); - SetCutValue(cut, "e+"); - - SetCutValueForOthers(cut); - - if (verboseLevel>1) { - DumpCutValuesTable(); - } -} diff --git a/examples/extended/E01/src/ExE01PrimaryGeneratorAction.cc b/examples/extended/E01/src/ExE01PrimaryGeneratorAction.cc deleted file mode 100644 index 2fadb24c7a..0000000000 --- a/examples/extended/E01/src/ExE01PrimaryGeneratorAction.cc +++ /dev/null @@ -1,36 +0,0 @@ - -#include "ExE01PrimaryGeneratorAction.hh" - -#include "G4Event.hh" -#include "G4ParticleGun.hh" -#include "G4ParticleTable.hh" -#include "G4ParticleDefinition.hh" -#include "globals.hh" - -ExE01PrimaryGeneratorAction::ExE01PrimaryGeneratorAction() -{ - G4int n_particle = 1; - particleGun = new G4ParticleGun(n_particle); -} - -ExE01PrimaryGeneratorAction::~ExE01PrimaryGeneratorAction() -{ - delete particleGun; -} - -void ExE01PrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent) -{ - G4ParticleTable* particleTable = G4ParticleTable::GetParticleTable(); - G4String particleName; - G4ParticleDefinition* particle - = particleTable->FindParticle(particleName="geantino"); - particleGun->SetParticleDefinition(particle); - - particleGun->SetParticleMomentumDirection(G4ThreeVector(0.,1.,0.)); - particleGun->SetParticleEnergy(100.*GeV); - particleGun->SetParticlePosition(G4ThreeVector(0.*cm,-300.*cm,0.*cm)); - - particleGun->GeneratePrimaryVertex(anEvent); -} - - diff --git a/examples/extended/E01/src/ExE01RunAction.cc b/examples/extended/E01/src/ExE01RunAction.cc deleted file mode 100644 index 196a2f85a0..0000000000 --- a/examples/extended/E01/src/ExE01RunAction.cc +++ /dev/null @@ -1,49 +0,0 @@ -// $Id: ExE01RunAction.cc,v 1.3 1999/04/22 21:49:21 asaim Exp $ - -#include "ExE01RunAction.hh" -#include "G4Run.hh" -#include "G4UImanager.hh" -#include "G4ios.hh" - -HepRef(Histo1D) ExE01RunAction::myHisto1D; -HepRef(Histo2D) ExE01RunAction::myHisto2D; - -void ExE01RunAction::BeginOfRunAction(const G4Run* aRun) -{ - G4UImanager* UI = G4UImanager::GetUIpointer(); - UI->ApplyCommand("/event/Verbose 0"); - UI->ApplyCommand("/tracking/Verbose 0"); - - dbApp.Init(); - dbApp.startUpdate(); - - HepDatabaseRef dbH = dbApp.db("ExE01DB"); - - // Number of histogram bins - int nBins1d = 100; - int nBins2d = 40; - - // Limits for values - double low = 0, high = 1; - double xlow = 0, xhigh = 1, ylow = 0, yhigh = 1; - - myHisto1D = new(dbH) - Histo1D("HepJamesRandom1", nBins1d, low, high); - - myHisto2D = new(dbH) - Histo2D("HepJamesVsDRand48", nBins2d, xlow, xhigh, nBins2d, ylow, yhigh); -} - -void ExE01RunAction::EndOfRunAction(const G4Run*) -{ - // Print histograms - HistPrintout p(G4cout); - - p.print(*myHisto1D); - p.print(*myHisto2D); - - // commit changes to Objectivty database - dbApp.commit(); -} - - diff --git a/examples/extended/E01/src/ExE01SteppingAction.cc b/examples/extended/E01/src/ExE01SteppingAction.cc deleted file mode 100644 index 47b189b1a1..0000000000 --- a/examples/extended/E01/src/ExE01SteppingAction.cc +++ /dev/null @@ -1,22 +0,0 @@ -// $Id: ExE01SteppingAction.cc,v 1.2 1999/04/17 04:06:49 kurasige Exp $ - -#include "ExE01SteppingAction.hh" -#include "ExE01RunAction.hh" - -void ExE01SteppingAction::UserSteppingAction(const G4Step*){ - - HepRef(Histo1D) h1 = ExE01RunAction::get_1d(); - HepRef(Histo2D) h2 = ExE01RunAction::Get2d(); - - HepRandom::setTheEngine(&theJamesEngine); - - double james = RandGauss::shoot(0.3,0.1); - h1->fill(james,0.01); - - HepRandom::setTheEngine(&theDRand48Engine); - - double d48 = RandGauss::shoot(0.7,0.1); - h2->fill(james,d48,0.01); -} - - diff --git a/examples/extended/E02/GNUmakefile b/examples/extended/E02/GNUmakefile deleted file mode 100644 index 6a771af278..0000000000 --- a/examples/extended/E02/GNUmakefile +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: GNUmakefile,v 1.1 1999/01/07 16:05:20 gunter Exp $ -# -------------------------------------------------------------- -# GNUmakefile for tests module. Gabriele Cosmo, 27/06/98. -# -------------------------------------------------------------- -# You must have unique G4EXAMPLE_FDID assigned by your local -# manager of Objectivity/DB lock server. -# -# G4EXAMPLE_BOOT is defined as $HOME/G4EXAMPLE by default. - -name := exampleE02 -G4ODBMS := true -G4TARGET := $(name) -G4EXLIB := true - -ifndef G4INSTALL - G4INSTALL = ../../.. -endif - -.PHONY: all cleandb -all: lib bin - -include $(G4INSTALL)/config/architecture.gmk - -include $(G4INSTALL)/config/binmake.gmk - - CPPFLAGS += \ - -Iinclude \ - -I$(G4TMPDIR) - -test: - @echo $(CPPFLAGS) - -# -------------------------------------------------------------- - -# override the target all, and warn if G4ODBMS flag is not defined. -ifndef G4ODBMS -all: - @echo Error - Persistency requires G4ODBMS and related database setup. - exit 1 -endif - -cleandb: -ifndef G4EXAMPLE_FDID - @echo G4EXAMPLE_FDID is not defined. Stop. - exit 1 -endif - @rm -f $(G4EXAMPLE_BOOT_DIR)/G4EXAMPLE - @rm -f $(G4EXAMPLE_BOOT_DIR)/G4EXAMPLE.FDDB - @rm -f $(G4EXAMPLE_BOOT_DIR)/*.G4EXAMPLE.DB - @echo Copying schema file to $(G4EXAMPLE_BOOT) for FDID $(G4EXAMPLE_FDID) - @$(HEP_ODBMS_DIR)/etc/getdb $(G4SCHEMA_DIR)/G4SCHEMA \ - $(G4EXAMPLE_BOOT) $(G4EXAMPLE_FDID) - diff --git a/examples/extended/E02/README b/examples/extended/E02/README deleted file mode 100644 index d35b353b2f..0000000000 --- a/examples/extended/E02/README +++ /dev/null @@ -1,151 +0,0 @@ -$Id: README,v 1.2 1999/04/29 09:04:55 morita Exp $ -------------------------------------------------------------------- - - ========================================================= - Geant4 - an Object-Oriented Toolkit for Simulation in HEP - ========================================================= - - Example E02 - ----------- - -This program demonstrates how user can use object database using -HepODBMS interface. Please contact your local system manager for -the avaiability of HepODBMS and Objectivity/DB. - -To use HepODBMS and underlying Objectivity/DB package, user needs -a deep knowledge of the object database and environmental set -procedures. The code is provided here to give just a brief idea -of using the persistency in Geant4. - -How to build: - -- Setup: - -In addition to the standard Geant4 setup, additional setup for -HepODBMS, Objectivity/DB and federated database should be defined. - -For CERN AFS users, an example setup script "g4odbms_setup.csh" is -provided in this directory. Put a line such as - -source ${G4INSTALL}/examples/extended/E02/g4odbms_setup.csh - -in your .cshrc file, where ${G4INSTALL} is the actual location of -the Geant4 package. - -- Objectivity/DB boot file and lock server - -Boot file is a set of configuration file and baseline federated database -file which contain database schema information of some basic -HepODBMS and Objectivity/DB classes. Each time you compile your -own persistent-capable class, a schema is compiled into your -local copy of federeated database. - -When creating a persistency library of Geant4, Geant4-specific persistent -classes will be compiled into your local copy of the boot file. - -Default location of the Geant4 boot file is $HOME/G4EXAMPLE. -You may want to change the definition of this temporary boot -file in your .cshrc. - -example: - setenv G4EXAMPLE_BOOT_DIR ${HOME}/tmp/G4EXAMPLE - setenv G4EXAMPLE_BOOT ${G4EXAMPLE_BOOT_DIR}/G4EXAMPLE - -For each boot file, you must have unique federated database ID (FDID). -This number can be obtained from your local manager of Objectivity -lock server. Define G4EXAMPLE_FDID in your .cshrc. - -example: - setenv G4EXAMPLE_FDID 501 - -To compile the schema and to build the library, you also need an -access to Objectivity/DB lock server. For the CERN AFS users, see -the notes below, for other systems, contact your local system manager -for the lock server configuration. - -Then type, - - gmake cleandb - -to create your local copy of Geant4 boot file. -___________________________________________________________________________ -Note: On CERN AFS, contact your group system administrator to obtain access - to your group lock server. If you want to run this example on your - own, you must run your own lock server process on the same machine as - you run the executable program, due to a technical limitation on AFS - and Objectivity. - - To start your own lock server process, - - oocheckls -notitle `hostname` || \ - oolockserver -notitle -noauto `hostname`::${G4EXAMPLE_BOOT} - - Then check the process with - - ps -ef | grep ools - .... - 60156 1 0 06:36:40 pts/15 0:00 ools -OO_NO_AUTOREC - .... - - When you finish running this example, don't forget to kill - the lock server process by yourself. - - ookillls - or - kill -9 - - You must have AFS ACL access to HepODBMS and Objectivity/DB - directories. - - At CERN, the FDID allocation table is given in this URL: - - http://wwwinfo.cern.ch/asd/rd45/white-papers/9804/FDIDAllocation.html -___________________________________________________________________________ - -- libG4persistency.a - -Persistency in Geant4 is provided as a separate sub category. -Geant4 installer must explictly go to ${G4INSTALL}/source/persistency -directory and type - - cd ...where Geant4 is installed... - cd source/persistency - gmake cleandb - gmake - gmake global - -to create libG4persistency.a. This process will also produce a base -schema file in the directory $(G4INSTALL)/schema/. - -- exampleE02 executable - -exampleE02 executable can be made by simply typing "gmake" in this directory. - -Current example of Geant4 persistency requires the executable to be -run as the same directory as your local federated database. -Use exampleE02run csh-script for simple test. - -example: - gmake cleandb # see above - gmake # creates exampleE02 executable - exampleE02run # run exampleE02 - -- Persistent output - -When exampleE02 is run correctly, following database files will be created -in your federated database directory. - -Events.G4EXAMPLE.DB G4EXAMPLE.FDDB System.G4EXAMPLE.DB -G4EXAMPLE Geometry.G4EXAMPLE.DB - -To browse the contents, use "ootoolmgr". - - cd ...your federated database directory... - setenv DISPLAY :0.0 - ootoolmgr -notitle G4EXAMPLE & - -Make sure to terminate ootoolmgr when you finish browsing. -Otherwise lockserver will remember the browsing by ootoolmgr as -a "transaction", and the further updates to the database will be blocked. - --- diff --git a/examples/extended/E02/exampleE02.cc b/examples/extended/E02/exampleE02.cc deleted file mode 100644 index 751acfba97..0000000000 --- a/examples/extended/E02/exampleE02.cc +++ /dev/null @@ -1,64 +0,0 @@ -// This code implementation is the intellectual property of -// the RD44 GEANT4 collaboration. -// -// By copying, distributing or modifying the Program (or any work -// based on the Program) you indicate your acceptance of this statement, -// and all its terms. -// -// $Id: exampleE02.cc,v 1.1 1999/01/07 16:05:21 gunter Exp $ -// GEANT4 tag $Name: geant4-00-01 $ -// -// -// -------------------------------------------------------------- -// GEANT4 - exampleE02 -// -// For information related to this code contact: -// CERN, IT Division, ASD Group -// -------------------------------------------------------------- -// Comments -// -// -// -------------------------------------------------------------- - - -#include "ExE02DetectorConstruction.hh" -#include "ExE02PhysicsList.hh" -#include "ExE02RunAction.hh" -#include "ExE02PrimaryGeneratorAction.hh" -#include "ExE02EventAction.hh" -#include "ExE02StackingAction.hh" - -#include "G4ios.hh" - -#include "G4RunManager.hh" -#include "G4PersistencyManager.hh" - -int main() -{ - // Persistency Manager - G4PersistencyManager * persistencyManager = - G4PersistencyManager::GetPersistencyManager(); - - // Run manager - G4RunManager * runManager = new G4RunManager; - - // Detector geometry - runManager->SetUserInitialization(new ExE02DetectorConstruction); - runManager->SetUserInitialization(new ExE02PhysicsList); - - // UserAction classes. - runManager->SetUserAction(new ExE02RunAction); - runManager->SetUserAction(new ExE02PrimaryGeneratorAction); - runManager->SetUserAction(new ExE02EventAction); - runManager->SetUserAction(new ExE02StackingAction); - - runManager->Initialize(); - - // Event loop - G4int n_event = 10; - runManager->BeamOn(n_event); - - delete runManager; - return 0; -} - diff --git a/examples/extended/E02/exampleE02.in b/examples/extended/E02/exampleE02.in deleted file mode 100644 index a9038b7447..0000000000 --- a/examples/extended/E02/exampleE02.in +++ /dev/null @@ -1,18 +0,0 @@ -# -# Macro file of "skeleton.cc" -# for tracking performance test -# -/control/verbose 2 -/run/verbose 2 -# -# SimpleBox geometry made by Pb -# Geantino 100 GeV to the direction (1.,0.,0.) -# 10 events -# -/mydet/switchDetector SimpleBox -/mydet/selectMaterial Pb -/gun/particle geantino -/gun/energy 100 GeV -/gun/direction 1 0 0 -/run/initialize -/run/beamOn 10 diff --git a/examples/extended/E02/exampleE02.out b/examples/extended/E02/exampleE02.out deleted file mode 100644 index b1f5eae613..0000000000 --- a/examples/extended/E02/exampleE02.out +++ /dev/null @@ -1,112 +0,0 @@ -Unit category